From 71008c84866c7ba2173603710d382fae6fc7b3c8 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 5 Dec 2025 15:56:57 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-05=20=E6=94=B6=E8=B4=A7=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E4=BB=BB=E5=8A=A1-=E3=80=8B=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/qc/inboundNotification.vue | 80 ++++++++++++++------
 1 file changed, 58 insertions(+), 22 deletions(-)

diff --git a/src/views/modules/qc/inboundNotification.vue b/src/views/modules/qc/inboundNotification.vue
index 5be9376..891f505 100644
--- a/src/views/modules/qc/inboundNotification.vue
+++ b/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 并加上单引号
-        let partNos = this.partList2.map(part => part.partNo)
-        // 使用 join 将 partNo 连接成一个字符串
-        this.detailSearchData.partNos = partNos.join(",")
+        // 生产入库按卷号排除，其他入库按物料编码排除
+        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)
+          this.detailSearchData.partNos = partNos.join(",")
+        }
         this.handleGetProjectPartList()
       },
 
@@ -1494,8 +1526,12 @@
           return
         }
         this.partSelections2.forEach(item => {
-          // 使用 filter 过滤掉 partList2 中与 selection.part_no 相同的项
-          this.partList2 = this.partList2.filter(part => part.partNo !== item.partNo)
+          // 生产入库按卷号删除，其他入库按物料编码删除
+          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()
       },