From cd5fb9501861e7ed7e24dc948bf048ad9e580218 Mon Sep 17 00:00:00 2001 From: chenfang Date: Fri, 5 Jan 2024 11:17:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/balance/index.ts | 8 ++++- .../deliver/deliverRequestMain/index.vue | 10 +++++-- .../inventorymoveJobMain.data.ts | 13 +++++++- .../inventorymoveRequestMain/index.vue | 14 +++++++++ .../inventorymoveRequestMain.data.ts | 30 +++++++++++++++++++ 5 files changed, 70 insertions(+), 5 deletions(-) diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 66cb6ddab..233002ba5 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -94,5 +94,11 @@ export const importTemplate = () => { // 获得库位代码筛选出的库存余额分页 export const selectLocationTypeToBalance = async (params) => { - return request.get({ url: '/wms/balance/pageLocationCodeToBalance', params}) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/balance/pageLocationCodeToBalanceSenior', data }) + } else { + return request.get({ url: '/wms/balance/pageLocationCodeToBalance', params}) + } } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 426f9b7b2..c25740677 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -293,12 +293,16 @@ const openForm =async (type: string, row?: number) => { if(type == "update"){ DeliverRequestMain.allSchemas.formSchema.forEach((item) => { if (item.field == 'deliverPlanNumber') { - item.componentProps.isSearchList = false + item.componentProps.isSearchList = false, + item.componentProps.disabled = true } }) }else { - item.componentProps.isSearchList = true, - item.componentProps.disabled = true + DeliverRequestMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'deliverPlanNumber') { + item.componentProps.isSearchList = true + } + }) } tableData.value = [] // 重置明细数据 formRef.value.open(type, row) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts index 2328ea65c..373ac82b0 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts @@ -700,7 +700,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([ }, }, { - label: '库存状态', + label: '从库存状态', field: 'inventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', @@ -710,6 +710,17 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '到库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '订单号', field: 'poNumber', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index cf8fadf58..95f638315 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -275,6 +275,20 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['fromBatch'] = val[0]['batch'] setV['fromInventoryStatus'] = val[0]['inventoryStatus'] setV['fromLocationCode'] = val[0]['locationCode'] + setV['uom'] = val[0]['uom'] + if(routeName.value == 'OktoholdRequestMain'){ + row['toInventoryStatus'] = "HOLD" + }else if ( routeName.value == 'HoldtookRequestMain') { + row['toInventoryStatus'] = "OK" + }else if ( routeName.value == 'HoldtoscrapRequestMain') { + row['toInventoryStatus'] = "SCRAP" + }else if ( routeName.value == 'OktoscrapRequestMain') { + row['toInventoryStatus'] = "SCRAP" + }else if ( routeName.value == 'ScraptoholdRequestMain') { + row['toInventoryStatus'] = "HOLD" + }else{ + row['toInventoryStatus'] = null + } } else { setV[formField] = val[0][searchField] } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 644885910..5776c9000 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -465,6 +465,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } }, { @@ -506,6 +511,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } }, { @@ -574,6 +584,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } }, { @@ -618,6 +633,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, tableForm: { type: 'Select' + }, + form: { + componentProps: { + disabled: true + } } }, { @@ -629,6 +649,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, tableForm: { disabled: true + }, + form: { + componentProps: { + disabled: true + } } }, { @@ -683,6 +708,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( tableForm: { disabled: true, type: 'Select' + }, + form: { + componentProps: { + disabled: true + } } }, { From 178a75ba0572f602f5ce6e056206e10b0a280750 Mon Sep 17 00:00:00 2001 From: chenfang Date: Fri, 5 Jan 2024 11:48:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=B7=B2=E9=80=89=E5=8F=91=E8=B4=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=8D=95=E5=8F=B7=E5=88=99=E9=9A=90=E8=97=8F=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=98=8E=E7=BB=86=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliver/deliverRequestMain/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index c25740677..80ca6ddb2 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -55,6 +55,7 @@ @handleDeleteTable="handleDeleteTable" @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" + :isShowButton = isShowButton /> @@ -113,8 +114,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV[formField] = val[0][searchField] if(formField == 'deliverPlanNumber') { setV['deliverPlanNumber'] = val[0]['number'] + if(setV['deliverPlanNumber'] != null){ + isShowButton.value = false + } setV['customerCode'] = val[0]['customerCode'] - isShowButton.value = false // 获取子表数据 getBomDisassemble DeliverPlanDetailApi.selectDetailByMasterID(val[0]['id']) .then(res => {