2025-12-05

收货入库任务-》生产入库类型的入库明细优化

src/views/modules/qc/inboundNotification.vue

@@ -331,14 +331,14 @@
               prop="partNo"
               header-align="center"
               align="left"
-              min-width="100"
+              min-width="120"
               label="物料编码">
             </el-table-column>
             <el-table-column
               prop="partDesc"
               header-align="center"
               align="left"
-              min-width="300"
+              min-width="200"
               label="物料名称">
             </el-table-column>
             <el-table-column
@@ -389,14 +389,14 @@
                 prop="partNo"
                 header-align="center"
                 align="left"
-                min-width="100"
+                min-width="120"
                 label="物料编码">
               </el-table-column>
               <el-table-column
                 prop="partDesc"
                 header-align="center"
                 align="left"
-                min-width="300"
+                min-width="200"
                 label="物料名称">
               </el-table-column>
               <el-table-column
@@ -469,21 +469,21 @@
               prop="relatedOrderNo"
               header-align="center"
               align="left"
-              min-width="100"
+              min-width="120"
               label="生产订单">
             </el-table-column>
             <el-table-column
               prop="partNo"
               header-align="center"
               align="left"
-              min-width="100"
+              min-width="120"
               label="物料编码">
             </el-table-column>
             <el-table-column
               prop="partDesc"
               header-align="center"
               align="left"
-              min-width="300"
+              min-width="200"
               label="物料名称">
             </el-table-column>
             <el-table-column
@@ -508,11 +508,19 @@
               label="可入库数">
             </el-table-column>
             <el-table-column
-              prop="countRollNo"
+              prop="rollNo"
               header-align="center"
-              align="right"
-              min-width="80"
-              label="可入库卷数">
+              align="left"
+              min-width="120"
+              label="卷号">
+            </el-table-column>
+            <el-table-column
+              prop="remark"
+              header-align="center"
+              align="left"
+              min-width="150"
+              show-overflow-tooltip
+              label="备注">
             </el-table-column>
           </el-table>
           <!-- 分页-->
@@ -555,23 +563,30 @@
                 prop="relatedOrderNo"
                 header-align="center"
                 align="left"
-                min-width="100"
+                min-width="120"
                 label="生产订单">
               </el-table-column>
               <el-table-column
                 prop="partNo"
                 header-align="center"
                 align="left"
-                min-width="100"
+                min-width="120"
                 label="物料编码">
               </el-table-column>
               <el-table-column
                 prop="partDesc"
                 header-align="center"
                 align="left"
-                min-width="300"
+                min-width="200"
                 label="物料名称">
               </el-table-column>
+              <el-table-column
+                prop="rollNo"
+                header-align="center"
+                align="left"
+                min-width="120"
+                label="卷号">
+              </el-table-column>
               <el-table-column
                 prop=""
                 header-align="center"
@@ -964,9 +979,22 @@
             columnWidth: 200,
           },
           {
-            columnProp: 'unit',
+            columnProp: 'rollNo',
             headerAlign: "center",
             align: "left",
+            columnLabel: '卷号',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 120,
+          },
+          {
+            columnProp: 'umName',
+            headerAlign: "center",
+            align: "center",
             columnLabel: '单位',
             columnHidden: false,
             columnImage: false,
@@ -974,7 +1002,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
-            columnWidth: 100,
+            columnWidth: 80,
           },
         ],
         columnDetailList2: [
@@ -1467,10 +1495,14 @@
 
       // 改变事件
       searchTypeChange () {
-        // 使用 map 提取 partNo 并加上单引号
+        // 生产入库按卷号排除，其他入库按物料编码排除
+        if (this.detailSearchData.orderType === '生产入库') {
+          let rollNos = this.partList2.map(part => part.rollNo)
+          this.detailSearchData.partNos = rollNos.join(",")
+        } else {
           let partNos = this.partList2.map(part => part.partNo)
-        // 使用 join 将 partNo 连接成一个字符串
           this.detailSearchData.partNos = partNos.join(",")
+        }
         this.handleGetProjectPartList()
       },
 
@@ -1494,8 +1526,12 @@
           return
         }
         this.partSelections2.forEach(item => {
-          // 使用 filter 过滤掉 partList2 中与 selection.part_no 相同的项
+          // 生产入库按卷号删除，其他入库按物料编码删除
+          if (this.detailSearchData.orderType === '生产入库') {
+            this.partList2 = this.partList2.filter(part => part.rollNo !== item.rollNo)
+          } else {
             this.partList2 = this.partList2.filter(part => part.partNo !== item.partNo)
+          }
         })
         this.searchTypeChange()
       },