Merge remote-tracking branch 'origin/material-ui' into material-ui

2025-08-26 23:48:46 +08:00 · 2025-08-26 23:48:46 +08:00 · e885973e01
parent 31b32f4f2f b278a776c6
commit e885973e01
7 changed files with 64 additions and 19 deletions
--- a/src/api/purchase/goodsBind.js
+++ b/src/api/purchase/goodsBind.js
@ -72,6 +72,11 @@ export function exportNewBuy(purchaseId) {
        url: '/material/purchase/bind/downloadQrCode?purchaseId='+purchaseId,
        method: 'post',
        responseType: 'blob',
+        headers: {
+            encryptRequest: false,
+            checkIntegrity: false,
+            encryptResponse: false,
+        },
    })
 }
  
--- a/src/views/material/code/index.vue
+++ b/src/views/material/code/index.vue
@ -153,7 +153,7 @@

        <!-- 二维码下载对话框 -->
        <el-dialog title="二维码" :visible.sync="uploadOpen" width="450px" append-to-body :close-on-click-modal="false">
-            <div style="text-align: center" ref="codeBox">
+            <div style="text-align: center" ref="codeBox" v-if="uploadOpen">
                <div class="uploadImg">
                    <div id="qrcode" class="qrcode" ref="codeItem"></div> 
                </div>
--- a/src/views/material/lease/apply/component/addToolsApply.vue
+++ b/src/views/material/lease/apply/component/addToolsApply.vue
@ -263,7 +263,7 @@
            v-model="scope.row.preNum"
            type="text"
            style="width: 100%"
-            :disabled="scope.row.alNum && scope.row.alNum != 0"
+            :disabled="scope.row.alNum && scope.row.alNum != 0 ? true : false"
            @input="handlePreNum(scope.row, $event, 'input')"
            @blur="handlePreNum(scope.row, $event, 'blur')"
          />
@ -899,7 +899,7 @@ export default {
                  this.$message.error(`第 ${i + 1} 行的 ${'预领数量必须大于0'} `);
                  return
                }
