Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui

src/views/business/costRecord/component/applyDetail.vue

@@ -537,7 +537,7 @@ export default {
         handleExportAll() {
             const params = this.rowData
             this.download(
-                'material/slt_agreement_info/exportAll',
+                'material/slt_agreement_info/exportAlls',
                 {...params,},
                 `全部费用明细_${new Date().getTime()}.xlsx`,
             )

src/views/material/back/component/queryReturn.vue

@@ -173,7 +173,7 @@
                  min-width="100"
             >
                 <template slot-scope="scope">
-                    <div style="color: rgb(2, 167, 240);" @click="openAddCode(scope.row)" v-if="scope.row.manageType==0">查看编码</div>
+                    <div style="color: rgb(2, 167, 240);" @click="openAddCode(scope.row)" v-if="scope.row.manageType==0">{{ scope.row.preNum }}</div>
                     <!-- <el-input
                         v-if="scope.row.manageType==1"
                         v-model.number="scope.row.preNum"
@@ -184,7 +184,7 @@
                         @input="checkNum(scope.row)"
                         style="width: 100%"
                     /> -->
-                    <div>{{ scope.row.preNum }}</div>
+                    <div v-if="scope.row.manageType==1">{{ scope.row.preNum }}</div>
                 </template>
             </el-table-column>
             <el-table-column

src/views/material/purchase/goodsArrived/component/home.vue

@@ -116,6 +116,7 @@
             @click="handleNotice(scope.row)" v-hasPermi="['purchase:person:notice']"
             >通知</el-button>
           <el-button size="mini" type="warning" 
+            v-if="scope.row.taskStatusName == '未完成'"
             @click="handlePrint(scope.row)"
             >验收单</el-button> 
           <el-button size="mini" type="danger" v-hasPermi="['purchase:info:remove']"

src/views/material/repair/scrapLedger/detail.vue

@@ -8,12 +8,16 @@
       v-show="showSearch"
       label-width="90px"
     >
-      <el-form-item  prop="dateRange">
+      <el-form-item prop="time">
           <el-date-picker
-            v-model="queryParams.month"
-            type="month"
-            placeholder="请选择月份">
-          </el-date-picker>
+              v-model="queryParams.time"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              style="width: 240px"
+          ></el-date-picker>
       </el-form-item>
       <el-form-item  prop="keyWord">
           <el-input
@@ -126,7 +130,7 @@ export default {
 
       // 查询参数
       queryParams: {
-        month:null,
+        time:null,
         keyWord: null,
         pageNum: 1,
         pageSize: 10,
@@ -158,8 +162,8 @@ export default {
       const params = {
           month: this.month,
           keyWord: this.queryParams.keyWord,
-          startTime: this.queryParams.month && this.queryParams.month[0],
-          endTime: this.queryParams.month && this.queryParams.month[1],
+          startTime: this.queryParams.time && this.queryParams.time[0],
+          endTime: this.queryParams.time && this.queryParams.time[1],
           pageSize: this.queryParams.pageSize,
           pageNum: this.queryParams.pageNum
       }
@@ -174,7 +178,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.keyWord = null;
-      this.queryParams.month = null;
+      this.queryParams.time = null;
       this.handleQuery();
     },
     /** 搜索按钮操作 */
@@ -189,8 +193,8 @@ export default {
         const params = {
           month: this.month,
           keyWord: this.queryParams.keyWord,
-          startTime: this.queryParams.month && this.queryParams.month[0],
-          endTime: this.queryParams.month && this.queryParams.month[1],
+          startTime: this.queryParams.time && this.queryParams.time[0],
+          endTime: this.queryParams.time && this.queryParams.time[1],
       }
       this.download(
         "/material/scrap_apply_details/getScrapDetailsList",

src/views/material/repair/scrapLedger/index.vue

@@ -1,11 +1,12 @@
 <template>
     <div class="app-container">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item  prop="dateRange">
+        <el-form-item  prop="month">
             <el-date-picker
               v-model="queryParams.month"
               type="month"
-              placeholder="请选择月份">
+              placeholder="请选择月份"
+              value-format="yyyy-MM">
             </el-date-picker>
         </el-form-item>
         <el-form-item  prop="keyWord">
@@ -87,7 +88,6 @@ import { getToken } from '@/utils/auth'
         // 显示搜索条件
         showSearch: true,
         showHouse: false,
-        dateRange:[],
         ids: [],
         infos: [],
         // 总条数
@@ -114,6 +114,7 @@ import { getToken } from '@/utils/auth'
         /** 查询列表 */
         getList() {
             this.loading = true;
+            console.log(this.queryParams)
             getScrapList(this.queryParams).then(response => {
                 this.tableList = response.data.rows;
                 this.total = response.data.total;