diff --git a/src/api/payment/invoiceApplication.js b/src/api/payment/invoiceApplication.js index 806a89f..3e0433f 100644 --- a/src/api/payment/invoiceApplication.js +++ b/src/api/payment/invoiceApplication.js @@ -5,8 +5,12 @@ const baseUrl = '/blade-transport/invoice-application'; export const getList = (current, size, params) => request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } }); export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } }); -export const getSettlementCandidates = keyword => - request({ url: `${baseUrl}/settlement-candidates`, method: 'get', params: { keyword } }); +export const getSettlementCandidates = (current, size, params) => + request({ + url: `${baseUrl}/settlement-candidates`, + method: 'get', + params: { current, size, ...params }, + }); export const getSettlementDetails = settlementIds => request({ url: `${baseUrl}/settlement-details`, method: 'get', params: { settlementIds } }); export const getReceiverInformation = settlementIds => diff --git a/src/api/settlement/formalSettlement.js b/src/api/settlement/formalSettlement.js index bad7c4c..78aa78b 100644 --- a/src/api/settlement/formalSettlement.js +++ b/src/api/settlement/formalSettlement.js @@ -32,6 +32,12 @@ export const syncKingdee = id => request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } }); export const getDetailFees = detailId => request({ url: `${baseUrl}/detail-fees`, method: 'get', params: { detailId } }); +export const getReceiptClaims = formalSettlementId => + request({ + url: `${baseUrl}/receipt-claims`, + method: 'get', + params: { formalSettlementId }, + }); export const adjustDetail = data => request({ url: `${baseUrl}/adjust-detail`, method: 'post', data }); export const applyPayment = data => diff --git a/src/option/settlement/preSettlementTable.js b/src/option/settlement/preSettlementTable.js index 33355a6..b383b92 100644 --- a/src/option/settlement/preSettlementTable.js +++ b/src/option/settlement/preSettlementTable.js @@ -11,13 +11,13 @@ export const preSettlementTableColumns = [ { label: '本位币结算金额', prop: 'localSettlementAmount', minWidth: 150, money: true, precision: 2 }, { label: '结算汇率', prop: 'exchangeRate', minWidth: 110, precision: 2 }, { - label: '申请预付金额(审核中的)', + label: '申请预付金额', prop: 'advanceAppliedAmount', minWidth: 190, money: true, }, { - label: '已付款金额(审核通过的)', + label: '已付款金额', prop: 'advancePaidAmount', minWidth: 200, money: true, diff --git a/src/views/payment/invoice-application-form.vue b/src/views/payment/invoice-application-form.vue index b8ceaf0..d759f52 100644 --- a/src/views/payment/invoice-application-form.vue +++ b/src/views/payment/invoice-application-form.vue @@ -16,7 +16,7 @@ - + @@ -414,7 +414,7 @@ @@ -423,18 +423,19 @@ v-model="settlementDialog.keyword" clearable placeholder="结算单号、项目或合同" - @keyup.enter="loadSettlementCandidates" + @keyup.enter="handleSettlementSearch" /> - 查询 + 查询 - + @@ -454,6 +455,17 @@ +
+ +
diff --git a/src/views/settlement/receivable-payable-detail.vue b/src/views/settlement/receivable-payable-detail.vue index d49b3bc..87e78cf 100644 --- a/src/views/settlement/receivable-payable-detail.vue +++ b/src/views/settlement/receivable-payable-detail.vue @@ -34,7 +34,12 @@
生成费用 更新费用 - + 批量转结算 导出 @@ -457,6 +462,7 @@ v-model="transferForm.settlementBillType" @change="handleTransferTypeChange" > + 预结算单 正式结算单 @@ -784,7 +790,7 @@ export default { billingPlanOptions: [], transferDialog: { visible: false, loading: false, submitting: false }, transferQuery: {}, - transferForm: { settlementBillType: 'formal' }, + transferForm: { settlementBillType: 'pre' }, transferRows: [], transferSelection: [], transferPage: { current: 1, size: 10, total: 0 }, @@ -1594,7 +1600,7 @@ export default { }, openTransferDialog() { this.transferDialog.visible = true; - this.transferForm = { settlementBillType: 'formal' }; + this.transferForm = { settlementBillType: this.isReceivable ? 'formal' : 'pre' }; this.transferQuery = {}; this.transferRows = []; this.transferSelection = []; @@ -1724,7 +1730,9 @@ export default { try { const transferRows = await this.resolveTransferContractIds(this.transferSelection); if (!transferRows) return; - const settlementBillType = this.transferForm.settlementBillType; + const settlementBillType = this.isReceivable + ? 'formal' + : this.transferForm.settlementBillType; const transferToken = createSettlementTransfer({ settlementBillType, settlementType: this.settlementType || transferRows[0]?.settlementType,