-                if(this.equipmentList[i].preNum>this.equipmentList[i].storageNum){
+                if(this.equipmentList[i].preNum - this.equipmentList[i].alNum > this.equipmentList[i].storageNum){
                  this.$message.error(`第 ${i + 1} 行的 ${'预领数量不可大于库存量'} `);
                  return
                }
@ -923,6 +923,9 @@ export default {
                  this.maForm.leaseUnitId = this.maForm.unitId;
                  this.maForm.leaseProjectId = this.maForm.projectId;
                  console.log("编辑",this.maForm.bmFileInfos);
+                  if (this.maForm.leaseSignUrl) {
+                    delete this.maForm.leaseSignUrl
+                  }
                  this.loading = true;
                  updateApplyInfo({
                    leaseApplyDetailsList: this.equipmentList,
--- a/src/views/material/ma/device/index.vue
+++ b/src/views/material/ma/device/index.vue
@ -364,7 +364,7 @@

    <!-- 二维码下载对话框 -->
    <el-dialog title="二维码查看" :visible.sync="uploadOpen" width="450px" append-to-body :close-on-click-modal="false">
-      <div style="text-align: center" ref="codeQr">
+      <div style="text-align: center" ref="codeQr" v-if="uploadOpen">
        <div class="uploadImg">
          <div id="qrcode" class="qrcode" ref="codeItem"></div>
        </div>
@ -819,10 +819,12 @@ export default {

    // 二维码查看
    handleViewQrCode(row) {
+      console.log('🚀 ~ handleViewQrCode ~ row:', row)
      this.rowObj = row
      this.uploadOpen = true
      this.qrCode = row.qrCode
-      let str = row.qrCode
+      let str = 'http://ahjj.jypxks.com:9988/imw/backstage/machine/qrCodePage?qrcode=' + row.qrCode
+      console.log('🚀 ~ handleViewQrCode ~ str:', str)
      this.$nextTick(() => {
        this.$refs.codeItem.innerHTML = ''
        var qrcode = new QRCode(this.$refs.codeItem, {
@ -855,7 +857,7 @@ export default {

        // 使用 qrcodejs2 生成二维码
        new QRCode(qrcodeContainer, {
-          text: row.qrCode,
+          text: 'http://ahjj.jypxks.com:9988/imw/backstage/machine/qrCodePage?qrcode=' + row.qrCode,
          width: 256,
          height: 256,
          colorDark: '#000000',
--- a/src/views/material/repair/scrapManage/component/addToolsApply.vue
+++ b/src/views/material/repair/scrapManage/component/addToolsApply.vue
@ -135,6 +135,16 @@
        prop="scrapReason"
        :show-overflow-tooltip="true"
      />
+      <el-table-column
+        label="损坏原因"
+        align="center"
+        prop="scrapType"
+        :show-overflow-tooltip="true"
+      >
+        <template slot-scope="{ row }">
+          {{ row.scrapType == 0 ? '自然损坏' : '人为损坏' }}
+        </template>
+      </el-table-column>
      <el-table-column
        label="附件"
        align="center"
@ -357,12 +367,15 @@ export default {
        });
        return;
      } else { 
-        batchPassApi({'scrapApplyDetailsList':this.passTemp}).then((response) => {
-          if (response.code == 200) {
-            this.$modal.msgSuccess("通过成功");
-          }
-          this.getTaskInfo();
-        });
+        // 二次确认
+        this.$modal.confirm("是否确认通过所选择的数据项？").then(() => {
+          batchPassApi({'scrapApplyDetailsList':this.passTemp}).then((response) => {
+            if (response.code == 200) {
+              this.$modal.msgSuccess("通过成功");
+            }
+            this.getTaskInfo();
+          })
+        })
      }
    },
    //多个驳回
@ -374,12 +387,14 @@ export default {
        });
        return;
      } else {
-        batchRejectApi({'scrapApplyDetailsList':this.failTemp}).then((response) => {
-          if (response.code == 200) {
-            this.$modal.msgSuccess("驳回成功");
-          }
-          this.getTaskInfo();
-        });
+        this.$modal.confirm("是否确认驳回所选择的数据项？").then(() => {
+          batchRejectApi({'scrapApplyDetailsList':this.failTemp}).then((response) => {
+            if (response.code == 200) {
+              this.$modal.msgSuccess("驳回成功");
+            }
+            this.getTaskInfo();
+          })
+        })
      }
    },
  },
--- a/src/views/material/stquery/deviceComparisonStatistical.vue
+++ b/src/views/material/stquery/deviceComparisonStatistical.vue
@ -210,7 +210,7 @@ export default {
        const params = {
          keyWord: this.queryParams.keyWord,
          typeName: this.queryParams.typeName,
-          typeModelName: this.queryParams.typeModelName,
+          proName: this.queryParams.proName,
          pageSize: this.queryParams.pageSize,
          pageNum: this.queryParams.pageNum,
          startTime: this.queryParams.time ? this.queryParams.time[0] : '',
@ -281,6 +281,9 @@ export default {
      this.openUseRecord = true
      this.dialogUseQuery.typeId = row.typeId
      this.dialogUseQuery.keyWord = ''
+      this.dialogUseQuery.pageNum = 1
+      this.dialogUseQuery.pageSize = 10
+      this.useRecordList = []
      this.getUserRecords()
    },
    /** 查询在用设备列表 */
--- a/src/views/material/stquery/deviceStatusRecord.vue
+++ b/src/views/material/stquery/deviceStatusRecord.vue
@ -790,6 +790,9 @@ export default {
        this.openRecord = true
        this.dialogQuery.keyWord = ""
        this.dialogQuery.typeId = row.typeId;
+        this.dialogQuery.pageNum = 1
+        this.dialogQuery.pageSize = 10
+        this.dialogList = []
        this.getStoreCodeList()
      },
      /** 查询在库编码列表 */
@ -828,6 +831,9 @@ export default {
        this.openUseRecord = true
        this.dialogUseQuery.typeId= row.typeId
        this.dialogUseQuery.keyWord = "";
+        this.dialogUseQuery.pageNum = 1
+        this.dialogUseQuery.pageSize = 10
+        this.useRecordList = []
        this.getUserRecords()
      },
      /** 查询在用设备列表 */
@ -867,6 +873,9 @@ export default {
        this.dialogRepairQuery.typeId= row.typeId
        this.dialogRepairQuery.pageNum = 1;
        this.dialogRepairQuery.keyWord = "";
+        this.dialogRepairQuery.pageNum = 1
+        this.dialogRepairQuery.pageSize = 10
+        this.repairRecordList = []
        this.getRepairRecords()
      },
      /** 查询在修设备列表 */
@ -905,7 +914,9 @@ export default {
        this.openPurchaseRecord = true
        this.dialogPurchaseQuery.typeId= row.typeId
        this.dialogPurchaseQuery.pageNum = 1;
+        this.dialogPurchaseQuery.pageSize = 10
        this.dialogPurchaseQuery.keyWord = "";
+        this.purchaseRecordList = []
        this.getPurchaseRecords()
      },
      /** 查询新购入库设备列表 */
@ -944,7 +955,9 @@ export default {
        this.openTestedRecord = true
        this.dialogTestedQuery.typeId= row.typeId
        this.dialogTestedQuery.pageNum = 1;
+        this.dialogTestedQuery.pageSize = 10
        this.dialogTestedQuery.keyWord = "";
+        this.testedRecordList = []
        this.getTestedRecords()
      },
      /** 查询修试入库设备列表 */
@ -984,7 +997,9 @@ export default {
        this.openToScrapRecord = true
        this.dialogToScrapQuery.typeId= row.typeId
        this.dialogToScrapQuery.pageNum = 1;
+        this.dialogToScrapQuery.pageSize = 10
        this.dialogToScrapQuery.keyWord = "";
+        this.toScrapRecordList = []
        this.getToScrapRecords()
      },
      /** 查询待报废设备列表 */
@ -1023,7 +1038,9 @@ export default {
        this.openAuditedRecord = true
        this.dialogAuditedQuery.typeId= row.typeId
        this.dialogAuditedQuery.pageNum = 1;
+        this.dialogAuditedQuery.pageSize = 10
        this.dialogAuditedQuery.keyWord = "";
+        this.auditedRecordList = []
        this.getAuditedRecords()
      },
      /** 查询已审核报废设备列表 */