From 73db0a5bff976efd3f36998d19491fe1cac1bee6 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 27 Dec 2024 11:23:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=87=8C=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryManage/expectin/expectin.data.ts | 1 + .../wms/inventoryManage/expectout/expectout.data.ts | 1 + .../inventoryManage/transaction/transaction.data.ts | 12 ++++++++++++ .../inventoryManage/transferlog/transferlog.data.ts | 12 ++++++++++++ 4 files changed, 26 insertions(+) diff --git a/src/views/wms/inventoryManage/expectin/expectin.data.ts b/src/views/wms/inventoryManage/expectin/expectin.data.ts index 0bca62df5..264199338 100644 --- a/src/views/wms/inventoryManage/expectin/expectin.data.ts +++ b/src/views/wms/inventoryManage/expectin/expectin.data.ts @@ -38,6 +38,7 @@ export const Expectin = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + hiddenSearchHigh: true }, { label: '批次', diff --git a/src/views/wms/inventoryManage/expectout/expectout.data.ts b/src/views/wms/inventoryManage/expectout/expectout.data.ts index aa209337c..1d9136dc9 100644 --- a/src/views/wms/inventoryManage/expectout/expectout.data.ts +++ b/src/views/wms/inventoryManage/expectout/expectout.data.ts @@ -38,6 +38,7 @@ export const Expectout = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + hiddenSearchHigh: true }, { label: '包装号', diff --git a/src/views/wms/inventoryManage/transaction/transaction.data.ts b/src/views/wms/inventoryManage/transaction/transaction.data.ts index b59d93d93..bf377b82b 100644 --- a/src/views/wms/inventoryManage/transaction/transaction.data.ts +++ b/src/views/wms/inventoryManage/transaction/transaction.data.ts @@ -98,6 +98,18 @@ export const Transaction = useCrudSchemas(reactive([ }, isSearch: true, }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + isSearch: true, + hiddenSearchHigh: true + }, { label: '数量', field: 'qty', diff --git a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts index 9f20592e5..c27d2de17 100644 --- a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts +++ b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts @@ -55,6 +55,18 @@ export const Transferlog = useCrudSchemas(reactive([ }, isSearch: true, }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + isSearch: true, + hiddenSearchHigh: true + }, { label: '数量', field: 'qty', From 6a3cc4593d98125e6cfb5a075c7847b1638f7485 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 27 Dec 2024 11:39:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestMain.data.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index e82073ed5..08e7cc0c4 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -45,6 +45,7 @@ const queryParams = { // 获取当前操作人的部门 import { useUserStore } from '@/store/modules/user' import { TableColumn } from '@/types/table' +import { table } from 'console' const userStore = useUserStore() const userDept = userStore.userSelfInfo.dept // id 转str 否则form回显匹配不到 @@ -1520,8 +1521,12 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive Date: Fri, 27 Dec 2024 11:58:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=A4=87=E6=B3=A8=E5=8F=96?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchaseMain/purchaseMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index a6f67b895..1784ec0be 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -250,7 +250,7 @@ export const PurchaseMain = useCrudSchemas(reactive([ }, { label: '订单备注', - field: 'poRmks', + field: 'remark', sort: 'custom', isTable: false, isForm:false,