From 9225e8ced8cd29523fd0c7002a93cdfd69ca3ff9 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 21 Apr 2025 10:12:53 +0800 Subject: [PATCH] =?UTF-8?q?ECUP-404=20SCP=E9=A1=B5=E9=9D=A2=E9=83=A8?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptJobMain.data.ts | 1 - .../purchasereceiptRecordMain.data.ts | 1 - .../purchasereturnRecordMain.data.ts | 1 - .../purchasePlanMain/index.vue | 5 ++ .../purchasePlanMain/purchasePlanMain.data.ts | 35 +++++++++++++ .../supplierdeliverRecordMain.data.ts | 49 ++++++++++--------- 6 files changed, 65 insertions(+), 27 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index 940d6f7fd..a8d0e4ab4 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -994,7 +994,6 @@ export const PurchasereceiptJobDetail = useCrudSchemas( table: { width: 150 }, - hiddenInMain: true, sortTableDefault: 7 }, { diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 93e8d66cf..22b576d01 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -747,7 +747,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive width: 150 }, sortTableDefault:11, - hiddenInMain:true }, { label: '物料描述2', diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts index f50117219..e95ed78da 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts @@ -772,7 +772,6 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( width: 150 }, sortSearchDefault: 7, - hiddenInMain: true }, { label: '物料描述2', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index dc29e1e66..3ff4a17ab 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -198,6 +198,9 @@ const { loadStart, loadDone } = usePageLoading() newRow[formField] = item[searchField] newRow['itemCode'] = item['code'] + newRow['itemName'] = item['itemName'] + newRow['itemDesc1'] = item['itemDesc1'] + newRow['poNumber'] = item['number'] newRow['poLine'] = item['lineNumber'] newRow['id'] = item['id'] @@ -286,6 +289,8 @@ const getSearchTableData = async (number,formField,searchField)=>{ // 明细查询页赋值 newRow[formField] = row[searchField] newRow['itemCode'] = row['itemCode'] + newRow['itemName'] = row['itemName'] + newRow['itemDesc1'] = row['itemDesc1'] newRow['poNumber'] = row['number'] newRow['poLine'] = row['lineNumber'] newRow['planQty'] = 0 // 默认值 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index b5c19eeb9..f8c48c804 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -752,6 +752,41 @@ export const PurchasePlanDetail = useCrudSchemas(reactive([ } } }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + form: { + componentProps: { + disabled: true + } + }, + sortTableDefault:3, + tableForm: { + disabled: true + } + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:3, + isTableForm: true, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true + } + }, { label: '订单数量', field: 'orderQty', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts index 742908d9e..7acd492f5 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts @@ -456,6 +456,30 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive width: 150 }, }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '数量', field: 'qty', @@ -649,30 +673,7 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive }, }, - { - label: '物料名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物料描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物料描述2', - field: 'itemDesc2', - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '项目代码', field: 'projectCode',