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

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

@@ -864,7 +864,7 @@ import {
 } from "@/api/lease/out";
 import vueEasyPrint from "vue-easy-print";
 // import chapter from '../../../../utils/chapter';
-// import printJS from 'print-js';
+import printJS from 'print-js';
 export default {
   dicts: ["lease_task_status"],
   components: { vueEasyPrint },

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>

src/views/material/stquery/deviceInBound.vue

@@ -95,7 +95,7 @@
           <el-table-column label="入库单号" align="center" prop="inputCode" :show-overflow-tooltip="true">
             <template slot-scope="scope">
               <span class="clickText" v-if="scope.row.inputType=='新购入库'" @click="jumpInput(scope.row.inputCode)">{{ scope.row.inputCode }}</span>
-              <span class="clickText" v-if="scope.row.inputType=='修试后入库'" @click="jumpRepairInput(scope.row.inputCode)">{{ scope.row.inputCode }}</span>
+              <span class="clickText" v-if="scope.row.inputType=='修试入库'" @click="jumpRepairInput(scope.row.inputCode)">{{ scope.row.inputCode }}</span>
             </template>
           </el-table-column>
           <el-table-column label="入库类型" align="center" prop="inputType" :show-overflow-tooltip="true"></el-table-column>
@@ -133,7 +133,7 @@ export default {
             multiple: true,
             // 显示搜索条件
             showSearch: true,
-            inputTypeList:[{id:'新购入库',name:'新购入库'},{id:'修试后入库',name:'修试后入库'},{id:'盘点入库',name:'盘点入库'}],
+            inputTypeList:[{id:'新购入库',name:'新购入库'},{id:'修试入库',name:'修试入库'},{id:'盘点入库',name:'盘点入库'}],
             // 总条数
             total: 0,
             // 主表格数据