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

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

@@ -373,8 +373,8 @@ export default {
                     ...this.queryParams,
                 }
                 const res = await getBackApplyList(params)
-                this.typeList = res.rows
+                this.typeList = res.data.rows
-                this.total = res.total
+                this.total = res.data.total
                 this.loading = false
             } catch (error) {}
         },

src/views/material/code/index.vue

@@ -430,7 +430,7 @@ export default {
                     const res = await addQrCodeApi(this.dialogForm)
                     if (res.code == 200) {
                         this.$message({ type: 'success', message: "新增成功" }) 
-                        this.open=true; 
+                        this.open=false; 
                         this.resetQuery()
                     }
                 }

src/views/material/lease/apply/component/homeApply.vue

@@ -443,9 +443,9 @@ export default {
         pageNum: this.queryParams.pageNum,
         statusList:[this.queryParams.taskStatus]
       };
-      getListLeaseApply(this.addDateRange(params)).then((response) => {
+      getListLeaseApply(params).then((response) => {
-        this.typeList = response.rows;
+        this.typeList = response.data.rows;
-        this.total = response.total;
+        this.total = response.data.total;
         this.loading = false;
       });
     },

src/views/material/lease/outBound/component/homeOutBound.vue

@@ -490,9 +490,9 @@ export default {
         pageSize: this.queryParams.pageSize,
         pageNum: this.queryParams.pageNum,
       };
-      getListLeaseApply(this.addDateRange(params)).then((response) => {
+      getListLeaseApply(params).then((response) => {
-        this.typeList = response.rows;
+        this.typeList = response.data.rows;
-        this.total = response.total;
+        this.total = response.data.total;
         this.loading = false;
       });
     },

src/views/material/lease/outBound/index.vue

@@ -933,8 +933,8 @@ export default {
         params.statusList=[this.queryParams.taskStatus]
       }
       getListLeaseApply(this.addDateRange(params)).then((response) => {
-        this.typeList = response.rows;
+        this.typeList = response.data.rows;
-        this.total = response.total;
+        this.total = response.data.total;
         this.loading = false;
       });
     },

src/views/material/part/partLease/component/homeApply.vue

@@ -334,8 +334,8 @@ export default {
         taskStatus: this.queryParams.taskStatus, 
       };
       getPartLeaseInfoListApi(params).then((response) => {
-        this.tableList = response.rows;
+        this.tableList = response.data.rows;
-        this.total = response.total;
+        this.total = response.data.total;
         this.loading = false;
       });
     },

src/views/material/repair/repairManage/component/edit.vue

@@ -1253,13 +1253,13 @@ export default {
               this.$message.error("配件数量不能为0！");
               return;
             }
-            const isCost = this.backTableList.some(
+            // const isCost = this.backTableList.some(
-              (item) => item.backCost == 0 || item.backCost == undefined
+            //   (item) => item.backCost == 0 || item.backCost == undefined
-            );
+            // );
-            if (isCost) {
+            // if (isCost) {
-              this.$message.error("维修金额不能为0！");
+            //   this.$message.error("维修金额不能为0！");
-              return;
+            //   return;
-            }
+            // }
             this.backTableList.forEach(item=>{
               item.supplierId = this.backForm.supplierId
               item.remark = this.backForm.remark

src/views/material/repair/repairManage/component/home.vue

@@ -378,8 +378,8 @@ export default {
                     ...this.queryParams,
                 }
                 const res = await getRepairTaskList(params)
-                this.tableList = res.rows
+                this.tableList = res.data.rows
-                this.total = res.total
+                this.total = res.data.total
                 this.loading = false
             } catch (error) {}
         },

src/views/material/repair/scrapManage/component/homeApply.vue

@@ -45,12 +45,12 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-check" size="mini" @click="handlePassAll">通过</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="el-icon-close" size="mini" @click="handleFailAll">驳回</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
       </el-col>
@@ -163,8 +163,8 @@ export default {
         pageNum: this.queryParams.pageNum,
       };
       getScrapApplyListApi(params).then((response) => {
-        this.tableList = response.rows;
+        this.tableList = response.data.rows;
-        this.total = response.total;
+        this.total = response.data.total;
         this.loading = false;
       });
     },

src/views/material/repair/testExamine/component/homeApply.vue

@@ -354,8 +354,8 @@ export default {
         taskType:5,
       };
       getListTestExamineApply(this.addDateRange(params)).then((response) => {
-        this.typeList = response.rows;
+        this.typeList = response.data.rows;
-        this.total = response.total;
+        this.total = response.data.total;
         this.loading = false;
       });
     },

src/views/material/repair/testedInBound/component/home.vue

@@ -197,8 +197,8 @@ export default {
     getList() {
       this.loading = true;
       getTestedListApi(this.queryParams).then((response) => {
-        this.testedList = response.rows;
+        this.testedList = response.data.rows;
-        this.total = response.total;
+        this.total = response.data.total;
         this.loading = false;
       });
     },