From cdb2ea0e872cd3ecee278823ee63fe987c9f1c7a Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 16 Oct 2024 09:36:59 +0800 Subject: [PATCH 1/7] =?UTF-8?q?HL-6188=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?= =?UTF-8?q?=EF=BC=8C0927=E4=BC=9A=E8=AE=AE=E8=AE=A8=E8=AE=BA=EF=BC=8C?= =?UTF-8?q?=E8=AF=A6=E8=A7=81=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 8 -------- .../customerreturn/customerreturnRequestMain/index.vue | 4 +--- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 867199c08..bb1fe36ed 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -134,14 +134,6 @@ export const CustomerreturnRequestMain = useCrudSchemas( } } }, - { - label: ' ', - field: 'kong', - isForm: true, - isTable: false, - isSearch: false, - isDetail: false, - }, { label: '从库位代码', field: 'fromLocationCode', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 60e32f7d6..ae923f2d7 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -62,9 +62,7 @@ @onEnter="onEnter" @inputNumberChange="inputNumberChange" @clearSearchInput="clearSearchInput" - > - - + /> From 03f2a0a18bc827bfef5ab84e45981df41c97157f Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 16 Oct 2024 15:45:35 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=BE=BE=E6=98=8E=E6=96=B0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=8E=BB=E6=8E=89available?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain.data.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index bb1fe36ed..402447f35 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -1492,11 +1492,6 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive searchAllSchemas: BalanceCopy.allSchemas, searchPage: BalanceApi.getBalanceByLocation, searchCondition:[ - { - key: 'available', - value: 'TRUE', - isMainValue: false - }, { message: '请选择从库位代码！', key: 'locationCode', @@ -1515,11 +1510,6 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive searchAllSchemas: BalanceCopy.allSchemas, // 查询弹窗所需类 searchPage: BalanceApi.getBalanceByLocation, // 查询弹窗所需分页方法 searchCondition:[ - { - key: 'available', - value: 'TRUE', - isMainValue: false - }, { message: '请选择从库位代码！', key: 'locationCode', From 3f1f602ddc2e36282dbbcd5150e3b9f0726161b2 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 16 Oct 2024 16:31:03 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=BE=BE=E6=98=8E--=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleShipmentMainRecord.data.ts | 16 ++++++++-------- .../saleShipmentMain.data.ts | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts index 6afc3ec22..d991ca111 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts @@ -216,14 +216,14 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive([ sort: 'custom', isTable:false }, - { - label: '批次', - field: 'batch', - sort: 'custom', - table: { - width: 150, - } - }, + // { + // label: '批次', + // field: 'batch', + // sort: 'custom', + // table: { + // width: 150, + // } + // }, { label: '库存状态', field: 'inventoryStatus', diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts index b9117e79d..823244b3a 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts @@ -314,9 +314,9 @@ export const SaleShipmentDetailRules = reactive({ fromLocationCode: [ { required: true, message: '请选择客户库位', trigger: 'blur' } ], - batch: [ - { required: true, message: '请输入批次', trigger: 'blur' } - ], + // batch: [ + // { required: true, message: '请输入批次', trigger: 'blur' } + // ], qty: [ { required: true, message: '请输入开票数量', trigger: 'blur' } ], @@ -405,11 +405,11 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '批次', - field: 'batch', - sort: 'custom', - }, + // { + // label: '批次', + // field: 'batch', + // sort: 'custom', + // }, { label: '客户库位', field: 'fromLocationCode', From 2bf9b46be43c4e5704a541e55ff8e4c8d373b9f5 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 16 Oct 2024 16:34:59 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9C=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleShipmentMainRecord.data.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts index d991ca111..6afc3ec22 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts @@ -216,14 +216,14 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive([ sort: 'custom', isTable:false }, - // { - // label: '批次', - // field: 'batch', - // sort: 'custom', - // table: { - // width: 150, - // } - // }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150, + } + }, { label: '库存状态', field: 'inventoryStatus', From cc67b1f7bc4ee81302cfc9b5b969b8a5129c7cff Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 16 Oct 2024 17:29:54 +0800 Subject: [PATCH 5/7] =?UTF-8?q?HL-6188=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRequestMain/index.vue | 82 ++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index ae923f2d7..bd68d9462 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -93,7 +93,7 @@ :isShowButton="false" :isShowReduceButton="false" @submitForm="submitFormLabel" - @searchTableSuccess="searchTableSuccess" + @searchTableSuccess="searchTableSuccessLabel" /> @@ -144,6 +144,86 @@ const onEnter = async (field,value)=>{ console.log('onEnter',field,value) } // 查询页面返回 +const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row ) => { + nextTick(() => { + console.log('searchTableSuccess',formField, searchField, val, formRef, type, row) + CustomerreturnRequestMain.allSchemas.formSchema.forEach(item => { + if(item.field == 'deliverRecordNumber') { + if(customerCode.value != null){ + item.componentProps.searchCondition = [ + { + key: 'customerCode', + value: customerCode.value , + isMainValue: false + }] + } + } + }) + + console.log(128, customerCode.value) + + if (type == 'tableForm') { + if(formField == 'packingNumber') { + row['packingNumber'] = val[0]['packingNumber'] + row['containerNumber'] = val[0]['containerNumber'] + row['batch'] = val[0]['batch'] + row['inventoryStatus'] = val[0]['inventoryStatus'] + row['fromLocationCode'] = val[0]['locationCode'] + row['itemCode'] = val[0]['itemCode'] + row['uom'] = val[0]['uom'] + }else if(formField == 'packUnit'){ + row['packUnit'] = val[0]['packUnit'] + row['packQty'] = val[0]['packQty'] + } else { + row[formField] = val[0][searchField] + } + } else { + const setV = {} + if (formField == 'customerCode') { + setV['deliverRecordNumber'] = '' + setV['q1Number'] = '' + tableData.value = [] + } + if(formField == 'deliverRecordNumber') { + setV['deliverRecordNumber'] = val[0]['number'] + setV['deliverPlanNumber'] = val[0]['deliverPlanNumber'] + // setV['customerCode'] = val[0]['customerCode'] + // setV['customerDockCode'] = val[0]['customerDockCode'] + + // 获取子表数据 + DeliverRecordDetailApi.getDeliverRecordDetailPageCustomerreturn({pageSize:999,masterId:val[0]['masterId']}).then(res => { + + res.list.forEach(obj => { + let value = null + value = obj.fromLocationCode + obj.fromLocationCode = obj.toLocationCode + obj.toLocationCode = '' + obj.packingNumber = '' // 包装号所有为空 + CustomerreturnRequestDetail.allSchemas.tableFormColumns.map(item =>{ + if(item.field == 'packingNumber') { + item.isInpuFocusShow = false + item.tableForm.isInpuFocusShow = false + item.tableForm.disabled = true + } + }) + }) + if (res) { + tableData.value = [...res.list] + originTableData.value = [...res.list] + } + + }).catch(err => { + console.log(err) + message.error('错误') + }) + } else { + setV[formField] = val[0][searchField] + } + formRef.setValues(setV) + } + }) +} +// 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { console.log('searchTableSuccess',formField, searchField, val, formRef, type, row) From 49a15d8cc417353c76352fbdd9ad848327266c6e Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 17 Oct 2024 09:09:00 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=94=B3=E8=AF=B7--=E6=9B=B4=E6=8D=A2=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliversettlementManage/saleShipmentMainRequest/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index 7f8cff2c0..0ae64db7c 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -349,7 +349,7 @@ const openForm = (type: string, row?: any) => { const inputNumberChange = (field, val,row, index) => { if(field=='qty'){ if(row['subSettleQty']!=null&&row['qty']>row['subSettleQty']){ - message.error(`物料${row['itemCode']}最大数量为${row['subSettleQty']}`) + message.error(`${row['itemCode']}物料开票数量${row['qty']}大于库存数量${row['subSettleQty']}`) } } console.log('inputNumberChange',field, val,row, index) @@ -364,7 +364,7 @@ const submitForm = async (formType, submitData) => { tableData.value.forEach(item=>{ if(item['subSettleQty']!=null&&item['qty']>item['subSettleQty']){ flag = false - message.error(`物料${item['itemCode']}最大数量为${item['subSettleQty']}`) + message.error(`${item['itemCode']}物料开票数量${item['qty']}大于库存数量${item['subSettleQty']}`) } }) if(!flag){ From 19e13982ae5db59475b1371f7701cc9b575817fa Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 17 Oct 2024 11:15:18 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleShipmentMainRequest/index.vue | 1 + .../saleShipmentMain.data.ts | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index 0ae64db7c..105c38110 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -178,6 +178,7 @@ const updataTableColumns = (val) => { tableColumns.value = val } + const { tableObject, tableMethods } = useTable({ getListApi: SaleShipmentDetailApi.getSaleShipmentDetailPage // 分页接口 }) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts index 823244b3a..b9117e79d 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts @@ -314,9 +314,9 @@ export const SaleShipmentDetailRules = reactive({ fromLocationCode: [ { required: true, message: '请选择客户库位', trigger: 'blur' } ], - // batch: [ - // { required: true, message: '请输入批次', trigger: 'blur' } - // ], + batch: [ + { required: true, message: '请输入批次', trigger: 'blur' } + ], qty: [ { required: true, message: '请输入开票数量', trigger: 'blur' } ], @@ -405,11 +405,11 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ width: 150 }, }, - // { - // label: '批次', - // field: 'batch', - // sort: 'custom', - // }, + { + label: '批次', + field: 'batch', + sort: 'custom', + }, { label: '客户库位', field: 'fromLocationCode',