发票

src/views/finance/feeSettlement/columns.tsx

@@ -1320,7 +1320,7 @@ export const freeTableDetailColums: BasicColumn[] = [
   },
   {
     title: '未结金额',
-    dataIndex: 'restAmount',
+    dataIndex: 'maxRestAmount',
     width: 100,
   },
   {

src/views/finance/feeSettlement/detail/invoiceTable.vue

@@ -315,7 +315,7 @@ const onRowClick = (record, index) => {
     }
     PaymentFreeSettlementGetFees(data).then(res => {
       if (res.succeeded) {
-        res.data.items.forEach(item=>{
+        res.data.items.forEach(item => {
           item.maxRestAmount = item.restAmount
         })
         setTableData(res.data.items)
@@ -407,6 +407,22 @@ function addInfos() {
     })
   }
   if (route.query.type == 'free') {
+    const queryDataStr1 = JSON.parse(queryData.value.queryCondition)
+    const queryDataStrarr = [] as any
+    queryDataStr1.forEach(item => {
+      if (item.FieldName == 'feeType') {
+        queryDataStrarr.push(item)
+      }
+      if (item.FieldName == 'currency') {
+        queryDataStrarr.push(item)
+      }
+      if (item.FieldName == 'feeName') {
+        queryDataStrarr.push(item)
+      }
+      if (item.FieldName == 'FeeRange') {
+        queryDataStrarr.push(item)
+      }
+    })
     const data = [] as any
     arr.forEach(item => {
       data.push({
@@ -418,7 +434,11 @@ function addInfos() {
     })
     currenciesData.value = []
     exchangarr.value = []
-    PaymentFreeSettlementGetExchangesAsync(data).then(res => {
+    const obj = {
+      items: data,
+      queryCondition: JSON.stringify(queryDataStrarr)
+    }
+    PaymentFreeSettlementGetExchangesAsync(obj).then(res => {
       const cuArr = [] as any
       currenciesData.value = res.data
       res.data.forEach(item => {
@@ -522,6 +542,11 @@ function addInfosFee() {
   }
   if (cuArr.length == 0) {
     const list = JSON.parse(JSON.stringify(getSelectRowsDetail()))
+    list.forEach(item => {
+      item.originalCurrency = item.currency
+      item.currency = currency.value
+      item.originalAmount = item.restAmount
+    })
     emits('updateListFree', list, currency.value)
   }
 }
@@ -594,7 +619,7 @@ function handleSureExhange() {
           arrQuery.push(item)
         }
       })
-      emits('updateListFreeLeft', currenciesData.value, currency.value,arrQuery)
+      emits('updateListFreeLeft', currenciesData.value, currency.value, arrQuery)
     }
 
   }

src/views/finance/paymentSettlement/paymentSettlementFree/columns.tsx

@@ -1301,7 +1301,7 @@ export const freeTableDetailColums: BasicColumn[] = [
   },
   {
     title: '未结金额',
-    dataIndex: 'restAmount',
+    dataIndex: 'unsettledAmountText',
     width: 100,
   },
   {

src/views/finance/paymentSettlement/paymentSettlementFree/invoiceTable.vue

@@ -315,7 +315,7 @@ const onRowClick = (record, index) => {
     }
     PaymentFreeSettlementGetFees(data).then(res => {
       if (res.succeeded) {
-        res.data.items.forEach(item=>{
+        res.data.items.forEach(item => {
           item.maxRestAmount = item.restAmount
         })
         setTableData(res.data.items)
@@ -522,6 +522,11 @@ function addInfosFee() {
   }
   if (cuArr.length == 0) {
     const list = JSON.parse(JSON.stringify(getSelectRowsDetail()))
+    list.forEach(item => {
+      item.originalCurrency = item.currency
+      item.currency = currency.value
+      item.originalAmount = item.restAmount
+    })
     emits('updateListFree', list, currency.value)
   }
 }
@@ -595,7 +600,7 @@ function handleSureExhange() {
           arrQuery.push(item)
         }
       })
-      emits('updateListFreeLeft', currenciesData.value, currency.value,arrQuery)
+      emits('updateListFreeLeft', currenciesData.value, currency.value, arrQuery)
     }
 
   }

src/views/operation/invoiceApply/detail/index.vue

@@ -473,7 +473,6 @@ const bottomForm = [
     {
         label: '客户名称',
         field: 'customerName',
-        required: true,
         component: 'ApiSelect',
         colProps: { span: 4 },
         componentProps: ({ formModel }) => {