货币

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
   }
 
 

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)
         })

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',