From 0908fc6a70976b396f54f498e084307ce221fd49 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Tue, 8 Oct 2024 15:36:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?WMS=20bug=20HL-6211=20=EF=BC=9A=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E8=BD=AC=E5=90=88=E6=A0=BC=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRecordMain.data.ts | 3 -- .../inventorymoveRequestMain.data.ts | 7 +++- .../inventorymoveRequestMain.data.ts | 7 +++- .../inventorymoveRequestMain.data.ts | 7 +++- .../inventorymoveRequestMain.data.ts | 40 +++++++++---------- 5 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts index b80264573..5363d11ef 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts @@ -453,9 +453,6 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive( searchListPlaceholder: '请选择从包装号', searchField: 'packingNumber', searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, + searchAllSchemas: BalanceShow.allSchemas, searchPage: BalanceApi.selectLocationTypeToBalance, }, form: { @@ -599,7 +602,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( searchListPlaceholder: '请选择从包装号', searchField: 'packingNumber', searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, + searchAllSchemas: BalanceShow.allSchemas, searchPage: BalanceApi.selectLocationTypeToBalance, } } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts index f3fcbde3c..f4a276025 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts @@ -25,6 +25,9 @@ const queryParams = { // 获取当前操作人的部门 import { useUserStore } from '@/store/modules/user' import { TableColumn } from '@/types/table' +import { + BalanceShow +} from "@/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data"; const userStore = useUserStore() const userDept = userStore.userSelfInfo.dept // id 转str 否则form回显匹配不到 @@ -588,7 +591,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( searchListPlaceholder: '请选择从包装号', searchField: 'packingNumber', searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, + searchAllSchemas: BalanceShow.allSchemas, searchPage: BalanceApi.selectLocationTypeToBalance, }, form: { @@ -598,7 +601,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( searchListPlaceholder: '请选择从包装号', searchField: 'packingNumber', searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, + searchAllSchemas: BalanceShow.allSchemas, searchPage: BalanceApi.selectLocationTypeToBalance, } } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts index a3d55a9ac..656e456a6 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts @@ -25,6 +25,9 @@ const queryParams = { // 获取当前操作人的部门 import { useUserStore } from '@/store/modules/user' import { TableColumn } from '@/types/table' +import { + BalanceShow +} from "@/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data"; const userStore = useUserStore() const userDept = userStore.userSelfInfo.dept // id 转str 否则form回显匹配不到 @@ -588,7 +591,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( searchListPlaceholder: '请选择从包装号', searchField: 'packingNumber', searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, + searchAllSchemas: BalanceShow.allSchemas, searchPage: BalanceApi.selectLocationTypeToBalance, }, form: { @@ -598,7 +601,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( searchListPlaceholder: '请选择从包装号', searchField: 'packingNumber', searchTitle: '库存余额信息', - searchAllSchemas: Balance.allSchemas, + searchAllSchemas: BalanceShow.allSchemas, searchPage: BalanceApi.selectLocationTypeToBalance, } } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts index ede868261..0c1156a9e 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts @@ -540,6 +540,26 @@ export const BalanceShow = useCrudSchemas( }, isSearch: true }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true + }, + { + label: '库存数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber' + } + }, { label: '批次', field: 'batch', @@ -580,17 +600,6 @@ export const BalanceShow = useCrudSchemas( width: 180 } }, - { - label: '库存数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber' - } - }, { label: '库位代码', field: 'locationCode', @@ -611,15 +620,6 @@ export const BalanceShow = useCrudSchemas( width: 150 } }, - { - label: '物料名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true - }, { label: '物料描述1', field: 'itemDesc1', From adf392a12fab8eaa0e28ef1262cffe857c7c3c83 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 9 Oct 2024 08:41:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=9B=9E=E6=94=B6?= =?UTF-8?q?=E7=94=B3=E8=AF=B7---=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=A0=E7=BB=99=E5=90=8E=E7=AB=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productredress/productredressRequestMain/index.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index d79ad0225..4f3fd7fcd 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -176,6 +176,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }else if('productionLineCode'==formField){ //生产线 setV['workStationCode'] = '' + }else if('workStationCode'==formField){ + //工位代码 + setV['productionLineCode1'] = val[0]['productionLineCode']//用于没选生产线代码，给后端用 } formRef.setValues(setV) } @@ -446,6 +449,9 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } + if(!data.productionLineCode){ + data.productionLineCode = data.productionLineCode1 + } data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(item=>{ item['workStationCode'] = data['workStationCode'] From 76360b957e653f9c8d2dbc71c422efe6fef331eb Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 9 Oct 2024 08:46:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?HL-6178=E8=AE=A1=E5=88=92=E5=A4=96=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=EF=BC=8C=E9=80=89=E6=8B=A9=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81=E3=80=81?= =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=8E=9F=E5=9B=A0=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E6=8D=A2=E6=88=90=E6=9C=AC=E4=B8=AD=E5=BF=83=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=BA=94=E6=B8=85=E7=A9=BA=E9=A2=86=E7=94=A8=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E4=BB=A3=E7=A0=81=EF=BC=8C=E7=8E=B0=E5=8F=AF=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E4=BF=9D=E5=AD=98=E6=88=90=E5=8A=9F=EF=BC=8C=E9=A2=86?= =?UTF-8?q?=E7=94=A8=E5=8E=9F=E5=9B=A0=E4=BB=A3=E7=A0=81=E4=B8=8E=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E4=B8=AD=E5=BF=83=E7=B1=BB=E5=9E=8B=E4=B8=8D=E4=B8=80?= =?UTF-8?q?=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedissueRequestMain/index.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index c7d328cce..41241378c 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue @@ -60,6 +60,7 @@ @searchTableSuccess="searchTableSuccess" @submitForm="submitForm" @tableFormSelectOnBlur="tableFormSelectOnBlur" + @clearSearchInput="clearSearchInput" /> @@ -109,7 +110,16 @@ const tableColumns = ref([...UnplannedissueRequestMain.allSchemas.tableColumns,. const updataTableColumns = (val) => { tableColumns.value = val } - +const clearSearchInput = (field)=>{ + console.log('field',field) + if('costCenterCode' == field){ + //成本中心代码 + formRef.value.formRef.setValues({ + reasonCodeRequisition: '', + costCenterType: '' + }) + } +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { From e44ccfa7800bd6a6c56259e15303c8a1a9433a86 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 9 Oct 2024 09:49:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?WMS=20bug=20HL-6205=20HL-6206=20=EF=BC=9A?= =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E6=8A=A5=E5=BA=9F=E8=AE=B0=E5=BD=95=20=20?= =?UTF-8?q?=E7=BB=99QAD=20=E4=BC=A0=E6=95=B0=E9=87=8F=20=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=20=E5=AF=BC=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionscrapRecordMain/productionscrapRecordMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts index b8cb9edf4..48ab56bc1 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts @@ -664,7 +664,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive table: { width: 150 }, - hiddenInMain: true, + hiddenInMain: false, form: { component: 'InputNumber', }