维修合格

src/api/repair/repair.js

@@ -10,6 +10,16 @@ export function getRepairTaskList(query) {
     params: query
   })
 }
+
+// // 查询维修任务一级列表
+// export function getRepaiDocumentInfo(query) {
+//   return request({
+//     url: '/material/repair/getRepaiDocumentInfo',
+//     method: 'get',
+//     params: query
+//   })
+// }
+
 // 查询维修任务机具列表二级列表
 export function getAppRepairMaTypeList(query) {
   return request({

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

@@ -94,13 +94,13 @@
       <el-table-column
         label="退料数量"
         align="center"
-        prop="repairNum"
+        prop="typeRepairNum"
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
         label="已修数量"
         align="center"
-        prop="repairedNum"
+        prop="typeRepairedNum"
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
@@ -108,7 +108,8 @@
         align="center"
         prop="disrepairNum"
         show-overflow-tooltip
-      ></el-table-column>
+      >
+      </el-table-column>
       <el-table-column label="管理模式" align="center" prop="manageType">
         <template slot-scope="scope">
           <!-- 0编码1数量 -->
@@ -1000,7 +1001,7 @@ export default {
       // 遮罩层
       loading: false,
       // 选中数组
-      ids: [],
+      idsTemp: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -1263,30 +1264,37 @@ export default {
       const res = await getAppRepairMaTypeList(param);
       this.equipmentList = res.data;
       this.equipmentList.forEach((e) => {
-        e.disrepairNum = Number(e.repairNum) - Number(e.repairedNum);
+        e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum);
       });
       // this.GetDeviceTypeTreeFn(data.backApplyInfo.agreementId)
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.queryParams.equipmentList = selection;
-      this.idsList = [];
+      // this.idsList = [];
-      this.ids = selection.map((item) => item.id);
+      selection.map((item) => {
-      selection.forEach((item) => {
+        if(item.ids.length>0){
-        this.idsList.push(item.id);
+          item.ids.forEach((itemTwo =>{
-      });
+            this.idsTemp.push(itemTwo)
+          }))
+        }
+      })
+      // this.idsTemp = selection.map((item) => item.ids);
+      // selection.forEach((item) => {
+      //   this.idsList.push(item.id);
+      // });
       this.single = selection.length != 1;
        this.multiple = !selection.length;
     },
     /** 批量合格按钮操作 */
     handleAdd() {
-      if (this.ids.length == 0) {
+      if (this.idsTemp.length == 0) {
         this.$alert("请至少勾选一条数据", "提示", {
           type: "warning",
           confirmButtonText: "确定",
         });
       }else{
-        auditPass(this.idsList).then((response) => {
+        auditPass(this.idsTemp).then((response) => {
           if (response.code == 200) {
             this.$modal.msgSuccess("通过成功");
           }
@@ -1295,8 +1303,8 @@ export default {
     },
     //单个合格按钮操作
     handleAddSingle(row){
-      const ids = [];
+      let ids = [];
-      ids.push(row.id);
+      ids = row.ids;
       this.$modal
         .confirm("是否确认合格所选择的数据项？")
         .then(function () {
@@ -1408,7 +1416,7 @@ export default {
       const res = await getAppRepairMaTypeList(param);
       this.equipmentList = res.data;
       this.equipmentList.forEach((e) => {
-        e.disrepairNum = Number(e.repairNum) - Number(e.repairedNum);
+        e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum);
       }); 
       this.openCode = false;
       // console.log(this.equipmentList)
@@ -1424,7 +1432,7 @@ export default {
       const res = await getAppRepairMaTypeList(param);
       this.equipmentList = res.data;
       this.equipmentList.forEach((e) => {
-        e.disrepairNum = Number(e.repairNum) - Number(e.repairedNum);
+        e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum);
       }); 
       this.openCode = false;
     },
@@ -1880,7 +1888,7 @@ export default {
           const res =  await getAppRepairMaTypeList(param);
           this.equipmentList = res.data;
           this.equipmentList.forEach((e) => {
-            e.disrepairNum = Number(e.repairNum) - Number(e.repairedNum);
+            e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum);
           }); 
           this.openNum=false;
         }
@@ -1931,7 +1939,7 @@ export default {
           const res =  await getAppRepairMaTypeList(param);
           this.equipmentList = res.data;
           this.equipmentList.forEach((e) => {
-            e.disrepairNum = Number(e.repairNum) - Number(e.repairedNum);
+            e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum);
           }); 
           this.openNum=false;
         }

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

@@ -425,6 +425,7 @@
   
 import {
     getRepairTaskList,
+    getRepaiDocumentInfo,
     rejectRepair,
     sendList,
     getRepairInfo,