From 2b14fd26bf866c1279b677d0e4d769e94fb8ef0a Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 21 Apr 2025 09:48:44 +0800
Subject: [PATCH] =?UTF-8?q?ECUP-404=E7=89=A9=E6=96=99=E5=90=8D=E7=A7=B0=20?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliver/purchaseMain/index.vue    |  1 +
 .../purchaseMain/purchaseMain.data.ts         | 16 ++++++++++
 .../supplierdeliverBasicForm.vue              |  1 +
 .../supplierdeliverRequestMain.data.ts        | 29 +++++++++++--------
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index 83ca0e8fb..e4dad792b 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -174,6 +174,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
               newRow['lineNumber'] = lineNumber
               newRow['uom'] = item['supplierUom']
               newRow['itemDesc1'] = item['itemDesc1']
+              newRow['itemName'] = item['itemName']
               newRow['id'] = item['id']
               tableData.value.push(newRow)
             })
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
index e05519270..b424a383c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts
@@ -506,6 +506,22 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '物料描述1',
     field: 'itemDesc1',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 1321bda66..82506f5ec 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -288,6 +288,7 @@ const getSearchTableData = async (number,formField,searchField,isAll)=>{
     newRow['allowOverShipment'] = row['allowOverShipment'] // 是否允许超发
     newRow['poNumber'] = row['poNumber']
     newRow['itemCode'] = row['itemCode']
+    newRow['itemName'] = row['itemName']
     newRow['itemDesc1'] = row['itemDesc1']
     newRow['poLine'] = row['poLine']
     newRow['orderQty'] = row['orderQty']
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index f4e956349..b0fbf8905 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -698,6 +698,23 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       disabled: true
     }
   },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:3,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '物料描述1',
     field: 'itemDesc1',
@@ -1232,18 +1249,6 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm: false,
     isForm: false
   },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isTableForm: false,
-    isForm: false
-  },
-  
   {
     label: '项目代码',
     field: 'projectCode',