From 3961e27684378d81aa910276b1467955b52b6f2e Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Thu, 13 Jun 2024 14:15:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRequestMain/index.vue      |  1 +
 .../supplierinvoiceRequestMain.data.ts        | 56 ++++++++++---------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index 17bd9efa9..b03465d49 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -267,6 +267,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
             newRow['purchasePrice'] = item['purchasePrice']
             newRow['invoicableQuantity'] = item['invoicableQuantity']
             newRow['itemCode'] = item['itemCode']
+            newRow['planArriveTime'] = item['prhRcpDate']
           }
           tableData.value.push(newRow)
         })
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
index ef475c3e5..05ab4f7b9 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -1090,6 +1090,34 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isDetail: false,
     isTable: true,
   },
+  
+  {
+    label: '到货数量',
+    field: 'arrivalQty',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
   //仅是主列表页面的筛选搜索条件
   {
     label: '到货时间',
@@ -1119,35 +1147,11 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     formatter: dateFormatter2,
     sortTableDefault:5,
     isForm:false,
-    isTableForm:false,
-    isDetail: false,
-    isTable: true,
-  },
-  {
-    label: '到货数量',
-    field: 'arrivalQty',
-    table: {
-      width: 150
-    },
-    sortTableDefault:6,
-    isForm:false,
-    isTableForm:false,
+    isTableForm:true,
     isDetail: false,
     isTable: true,
-  },
-  {
-    label: '物料名称',
-    field: 'itemName',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    },
     tableForm:{
-      disabled: true
+      disabled:true
     }
   },
   {