From f565ef1a1fc976ebe6e491b24a73d083bba24e91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Fri, 14 Nov 2025 23:14:38 +0800 Subject: [PATCH] 1 --- .../noOrderIssue/newNoOrderIssueNotify.vue | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/views/modules/noOrderIssue/newNoOrderIssueNotify.vue b/src/views/modules/noOrderIssue/newNoOrderIssueNotify.vue index b1141e1..18f76af 100644 --- a/src/views/modules/noOrderIssue/newNoOrderIssueNotify.vue +++ b/src/views/modules/noOrderIssue/newNoOrderIssueNotify.vue @@ -99,9 +99,9 @@ - shoporder - slittingorder - shipment + 分切订单 + 销售发货 + 成品订单 @@ -212,7 +212,7 @@ 添加 - + @@ -363,7 +363,7 @@ import { saveSOIssueNotifyOrderList, deleteNotifySOS, searchNotifyMaterialListNew, - + } from '@/api/orderIssure/soIssueNotify.js' import Chooselist from '@/views/modules/common/Chooselist_eam' import { @@ -410,7 +410,6 @@ export default { dataList2: [], dataList3: [], materialDetailList: [], - materialDetailColumnList: [], currentRow: '', dataListLoading: false, // 是否收藏 @@ -1068,7 +1067,7 @@ export default { availableMaterialLimit: 100, // 每页条数 availableMaterialTotal: 0, // 总条数 componentPartNo: '', // 物料编码搜索 - orderType: 'shoporder', + orderType: 'slittingorder', // 申请明细弹框相关 isMaterialDetailModal: false, // 标识是否从申请明细弹框打开选择物料弹框 clickrow:{}, @@ -1650,7 +1649,7 @@ export default { // 打开选择物料弹框 openSelectMaterialModal() { this.isMaterialDetailModal = false // 标识从新增工单物料弹框打开 - + // 设置模板编号和名称 this.modelCode = this.seqNoData.orderNo this.modelName = this.seqNoData.releaseNo @@ -1684,7 +1683,7 @@ export default { const selectedPartNos = this.selectedMaterialList.map( (item) => item.partNo || item.componentPartNo ) - + // 如果是从申请明细弹框打开的,还需要过滤掉sobomList中已存在的物料 if (this.isMaterialDetailModal && this.sobomList && this.sobomList.length > 0) { const sobomPartNos = this.sobomList.map( @@ -1807,7 +1806,7 @@ export default { // 确认选择物料 confirmSelectMaterial() { if (this.isMaterialDetailModal) { - + // 从申请明细弹框打开的情况,将右侧"已有物料"列表的完整数据更新到sobomList const selectedItems = JSON.parse(JSON.stringify(this.selectedMaterialList)) // 将选中的物料转换为sobomList需要的格式 @@ -1828,7 +1827,7 @@ export default { // 将右侧"已有物料"列表的完整数据替换sobomList(包括原有和新增的) this.sobomList = selectedItems console.log("this.sobomList", this.sobomList); - + this.isMaterialDetailModal = false } else { // 从新增工单物料弹框打开的情况,将数据添加到seqNoList