From 4bd810e93d43985f22856678ca7abd305855cf02 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 27 Dec 2024 10:00:24 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E9=A1=BA=E9=A5=AE=E5=93=81=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inducedProduct/deliverRecordMain/deliverRecordMain.data.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 5cf345dac..95d338743 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -596,8 +596,9 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true, isTableForm: false, + isSearch: true, + isForm: false }, { label: '描述', From ecd2a5669265bc73fd8bb240fe3ac3e2979deafb Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 27 Dec 2024 10:02:48 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E4=B8=B0=E7=94=B0=E8=A1=A5=E7=BB=99?= =?UTF-8?q?=E5=93=81=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain/deliverRecordMain.data.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index e7a3cd1df..9c75c6e63 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -272,7 +272,9 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true + isTableForm: false, + isSearch: true, + isForm: false }, { label: '描述', From aae8f13067f539c7f646997da5757069bc680254 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 27 Dec 2024 10:04:03 +0800 Subject: [PATCH 03/18] =?UTF-8?q?ss=E5=93=81=E5=8F=91=E8=B4=A7=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain/deliverRecordMain.data.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 478811166..3ae988d98 100644 --- a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -351,7 +351,9 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true + isTableForm: false, + isSearch: true, + isForm: false }, { label: '描述', From 29458352aa589be07206a6b2b2fddf110f390c3f Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 27 Dec 2024 10:07:32 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E5=A4=A9=E4=BA=95=E5=9C=B0=E6=AF=AF?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain/deliverRecordMain.data.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 9e41f03af..362b3dd9c 100644 --- a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -264,7 +264,9 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true + isTableForm: false, + isSearch: true, + isForm: false }, { label: '描述', From e726d207a90d891d21a2ee328cf1602f4aab5b50 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 27 Dec 2024 10:12:35 +0800 Subject: [PATCH 05/18] =?UTF-8?q?YT-1662=EF=BC=9A=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=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 --- .../customerSaleInvoiceRecordMain.data.ts | 19 +++++++++++++++++++ .../customerSaleInvoiceRequestMain.data.ts | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts index bf02b7f9d..6f3a6a436 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts @@ -350,6 +350,25 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive([ // } }, + { + label: '背番', + field: 'backNumber', + sort: 'custom', + isSearch: true, +isForm:false, +hiddenSearchHigh:true, + table: { + width: 150 + }, +form:{ + componentProps:{ + disabled: true, + } + }, + tableForm:{ + disabled:true + } + }, { label: '品号', field: 'articleNumber', diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts index 1df99173c..b6092b8db 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts @@ -379,6 +379,25 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive([ // } }, + { + label: '背番', + field: 'backNumber', + sort: 'custom', + isSearch: true, +isForm:false, +hiddenSearchHigh:true, + table: { + width: 150 + }, +form:{ + componentProps:{ + disabled: true, + } + }, + tableForm:{ + disabled:true + } + }, { label: '品号', field: 'articleNumber', From b05a54fcdf0c89e48330a6846a8f47a856a60ad8 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 27 Dec 2024 10:13:16 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E5=AE=A2=E6=88=B7PDA=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain/deliverRecordMain.data.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts index e4ae230cb..733deca5e 100644 --- a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -274,7 +274,9 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true + isTableForm: false, + isSearch: true, + isForm: false }, { label: '描述', From e51283c0969c6fbb97436b835ecf898ec8f1c933 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 27 Dec 2024 10:17:57 +0800 Subject: [PATCH 07/18] =?UTF-8?q?ss=EF=BC=8C=E5=A4=A9=E4=BA=95=EF=BC=8C?= =?UTF-8?q?=E4=B8=B0=E7=94=B0=EF=BC=8C=E5=AE=A2=E6=88=B7pda=EF=BC=8C?= =?UTF-8?q?=E7=9B=B4=E7=BA=B3=E5=93=81=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain/deliverRecordMain.data.ts | 1 - .../deliverRecordMain/deliverRecordMain.data.ts | 3 ++- .../deliverRecordMain/deliverRecordMain.data.ts | 1 - .../deliverRecordMain/deliverRecordMain.data.ts | 1 - .../deliverRecordMain/deliverRecordMain.data.ts | 1 - 5 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 733deca5e..4dd9133a0 100644 --- a/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverPdaRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -275,7 +275,6 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, isTableForm: false, - isSearch: true, isForm: false }, { diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts index cc2438032..2342adb94 100644 --- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -329,7 +329,8 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain: true + isTableForm: false, + isForm: false }, { label: '描述', diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 9c75c6e63..70d8c6923 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -273,7 +273,6 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, isTableForm: false, - isSearch: true, isForm: false }, { diff --git a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 3ae988d98..ebddd865f 100644 --- a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -352,7 +352,6 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, isTableForm: false, - isSearch: true, isForm: false }, { diff --git a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 362b3dd9c..1e22a5e60 100644 --- a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -265,7 +265,6 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ width: 150 }, isTableForm: false, - isSearch: true, isForm: false }, { From d1333ae31215d7615539d1861b3acf079895e68f Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 27 Dec 2024 10:39:03 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E7=BB=93=E7=AE=97=E5=87=BA=E5=BA=93?= =?UTF-8?q?=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 --- .../saleShipmentMainRecord.data.ts | 15 ++++++++++++++- .../saleShipmentMain.data.ts | 19 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts index 04f1bc054..d4a2f3487 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts @@ -304,7 +304,20 @@ export const SaleShipmentDetailRecord = useCrudSchemas(reactive([ label: '背番', field: 'itemDesc1', sort: 'custom', - isTable:false + isSearch: true, +isForm:false, +hiddenSearchHigh:true, + table: { + width: 150 + }, +tableForm:{ + disabled:true + }, +form:{ + componentProps:{ + disabled: true, + } + } }, { label: '描述', diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts index 53ec78613..501bb1637 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts @@ -407,6 +407,25 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + isSearch: true, +isForm:false, +hiddenSearchHigh:true, + table: { + width: 150 + }, +tableForm:{ + disabled:true + }, +form:{ + componentProps:{ + disabled: true, + } + } + }, { label: '批次', field: 'batch', From 2172a39e37baa477a4589bed90160c57b8520c4a Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 27 Dec 2024 10:41:14 +0800 Subject: [PATCH 09/18] =?UTF-8?q?YT-1847=E5=88=9B=E5=BB=BA=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=97=B6=EF=BC=8C=E8=83=8C=E7=95=AA=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=97=B6=E5=BA=94=E6=98=BE=E7=A4=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain.data.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 3a30605cb..69c92c724 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1748,7 +1748,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( width: 150 }, tableForm: { - disabled: true + disabled: true, + isPlaceholder:false }, form: { componentProps: { From f425b5c7f8fd6ff8d261c400c7f47e97eea3b308 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 27 Dec 2024 10:44:35 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverplan/deliverPlanMain/deliverPlanMain.data.ts | 6 ++++-- .../stockup/stockupMainRequest/stockupMainRequest.data.ts | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index b0b2ecff8..0773a3858 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -655,7 +655,8 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ minWidth: 150 }, isTableForm: false, - isForm: false + isForm: false, + hiddenSearchHigh: true }, { label: '计划数量', @@ -975,7 +976,8 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive([ width: 150 }, isTableForm: false, - isForm: false + isForm: false, + hiddenSearchHigh:true }, { label: '计划数量', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index 1de98e3b1..bc4bcee35 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -708,11 +708,11 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ label: '背番', field: 'itemDesc1', sort: 'custom', - isTableForm: false, table: { - width: 120 + width: 150 }, - hiddenInMain: true + isTableForm: false, + isForm: false }, { label: '描述', From 7f6b7f22526c78a50c03484798528ccf64d2f736 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 27 Dec 2024 10:56:14 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=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 --- .../deliverplan/saleMain/saleMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts index 159b008ee..9d3a42f7d 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts @@ -626,6 +626,7 @@ export const SaleDetail = useCrudSchemas(reactive([ label: '背番', field: 'itemDesc1', sort: 'custom', + hiddenSearchHigh:true, table: { width: 150 }, From e7766de15a3ab52802a48c26b5a1a7748962b556 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 27 Dec 2024 11:13:17 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E7=9B=98=E7=82=B9=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=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 --- .../countManage/count/countRequestMain/countRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts index 4c979636c..e68425b7b 100644 --- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts +++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts @@ -411,6 +411,7 @@ export const CountRequestDetail = useCrudSchemas(reactive([ label: '背番', field: 'itemDesc1', sort: 'custom', + hiddenSearchHigh:true, table: { width: 150 }, From 2dee0d1261bf5b4c873efde61c2fe8e3c667bea3 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 27 Dec 2024 11:18:16 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E7=9B=98=E7=82=B9=E8=B0=83=E6=95=B4?= =?UTF-8?q?=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 --- .../countadjustRecordMain/countadjustRecordMain.data.ts | 1 + .../countadjustRequestMain/countadjustRequestMain.data.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts index a5079c34d..f77c44782 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts @@ -333,6 +333,7 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive([ label: '背番', field: 'itemDesc1', sort: 'custom', + hiddenSearchHigh:true, table: { width: 150 }, diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index e9acaff7c..2e0425e8a 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -389,6 +389,7 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive([ label: '背番', field: 'itemDesc1', sort: 'custom', + hiddenSearchHigh:true, table: { width: 150 }, 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 14/18] =?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 15/18] =?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 16/18] =?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, From 6525b3fbff30b9e35b80a756a57b48cd94c885d0 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 27 Dec 2024 14:08:38 +0800 Subject: [PATCH 17/18] =?UTF-8?q?YT-1848=EF=BC=9A=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/unitConversion/index.ts | 57 ++++ .../itemManage/unitConversion/index.vue | 244 ++++++++++++++++++ .../unitConversion/unitConversion.data.ts | 171 ++++++++++++ 3 files changed, 472 insertions(+) create mode 100644 src/api/wms/unitConversion/index.ts create mode 100644 src/views/wms/basicDataManage/itemManage/unitConversion/index.vue create mode 100644 src/views/wms/basicDataManage/itemManage/unitConversion/unitConversion.data.ts diff --git a/src/api/wms/unitConversion/index.ts b/src/api/wms/unitConversion/index.ts new file mode 100644 index 000000000..1c43bd535 --- /dev/null +++ b/src/api/wms/unitConversion/index.ts @@ -0,0 +1,57 @@ +import request from '@/config/axios' + +export interface UnitConversionVO { + id: number + itemCode: string + uom: string + purchaseUom: string + convertRate: number + available: string + remark: string +} + +// 查询品番单位转换表（WMS）列表 +export const getUnitConversionPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/unit-conversion/senior', data }) + } else { + return await request.get({ url: `/wms/unit-conversion/page`, params }) + } +} + +// 查询品番单位转换表（WMS）详情 +export const getUnitConversion = async (id: number) => { + return await request.get({ url: `/wms/unit-conversion/get?id=` + id }) +} + +// 新增品番单位转换表（WMS） +export const createUnitConversion = async (data: UnitConversionVO) => { + return await request.post({ url: `/wms/unit-conversion/create`, data }) +} + +// 修改品番单位转换表（WMS） +export const updateUnitConversion = async (data: UnitConversionVO) => { + return await request.put({ url: `/wms/unit-conversion/update`, data }) +} + +// 删除品番单位转换表（WMS） +export const deleteUnitConversion = async (id: number) => { + return await request.delete({ url: `/wms/unit-conversion/delete?id=` + id }) +} + +// 导出品番单位转换表（WMS） Excel +export const exportUnitConversion = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/unit-conversion/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/unit-conversion/export-excel`, params }) + } +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/unit-conversion/get-import-template' }) +} \ No newline at end of file diff --git a/src/views/wms/basicDataManage/itemManage/unitConversion/index.vue b/src/views/wms/basicDataManage/itemManage/unitConversion/index.vue new file mode 100644 index 000000000..f193d68b5 --- /dev/null +++ b/src/views/wms/basicDataManage/itemManage/unitConversion/index.vue @@ -0,0 +1,244 @@ + + + diff --git a/src/views/wms/basicDataManage/itemManage/unitConversion/unitConversion.data.ts b/src/views/wms/basicDataManage/itemManage/unitConversion/unitConversion.data.ts new file mode 100644 index 000000000..7d6d6210a --- /dev/null +++ b/src/views/wms/basicDataManage/itemManage/unitConversion/unitConversion.data.ts @@ -0,0 +1,171 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const UnitConversionRules = reactive({ + itemCode: [required], + uom: [required], + purchaseUom: [required], + convertRate: [required], +}) + +export const UnitConversion = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isTable: false, + isForm: false, + }, + { + label: '品番', + field: 'itemCode', + sort: 'custom', + isSearch: true, + }, + { + label: '背番', + field: 'backNumber', + hiddenSearchHigh:true, + sort: 'custom', + isSearch: true, + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: true, + form: { + component: 'SelectV2' + }, + }, + { + label: '采购计量单位', + field: 'purchaseUom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + isSearch: true, + form: { + component: 'SelectV2' + }, + }, + { + label: '转换率', + field: 'convertRate', + sort: 'custom', + }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + isTable: false, + }, + // { + // label: '备注', + // field: 'remark', + // sort: 'custom', + // }, + { + label: '创建者', + field: 'creator', + isForm: false, + isTable: true, + table: { + width: 180 + }, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: true, + table: { + width: 180 + }, + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isTable: true, + isDetail: true, + formatter: dateFormatter, + isForm: false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + + // { + // label: '创建时间', + // field: 'createTime', + // sort: 'custom', + // isTable: true, + // formatter: dateFormatter, + // isForm: false, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // } + // }, + // { + // label: '操作', + // field: 'action', + // isForm: false, + // table: { + // width: 150, + // fixed: 'right' + // } + // } +])) From 53b9e1faa8d81f1f6fbbb5980cab7c6b53a91851 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Fri, 27 Dec 2024 14:16:16 +0800 Subject: [PATCH 18/18] =?UTF-8?q?YT-1847=E5=88=9B=E5=BB=BA=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=A1=B5=E5=8E=BB=E6=8E=89=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain.data.ts | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index 69c92c724..0b57dccd9 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1740,23 +1740,23 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( } } }, - { - label: '背番', - field: 'backNumber', - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true, - isPlaceholder:false - }, - form: { - componentProps: { - disabled: true - } - } - }, + // { + // label: '背番', + // field: 'backNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm: { + // disabled: true, + // isPlaceholder:false + // }, + // form: { + // componentProps: { + // disabled: true + // } + // } + // }, { label: '批次', field: 'batch',