From facdf8f05579f04fa366cd281b0390cc56873197 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Mon, 23 Sep 2024 15:15:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=BC=80=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bookingcabin/CabinManagement/columns.tsx | 6 +- src/views/operation/invoicExamine/columns.tsx | 2 +- src/views/operation/invoiceApply/columns.tsx | 2 +- .../invoiceApply/detail/InvoiceDetails.vue | 9 +- src/views/operation/invoiceIssue/api.js | 14 + src/views/operation/invoiceIssue/columns.tsx | 6 +- .../invoiceIssue/detail/applyInvoice.vue | 332 +++++++++++++++--- .../operation/invoiceIssue/detail/index.vue | 60 +++- 8 files changed, 364 insertions(+), 67 deletions(-) diff --git a/src/views/bookingcabin/CabinManagement/columns.tsx b/src/views/bookingcabin/CabinManagement/columns.tsx index 17bf4c58..55610878 100644 --- a/src/views/bookingcabin/CabinManagement/columns.tsx +++ b/src/views/bookingcabin/CabinManagement/columns.tsx @@ -522,21 +522,21 @@ export const columns: BasicColumn[] = [ title: '装货港', align: 'center', width: 180, - dataIndex: 'portload', + dataIndex: 'portLoad', customCell: sharedOnCell, }, { title: '卸货港', align: 'center', width: 180, - dataIndex: 'portdischarge', + dataIndex: 'portDischarge', customCell: sharedOnCell, }, { title: '卸货港国家', align: 'center', width: 180, - dataIndex: 'portdischargeCountry', + dataIndex: 'portDischargeCountry', customCell: sharedOnCell, }, { diff --git a/src/views/operation/invoicExamine/columns.tsx b/src/views/operation/invoicExamine/columns.tsx index 638c135d..f529252e 100644 --- a/src/views/operation/invoicExamine/columns.tsx +++ b/src/views/operation/invoicExamine/columns.tsx @@ -227,7 +227,7 @@ export const feeColumns: BasicColumn[] = [ }, { title: '申请金额', - dataIndex: 'amount', + dataIndex: 'applyAmount', width: 80, }, { diff --git a/src/views/operation/invoiceApply/columns.tsx b/src/views/operation/invoiceApply/columns.tsx index 46364ecb..08da0779 100644 --- a/src/views/operation/invoiceApply/columns.tsx +++ b/src/views/operation/invoiceApply/columns.tsx @@ -584,7 +584,7 @@ export const feeColumns: BasicColumn[] = [ }, { title: '申请金额', - dataIndex: 'orderAmount', + dataIndex: 'applyAmount', width: 80, }, { diff --git a/src/views/operation/invoiceApply/detail/InvoiceDetails.vue b/src/views/operation/invoiceApply/detail/InvoiceDetails.vue index 85716abf..0279b98e 100644 --- a/src/views/operation/invoiceApply/detail/InvoiceDetails.vue +++ b/src/views/operation/invoiceApply/detail/InvoiceDetails.vue @@ -260,8 +260,11 @@ function changeApply() { exchangeArr.push(item) } }) - if (exchangeArr.length > 0) { - const promises = exchangeArr.map(item => { + const filteredItems = exchangeArr.filter((item, index, self) => + index === self.findIndex((t) => t.currency === item.currency) + ); + if (filteredItems.length > 0) { + const promises = filteredItems.map(item => { return new Promise((resolve) => { const data = { currencyFrom: 'RMB', @@ -278,7 +281,7 @@ function changeApply() { exchangeFlag.value = true }); } - if (exchangeArr.length == 0) { + if (filteredItems.length == 0) { const arr = getSelectRowsFee() let total = 0 arr.forEach(item => { diff --git a/src/views/operation/invoiceIssue/api.js b/src/views/operation/invoiceIssue/api.js index a423f571..05aad281 100644 --- a/src/views/operation/invoiceIssue/api.js +++ b/src/views/operation/invoiceIssue/api.js @@ -168,4 +168,18 @@ export function FreeInvoiceGetFees(parameter) { method: 'post', data: parameter, }) +} +export function FreeInvoiceSave(parameter) { + return request({ + url: '/feeApi/FreeInvoice/Save', + method: 'post', + data: parameter, + }) +} +export function GetCurrencies(parameter) { + return request({ + url: '/feeApi/FreeInvoice/GetCurrencies', + method: 'post', + data: parameter, + }) } \ No newline at end of file diff --git a/src/views/operation/invoiceIssue/columns.tsx b/src/views/operation/invoiceIssue/columns.tsx index cc6de2eb..7d835def 100644 --- a/src/views/operation/invoiceIssue/columns.tsx +++ b/src/views/operation/invoiceIssue/columns.tsx @@ -713,7 +713,7 @@ export const feeColumnsDetail: BasicColumn[] = [ }, { title: '申请金额', - dataIndex: 'orderAmount', + dataIndex: 'applyAmount', width: 80, }, { @@ -748,12 +748,12 @@ export const feeColumnsDetail: BasicColumn[] = [ }, { title: '装货港', - dataIndex: 'saleName', + dataIndex: 'saleName2', width: 80, }, { title: '卸货港', - dataIndex: 'saleName', + dataIndex: 'saleName1', width: 80, }, ] diff --git a/src/views/operation/invoiceIssue/detail/applyInvoice.vue b/src/views/operation/invoiceIssue/detail/applyInvoice.vue index 04f24f34..c15413d6 100644 --- a/src/views/operation/invoiceIssue/detail/applyInvoice.vue +++ b/src/views/operation/invoiceIssue/detail/applyInvoice.vue @@ -3,7 +3,7 @@
- +