新增字段、修改计算逻辑

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

@@ -187,7 +187,7 @@
             @click="handleUpdate(scope.row)"
             v-if="scope.row.status != '2'"
             >出库</el-button
-          > 
+          >
           <el-button
             size="mini"
             type="warning"
@@ -409,7 +409,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        time: null, //申请时间 
+        time: null, //申请时间
         taskStatus: "",
         keyWord: "",
       },

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"
@@ -145,14 +151,14 @@ export default {
             equipmentList: [],
 
             // 选中的设备类型
-            deviceType: null, 
+            deviceType: null,
             companyId: '',
             createBy: '',
             rowId: '',
         }
     },
     mounted() {
-         this.GetViewByApply();     
+         this.GetViewByApply();
     },
     computed: {
         ...mapState(["user"]),
@@ -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"
@@ -234,7 +240,7 @@ import {
 } from "@/api/repair/repair";
 export default {
   name: "Home",
-  dicts: ['repair_task_status'],  
+  dicts: ['repair_task_status'],
   data() {
     return {
       // 遮罩层

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>
@@ -103,7 +108,7 @@
               <div v-if="scope.row.manageType==0">编码管理</div>
               <div v-if="scope.row.manageType==1">数量管理</div>
         </template>
-      </el-table-column> 
+      </el-table-column>
       <el-table-column
         label="审核状态"
         align="center"