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] =?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',