2025-10-16

取值优化

src/views/modules/orderIssure/soIssueNotify/searchIssureNotify.vue

@@ -3770,35 +3770,25 @@
           this.$message.warning('请先选择一条申请单记录！');
           return;
         }
-
         if (!row.orderNo) {
           this.$message.warning('该记录没有关联工单，无法查询替代料！');
           return;
         }
-
         const params = {
           site: row.site,
           notifyNo: row.notifyNo,
           orderNo: row.orderNo,
           componentPart: row.componentPartNo
         };
-
         this.alternativePartsLoading = true;
         this.alternativePartsModalFlag = true;
-
         getBomAlternativeParts(params).then(({data}) => {
           if (data && data.code === 0) {
-            this.alternativePartsList = data.rows || [];
-            if (this.alternativePartsList.length === 0) {
-              this.$message.info('未找到该物料的替代料');
-            }
+            this.alternativePartsList = data.rows || []
           } else {
             this.$message.error(data.msg || '查询替代料失败');
             this.alternativePartsList = [];
           }
-        }).catch(err => {
-          this.$message.error('查询替代料失败: ' + err.message);
-          this.alternativePartsList = [];
         }).finally(() => {
           this.alternativePartsLoading = false;
         });

src/views/modules/print/PoPartPrint.vue

@@ -216,7 +216,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="本次可发行数量">
+            <el-form-item label="可发行数量">
               <el-input v-model="addModelData.remainingIssuableQty"  disabled style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
@@ -393,126 +393,144 @@ export default {
         {
           userId: this.$store.state.user.name,
           functionId: this.functionId,
-          serialNumber: '670Table1PoOrderNo',
+          serialNumber: '670Table1OrderQty',
           tableId: "670Table1",
           tableName: "采购检验合格单",
-          columnProp: "poOrderNo",
+          columnProp: "orderQty",
           headerAlign: "center",
-          align: "left",
-          columnLabel: "采购订单号",
-          columnWidth: '120',
+          align: "right",
+          columnLabel: "到货数量",
+          columnWidth: '100',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
-          sortLv: 5,
+          sortLv: 10,
           status: true,
           fixed: false
         },
         {
           userId: this.$store.state.user.name,
           functionId: this.functionId,
-          serialNumber: '670Table1PoItemNo',
+          serialNumber: '670Table1RollCount',
           tableId: "670Table1",
           tableName: "采购检验合格单",
-          columnProp: "poItemNo",
+          columnProp: "rollCount",
           headerAlign: "center",
-          align: "center",
-          columnLabel: "行号",
-          columnWidth: '80',
+          align: "right",
+          columnLabel: "到货卷数",
+          columnWidth: '100',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
-          sortLv: 6,
+          sortLv: 11,
           status: true,
           fixed: false
         },
         {
           userId: this.$store.state.user.name,
           functionId: this.functionId,
-          serialNumber: '670Table1SupplierName',
+          serialNumber: '670Table1BatchQualifiedQty',
           tableId: "670Table1",
           tableName: "采购检验合格单",
-          columnProp: "supplierName",
+          columnProp: "batchQualifiedQty",
+          headerAlign: "center",
+          align: "right",
+          columnLabel: "允许入库数",
+          columnWidth: '100',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 14,
+          status: true,
+          fixed: false
+        },
+        {
+          userId: this.$store.state.user.name,
+          functionId: this.functionId,
+          serialNumber: '670Table1PoOrderNo',
+          tableId: "670Table1",
+          tableName: "采购检验合格单",
+          columnProp: "poOrderNo",
           headerAlign: "center",
           align: "left",
-          columnLabel: "供应商",
+          columnLabel: "采购订单号",
           columnWidth: '120',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
-          sortLv: 7,
+          sortLv: 5,
           status: true,
           fixed: false
         },
         {
           userId: this.$store.state.user.name,
           functionId: this.functionId,
-          serialNumber: '670Table1InspectorDate',
+          serialNumber: '670Table1PoItemNo',
           tableId: "670Table1",
           tableName: "采购检验合格单",
-          columnProp: "inspectorDate",
+          columnProp: "poItemNo",
           headerAlign: "center",
           align: "center",
-          columnLabel: "检验日期",
-          columnWidth: '100',
+          columnLabel: "行号",
+          columnWidth: '80',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
-          sortLv: 8,
+          sortLv: 6,
           status: true,
           fixed: false
         },
         {
           userId: this.$store.state.user.name,
           functionId: this.functionId,
-          serialNumber: '670Table1InspectorNo',
+          serialNumber: '670Table1SupplierName',
           tableId: "670Table1",
           tableName: "采购检验合格单",
-          columnProp: "inspectorNo",
+          columnProp: "supplierName",
           headerAlign: "center",
           align: "left",
-          columnLabel: "检验员",
-          columnWidth: '100',
+          columnLabel: "供应商",
+          columnWidth: '120',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
-          sortLv: 9,
+          sortLv: 7,
           status: true,
           fixed: false
         },
         {
           userId: this.$store.state.user.name,
           functionId: this.functionId,
-          serialNumber: '670Table1OrderQty',
+          serialNumber: '670Table1InspectorDate',
           tableId: "670Table1",
           tableName: "采购检验合格单",
-          columnProp: "orderQty",
+          columnProp: "inspectorDate",
           headerAlign: "center",
-          align: "right",
-          columnLabel: "到货数量",
+          align: "center",
+          columnLabel: "检验日期",
           columnWidth: '100',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
-          sortLv: 10,
+          sortLv: 8,
           status: true,
           fixed: false
         },
         {
           userId: this.$store.state.user.name,
           functionId: this.functionId,
-          serialNumber: '670Table1RollCount',
+          serialNumber: '670Table1InspectorNo',
           tableId: "670Table1",
           tableName: "采购检验合格单",
-          columnProp: "rollCount",
+          columnProp: "inspectorNo",
           headerAlign: "center",
-          align: "right",
-          columnLabel: "到货卷数",
+          align: "left",
+          columnLabel: "检验员",
           columnWidth: '100',
           columnHidden: false,
           columnImage: false,
           columnSortable: false,
-          sortLv: 11,
+          sortLv: 9,
           status: true,
           fixed: false
         },
@@ -552,24 +570,6 @@ export default {
           status: true,
           fixed: false
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: this.functionId,
-          serialNumber: '670Table1BatchQualifiedQty',
-          tableId: "670Table1",
-          tableName: "采购检验合格单",
-          columnProp: "batchQualifiedQty",
-          headerAlign: "center",
-          align: "right",
-          columnLabel: "允许入库数",
-          columnWidth: '100',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 14,
-          status: true,
-          fixed: false
-        }
       ],
       columnArray2: [
         {
@@ -879,7 +879,7 @@ export default {
             batchQualifiedQty: row.batchQualifiedQty,
             remainingIssuableQty: outData.remainingIssuableQty,
             exceedInRatio: outData.exceedInRatio,
-            expirationFlag: outData.expirationFlag? outData.expirationFlag:'N',
+            expirationFlag: outData.expirationFlag,
             expirationDay:outData.expirationDay?Number(outData.expirationDay):0,
             nowRollQty: row.rollQty,
             productionDate: this.dayjs().format("YYYY-MM-DD"),