From 44af11e6ffab07993d79bc51ac5a1ed74dd80cd4 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 29 Jun 2024 15:14:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E5=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierinvoiceRecordMain/index.vue       |  4 +--
 .../supplierinvoiceRequestMain/index.vue      |  2 ++
 .../supplierinvoiceRequestMain.data.ts        | 36 ++++++++++---------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
index 91eabd141..1a15570de 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue
@@ -225,9 +225,7 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => {
   requestTableObject.params.number = row.requestNumber
   await requestGetList()
   if(requestTableObject.tableList.length>0){
-    // row.annexMasterId = requestTableObject.tableList[0].masterId
-    row.annexMasterId = row.id
-
+    row.annexMasterId = requestTableObject.tableList[0].masterId
   }
 
 
diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
index fc389e9d7..003d4a688 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
@@ -342,6 +342,8 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
             newRow['deliveryDate'] = item['prhRcpDate']
             newRow['arrivalQty'] = item['prhRcvd']
             newRow['id'] = item['id']
+            newRow['currency'] = item['currency']
+            
           }
           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 a7b0900af..265581d6c 100644
--- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
+++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
@@ -117,6 +117,10 @@ export const PurchaseReceiptOrReturnRecordDetail = useCrudSchemas(reactive<CrudS
     label: '可开票数量',
     field: 'invoicableQuantity'
   },
+  {
+    label: '货币',
+    field: 'currency',
+  },
   {
     label: '物料代码',
     field: 'itemCode'
@@ -385,7 +389,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
   //   }
   // },
   {
-    label: '调整价差',
+    label: '折扣金额',
     field: 'discountAmount1',
     formatter: accountantFormart,
     table: {
@@ -1438,21 +1442,21 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     
   },
   
-  // {
-  //   label: '货币',
-  //   field: 'currency',
-  //   table: {
-  //     width: 150
-  //   },
-  //   form: {
-  //     componentProps: {
-  //       disabled: true
-  //     }
-  //   },
-  //   tableForm:{
-  //     disabled: true
-  //   }
-  // },
+  {
+    label: '货币',
+    field: 'currency',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '备注',
     field: 'remark',