From ec2b75b9d928f2f54fd89550970947815a97ef24 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 16 Dec 2024 14:50:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?WMS=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=83=8C=E7=95=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 21 +++++++--- .../purchasereceiptRecordMain.data.ts | 13 +++--- .../purchasereceiptJobMain.data.ts | 15 ++++++- .../purchasereceiptRecordMain.data.ts | 15 ++++++- .../purchasereceiptRequestMain.data.ts | 15 ++++++- .../purchasereceiptRecordMain.data.ts | 11 ++--- .../purchasereceiptRequestMain.data.ts | 15 ++++++- .../purchasereceiptJobMain.data.ts | 15 ++++++- .../purchasereceiptRecordMain.data.ts | 40 ++++++++++++------- .../purchasereceiptRequestMain.data.ts | 15 ++++++- .../purchasereceiptJobMain.data.ts | 15 ++++++- .../purchasereceiptRecordMain.data.ts | 21 +++++++--- .../purchasereceiptRequestMain.data.ts | 15 ++++++- 13 files changed, 175 insertions(+), 51 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 6577c20d8..0ae88cc20 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,15 +669,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - sortTableDefault:11, - hiddenInMain:true + sortTableDefault: 10, + isTableForm: false, + isForm: false }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:11, + // hiddenInMain:true + // }, { label: '物料描述2', field: 'itemDesc2', diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 3cb60fdd1..61cb2eda9 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,14 +669,15 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 - }, - sortTableDefault:11, - hiddenInMain:true + }, + sortTableDefault: 10, + isTableForm: false, + isForm: false }, { label: '物料描述2', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts index d418e93e9..15014d8c3 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -972,7 +972,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas( sortTableDefault: 1008 }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -982,7 +982,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas( isSearch: true }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -990,6 +990,17 @@ export const PurchasereceiptJobDetail = useCrudSchemas( }, sortTableDefault: 7 }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 7, + isTableForm: false, + isForm: false + }, { label: '物料类型', field: 'itemType', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 33bbd3263..4a9620b54 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -668,6 +668,17 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, sortTableDefault:10, }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 10, + isTableForm: false, + isForm: false + }, { label: '物料描述1', field: 'itemDesc1', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 4093efc95..d769fe1e8 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,14 +669,15 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - sortTableDefault:11, - hiddenInMain:true + sortTableDefault: 10, + isTableForm: false, + isForm: false }, { label: '物料描述2', diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 4093efc95..d769fe1e8 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive disabled: true }, }, - { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:10, - isSearch: true - }, + { label: '是否已发送检验申请', field: 'inspectRequestFlag', @@ -660,7 +651,17 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品番', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 10, + isSearch: true + }, + { + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,15 +670,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - sortTableDefault:11, - hiddenInMain:true + sortTableDefault: 10, + isTableForm: false, + isForm: false }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:11, + // hiddenInMain:true + // }, { label: '物料描述2', field: 'itemDesc2', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 9de876502..60d477a41 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -749,7 +749,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,15 +669,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - sortTableDefault:11, - hiddenInMain:true + sortTableDefault: 10, + isTableForm: false, + isForm: false }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:11, + // hiddenInMain:true + // }, { label: '物料描述2', field: 'itemDesc2', diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 4093efc95..d769fe1e8 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive Date: Mon, 16 Dec 2024 16:17:18 +0800 Subject: [PATCH 2/6] =?UTF-8?q?YT-1722=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7-=E6=96=B0=E5=A2=9E=EF=BC=8C?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=BC=B9=E5=87=BA=E7=9A=84=E8=A6=81=E8=B4=A7=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=88=97=E8=A1=A8=E4=B8=AD=E5=A2=9E=E5=8A=A0=E3=80=90?= =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E3=80=91=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 0651aa38f..f076d3111 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -34,6 +34,15 @@ if(PurchasePlanDetailSchemas?.tableColumns){ formatter: dateFormatter2, sortTableDefault:2 }); + PurchasePlanDetailSchemas.tableColumns.splice(1, 0, { + label: '要货计划单号', + field: 'number', + table: { + width: 180 + }, + width: 180, + sortTableDefault:1 + }); } From 01caa25e1b35e2564e4159091323f0ab6e11b5a8 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 16 Dec 2024 16:20:36 +0800 Subject: [PATCH 3/6] =?UTF-8?q?YT-1718=EF=BC=9A=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=BC=80=E7=A5=A812-16=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 16 ++++++++++++++++ .../supplierinvoiceRequestMain/index.vue | 2 +- .../supplierinvoiceRequestMain.data.ts | 16 ++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 53edc52cb..d96edb212 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1615,6 +1615,22 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive isDetail: false, isTable: true, }, + { + label: '采购计量单位', + field: 'purchaseStdUom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + table: { + width: 150 + }, + isForm:false, + isTableForm:true, + isDetail: false, + isTable: true, + tableForm:{ + disabled:true + } + }, { label: '物料名称', field: 'itemName', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index a88ac0031..97663905e 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -602,7 +602,7 @@ const searchTableSuccess = (formField, searchField, val, searchFormRef, type, ro newRow['invoicableQuantity'] = item['invoicableQuantity'] newRow['itemCode'] = item['itemCode'] newRow['itemName'] = item['itemName'] - + newRow['purchaseStdUom'] = item['purchaseStdUom'] newRow['deliveryDate'] = item['prhRcpDate'] newRow['arrivalQty'] = item['prhRcvd'] newRow['id'] = item['id'] diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 9bc43307c..80cf33539 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1991,6 +1991,22 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive Date: Mon, 16 Dec 2024 16:39:52 +0800 Subject: [PATCH 4/6] =?UTF-8?q?YT-1719=E7=94=9F=E6=88=90=E5=A4=87=E6=96=99?= =?UTF-8?q?=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionMain/productionMain.data.ts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index ad36bcc6a..f8da1134e 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -475,6 +475,16 @@ export const ProductionMain = useCrudSchemas(reactive([ isTable: false, isForm: false, }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 350 + }, + isTable: false, + isForm: false, + }, // { // label: '开始时间', // field: 'beginTime', From ff41fb7b69110dc171f92af022fe42c45ea5081e Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 16 Dec 2024 18:35:51 +0800 Subject: [PATCH 5/6] =?UTF-8?q?YT-1718=EF=BC=9A=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=BC=80=E7=A5=A812-16=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index d96edb212..8ac1671fc 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1620,6 +1620,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive field: 'purchaseStdUom', dictType: DICT_TYPE.UOM, dictClass: 'string', + sortTableDefault:6, table: { width: 150 }, From 59043f7d5b8b878b7d1faa2bbb99d0428ab55a11 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 16 Dec 2024 19:17:47 +0800 Subject: [PATCH 6/6] =?UTF-8?q?YT-1720:=E8=A1=A5=E7=BB=99=E5=93=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=89=93=E5=8D=B0=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E9=A1=B5=E9=9D=A2=E7=BC=BA=E5=B0=91=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain.data.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index f076d3111..6d162b5f3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1977,6 +1977,14 @@ export const SupplierdeliverRequestPackage2 = useCrudSchemas(reactive