Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c7bd4461e2 | |||
| e0a420ad08 |
@@ -38,12 +38,6 @@ export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'p
|
||||
export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
|
||||
export const pushKingdee = ids =>
|
||||
request({ url: `${baseUrl}/push-kingdee`, method: 'post', timeout: 30000, data: ids });
|
||||
// 先票后款:发票明细查询(收票登记明细区块按票号带出发票明细行)
|
||||
export const invoiceDetailQuery = invoiceNo =>
|
||||
request({ url: `${baseUrl}/invoice-detail-query`, method: 'get', params: { invoiceNo } });
|
||||
// 先票后款:结算单认领收票单候选(审批通过且未被有效应付结算单认领)
|
||||
export const claimCandidates = keyword =>
|
||||
request({ url: `${baseUrl}/claim-candidates`, method: 'get', params: { keyword } });
|
||||
|
||||
export const approvalStatusOptions = [
|
||||
{ label: '草稿', value: 'draft' },
|
||||
|
||||
@@ -8,12 +8,20 @@ export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get'
|
||||
export const updateAttachments = data =>
|
||||
request({ url: `${baseUrl}/attachments`, method: 'post', data });
|
||||
export const voidClaim = id => request({ url: `${baseUrl}/void`, method: 'post', params: { id } });
|
||||
export const queryKingdeeResult = () =>
|
||||
request({ url: `${baseUrl}/query-kingdee-result`, method: 'post' });
|
||||
|
||||
export const claimStatusOptions = [
|
||||
{ label: '已认领', value: 'claimed' },
|
||||
{ label: '已作废', value: 'voided' },
|
||||
];
|
||||
|
||||
export const pushStatusOptions = [
|
||||
{ label: '未推送', value: 'none' },
|
||||
{ label: '已推送', value: 'pushed' },
|
||||
{ label: '推送失败', value: 'failed' },
|
||||
];
|
||||
|
||||
export const kingdeeBillStatusOptions = [
|
||||
{ label: '未生成', value: 'none' },
|
||||
{ label: '已推送', value: 'pushed' },
|
||||
|
||||
@@ -2,9 +2,6 @@ import request from '@/axios';
|
||||
|
||||
const baseUrl = '/blade-transport/receipt-flow';
|
||||
|
||||
/** 收款流水同步需远程拉取金蝶收款单并逐条落库,覆盖全局 10s 超时 */
|
||||
export const SYNC_TIMEOUT = 30000;
|
||||
|
||||
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 } });
|
||||
@@ -15,7 +12,9 @@ export const getSettlementCandidates = (keyword, flowId) =>
|
||||
params: { keyword, flowId },
|
||||
});
|
||||
export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
|
||||
export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post', timeout: SYNC_TIMEOUT });
|
||||
export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' });
|
||||
export const pushKingdee = flowId =>
|
||||
request({ url: `${baseUrl}/push-kingdee`, method: 'post', params: { flowId } });
|
||||
|
||||
export const claimStatusOptions = [
|
||||
{ label: '未认领', value: 'unclaimed' },
|
||||
@@ -23,6 +22,12 @@ export const claimStatusOptions = [
|
||||
{ label: '认领完成', value: 'claimed' },
|
||||
];
|
||||
|
||||
export const pushStatusOptions = [
|
||||
{ label: '未推送', value: 'none' },
|
||||
{ label: '已推送', value: 'pushed' },
|
||||
{ label: '推送失败', value: 'failed' },
|
||||
];
|
||||
|
||||
export const kingdeeBillStatusOptions = [
|
||||
{ label: '已推送', value: 'pushed' },
|
||||
{ label: '审核通过', value: 'approved' },
|
||||
|
||||
@@ -58,13 +58,5 @@ export const applyPayments = data =>
|
||||
request({ url: `${baseUrl}/apply-payments`, method: 'post', data });
|
||||
export const claimInvoices = data =>
|
||||
request({ url: `${baseUrl}/claim-invoices`, method: 'post', data });
|
||||
// 先票后款:发票登记确认推送(认领收票单逐单 A302-6 指定应付),涉及多次金蝶远程调用,覆盖全局超时
|
||||
export const invoiceAssignKingdee = id =>
|
||||
request({
|
||||
url: `${baseUrl}/invoice-assign-kingdee`,
|
||||
method: 'post',
|
||||
timeout: 30000,
|
||||
params: { id },
|
||||
});
|
||||
export const queryInvoicePool = params =>
|
||||
request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });
|
||||
|
||||
@@ -175,30 +175,6 @@ export const querySupplierCode = creditCode => {
|
||||
});
|
||||
};
|
||||
|
||||
// 金蝶开户行查询(A905-3):收款信息填写开户行失焦后精确匹配带出联行号
|
||||
export const queryKingdeeBank = bankName => {
|
||||
return request({
|
||||
url: '/blade-transport/customer-archive/query-bank',
|
||||
method: 'get',
|
||||
timeout: 30000,
|
||||
params: {
|
||||
bankName,
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
// 金蝶联行号校验(A905-3):收款信息保存前按联行号精确匹配,查不到不允许保存
|
||||
export const queryKingdeeBankByNumber = cnapsCode => {
|
||||
return request({
|
||||
url: '/blade-transport/customer-archive/query-bank-by-number',
|
||||
method: 'get',
|
||||
timeout: 30000,
|
||||
params: {
|
||||
cnapsCode,
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
export const syncKingdee = id => {
|
||||
return request({
|
||||
url: '/blade-transport/customer-archive/sync-kingdee',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
export const receiptClaimRecordTableColumns = [
|
||||
{ prop: 'receiptNoticeNo', label: '收款单号', minWidth: 150, link: true },
|
||||
{ prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150, link: true },
|
||||
{ prop: 'payerName', label: '付款人', minWidth: 130 },
|
||||
{ prop: 'receiptAmount', label: '收款金额', minWidth: 130, money: true },
|
||||
{ prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true },
|
||||
{ prop: 'counterpartyName', label: '对方户名', minWidth: 150 },
|
||||
{ prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 },
|
||||
{ prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 },
|
||||
|
||||
@@ -1,23 +1,18 @@
|
||||
export const receiptFlowTableColumns = [
|
||||
{ prop: 'receiptNoticeNo', label: '收款单号', minWidth: 150, link: true },
|
||||
{ prop: 'receiptNoticeNo', label: '认领通知单', minWidth: 150, link: true },
|
||||
{ prop: 'payerName', label: '付款人', minWidth: 130 },
|
||||
{ prop: 'receiptAmount', label: '收款金额', minWidth: 130, money: true },
|
||||
{ prop: 'receiptAmount', label: '付款金额', minWidth: 130, money: true },
|
||||
{ prop: 'counterpartyName', label: '对方户名', minWidth: 150 },
|
||||
{ prop: 'counterpartyAccount', label: '对方账号', minWidth: 170 },
|
||||
{ prop: 'counterpartyBank', label: '对方开户行', minWidth: 150 },
|
||||
{ prop: 'payeeName', label: '收款人(公司)', minWidth: 150 },
|
||||
//{ prop: 'orgNumber', label: '收款公司编码', minWidth: 130 },
|
||||
//{ prop: 'openOrgNumber', label: '核算组织编码', minWidth: 130 },
|
||||
{ prop: 'summary', label: '摘要', minWidth: 160 },
|
||||
{ prop: 'transactionTime', label: '交易时间', minWidth: 170 },
|
||||
{ prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },
|
||||
{ prop: 'kingdeeClaimStatusName', label: '公告状态', minWidth: 110 },
|
||||
{ prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
|
||||
{ prop: 'remainingAmount', label: '剩余可认领金额', minWidth: 140, money: true },
|
||||
{ prop: 'unmatchAmountRec', label: '未匹配金额', minWidth: 140, money: true },
|
||||
//{ prop: 'matchAmountRec', label: '已匹配收款金额', minWidth: 140, money: true },
|
||||
//{ prop: 'matchAmountPay', label: '已匹配付款金额', minWidth: 140, money: true },
|
||||
//{ prop: 'unmatchAmountPay', label: '未匹配付款金额', minWidth: 140, money: true },
|
||||
//{ prop: 'settleAmount', label: '已结算金额', minWidth: 130, money: true },
|
||||
//{ prop: 'unsettleAmount', label: '未结算金额', minWidth: 130, money: true },
|
||||
{ prop: 'unclaimedAmount', label: '金蝶未认领金额', minWidth: 140, money: true },
|
||||
{ prop: 'pushStatusName', label: '推送状态', minWidth: 110, status: true },
|
||||
{ prop: 'pushFailReason', label: '推送失败原因', minWidth: 160 },
|
||||
{ prop: 'kingdeeBillNo', label: '金蝶收款单号', minWidth: 150 },
|
||||
{ prop: 'kingdeeBillStatusName', label: '金蝶状态', minWidth: 110 },
|
||||
];
|
||||
|
||||
@@ -16,6 +16,7 @@ import {
|
||||
approvalStatusOptions,
|
||||
invoiceStatusOptions,
|
||||
kingdeeSyncStatusOptions,
|
||||
kingdeeWriteOffStatusOptions,
|
||||
paymentStatusOptions,
|
||||
} from './formalSettlementSearch';
|
||||
import { formalSettlementTableColumns } from './formalSettlementTable';
|
||||
@@ -87,6 +88,7 @@ const COLUMN_EXTRA = {
|
||||
searchPlaceholder: '请选择',
|
||||
},
|
||||
kingdeeLockStatus: { slot: true },
|
||||
kingdeeWriteOffStatus: { slot: true },
|
||||
createTime: { width: 180 },
|
||||
};
|
||||
|
||||
@@ -171,4 +173,5 @@ export const formalSettlementOption = () => ({
|
||||
});
|
||||
|
||||
export const kingdeeSyncName = value => pickLabel(kingdeeSyncStatusOptions, value);
|
||||
export const kingdeeWriteOffName = value => pickLabel(kingdeeWriteOffStatusOptions, value);
|
||||
export const paymentStatusName = value => pickLabel(paymentStatusOptions, value);
|
||||
|
||||
@@ -34,6 +34,11 @@ export const kingdeeSyncStatusOptions = [
|
||||
{ label: '同步失败', value: 'failed' },
|
||||
];
|
||||
|
||||
export const kingdeeWriteOffStatusOptions = [
|
||||
{ label: '未冲销', value: 'unwrittenoff' },
|
||||
{ label: '已冲销', value: 'writtenoff' },
|
||||
];
|
||||
|
||||
export const formalSettlementSearchFields = [
|
||||
{ label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
|
||||
{ label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
|
||||
|
||||
@@ -25,6 +25,7 @@ export const formalSettlementTableColumns = [
|
||||
{ label: '来源原单号', prop: 'originFormalSettlementNo', minWidth: 170 },
|
||||
{ label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
|
||||
{ label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
|
||||
{ label: '金蝶冲销状态', prop: 'kingdeeWriteOffStatus', minWidth: 135 },
|
||||
{ label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 },
|
||||
{ label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 },
|
||||
{ label: '创建人', prop: 'createUserName', minWidth: 110 },
|
||||
|
||||
@@ -13,3 +13,12 @@ export const KINGDEE_STATUS_TAG_TYPES = {
|
||||
|
||||
/** 金蝶单据状态 → el-tag 颜色类型,未映射状态返回 info */
|
||||
export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info';
|
||||
|
||||
/** 金蝶冲销状态 → el-tag 颜色类型(已冲销=绿、未冲销=黄) */
|
||||
export const KINGDEE_WRITEOFF_TAG_TYPES = {
|
||||
writtenoff: 'success',
|
||||
unwrittenoff: 'warning',
|
||||
};
|
||||
|
||||
/** 金蝶冲销状态 → el-tag 颜色类型,未映射状态(null=未校验)返回 info */
|
||||
export const kingdeeWriteOffTagType = status => KINGDEE_WRITEOFF_TAG_TYPES[status] || 'info';
|
||||
|
||||
@@ -93,24 +93,15 @@
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
|
||||
<!-- 客商风险:等级与金蝶黑名单组合展示(推送链路按金蝶命中口径落库),复用公共展示方法;非无风险标签悬浮见明细 -->
|
||||
<!-- 客商风险:等级与金蝶黑名单组合展示(推送链路按金蝶命中口径落库),复用公共展示方法 -->
|
||||
<template #customerRisk="{ row }">
|
||||
<el-tooltip
|
||||
<el-tag
|
||||
v-if="contractRiskTagName(row)"
|
||||
placement="top"
|
||||
effect="dark"
|
||||
popper-class="customer-risk-popper"
|
||||
:type="isContractRisky(row) ? 'danger' : row.hcsRiskLevel === '1' ? 'warning' : 'success'"
|
||||
class="status-text"
|
||||
>
|
||||
<template #content>
|
||||
<div>{{ row.hcsRiskDetail || contractRiskTagName(row) }}</div>
|
||||
</template>
|
||||
<el-tag
|
||||
:type="isContractRisky(row) ? 'danger' : row.hcsRiskLevel === '1' ? 'warning' : 'success'"
|
||||
class="status-text"
|
||||
>
|
||||
{{ contractRiskTagName(row) }}
|
||||
</el-tag>
|
||||
</el-tooltip>
|
||||
{{ contractRiskTagName(row) }}
|
||||
</el-tag>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
|
||||
@@ -3848,10 +3839,4 @@ export default {
|
||||
white-space: normal;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
/* 风险客商悬浮提示(同客商列表页):popper 挂在 body 下,约束宽度 */
|
||||
.customer-risk-popper {
|
||||
max-width: 360px;
|
||||
line-height: 1.6;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -985,7 +985,6 @@ import { exportBlob } from '@/api/common';
|
||||
import { defineAsyncComponent } from 'vue';
|
||||
import * as api from '@/api/business/project-apply';
|
||||
import {
|
||||
getRisk,
|
||||
loadHcsImmediateEnabled,
|
||||
repush as hcsRepush,
|
||||
repushBatch as hcsRepushBatch,
|
||||
|
||||
@@ -53,6 +53,15 @@
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="税率">
|
||||
<el-input
|
||||
:model-value="formatRate(form.taxRate)"
|
||||
disabled
|
||||
placeholder="从金蝶票据池带出"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="开票金额">
|
||||
<el-input
|
||||
@@ -100,50 +109,34 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="结算组织" prop="deptId">
|
||||
<el-cascader
|
||||
v-if="!readonly"
|
||||
:model-value="deptCascaderValue"
|
||||
:options="deptTreeOptions"
|
||||
:props="deptCascaderProps"
|
||||
placeholder="请选择结算组织(合同承办部门)"
|
||||
filterable
|
||||
clearable
|
||||
@change="handleDeptChange"
|
||||
/>
|
||||
<el-input v-else :model-value="form.deptName" disabled />
|
||||
<el-form-item label="关联结算单" prop="settlementIds">
|
||||
<el-tooltip
|
||||
:content="settlementLabel"
|
||||
:disabled="!settlementLabel"
|
||||
placement="top"
|
||||
:show-after="200"
|
||||
>
|
||||
<div class="receipt-form-page__overflow-trigger">
|
||||
<el-input
|
||||
:model-value="settlementLabel"
|
||||
readonly
|
||||
placeholder="请选择应付正式结算单"
|
||||
>
|
||||
<template v-if="!readonly" #append>
|
||||
<el-tooltip content="选择付款结算单" placement="top">
|
||||
<el-button :icon="Search" @click="openSettlementDialog" />
|
||||
</el-tooltip>
|
||||
</template>
|
||||
</el-input>
|
||||
</div>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</section-card>
|
||||
|
||||
<section-card title="发票明细">
|
||||
<el-table :data="invoiceItems" border empty-text="选择金蝶票据池发票后带出发票明细行">
|
||||
<el-table-column type="index" label="序号" width="64" align="center" />
|
||||
<el-table-column prop="goodsName" label="货物名称" min-width="160" show-overflow-tooltip />
|
||||
<el-table-column prop="specModel" label="规格型号" min-width="120" show-overflow-tooltip />
|
||||
<el-table-column prop="unit" label="单位" min-width="80" align="center" />
|
||||
<el-table-column label="数量" min-width="100" align="right">
|
||||
<template #default="{ row }">{{ formatQuantity(row.num) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="单价" min-width="110" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.unitPrice) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="金额" min-width="120" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.detailAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="税率" min-width="90" align="center">
|
||||
<template #default="{ row }">{{ formatRateText(row.taxRate) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="税额" min-width="110" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="goodsCode" label="商品编码" min-width="140" show-overflow-tooltip />
|
||||
</el-table>
|
||||
</section-card>
|
||||
|
||||
<section-card title="结算信息">
|
||||
<el-table :data="form.settlements" border empty-text="暂无认领数据(认领关系由付款结算单侧维护)">
|
||||
<el-table :data="form.settlements" border>
|
||||
<el-table-column type="index" label="序号" width="64" align="center" />
|
||||
<el-table-column
|
||||
label="结算单号"
|
||||
@@ -163,8 +156,17 @@
|
||||
<el-table-column label="已收票金额" min-width="150" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.receivedInvoiceAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="分摊发票金额" min-width="150" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.allocatedInvoiceAmount) }}</template>
|
||||
<el-table-column label="分摊发票金额" min-width="180">
|
||||
<template #default="{ row }">
|
||||
<el-input-number
|
||||
v-model="row.allocatedInvoiceAmount"
|
||||
:disabled="readonly"
|
||||
:min="0"
|
||||
:max="remainingAmount(row)"
|
||||
:precision="2"
|
||||
:controls="false"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</section-card>
|
||||
@@ -214,6 +216,71 @@
|
||||
:query-api="apiQueryInvoicePool"
|
||||
@confirm="handleInvoicePicked"
|
||||
/>
|
||||
|
||||
<el-dialog
|
||||
v-model="settlementDialog.visible"
|
||||
title="选择应付正式结算单"
|
||||
width="86%"
|
||||
append-to-body
|
||||
>
|
||||
<div class="receipt-form-page__dialog-search">
|
||||
<el-input
|
||||
v-model="settlementDialog.keyword"
|
||||
clearable
|
||||
placeholder="结算单号、项目或合同"
|
||||
@keyup.enter="loadSettlementCandidates"
|
||||
/>
|
||||
<el-button type="primary" @click="loadSettlementCandidates">查询</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
ref="settlementTable"
|
||||
v-loading="settlementDialog.loading"
|
||||
:data="settlementDialog.rows"
|
||||
row-key="id"
|
||||
border
|
||||
@selection-change="settlementDialog.selection = $event"
|
||||
>
|
||||
<el-table-column type="selection" width="52" align="center" reserve-selection />
|
||||
<el-table-column
|
||||
prop="formalSettlementNo"
|
||||
label="结算单号"
|
||||
min-width="170"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column
|
||||
prop="projectName"
|
||||
label="所属项目"
|
||||
min-width="150"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column prop="deptName" label="所属组织" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column
|
||||
prop="contractNo"
|
||||
label="合同编号"
|
||||
min-width="150"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
<el-table-column prop="payerName" label="付款方" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column prop="payeeName" label="收款方" min-width="150" show-overflow-tooltip />
|
||||
<el-table-column label="结算总金额" min-width="140" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="已收票金额" min-width="140" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.receivedInvoiceAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="100" fixed="right" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-link type="primary" @click.stop="selectSettlement(row)">选择</el-link>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<template #footer>
|
||||
<el-button @click="settlementDialog.visible = false">取消</el-button>
|
||||
<el-button type="primary" @click="confirmSettlements">
|
||||
确定{{ settlementDialog.selection.length ? `(${settlementDialog.selection.length})` : '' }}
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</basic-container>
|
||||
</template>
|
||||
|
||||
@@ -221,7 +288,6 @@
|
||||
import { Search } from '@element-plus/icons-vue';
|
||||
import { mapGetters } from 'vuex';
|
||||
import * as api from '@/api/payment/invoiceReceipt';
|
||||
import { getDeptTree } from '@/api/system/dept';
|
||||
import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
|
||||
import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
|
||||
import { getMkPublicDetail } from '@/api/mk-process';
|
||||
@@ -244,7 +310,6 @@ const emptyForm = () => ({
|
||||
customerEmails: [],
|
||||
departmentEmails: [],
|
||||
projectName: '',
|
||||
deptId: null,
|
||||
deptName: '',
|
||||
payerName: '',
|
||||
payeeName: '',
|
||||
@@ -265,24 +330,26 @@ export default {
|
||||
form: emptyForm(),
|
||||
customerEmailOptions: [],
|
||||
departmentEmailOptions: [],
|
||||
invoiceItems: [],
|
||||
deptTreeOptions: [],
|
||||
deptMap: new Map(),
|
||||
// 结算组织=合同承办部门:部门树级联单选(取末级 id),后端沿部门树上溯平台公司取金蝶组织
|
||||
deptCascaderProps: { checkStrictly: true, emitPath: true },
|
||||
invoiceDialog: {
|
||||
visible: false,
|
||||
},
|
||||
settlementDialog: {
|
||||
visible: false,
|
||||
loading: false,
|
||||
keyword: '',
|
||||
rows: [],
|
||||
selection: [],
|
||||
},
|
||||
rules: {
|
||||
invoiceNo: [{ required: true, validator: this.validateInvoice, trigger: 'change' }],
|
||||
deptId: [{ required: true, validator: this.validateDept, trigger: 'change' }],
|
||||
settlementIds: [{ required: true, validator: this.validateSettlements, trigger: 'change' }],
|
||||
customerEmails: [{ validator: this.validateEmails, trigger: 'change' }],
|
||||
departmentEmails: [{ validator: this.validateEmails, trigger: 'change' }],
|
||||
},
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['permission', 'userInfo']),
|
||||
...mapGetters(['permission']),
|
||||
recordId() {
|
||||
return this.$route.query.id || '';
|
||||
},
|
||||
@@ -296,11 +363,14 @@ export default {
|
||||
const code = this.recordId ? 'invoice_receipt_edit' : 'invoice_receipt_add';
|
||||
return this.hasPermission(code);
|
||||
},
|
||||
deptCascaderValue() {
|
||||
if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') {
|
||||
return [];
|
||||
}
|
||||
return [String(this.form.deptId)];
|
||||
settlementLabel() {
|
||||
return this.form.settlements
|
||||
.map(item => item.formalSettlementNo)
|
||||
.filter(Boolean)
|
||||
.join(',');
|
||||
},
|
||||
settlementIds() {
|
||||
return this.form.settlements.map(item => item.formalSettlementId || item.settlementId);
|
||||
},
|
||||
},
|
||||
created() {
|
||||
@@ -336,7 +406,6 @@ export default {
|
||||
.filter(Boolean);
|
||||
},
|
||||
async initialize() {
|
||||
this.loadDepartments();
|
||||
if (this.isPublicViewPage) {
|
||||
await this.loadPublicDetail();
|
||||
return;
|
||||
@@ -350,13 +419,14 @@ export default {
|
||||
}
|
||||
const data = this.unwrapData(await api.getDetail(this.recordId));
|
||||
this.applyDetail(data);
|
||||
if (this.settlementIds.length) await this.loadReferenceInformation();
|
||||
},
|
||||
async loadPublicDetail() {
|
||||
if (!this.recordId) return;
|
||||
const data = this.unwrapData(await getMkPublicDetail('invoice-receipt', this.recordId));
|
||||
this.applyDetail(data);
|
||||
},
|
||||
async applyDetail(data) {
|
||||
applyDetail(data) {
|
||||
this.form = {
|
||||
...emptyForm(),
|
||||
...data,
|
||||
@@ -368,7 +438,6 @@ export default {
|
||||
})),
|
||||
attachments: this.parse(data.attachmentsJson),
|
||||
};
|
||||
await this.loadInvoiceDetail();
|
||||
},
|
||||
validateInvoice(rule, value, callback) {
|
||||
if (!value) {
|
||||
@@ -377,9 +446,9 @@ export default {
|
||||
}
|
||||
callback();
|
||||
},
|
||||
validateDept(rule, value, callback) {
|
||||
if (this.form.deptId === null || this.form.deptId === undefined || this.form.deptId === '') {
|
||||
callback(new Error('请选择结算组织'));
|
||||
validateSettlements(rule, value, callback) {
|
||||
if (!this.form.settlements.length) {
|
||||
callback(new Error('请选择应付正式结算单'));
|
||||
return;
|
||||
}
|
||||
callback();
|
||||
@@ -400,7 +469,7 @@ export default {
|
||||
openInvoiceDialog() {
|
||||
this.invoiceDialog.visible = true;
|
||||
},
|
||||
async confirmInvoice(row, options = {}) {
|
||||
confirmInvoice(row, options = {}) {
|
||||
const selected = row;
|
||||
if (!selected) {
|
||||
this.$message.warning('请选择一张金蝶票据池发票');
|
||||
@@ -435,63 +504,92 @@ export default {
|
||||
...new Set([...this.departmentEmailOptions, ...this.form.departmentEmails]),
|
||||
];
|
||||
this.invoiceDialog.visible = false;
|
||||
await this.loadInvoiceDetail();
|
||||
this.$refs.formRef?.validateField('invoiceNo').catch(() => {});
|
||||
return true;
|
||||
},
|
||||
// 发票明细区块:按票号带出金蝶发票明细行(A801-1 镜像,推送 A303-2 分录同源)
|
||||
async loadInvoiceDetail() {
|
||||
if (!this.form.invoiceNo) {
|
||||
this.invoiceItems = [];
|
||||
async openSettlementDialog() {
|
||||
this.settlementDialog.visible = true;
|
||||
this.settlementDialog.selection = [];
|
||||
await this.loadSettlementCandidates();
|
||||
await this.$nextTick();
|
||||
const selectedIds = new Set(this.settlementIds.map(id => String(id)));
|
||||
this.settlementDialog.rows.forEach(row => {
|
||||
if (selectedIds.has(String(row.id))) {
|
||||
this.$refs.settlementTable?.toggleRowSelection(row, true);
|
||||
}
|
||||
});
|
||||
},
|
||||
async loadSettlementCandidates() {
|
||||
this.settlementDialog.loading = true;
|
||||
try {
|
||||
this.settlementDialog.rows =
|
||||
this.unwrapData(
|
||||
await api.getSettlementCandidates(this.settlementDialog.keyword, this.form.id)
|
||||
) || [];
|
||||
} finally {
|
||||
this.settlementDialog.loading = false;
|
||||
}
|
||||
},
|
||||
async confirmSettlements() {
|
||||
const rows = this.settlementDialog.selection;
|
||||
if (!rows.length) {
|
||||
this.$message.warning('请至少选择一张应付正式结算单');
|
||||
return;
|
||||
}
|
||||
try {
|
||||
this.invoiceItems = this.unwrapData(await api.invoiceDetailQuery(this.form.invoiceNo)) || [];
|
||||
} catch {
|
||||
this.invoiceItems = [];
|
||||
const first = rows[0];
|
||||
const incompatible = rows.some(
|
||||
item =>
|
||||
String(item.projectId) !== String(first.projectId) ||
|
||||
String(item.deptId) !== String(first.deptId) ||
|
||||
item.payerName !== first.payerName ||
|
||||
item.payeeName !== first.payeeName
|
||||
);
|
||||
if (incompatible) {
|
||||
this.$message.warning('关联结算单必须属于同一项目、组织及收付款方');
|
||||
return;
|
||||
}
|
||||
const previousAmount = new Map(
|
||||
this.form.settlements.map(item => [
|
||||
String(item.formalSettlementId || item.settlementId),
|
||||
item.allocatedInvoiceAmount,
|
||||
])
|
||||
);
|
||||
this.form.settlements = rows.map(item => ({
|
||||
...item,
|
||||
formalSettlementId: item.id,
|
||||
settlementId: item.id,
|
||||
allocatedInvoiceAmount: previousAmount.has(String(item.id))
|
||||
? Number(previousAmount.get(String(item.id)) || 0)
|
||||
: rows.length === 1
|
||||
? Number(item.settlementAmount || 0)
|
||||
: 0,
|
||||
}));
|
||||
this.form.projectName = first.projectName;
|
||||
this.form.deptName = first.deptName;
|
||||
this.form.payerName = first.payerName;
|
||||
this.form.payeeName = first.payeeName;
|
||||
this.settlementDialog.visible = false;
|
||||
await this.loadReferenceInformation();
|
||||
this.$refs.formRef?.validateField('settlementIds').catch(() => {});
|
||||
},
|
||||
selectSettlement(row) {
|
||||
this.$refs.settlementTable?.toggleRowSelection(row);
|
||||
},
|
||||
async loadReferenceInformation() {
|
||||
const data = this.unwrapData(await api.getReferenceInformation(this.settlementIds.join(',')));
|
||||
this.customerEmailOptions = data.customerEmails || [];
|
||||
this.departmentEmailOptions = [
|
||||
...new Set([...this.departmentEmailOptions, ...(data.departmentEmails || [])]),
|
||||
];
|
||||
if (!this.form.customerEmails.length && this.customerEmailOptions.length) {
|
||||
this.form.customerEmails = [this.customerEmailOptions[0]];
|
||||
}
|
||||
},
|
||||
loadDepartments() {
|
||||
// 结算组织取租户部门树(过滤外部组织),选中取末级部门 id
|
||||
getDeptTree(this.userInfo?.tenantId)
|
||||
.then(response => {
|
||||
const rows = this.excludeExternalOrganization(this.unwrapData(response) || []);
|
||||
this.deptTreeOptions = this.toDeptCascaderOptions(rows);
|
||||
this.deptMap = new Map();
|
||||
this.flattenDepartments(rows).forEach(item =>
|
||||
this.deptMap.set(String(item.id), item.title || item.deptName || item.name)
|
||||
);
|
||||
})
|
||||
.catch(() => {});
|
||||
},
|
||||
excludeExternalOrganization(list = []) {
|
||||
return list.reduce((result, item) => {
|
||||
const deptName = item.title || item.deptName || item.name;
|
||||
if (String(deptName || '').trim() === '外部组织') return result;
|
||||
result.push({
|
||||
...item,
|
||||
children: item.children?.length
|
||||
? this.excludeExternalOrganization(item.children)
|
||||
: item.children,
|
||||
});
|
||||
return result;
|
||||
}, []);
|
||||
},
|
||||
toDeptCascaderOptions(list = []) {
|
||||
return list.map(item => ({
|
||||
label: item.title || item.deptName || item.name,
|
||||
value: item.id == null || item.id === '' ? '' : String(item.id),
|
||||
children: item.children?.length ? this.toDeptCascaderOptions(item.children) : undefined,
|
||||
}));
|
||||
},
|
||||
flattenDepartments(rows) {
|
||||
return (rows || []).flatMap(item => [item, ...this.flattenDepartments(item.children || [])]);
|
||||
},
|
||||
handleDeptChange(value) {
|
||||
const deptId = Array.isArray(value) ? value.at(-1) : value;
|
||||
this.form.deptId = deptId || null;
|
||||
this.form.deptName = deptId ? this.deptMap.get(String(deptId)) || '' : '';
|
||||
this.$refs.formRef?.validateField('deptId').catch(() => {});
|
||||
remainingAmount(row) {
|
||||
return Math.max(
|
||||
Number(row.settlementAmount || 0) - Number(row.receivedInvoiceAmount || 0),
|
||||
0
|
||||
);
|
||||
},
|
||||
openSettlementDetail(row) {
|
||||
const id = row.formalSettlementId || row.settlementId || row.id;
|
||||
@@ -504,6 +602,15 @@ export default {
|
||||
validateBusiness() {
|
||||
const invoiceAmount = Number(this.form.invoiceAmount || 0);
|
||||
if (invoiceAmount <= 0) throw new Error('开票金额必须大于0');
|
||||
for (const row of this.form.settlements) {
|
||||
const allocated = Number(row.allocatedInvoiceAmount);
|
||||
if (!Number.isFinite(allocated) || allocated < 0) {
|
||||
throw new Error('分摊发票金额必须大于或等于0');
|
||||
}
|
||||
if (allocated - this.remainingAmount(row) > 0.001) {
|
||||
throw new Error(`结算单${row.formalSettlementNo}的累计收票金额不能超过结算总金额`);
|
||||
}
|
||||
}
|
||||
},
|
||||
payload() {
|
||||
return {
|
||||
@@ -524,9 +631,10 @@ export default {
|
||||
departmentEmails: this.form.departmentEmails.join(';'),
|
||||
attachmentsJson: JSON.stringify(this.form.attachments || []),
|
||||
remark: this.form.remark,
|
||||
// 结算组织=页面手选部门(先票后款不挂结算单,认领关系由结算单侧维护,不再传 settlements)
|
||||
deptId: this.form.deptId,
|
||||
deptName: this.form.deptName,
|
||||
settlements: this.form.settlements.map(item => ({
|
||||
settlementId: item.formalSettlementId || item.settlementId,
|
||||
allocatedInvoiceAmount: item.allocatedInvoiceAmount,
|
||||
})),
|
||||
};
|
||||
},
|
||||
async saveDraft() {
|
||||
@@ -570,7 +678,8 @@ export default {
|
||||
this.$message.warning('金蝶票池未查询到该发票');
|
||||
return;
|
||||
}
|
||||
if (!(await this.confirmInvoice(invoice, { preserveUserInput: true }))) return;
|
||||
if (!this.confirmInvoice(invoice, { preserveUserInput: true })) return;
|
||||
if (this.settlementIds.length) await this.loadReferenceInformation();
|
||||
this.$message.success('同步成功');
|
||||
},
|
||||
goBack() {
|
||||
@@ -579,13 +688,8 @@ export default {
|
||||
formatMoney(value) {
|
||||
return Number(value || 0).toFixed(2);
|
||||
},
|
||||
formatQuantity(value) {
|
||||
const number = Number(value);
|
||||
return Number.isFinite(number) ? String(number) : '-';
|
||||
},
|
||||
formatRateText(value) {
|
||||
if (value === null || value === undefined || value === '') return '-';
|
||||
return `${value}%`;
|
||||
formatRate(value) {
|
||||
return value === null || value === undefined || value === '' ? '' : `${Number(value)}%`;
|
||||
},
|
||||
},
|
||||
};
|
||||
@@ -634,6 +738,15 @@ export default {
|
||||
:global(.avue-layout--horizontal .receipt-form-page__actions) {
|
||||
left: 0;
|
||||
}
|
||||
.receipt-form-page__dialog-search {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 8px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.receipt-form-page__dialog-search .el-input {
|
||||
width: 360px;
|
||||
}
|
||||
.receipt-form-page :deep(.el-table) {
|
||||
--el-table-border-color: #eff1f7;
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<section-card title="收款信息">
|
||||
<el-row :gutter="32">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="收款单号">
|
||||
<el-form-item label="认领通知单">
|
||||
<el-input v-model="form.receiptNoticeNo" disabled />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<section-card v-if="searchVisible" class="claim-record-page__search">
|
||||
<el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
|
||||
<div class="claim-record-page__search-grid">
|
||||
<el-form-item label="收款单号">
|
||||
<el-form-item label="认领通知单">
|
||||
<el-input v-model="query.receiptNoticeNo" clearable placeholder="请输入" />
|
||||
</el-form-item>
|
||||
<el-form-item label="对方户名">
|
||||
@@ -56,6 +56,16 @@
|
||||
<el-form-item v-show="searchExpanded" label="所属组织">
|
||||
<el-input v-model="query.claimerDeptName" clearable placeholder="请输入" />
|
||||
</el-form-item>
|
||||
<el-form-item v-show="searchExpanded" label="推送状态">
|
||||
<el-select v-model="query.pushStatus" clearable placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in pushStatusOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-show="searchExpanded" label="金蝶单据状态">
|
||||
<el-select v-model="query.kingdeeBillStatus" clearable placeholder="请选择">
|
||||
<el-option
|
||||
@@ -83,6 +93,9 @@
|
||||
|
||||
<section class="claim-record-page__table-panel">
|
||||
<div class="claim-record-page__toolbar">
|
||||
<el-button :loading="refreshing" @click="handleRefreshKingdeeResult">
|
||||
查询金蝶认领结果
|
||||
</el-button>
|
||||
<table-header-tools
|
||||
:columns="columns"
|
||||
v-model:visible-column-keys="visibleColumnKeys"
|
||||
@@ -118,7 +131,11 @@
|
||||
<el-table-column label="操作" width="120" fixed="right" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-link
|
||||
v-if="hasPermission('receipt_claim_record_void') && row.claimStatus === 'claimed'"
|
||||
v-if="
|
||||
hasPermission('receipt_claim_record_void') &&
|
||||
row.claimStatus === 'claimed' &&
|
||||
row.pushStatus !== 'pushed'
|
||||
"
|
||||
type="danger"
|
||||
@click="handleVoid(row)"
|
||||
>作废</el-link
|
||||
@@ -164,6 +181,7 @@ const emptyQuery = () => ({
|
||||
claimDateRange: [],
|
||||
claimerDeptName: '',
|
||||
kingdeeBillStatus: '',
|
||||
pushStatus: '',
|
||||
});
|
||||
|
||||
export default {
|
||||
@@ -177,15 +195,17 @@ export default {
|
||||
searchExpanded: false,
|
||||
// 与 avue-crud 一致:搜索项数量超过 searchIndex(默认一行 4 项)时才显示“展开/收起”
|
||||
searchIndex: 4,
|
||||
searchItemCount: 10,
|
||||
searchItemCount: 11,
|
||||
searchVisible: true,
|
||||
tableSize: 'default',
|
||||
claimStatusOptions: api.claimStatusOptions,
|
||||
kingdeeBillStatusOptions: api.kingdeeBillStatusOptions,
|
||||
pushStatusOptions: api.pushStatusOptions,
|
||||
columns: receiptClaimRecordTableColumns,
|
||||
visibleColumnKeys: receiptClaimRecordTableColumns.map(column => column.prop),
|
||||
rows: [],
|
||||
loading: false,
|
||||
refreshing: false,
|
||||
page: { current: 1, size: 10, total: 0 },
|
||||
};
|
||||
},
|
||||
@@ -252,7 +272,7 @@ export default {
|
||||
},
|
||||
async handleVoid(row) {
|
||||
await this.$confirm(
|
||||
'作废后将回退本次认领金额,并同步作废合同合规系统认领记录,是否继续?',
|
||||
'作废后将回退本次认领金额,是否继续?',
|
||||
'作废认领记录',
|
||||
{ type: 'warning', confirmButtonText: '确定', cancelButtonText: '取消' }
|
||||
);
|
||||
@@ -260,6 +280,16 @@ export default {
|
||||
this.$message.success('作废成功');
|
||||
await this.loadTable();
|
||||
},
|
||||
async handleRefreshKingdeeResult() {
|
||||
this.refreshing = true;
|
||||
try {
|
||||
const updated = Number(this.unwrapData(await api.queryKingdeeResult()) || 0);
|
||||
this.$message.success(`金蝶认领结果回写完成,更新${updated}条`);
|
||||
await this.loadTable();
|
||||
} finally {
|
||||
this.refreshing = false;
|
||||
}
|
||||
},
|
||||
hasPermission(code) {
|
||||
return this.isAdmin || this.validData(this.permission?.[code], false);
|
||||
},
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<el-table-column type="index" label="序号" width="64" align="center" />
|
||||
<el-table-column
|
||||
prop="receiptNoticeNo"
|
||||
label="收款单号"
|
||||
label="认领通知单"
|
||||
min-width="160"
|
||||
show-overflow-tooltip
|
||||
/>
|
||||
@@ -43,8 +43,8 @@
|
||||
<el-table-column label="已认领金额" min-width="130" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.claimedAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="未匹配金额" min-width="140" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.unmatchAmountRec) }}</template>
|
||||
<el-table-column label="金蝶未认领金额" min-width="140" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.unclaimedAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="剩余可认领金额" min-width="140" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(flowRemaining(row)) }}</template>
|
||||
@@ -96,7 +96,7 @@
|
||||
formatMoney(row.settlement.claimedReceiptAmount)
|
||||
}}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="收款单号" min-width="180">
|
||||
<el-table-column label="认领通知单" min-width="180">
|
||||
<template #default="{ row }">{{ row.flow.receiptNoticeNo || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="收款金额" min-width="140" align="right">
|
||||
@@ -302,8 +302,10 @@ export default {
|
||||
);
|
||||
},
|
||||
flowRemaining(flow) {
|
||||
// 认领只登记本地:剩余可认领 = 收款金额 − 已认领金额
|
||||
return Math.max(Number(flow.receiptAmount || 0) - Number(flow.claimedAmount || 0), 0);
|
||||
const unclaimed = Number(flow.unclaimedAmount || 0);
|
||||
const receipt = Number(flow.receiptAmount || 0);
|
||||
const ceiling = unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
|
||||
return Math.max(ceiling - Number(flow.claimedAmount || 0), 0);
|
||||
},
|
||||
maxAllocation(row) {
|
||||
const current = Number(row.settlement.allocations?.[row.flow.id] || 0);
|
||||
@@ -353,8 +355,12 @@ export default {
|
||||
}
|
||||
for (const flow of this.flows) {
|
||||
const total = this.flowAllocatedTotal(flow.id);
|
||||
if (total > this.flowRemaining(flow) + 0.001) {
|
||||
this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过剩余可认领金额`);
|
||||
const remaining = Math.max(
|
||||
Number(flow.unclaimedAmount || 0) - Number(flow.claimedAmount || 0),
|
||||
0
|
||||
);
|
||||
if (total > remaining + 0.001) {
|
||||
this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过公告未认领金额`);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<section-card title="收款信息">
|
||||
<el-row :gutter="32">
|
||||
<el-col :span="6"
|
||||
><el-form-item label="收款单号"
|
||||
><el-form-item label="认领通知单"
|
||||
><el-input v-model="form.receiptNoticeNo" disabled /></el-form-item
|
||||
></el-col>
|
||||
<el-col :span="6"
|
||||
@@ -48,8 +48,8 @@
|
||||
><el-input :model-value="formatMoney(form.claimedAmount)" disabled /></el-form-item
|
||||
></el-col>
|
||||
<el-col :span="6"
|
||||
><el-form-item label="未匹配金额"
|
||||
><el-input :model-value="formatMoney(form.unmatchAmountRec)" disabled /></el-form-item
|
||||
><el-form-item label="金蝶未认领金额"
|
||||
><el-input :model-value="formatMoney(form.unclaimedAmount)" disabled /></el-form-item
|
||||
></el-col>
|
||||
<el-col :span="6"
|
||||
><el-form-item label="剩余可认领金额"
|
||||
@@ -205,7 +205,7 @@ const emptyForm = () => ({
|
||||
transactionTime: '',
|
||||
detailSerialNo: '',
|
||||
claimedAmount: 0,
|
||||
unmatchAmountRec: 0,
|
||||
unclaimedAmount: 0,
|
||||
claimerName: '',
|
||||
claimerDeptName: '',
|
||||
claimDate: '',
|
||||
@@ -252,10 +252,11 @@ export default {
|
||||
);
|
||||
},
|
||||
claimableAmount() {
|
||||
// 认领只登记本地:剩余可认领 = 收款金额 − 已认领金额
|
||||
const unclaimed = Number(this.form.unclaimedAmount || 0);
|
||||
const receipt = Number(this.form.receiptAmount || 0);
|
||||
const claimed = Number(this.form.claimedAmount || 0);
|
||||
return Math.max(receipt - claimed, 0);
|
||||
const ceiling =
|
||||
unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
|
||||
return Math.max(ceiling - Number(this.form.claimedAmount || 0), 0);
|
||||
},
|
||||
},
|
||||
created() {
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<section v-if="searchVisible" class="receipt-flow-page__search">
|
||||
<el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
|
||||
<div class="receipt-flow-page__search-grid">
|
||||
<el-form-item label="收款单号">
|
||||
<el-form-item label="认领通知单">
|
||||
<el-input v-model="query.receiptNoticeNo" clearable placeholder="请输入" />
|
||||
</el-form-item>
|
||||
<el-form-item label="对方户名">
|
||||
@@ -15,6 +15,16 @@
|
||||
<el-form-item label="对方账号">
|
||||
<el-input v-model="query.counterpartyAccount" clearable placeholder="请输入" />
|
||||
</el-form-item>
|
||||
<el-form-item label="推送状态">
|
||||
<el-select v-model="query.pushStatus" clearable placeholder="请选择">
|
||||
<el-option
|
||||
v-for="item in pushStatusOptions"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="认领状态">
|
||||
<el-select v-model="query.claimStatus" clearable placeholder="请选择">
|
||||
<el-option
|
||||
@@ -149,10 +159,23 @@
|
||||
<span v-else>{{ displayValue(row[column.prop]) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="100" fixed="right" align="center">
|
||||
<el-table-column label="操作" width="170" fixed="right" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-link v-if="canClaim(row)" type="primary" @click="openClaim(row)">认领</el-link>
|
||||
<span v-else>-</span>
|
||||
<el-link
|
||||
v-if="canClaim(row)"
|
||||
type="primary"
|
||||
:disabled="pushingId === row.id"
|
||||
@click="openClaim(row)"
|
||||
>认领</el-link
|
||||
>
|
||||
<el-link
|
||||
v-if="canPush(row)"
|
||||
type="warning"
|
||||
:disabled="pushingId === row.id"
|
||||
@click="handlePush(row)"
|
||||
>推送金蝶</el-link
|
||||
>
|
||||
<span v-if="!canClaim(row) && !canPush(row)">-</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -178,13 +201,13 @@
|
||||
>
|
||||
<div v-loading="detailDialog.loading">
|
||||
<el-descriptions :column="3" border>
|
||||
<el-descriptions-item label="收款单号">
|
||||
<el-descriptions-item label="认领通知单">
|
||||
{{ displayValue(detailDialog.data.receiptNoticeNo) }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="付款人">
|
||||
{{ displayValue(detailDialog.data.payerName) }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="收款金额">
|
||||
<el-descriptions-item label="付款金额">
|
||||
{{ formatMoney(detailDialog.data.receiptAmount) }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="交易时间">
|
||||
@@ -213,8 +236,13 @@
|
||||
<el-descriptions-item label="剩余可认领金额">
|
||||
{{ formatMoney(detailDialog.data.remainingAmount) }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="未匹配金额">
|
||||
{{ formatMoney(detailDialog.data.unmatchAmountRec) }}
|
||||
<el-descriptions-item label="金蝶未认领金额">
|
||||
{{ formatMoney(detailDialog.data.unclaimedAmount) }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="推送状态">
|
||||
<el-tag :type="statusType(detailDialog.data, { prop: 'pushStatusName' })">
|
||||
{{ displayValue(detailDialog.data.pushStatusName) }}
|
||||
</el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="金蝶收款单号">
|
||||
{{ displayValue(detailDialog.data.kingdeeBillNo) }}
|
||||
@@ -222,6 +250,9 @@
|
||||
<el-descriptions-item label="金蝶状态">
|
||||
{{ displayValue(detailDialog.data.kingdeeBillStatusName) }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="推送失败原因">
|
||||
{{ displayValue(detailDialog.data.pushFailReason) }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="摘要">
|
||||
{{ displayValue(detailDialog.data.summary) }}
|
||||
</el-descriptions-item>
|
||||
@@ -236,7 +267,9 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="operatorName" label="认领人" min-width="120" align="center" />
|
||||
<el-table-column label="状态变化" min-width="170" align="center">
|
||||
<template #default="{ row }">{{ claimStatusChange(row) }}</template>
|
||||
<template #default="{ row }">
|
||||
{{ row.actionType === 'push' ? row.actionName : claimStatusChange(row) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="content" label="认领说明" min-width="220" />
|
||||
</el-table>
|
||||
@@ -264,6 +297,7 @@ const emptyQuery = () => ({
|
||||
summary: '',
|
||||
detailSerialNo: '',
|
||||
claimStatus: '',
|
||||
pushStatus: '',
|
||||
kingdeeBillStatus: '',
|
||||
receiptAmountStart: undefined,
|
||||
receiptAmountEnd: undefined,
|
||||
@@ -280,6 +314,7 @@ export default {
|
||||
ArrowUp,
|
||||
query: emptyQuery(),
|
||||
claimStatusOptions: api.claimStatusOptions,
|
||||
pushStatusOptions: api.pushStatusOptions,
|
||||
kingdeeBillStatusOptions: api.kingdeeBillStatusOptions,
|
||||
columns: receiptFlowTableColumns,
|
||||
visibleColumnKeys: receiptFlowTableColumns.map(column => column.prop),
|
||||
@@ -289,6 +324,7 @@ export default {
|
||||
selectedRows: [],
|
||||
loading: false,
|
||||
syncing: false,
|
||||
pushingId: null,
|
||||
searchExpanded: false,
|
||||
// 与 avue-crud 一致:搜索项数量超过 searchIndex(默认一行 4 项)时才显示“展开/收起”
|
||||
searchIndex: 4,
|
||||
@@ -353,7 +389,7 @@ export default {
|
||||
this.syncing = true;
|
||||
try {
|
||||
const syncedCount = Number(this.unwrapData(await api.sync()) || 0);
|
||||
this.$message.success(`流水同步完成,共同步${syncedCount}条收款流水`);
|
||||
this.$message.success(`流水同步完成,共同步${syncedCount}条认领公告`);
|
||||
await this.loadTable();
|
||||
} finally {
|
||||
this.syncing = false;
|
||||
@@ -412,7 +448,38 @@ export default {
|
||||
canClaim(row) {
|
||||
return this.hasPermission('receipt_flow_claim') && Number(row.remainingAmount || 0) > 0;
|
||||
},
|
||||
canPush(row) {
|
||||
return (
|
||||
this.hasPermission('receipt_flow_push') &&
|
||||
!!row.billId &&
|
||||
row.claimStatus === 'claimed' &&
|
||||
row.pushStatus !== 'pushed'
|
||||
);
|
||||
},
|
||||
async handlePush(row) {
|
||||
try {
|
||||
await this.$confirm(
|
||||
`确认将流水【${row.receiptNoticeNo || row.detailSerialNo || ''}】推送金蝶生成收款单?`,
|
||||
'推送金蝶',
|
||||
{ type: 'warning' }
|
||||
);
|
||||
} catch {
|
||||
return;
|
||||
}
|
||||
this.pushingId = row.id;
|
||||
try {
|
||||
const data = this.unwrapData(await api.pushKingdee(row.id));
|
||||
const billNo = data?.kingdeeBillNo;
|
||||
this.$message.success(billNo ? `推送成功,金蝶收款单号:${billNo}` : '推送成功');
|
||||
await this.loadTable();
|
||||
} finally {
|
||||
this.pushingId = null;
|
||||
}
|
||||
},
|
||||
statusType(row, column) {
|
||||
if (column?.prop === 'pushStatusName') {
|
||||
return { pushed: 'success', failed: 'danger' }[row.pushStatus] || 'info';
|
||||
}
|
||||
return (
|
||||
{ claimed: 'success', partial: 'warning', unclaimed: 'info' }[row.claimStatus] || ''
|
||||
);
|
||||
|
||||
@@ -440,15 +440,8 @@
|
||||
/>
|
||||
|
||||
<section-card title="发票信息">
|
||||
<div v-if="editable" class="formal-editor__invoice-claim">
|
||||
<!-- 先票后款:付款结算单选审批通过的收票单(全额认领);收款结算单维持原票池认领 -->
|
||||
<el-button
|
||||
v-if="form.settlementType !== 'receivable'"
|
||||
type="primary"
|
||||
@click="openInvoiceReceiptDialog"
|
||||
>选择收票单</el-button
|
||||
>
|
||||
<el-button v-else type="primary" @click="openInvoiceClaimDialog">认领查询</el-button>
|
||||
<div class="formal-editor__invoice-claim">
|
||||
<el-button type="primary" @click="openInvoiceClaimDialog">认领查询</el-button>
|
||||
</div>
|
||||
<el-table :data="invoices" border>
|
||||
<el-table-column type="index" label="序号" width="64" align="center" />
|
||||
@@ -459,6 +452,11 @@
|
||||
<el-table-column prop="invoiceType" label="发票类型" min-width="150" align="center">
|
||||
<template #default="{ row }">{{ displayValue(row.invoiceType) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="taxRate" label="税率" min-width="100" align="center">
|
||||
<template #default="{ row }">
|
||||
{{ row.taxRate === null || row.taxRate === undefined ? '-' : `${row.taxRate}%` }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="invoiceAmount"
|
||||
label="发票金额(含税)"
|
||||
@@ -482,9 +480,8 @@
|
||||
align="center"
|
||||
>
|
||||
<template #default="{ row }">
|
||||
<!-- 先票后款:收票单认领金额固定=发票金额(全额认领),不可改 -->
|
||||
<el-input-number
|
||||
v-if="editable && form.settlementType === 'receivable'"
|
||||
v-if="editable"
|
||||
v-model="row.matchedAmount"
|
||||
:min="0"
|
||||
:max="Number(row.availableInvoiceAmount || 0)"
|
||||
@@ -549,11 +546,6 @@
|
||||
@confirm="handleInvoiceClaimConfirm"
|
||||
/>
|
||||
|
||||
<invoice-receipt-candidates-dialog
|
||||
v-model="invoiceReceiptDialog.visible"
|
||||
@confirm="handleInvoiceReceiptConfirm"
|
||||
/>
|
||||
|
||||
<section-card
|
||||
v-if="readonly"
|
||||
:title="form.settlementType === 'receivable' ? '收款信息' : '付款信息'"
|
||||
@@ -567,7 +559,7 @@
|
||||
<el-table-column type="index" label="序号" width="64" align="center" />
|
||||
<el-table-column
|
||||
prop="receiptNoticeNo"
|
||||
label="收款单号"
|
||||
label="认领通知单"
|
||||
min-width="160"
|
||||
align="center"
|
||||
/>
|
||||
@@ -1076,7 +1068,6 @@ import {
|
||||
settlementDetailPath,
|
||||
} from '@/utils/settlement-detail-link';
|
||||
import { getBfiExchangeRate } from '@/api/base/currency';
|
||||
import InvoiceReceiptCandidatesDialog from './invoice-receipt-candidates-dialog.vue';
|
||||
import {
|
||||
createFormalSettlementForm,
|
||||
formalSettlementFormFields,
|
||||
@@ -1119,7 +1110,6 @@ export default {
|
||||
components: {
|
||||
InfoFilled,
|
||||
KingdeeInvoicePoolDialog,
|
||||
InvoiceReceiptCandidatesDialog,
|
||||
ChangeRecordDetailDialog,
|
||||
ProjectAdvanceWriteOff,
|
||||
},
|
||||
@@ -1168,10 +1158,6 @@ export default {
|
||||
selected: [],
|
||||
confirming: false,
|
||||
},
|
||||
// 先票后款:付款结算单选收票单(审批通过+未认领)弹窗
|
||||
invoiceReceiptDialog: {
|
||||
visible: false,
|
||||
},
|
||||
attachmentUploadFiles: [],
|
||||
attachmentTypeOptions: [],
|
||||
attachmentFileTypes: [
|
||||
@@ -2665,39 +2651,6 @@ export default {
|
||||
openInvoiceClaimDialog() {
|
||||
this.invoiceClaimDialog.visible = true;
|
||||
},
|
||||
// 先票后款:选收票单(审批通过+未被认领),确认后按发票号全额认领
|
||||
openInvoiceReceiptDialog() {
|
||||
this.invoiceReceiptDialog.visible = true;
|
||||
},
|
||||
async handleInvoiceReceiptConfirm(rows) {
|
||||
// 收票单行 → 结算单发票行:匹配金额固定=发票金额(全额认领),附件契约归一为单数 attachmentJson
|
||||
const invoices = rows.map(row => ({
|
||||
...row,
|
||||
attachmentJson: row.attachmentJson || row.attachmentsJson,
|
||||
invoiceType: row.invoiceType || '',
|
||||
taxRate: row.taxRate ?? null,
|
||||
availableInvoiceAmount: Number(row.invoiceAmount || 0),
|
||||
matchedAmount: Number(row.invoiceAmount || 0),
|
||||
}));
|
||||
if (!this.form.id) {
|
||||
const existingNumbers = new Set(this.invoices.map(item => String(item.invoiceNo)));
|
||||
this.invoices = [
|
||||
...this.invoices,
|
||||
...invoices.filter(row => !existingNumbers.has(String(row.invoiceNo))),
|
||||
];
|
||||
this.$message.success(`已选择${invoices.length}条收票单,保存正式结算单后生效`);
|
||||
return;
|
||||
}
|
||||
const existingNumbers = new Set(this.invoices.map(item => String(item.invoiceNo)));
|
||||
const newInvoices = invoices.filter(row => !existingNumbers.has(String(row.invoiceNo)));
|
||||
if (!newInvoices.length) {
|
||||
this.$message.warning('所选收票单均已认领');
|
||||
return;
|
||||
}
|
||||
await claimInvoicesApi({ formalSettlementId: this.form.id, invoices: newInvoices });
|
||||
await this.loadFormalDetail(this.form.id);
|
||||
this.$message.success('收票单认领成功,已同步正式结算单及关联付款单据');
|
||||
},
|
||||
invoicePoolQueryApi(params) {
|
||||
return queryInvoicePool(params);
|
||||
},
|
||||
@@ -2812,7 +2765,10 @@ export default {
|
||||
}
|
||||
matchedTotal += matchedAmount;
|
||||
}
|
||||
// 先票后款全额认领:匹配金额=发票全额,可超过结算金额,不再校验合计上限(收票状态按覆盖判定)
|
||||
if (matchedTotal > this.resolveInvoiceClaimSettlementAmount()) {
|
||||
this.$message.warning('发票匹配结算单金额合计不能超过结算金额');
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
},
|
||||
removeInvoice(index) {
|
||||
|
||||
@@ -72,6 +72,15 @@
|
||||
</el-tooltip>
|
||||
</template>
|
||||
|
||||
<template #kingdeeWriteOffStatus="{ row }">
|
||||
<el-tag
|
||||
v-if="row.kingdeeSyncStatus === 'synced'"
|
||||
:type="kingdeeWriteOffTagType(row.kingdeeWriteOffStatus)"
|
||||
>{{ kingdeeWriteOffName(row.kingdeeWriteOffStatus) || '未校验' }}</el-tag
|
||||
>
|
||||
<span v-else>-</span>
|
||||
</template>
|
||||
|
||||
<template #kingdeeLockStatus="{ row }">
|
||||
<el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
|
||||
<el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
|
||||
@@ -93,8 +102,8 @@
|
||||
|
||||
<script>
|
||||
import { invoiceStatusName } from '@/option/settlement/formalSettlementSearch';
|
||||
import { kingdeeSyncName, paymentStatusName } from '@/option/settlement/formalSettlement';
|
||||
import { kingdeeStatusType } from '@/utils/kingdee';
|
||||
import { kingdeeSyncName, kingdeeWriteOffName, paymentStatusName } from '@/option/settlement/formalSettlement';
|
||||
import { kingdeeStatusType, kingdeeWriteOffTagType } from '@/utils/kingdee';
|
||||
|
||||
export default {
|
||||
name: 'FormalSettlementTablePanel',
|
||||
@@ -189,13 +198,6 @@ export default {
|
||||
row.kingdeeSyncStatus !== 'synced'
|
||||
)
|
||||
actions.push({ type: 'void', label: '作废', danger: true });
|
||||
// 先票后款:付款结算单审批通过后可发票登记(关联收票单并推送指定应付)
|
||||
if (
|
||||
this.showPaymentAction &&
|
||||
this.hasPermission('invoice_register') &&
|
||||
row.approvalStatus === 'approved'
|
||||
)
|
||||
actions.push({ type: 'invoiceRegister', label: '发票登记' });
|
||||
return actions;
|
||||
},
|
||||
statusType(status) {
|
||||
@@ -214,6 +216,10 @@ export default {
|
||||
kingdeeSyncName(value) {
|
||||
return kingdeeSyncName(value);
|
||||
},
|
||||
kingdeeWriteOffName(value) {
|
||||
return kingdeeWriteOffName(value);
|
||||
},
|
||||
kingdeeWriteOffTagType,
|
||||
lockTag(row) {
|
||||
if (row.kingdeeLockStatus === 'locked') {
|
||||
return {
|
||||
|
||||
@@ -1,150 +0,0 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
v-model="visible"
|
||||
title="选择收票单"
|
||||
width="86%"
|
||||
append-to-body
|
||||
destroy-on-close
|
||||
@open="handleOpen"
|
||||
>
|
||||
<div class="invoice-candidates-dialog__search">
|
||||
<el-input
|
||||
v-model="keyword"
|
||||
clearable
|
||||
placeholder="发票号 / 销方(开票单位) / 购方(受票单位)"
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
<el-button type="primary" :loading="loading" @click="handleQuery">查询</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
ref="candidatesTable"
|
||||
v-loading="loading"
|
||||
:data="rows"
|
||||
row-key="id"
|
||||
border
|
||||
height="460"
|
||||
@selection-change="selection = $event"
|
||||
>
|
||||
<el-table-column type="selection" width="52" fixed="left" align="center" reserve-selection />
|
||||
<el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
|
||||
<el-table-column prop="invoiceDate" label="开票日期" min-width="110" align="center">
|
||||
<template #default="{ row }">{{ row.invoiceDate || '-' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="invoiceType" label="发票类型" min-width="140" />
|
||||
<el-table-column prop="issuerName" label="开票单位(销方)" min-width="180" show-overflow-tooltip />
|
||||
<el-table-column prop="receiverName" label="受票单位(购方)" min-width="180" show-overflow-tooltip />
|
||||
<el-table-column label="发票金额(含税)" min-width="140" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="推送状态" min-width="120" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="pushStatusType(row.kingdeePushStatus)" size="small">
|
||||
{{ pushStatusName(row.kingdeePushStatus) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<div class="invoice-candidates-dialog__tip">
|
||||
仅列出审批通过且未被其他付款结算单认领的收票单,最多 200 条
|
||||
</div>
|
||||
<template #footer>
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
<el-button type="primary" @click="handleConfirm">
|
||||
确定{{ selection.length ? `(${selection.length})` : '' }}
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { claimCandidates } from '@/api/payment/invoiceReceipt';
|
||||
|
||||
export default {
|
||||
name: 'InvoiceReceiptCandidatesDialog',
|
||||
props: {
|
||||
modelValue: { type: Boolean, required: true },
|
||||
},
|
||||
emits: ['update:modelValue', 'confirm'],
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
keyword: '',
|
||||
rows: [],
|
||||
selection: [],
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
visible: {
|
||||
get() {
|
||||
return this.modelValue;
|
||||
},
|
||||
set(value) {
|
||||
this.$emit('update:modelValue', value);
|
||||
},
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
unwrap(response) {
|
||||
const body = response?.data || response || {};
|
||||
return body?.data || body;
|
||||
},
|
||||
handleOpen() {
|
||||
this.keyword = '';
|
||||
this.selection = [];
|
||||
this.$refs.candidatesTable?.clearSelection?.();
|
||||
this.load();
|
||||
},
|
||||
handleQuery() {
|
||||
this.load();
|
||||
},
|
||||
async load() {
|
||||
this.loading = true;
|
||||
try {
|
||||
this.rows = this.unwrap(await claimCandidates(this.keyword)) || [];
|
||||
} finally {
|
||||
this.loading = false;
|
||||
}
|
||||
},
|
||||
handleConfirm() {
|
||||
if (!this.selection.length) {
|
||||
this.$message.warning('请至少选择一条收票单');
|
||||
return;
|
||||
}
|
||||
this.$emit('confirm', this.selection.map(row => ({ ...row })));
|
||||
this.visible = false;
|
||||
},
|
||||
pushStatusName(value) {
|
||||
return (
|
||||
{ pushed: '已保存收票单', assigned: '已指定应付', failed: '推送失败', unsynced: '未推送' }[
|
||||
value
|
||||
] || '未推送'
|
||||
);
|
||||
},
|
||||
pushStatusType(value) {
|
||||
return { pushed: 'warning', assigned: 'success', failed: 'danger', unsynced: 'info' }[value] || 'info';
|
||||
},
|
||||
formatMoney(value) {
|
||||
const number = Number(value);
|
||||
return Number.isFinite(number) ? number.toFixed(2) : '-';
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.invoice-candidates-dialog__search {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 8px;
|
||||
margin-bottom: 12px;
|
||||
|
||||
.el-input {
|
||||
width: 360px;
|
||||
}
|
||||
}
|
||||
.invoice-candidates-dialog__tip {
|
||||
margin-top: 8px;
|
||||
color: #909399;
|
||||
font-size: 12px;
|
||||
}
|
||||
</style>
|
||||
@@ -98,79 +98,6 @@
|
||||
></template
|
||||
>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 先票后款路径B:结算单审批后发票登记(关联收票单 → 确认推送指定应付) -->
|
||||
<el-dialog
|
||||
v-model="invoiceRegisterDialog.visible"
|
||||
title="发票登记"
|
||||
width="86%"
|
||||
append-to-body
|
||||
class="invoice-register-dialog"
|
||||
>
|
||||
<section-card title="结算基本信息">
|
||||
<el-descriptions :column="4" border size="small">
|
||||
<el-descriptions-item label="结算单号">
|
||||
{{ invoiceRegisterDialog.row.formalSettlementNo || '-' }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="结算总金额">
|
||||
{{ formatMoney(invoiceRegisterDialog.row.settlementAmount, invoiceRegisterDialog.row.currency) }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="已匹配发票金额">
|
||||
{{ formatMoney(invoiceRegisterDialog.row.invoiceAmount, invoiceRegisterDialog.row.currency) }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="金蝶同步状态">
|
||||
{{ kingdeeSyncName(invoiceRegisterDialog.row.kingdeeSyncStatus) }}
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</section-card>
|
||||
<section-card title="认领收票单">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
:disabled="invoiceRegisterDialog.saving"
|
||||
@click="candidatesDialog.visible = true"
|
||||
>选择收票单</el-button
|
||||
>
|
||||
<el-table :data="invoiceRegisterDialog.candidates" border class="invoice-register-dialog__table">
|
||||
<el-table-column type="index" label="序号" width="64" align="center" />
|
||||
<el-table-column prop="invoiceNo" label="发票号" min-width="160" align="center" />
|
||||
<el-table-column prop="invoiceDate" label="开票日期" min-width="120" align="center" />
|
||||
<el-table-column prop="invoiceType" label="发票类型" min-width="140" align="center" />
|
||||
<el-table-column prop="issuerName" label="开票单位(销方)" min-width="170" show-overflow-tooltip />
|
||||
<el-table-column label="发票金额(含税)" min-width="140" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="匹配结算单金额" min-width="150" align="right">
|
||||
<template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="90" fixed="right" align="center">
|
||||
<template #default="{ $index }">
|
||||
<el-link
|
||||
type="danger"
|
||||
:disabled="invoiceRegisterDialog.saving"
|
||||
@click="invoiceRegisterDialog.candidates.splice($index, 1)"
|
||||
>移除</el-link
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</section-card>
|
||||
<template #footer>
|
||||
<el-button @click="invoiceRegisterDialog.visible = false">取消</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
:loading="invoiceRegisterDialog.saving"
|
||||
:disabled="!invoiceRegisterDialog.candidates.length"
|
||||
@click="submitInvoiceRegister"
|
||||
>保存认领</el-button
|
||||
>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<invoice-receipt-candidates-dialog
|
||||
v-model="candidatesDialog.visible"
|
||||
@confirm="addInvoiceRegisterCandidates"
|
||||
/>
|
||||
</basic-container>
|
||||
</template>
|
||||
|
||||
@@ -186,17 +113,16 @@ import { isAdministrator } from '@/utils/auth';
|
||||
import { downloadFile } from '@/utils/util';
|
||||
import * as api from '@/api/settlement/formalSettlement';
|
||||
import * as paymentApi from '@/api/payment/paymentApplication';
|
||||
import { formalSettlementOption, kingdeeSyncName } from '@/option/settlement/formalSettlement';
|
||||
import { formalSettlementOption } from '@/option/settlement/formalSettlement';
|
||||
import organizationSearch from '@/mixins/organization-search';
|
||||
import FormalSettlementEditor from './components/formal-settlement-editor.vue';
|
||||
import FormalSettlementTablePanel from './components/formal-settlement-table-panel.vue';
|
||||
import InvoiceReceiptCandidatesDialog from './components/invoice-receipt-candidates-dialog.vue';
|
||||
import { submitMkApprovalFlow, loadMkEnabled } from '@/utils/mk-approval';
|
||||
import { getMKApprovalUrl } from '@/api/system/business-process';
|
||||
|
||||
export default {
|
||||
name: 'FormalSettlement',
|
||||
components: { FormalSettlementEditor, FormalSettlementTablePanel, InvoiceReceiptCandidatesDialog },
|
||||
components: { FormalSettlementEditor, FormalSettlementTablePanel },
|
||||
mixins: [organizationSearch],
|
||||
props: {
|
||||
/** 菜单拆分后锁定结算类型:payable=付款结算单,receivable=收款结算单 */
|
||||
@@ -225,16 +151,6 @@ export default {
|
||||
rows: [],
|
||||
form: { appliedAmount: 0, remark: '' },
|
||||
},
|
||||
// 先票后款路径B:发票登记(关联收票单 + 确认推送指定应付)
|
||||
invoiceRegisterDialog: {
|
||||
visible: false,
|
||||
saving: false,
|
||||
row: {},
|
||||
candidates: [],
|
||||
},
|
||||
candidatesDialog: {
|
||||
visible: false,
|
||||
},
|
||||
mkEnabled: false,
|
||||
// keep-alive 多标签下仅激活实例响应 detailNo,避免缓存页重复弹窗
|
||||
isPageActive: true,
|
||||
@@ -381,7 +297,6 @@ export default {
|
||||
return: () => this.handleReturn(row),
|
||||
void: () => this.handleVoid(row),
|
||||
print: () => this.handlePrint(row),
|
||||
invoiceRegister: () => this.openInvoiceRegisterDialog(row),
|
||||
};
|
||||
(handlers[type] || (() => {}))();
|
||||
},
|
||||
@@ -681,58 +596,6 @@ export default {
|
||||
this.paymentDialog.loading = false;
|
||||
}
|
||||
},
|
||||
// 先票后款路径B:发票登记——认领收票单(claim-invoices 走增量认领并同步收票侧关系)
|
||||
openInvoiceRegisterDialog(row) {
|
||||
this.invoiceRegisterDialog.row = row || {};
|
||||
this.invoiceRegisterDialog.candidates = [];
|
||||
this.invoiceRegisterDialog.visible = true;
|
||||
},
|
||||
addInvoiceRegisterCandidates(rows) {
|
||||
const existing = new Set(
|
||||
this.invoiceRegisterDialog.candidates.map(item => String(item.invoiceNo))
|
||||
);
|
||||
const added = rows.filter(row => !existing.has(String(row.invoiceNo)));
|
||||
if (!added.length) {
|
||||
this.$message.warning('所选收票单均已登记');
|
||||
return;
|
||||
}
|
||||
// 全额认领:匹配金额固定=发票金额
|
||||
this.invoiceRegisterDialog.candidates.push(
|
||||
...added.map(row => ({ ...row, matchedAmount: Number(row.invoiceAmount || 0) }))
|
||||
);
|
||||
},
|
||||
async submitInvoiceRegister() {
|
||||
const settlement = this.invoiceRegisterDialog.row;
|
||||
const invoices = this.invoiceRegisterDialog.candidates.map(row => ({
|
||||
...row,
|
||||
attachmentJson: row.attachmentJson || row.attachmentsJson,
|
||||
invoiceType: row.invoiceType || '',
|
||||
taxRate: row.taxRate ?? null,
|
||||
availableInvoiceAmount: Number(row.invoiceAmount || 0),
|
||||
matchedAmount: Number(row.invoiceAmount || 0),
|
||||
}));
|
||||
this.invoiceRegisterDialog.saving = true;
|
||||
try {
|
||||
await api.claimInvoices({ formalSettlementId: settlement.id, invoices });
|
||||
this.invoiceRegisterDialog.visible = false;
|
||||
this.onLoad(this.page);
|
||||
try {
|
||||
await this.$confirm('是否将发票匹配数据推送金蝶?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning',
|
||||
});
|
||||
} catch {
|
||||
this.$message.info('已保存认领,未推送金蝶');
|
||||
return;
|
||||
}
|
||||
const data = this.unwrapData(await api.invoiceAssignKingdee(settlement.id));
|
||||
this.$message.success(data || '发票登记推送金蝶成功');
|
||||
this.onLoad(this.page);
|
||||
} finally {
|
||||
this.invoiceRegisterDialog.saving = false;
|
||||
}
|
||||
},
|
||||
handlePrint(row) {
|
||||
if (!row) {
|
||||
row = this.selectedOne('打印');
|
||||
|
||||
@@ -49,24 +49,21 @@
|
||||
</template>
|
||||
<template #customerRisk="{ row }">
|
||||
<el-tooltip
|
||||
v-if="customerRowRiskName(row) && customerRowRiskName(row) !== '无风险'"
|
||||
v-if="customerRowRisky(row)"
|
||||
placement="top"
|
||||
effect="dark"
|
||||
popper-class="customer-risk-popper"
|
||||
>
|
||||
<template #content>
|
||||
<div>{{ row.hcsRiskDetail || customerRowRiskName(row) }}</div>
|
||||
<div>{{ row.hcsRiskDetail || '该客商为高风险/黑名单客商' }}</div>
|
||||
</template>
|
||||
<el-tag
|
||||
:type="customerRowRisky(row) ? 'danger' : row.hcsRiskLevel === '1' ? 'warning' : 'success'"
|
||||
class="status-text"
|
||||
>
|
||||
<el-tag type="danger" class="status-text">
|
||||
{{ customerRowRiskName(row) }}
|
||||
</el-tag>
|
||||
</el-tooltip>
|
||||
<el-tag
|
||||
v-else-if="customerRowRiskName(row)"
|
||||
type="success"
|
||||
:type="row.hcsRiskLevel === '1' ? 'warning' : 'success'"
|
||||
class="status-text"
|
||||
>
|
||||
{{ customerRowRiskName(row) }}
|
||||
@@ -1100,18 +1097,8 @@
|
||||
<el-form-item label="开户人姓名" prop="accountHolderName">
|
||||
<el-input v-model="receiptForm.accountHolderName" maxlength="50" />
|
||||
</el-form-item>
|
||||
<el-form-item prop="bankName">
|
||||
<template #label>
|
||||
<span class="receipt-bank-label">
|
||||
开户行
|
||||
<el-tooltip placement="top" effect="dark" content="请填写银行全称,系统将自动匹配金蝶档案带出联行号">
|
||||
<el-icon class="receipt-bank-help">
|
||||
<el-icon-question-filled />
|
||||
</el-icon>
|
||||
</el-tooltip>
|
||||
</span>
|
||||
</template>
|
||||
<el-input v-model="receiptForm.bankName" maxlength="100" @blur="fetchReceiptCnapsCode" />
|
||||
<el-form-item label="开户行" prop="bankName">
|
||||
<el-input v-model="receiptForm.bankName" maxlength="100" />
|
||||
</el-form-item>
|
||||
<el-form-item label="联行号" prop="cnapsCode">
|
||||
<el-input v-model="receiptForm.cnapsCode" maxlength="32" />
|
||||
@@ -1618,8 +1605,6 @@ import {
|
||||
remove,
|
||||
getScoreTemplate,
|
||||
recognizeBusinessLicenseOcr,
|
||||
queryKingdeeBank,
|
||||
queryKingdeeBankByNumber,
|
||||
queryKingdeeCustomer,
|
||||
querySupplierCode,
|
||||
syncKingdee,
|
||||
@@ -3669,50 +3654,18 @@ export default {
|
||||
this.receiptForm = this.emptyReceiptAccount();
|
||||
this.$refs.receiptForm?.clearValidate();
|
||||
},
|
||||
// 开户行失焦后按行名精确匹配金蝶行名行号档案(A905-3),命中自动带出联行号,未命中提示检查
|
||||
async fetchReceiptCnapsCode() {
|
||||
const bankName = String(this.receiptForm.bankName || '').trim();
|
||||
if (!bankName) return;
|
||||
try {
|
||||
const res = await queryKingdeeBank(bankName);
|
||||
// 防止响应返回时用户已修改开户行
|
||||
if (String(this.receiptForm.bankName || '').trim() !== bankName) return;
|
||||
const bank = res?.data?.data || null;
|
||||
if (bank && bank.unionNumber) {
|
||||
this.receiptForm.cnapsCode = bank.unionNumber;
|
||||
this.$refs.receiptForm?.clearValidate('cnapsCode');
|
||||
saveReceipt() {
|
||||
this.$refs.receiptForm.validate(valid => {
|
||||
if (!valid) return;
|
||||
const receipt = this.normalizeReceipt(this.receiptForm);
|
||||
if (this.receiptIndex > -1) {
|
||||
this.archiveForm.receiptAccounts.splice(this.receiptIndex, 1, receipt);
|
||||
} else {
|
||||
this.$message.warning('未查询到金蝶开户行信息,请检查开户行名称');
|
||||
this.archiveForm.receiptAccounts.push(receipt);
|
||||
this.handleDetailCurrentChange('receipt', this.getDetailPageCount('receipt'));
|
||||
}
|
||||
} catch (error) {
|
||||
// 忽略查询异常,联行号留空由用户手填
|
||||
}
|
||||
},
|
||||
async saveReceipt() {
|
||||
const valid = await this.$refs.receiptForm.validate().catch(() => false);
|
||||
if (!valid) return;
|
||||
// 保存前按联行号精确校验金蝶行名行号档案(A905-3),查不到不允许保存
|
||||
const cnapsCode = String(this.receiptForm.cnapsCode || '').trim();
|
||||
let bank = null;
|
||||
try {
|
||||
const res = await queryKingdeeBankByNumber(cnapsCode);
|
||||
bank = res?.data?.data || null;
|
||||
} catch (error) {
|
||||
this.$message.warning('金蝶联行号校验失败,请稍后重试');
|
||||
return;
|
||||
}
|
||||
if (!bank || !bank.unionNumber) {
|
||||
this.$message.warning('未查询到金蝶联行号信息,不能保存,请检查联行号');
|
||||
return;
|
||||
}
|
||||
const receipt = this.normalizeReceipt(this.receiptForm);
|
||||
if (this.receiptIndex > -1) {
|
||||
this.archiveForm.receiptAccounts.splice(this.receiptIndex, 1, receipt);
|
||||
} else {
|
||||
this.archiveForm.receiptAccounts.push(receipt);
|
||||
this.handleDetailCurrentChange('receipt', this.getDetailPageCount('receipt'));
|
||||
}
|
||||
this.receiptBox = false;
|
||||
this.receiptBox = false;
|
||||
});
|
||||
},
|
||||
deleteReceipt(index) {
|
||||
this.$confirm('确定删除该收款信息?', '提示', {
|
||||
@@ -6171,19 +6124,6 @@ export default {
|
||||
:deep(.el-select) {
|
||||
width: 60%;
|
||||
}
|
||||
|
||||
.receipt-bank-label {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.receipt-bank-help {
|
||||
color: #a8abb2;
|
||||
cursor: help;
|
||||
font-size: 14px;
|
||||
flex: none;
|
||||
}
|
||||
}
|
||||
|
||||
.receipt-dialog__footer-actions {
|
||||
|
||||
Reference in New Issue
Block a user