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

2024-12-27 10:16:55 +08:00 · 2024-12-27 10:16:55 +08:00 · 40a290936d
parent 992c849f42 0a821b88b1
commit 40a290936d
6 changed files with 56 additions and 39 deletions
--- a/src/views/material/lease/outBound/component/homeOutBound.vue
+++ b/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: "",
      },
--- a/src/views/material/lease/outBound/index.vue
+++ b/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 },
--- a/src/views/material/repair/repairManage/component/view.vue
+++ b/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);
      });
    },
    },
--- a/src/views/material/repair/testExamine/component/homeApply.vue
+++ b/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 {
      // 遮罩层
--- a/src/views/material/repair/testExamine/component/queryToolsApply.vue
+++ b/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"
--- a/src/views/material/stquery/deviceInBound.vue
+++ b/src/views/material/stquery/deviceInBound.vue
@ -19,7 +19,7 @@
            clearable :maxlength="20"
            style="width: 220px"
          />
-        </el-form-item> 
+        </el-form-item>
        <el-form-item label="物资名称" prop="typeName">
            <el-input
                v-model="queryParams.typeName"
@ -74,17 +74,17 @@
                size="mini"
                @click="handleExport"
                >导出</el-button
-            > 
+            >
        </el-form-item>
      </el-form>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> 
-      <el-table v-loading="loading" :data="tableList" border>  
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <el-table v-loading="loading" :data="tableList" border>
          <el-table-column label="序号" align="center" width="80" type="index">
-                <template scope="scope"> 
+                <template scope="scope">
                    <span>{{ (queryParams.pageNum - 1) * 10 + scope.$index+1 }}</span>
-                </template> 
-          </el-table-column> 
-           
+                </template>
+          </el-table-column>
+
          <el-table-column label="物资名称" align="center" prop="typeName" :show-overflow-tooltip="true"/>
          <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true"/>
          <el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true"/> 
@ -95,12 +95,12 @@
          <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>
          <el-table-column label="入库类型" align="center" prop="inputType" :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column label="入库方式" align="center" prop="inputStyle" :show-overflow-tooltip="true"/> 
-      </el-table> 
+          <el-table-column label="入库方式" align="center" prop="inputStyle" :show-overflow-tooltip="true"/>
+      </el-table>
      <pagination
          v-show="total > 0"
          :total="total"
@ -108,14 +108,14 @@
          :limit.sync="queryParams.pageSize"
          :page-sizes="[5, 10, 15, 20, 30]"
          @pagination="getList"
-      />  
+      />
    </div>
 </template>

 <script>
 import {
    getInputRecordListApi
-} from '@/api/stquery/stquery'; 
+} from '@/api/stquery/stquery';
 export default {
    name: '',
    dicts: [],
@ -132,25 +132,25 @@ export default {
            // 非多个禁用
            multiple: true,
            // 显示搜索条件
-            showSearch: true, 
-            inputTypeList:[{id:'新购入库',name:'新购入库'},{id:'修试后入库',name:'修试后入库'},{id:'盘点入库',name:'盘点入库'}],
+            showSearch: true,
+            inputTypeList:[{id:'新购入库',name:'新购入库'},{id:'修试入库',name:'修试入库'},{id:'盘点入库',name:'盘点入库'}],
            // 总条数
            total: 0,
            // 主表格数据
-            tableList: [], 
+            tableList: [],
            // 查询参数
            queryParams: {
                pageNum: 1,
                pageSize: 10,
                time: null,
                keyWord: null,
-                typeName: null, //物资名称 
-                typeModelName: null, //物资名称  
-                
-            }, 
+                typeName: null, //物资名称
+                typeModelName: null, //物资名称
+
+            },
        }
    },
-    created() { 
+    created() {
        this.getList()
    },
    methods: {
@ -179,7 +179,7 @@ export default {
            //   totalPrice: res.data.rows[0].projUsingDto.totalTotalPrice||0,
            //   isSltName:''
            // }
-            // this.tableList.unshift(obj) 
+            // this.tableList.unshift(obj)
          }else{
            this.tableList=[]
          }
@ -189,13 +189,13 @@ export default {
      handleQuery() {
          this.queryParams.pageNum = 1
          this.getList()
-      }, 
+      },
      /** 重置按钮操作 */
-      resetQuery() { 
+      resetQuery() {
        this.queryParams.time=[]
        this.resetForm('queryForm')
        this.handleQuery()
-      }, 
+      },
      /** 导出按钮操作 */
      handleExport() {
          this.download(
@ -212,7 +212,7 @@ export default {
      },
       // 跳转修试后入库
      jumpRepairInput(code){
-        this.$router.push({ path: "/repair/testedInBound", query: {'code':code} });   
+        this.$router.push({ path: "/repair/testedInBound", query: {'code':code} });
      },

    },