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="物料编码">
+ align="left"
+ min-width="120"
+ label="卷号">
+
+
@@ -555,23 +563,30 @@
prop="relatedOrderNo"
header-align="center"
align="left"
- min-width="100"
+ min-width="120"
label="生产订单">
+
+
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()
},