新增字段、修改计算逻辑

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

@@ -81,11 +81,17 @@
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
-        label="已修数量"
+        label="已维修数量"
         align="center"
         prop="typeRepairedNum"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column
+        label="报废数量"
+        align="center"
+        prop="typeScrapNum"
+        show-overflow-tooltip
+      ></el-table-column>
       <el-table-column
         label="待修数量"
         align="center"
@@ -174,7 +180,7 @@ export default {
       const res = await getAppRepairMaTypeList(param);
       this.equipmentList = res.data;
       this.equipmentList.forEach((e) => {
-        e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum);
+        e.disrepairNum = Number(e.typeRepairNum) - Number(e.typeRepairedNum) - Number(e.typeScrapNum);
       });
     },
     },

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

@@ -131,11 +131,17 @@
         :show-overflow-tooltip="true"
       />
       <el-table-column
-        label="维修单号"
+        label="维修审核单号"
         align="center"
         prop="repairNum"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="任务单号"
+        align="center"
+        prop="repairTaskCode"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="物资类型"
         align="center"

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

@@ -80,15 +80,20 @@
         prop="repairedNum"
         :show-overflow-tooltip="true"
       />
+      <el-table-column
+        label="报废数量"
+        align="center"
+        prop="scrapNum"
+        :show-overflow-tooltip="true"
+      />
       <el-table-column
         label="待修数量"
         align="center"
-        prop="waitNum"
         :show-overflow-tooltip="true"
       >
         <template slot-scope="scope">
           <div>
-            {{ scope.row.repairNum - scope.row.repairedNum }}
+            {{ scope.row.repairNum - scope.row.repairedNum - scope.row.scrapNum }}
           </div>
         </template>
       </el-table-column>