From e6850ebfc3ac291eeae1ef8075adb7ee4a54477e Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 23 Jul 2024 19:28:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=A7=E5=93=A5-=E5=A4=87=E6=B3=A8+?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issueRequestMain/issueRequestMain.data.ts | 20 ++++++++++--------- .../repleinshRequestMain.data.ts | 4 +++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 2cca7fa28..1bc99e9ae 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -425,15 +425,17 @@ export const IssueRequestMain = useCrudSchemas( } } }, - // { - // label: '备注', - // field: 'remark', - // sort: 'custom', - // table: { - // width: 150 - // }, - // isTable: false - // }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: true, + isDetail: true + }, // { // label: '使用在途库', // field: 'useOnTheWayLocation', diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index ec2025149..d71ab0d84 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -205,7 +205,9 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isForm: false, + isTable: true, + isDetail: true }, { label: '到库位代码', From cf716b7b2c8e7c5a753ec06d9d5a2fbbce6378f5 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 23 Jul 2024 19:30:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemManage/relegate/relegateRequest/index.vue | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index fbef4898b..e74f25d3f 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -112,12 +112,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => nextTick(() => { if (type == 'tableForm') { if (formField == 'itemCode') { - let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['itemCode'])) - if(itemCodes.length>0){ - itemCodes = itemCodes.map(item=>(item['itemCode'])) - message.warning(`物料${itemCodes.join(',')}已经存在`) - } - val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode'])) + val = val.filter(item=>!tableData.value.find(item1=>item1['itemCode']==item['itemCode']&&item1['fromBatch']==item['batch']&&item1['fromPackingNumber']==item['packingNumber']&&item1['fromLocationCode']==item['locationCode']&&item1['inventoryStatus']==item['inventoryStatus'])) if(val.length==0) return val.forEach(item=>{ const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...item})) From 6a5ea9fd6535b6e483d8499c47f1844e94cdd997 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Tue, 23 Jul 2024 19:47:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E3=80=81=E5=AE=A2=E6=88=B7=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=89=B9=E6=AC=A1=E3=80=81=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E8=A7=84=E6=A0=BC=E3=80=81=E5=8C=85=E8=A3=85=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E6=B2=A1=E6=9C=89=E5=B8=A6=E5=87=BA=E3=80=81bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreceiptRecordMain.data.ts | 17 ++++++++++++---- .../customerreceiptRequestMain.data.ts | 2 +- .../customerreturnRecordMain.data.ts | 20 ++++++++++++++++++- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts index 976ac1f58..14f139488 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts @@ -483,15 +483,15 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive }, { label: '批次', - field: 'batch', + field: 'fromBatch', sort: 'custom', table: { width: 150 }, }, { - label: '包装代码', - field: 'packingNumber', + label: '包装号', + field: 'fromPackingNumber', sort: 'custom', table: { width: 150 @@ -506,7 +506,16 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '数量', + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + isSearch: false, + }, + { + label: '收货数量', field: 'qty', sort: 'custom', table: { diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts index 19d5b35c8..a39a9ce07 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts @@ -586,7 +586,7 @@ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive( }, }, { - label: '数量', + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 + }, + isSearch: false, + }, + { + label: '包装数量', + field: 'packQty', + sort: 'custom', + table: { + width: 150 + }, + isSearch: false, + }, + { + label: '退货数量', field: 'qty', sort: 'custom', table: {