feat: 收款流水页新增推送金蝶按钮与推送状态/失败原因/金蝶单号列,认领口径切公告未认领金额
- 行按钮推送金蝶(receipt_flow_push 权限,认领完成且未推送可点),成功提示金蝶收款单号 - 列表/详情展示推送状态、推送失败原因、金蝶收款单号与金蝶状态,留痕表含推送记录 - 认领表单/批量认领上限校验切公告未认领金额口径,新增剩余可认领金额展示
This commit is contained in:
@@ -13,6 +13,8 @@ export const getSettlementCandidates = (keyword, flowId) =>
|
|||||||
});
|
});
|
||||||
export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
|
export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
|
||||||
export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' });
|
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 = [
|
export const claimStatusOptions = [
|
||||||
{ label: '未认领', value: 'unclaimed' },
|
{ label: '未认领', value: 'unclaimed' },
|
||||||
|
|||||||
@@ -11,4 +11,8 @@ export const receiptFlowTableColumns = [
|
|||||||
{ prop: 'kingdeeClaimStatusName', label: '公告状态', minWidth: 110 },
|
{ prop: 'kingdeeClaimStatusName', label: '公告状态', minWidth: 110 },
|
||||||
{ prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
|
{ prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
|
||||||
{ prop: 'unclaimedAmount', label: '金蝶未认领金额', minWidth: 140, 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 },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -339,11 +339,11 @@ export default {
|
|||||||
for (const flow of this.flows) {
|
for (const flow of this.flows) {
|
||||||
const total = this.flowAllocatedTotal(flow.id);
|
const total = this.flowAllocatedTotal(flow.id);
|
||||||
const remaining = Math.max(
|
const remaining = Math.max(
|
||||||
Number(flow.receiptAmount || 0) - Number(flow.claimedAmount || 0),
|
Number(flow.unclaimedAmount || 0) - Number(flow.claimedAmount || 0),
|
||||||
0
|
0
|
||||||
);
|
);
|
||||||
if (total > remaining + 0.001) {
|
if (total > remaining + 0.001) {
|
||||||
this.$message.warning(`流水${flow.receiptNoticeNo}的分摊金额不能超过剩余可认领金额`);
|
this.$message.warning(`流水${flow.receiptNoticeNo}的累计认领金额不能超过公告未认领金额`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,6 +51,10 @@
|
|||||||
><el-form-item label="金蝶未认领金额"
|
><el-form-item label="金蝶未认领金额"
|
||||||
><el-input :model-value="formatMoney(form.unclaimedAmount)" disabled /></el-form-item
|
><el-input :model-value="formatMoney(form.unclaimedAmount)" disabled /></el-form-item
|
||||||
></el-col>
|
></el-col>
|
||||||
|
<el-col :span="6"
|
||||||
|
><el-form-item label="剩余可认领金额"
|
||||||
|
><el-input :model-value="formatMoney(claimableAmount)" disabled /></el-form-item
|
||||||
|
></el-col>
|
||||||
<el-col :span="6"
|
<el-col :span="6"
|
||||||
><el-form-item label="摘要"><el-input v-model="form.summary" disabled /></el-form-item
|
><el-form-item label="摘要"><el-input v-model="form.summary" disabled /></el-form-item
|
||||||
></el-col>
|
></el-col>
|
||||||
@@ -247,6 +251,12 @@ export default {
|
|||||||
0
|
0
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
claimableAmount() {
|
||||||
|
return Math.max(
|
||||||
|
Number(this.form.unclaimedAmount || 0) - Number(this.form.claimedAmount || 0),
|
||||||
|
0
|
||||||
|
);
|
||||||
|
},
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
if (!this.batchMode) this.initialize();
|
if (!this.batchMode) this.initialize();
|
||||||
@@ -336,8 +346,8 @@ export default {
|
|||||||
this.$message.warning('分摊收款金额必须大于0');
|
this.$message.warning('分摊收款金额必须大于0');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (this.allocatedTotal > amount - Number(this.form.claimedAmount || 0) + 0.001) {
|
if (this.allocatedTotal > this.claimableAmount + 0.001) {
|
||||||
this.$message.warning('本次分摊金额不能超过流水剩余可认领金额');
|
this.$message.warning('累计认领金额不能超过公告未认领金额(剩余可认领金额)');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for (const row of this.form.settlements)
|
for (const row of this.form.settlements)
|
||||||
|
|||||||
@@ -90,7 +90,7 @@
|
|||||||
</el-link>
|
</el-link>
|
||||||
<el-tag
|
<el-tag
|
||||||
v-else-if="column.status"
|
v-else-if="column.status"
|
||||||
:type="statusType(row.claimStatus)"
|
:type="statusType(row, column)"
|
||||||
class="status-text"
|
class="status-text"
|
||||||
>
|
>
|
||||||
{{ displayValue(row[column.prop]) }}
|
{{ displayValue(row[column.prop]) }}
|
||||||
@@ -99,10 +99,23 @@
|
|||||||
<span v-else>{{ displayValue(row[column.prop]) }}</span>
|
<span v-else>{{ displayValue(row[column.prop]) }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" width="120" fixed="right" align="center">
|
<el-table-column label="操作" width="170" fixed="right" align="center">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<el-link v-if="canClaim(row)" type="primary" @click="openClaim(row)">认领</el-link>
|
<el-link
|
||||||
<span v-else>-</span>
|
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>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -153,7 +166,7 @@
|
|||||||
{{ displayValue(detailDialog.data.detailSerialNo) }}
|
{{ displayValue(detailDialog.data.detailSerialNo) }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="认领状态">
|
<el-descriptions-item label="认领状态">
|
||||||
<el-tag :type="statusType(detailDialog.data.claimStatus)">
|
<el-tag :type="statusType(detailDialog.data, { prop: 'claimStatusName' })">
|
||||||
{{ displayValue(detailDialog.data.claimStatusName) }}
|
{{ displayValue(detailDialog.data.claimStatusName) }}
|
||||||
</el-tag>
|
</el-tag>
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
@@ -166,6 +179,20 @@
|
|||||||
<el-descriptions-item label="金蝶未认领金额">
|
<el-descriptions-item label="金蝶未认领金额">
|
||||||
{{ formatMoney(detailDialog.data.unclaimedAmount) }}
|
{{ formatMoney(detailDialog.data.unclaimedAmount) }}
|
||||||
</el-descriptions-item>
|
</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) }}
|
||||||
|
</el-descriptions-item>
|
||||||
|
<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="摘要">
|
<el-descriptions-item label="摘要">
|
||||||
{{ displayValue(detailDialog.data.summary) }}
|
{{ displayValue(detailDialog.data.summary) }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
@@ -180,7 +207,9 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="operatorName" label="认领人" min-width="120" align="center" />
|
<el-table-column prop="operatorName" label="认领人" min-width="120" align="center" />
|
||||||
<el-table-column label="状态变化" min-width="170" 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>
|
||||||
<el-table-column prop="content" label="认领说明" min-width="220" />
|
<el-table-column prop="content" label="认领说明" min-width="220" />
|
||||||
</el-table>
|
</el-table>
|
||||||
@@ -218,6 +247,7 @@ export default {
|
|||||||
selectedRows: [],
|
selectedRows: [],
|
||||||
loading: false,
|
loading: false,
|
||||||
syncing: false,
|
syncing: false,
|
||||||
|
pushingId: null,
|
||||||
searchExpanded: false,
|
searchExpanded: false,
|
||||||
page: { current: 1, size: 10, total: 0 },
|
page: { current: 1, size: 10, total: 0 },
|
||||||
detailDialog: { visible: false, loading: false, data: {}, claimRecords: [] },
|
detailDialog: { visible: false, loading: false, data: {}, claimRecords: [] },
|
||||||
@@ -334,8 +364,41 @@ export default {
|
|||||||
canClaim(row) {
|
canClaim(row) {
|
||||||
return this.hasPermission('receipt_flow_claim') && Number(row.remainingAmount || 0) > 0;
|
return this.hasPermission('receipt_flow_claim') && Number(row.remainingAmount || 0) > 0;
|
||||||
},
|
},
|
||||||
statusType(status) {
|
canPush(row) {
|
||||||
return { claimed: 'success', partial: 'warning', unclaimed: 'info' }[status] || '';
|
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] || ''
|
||||||
|
);
|
||||||
},
|
},
|
||||||
claimStatusChange(row) {
|
claimStatusChange(row) {
|
||||||
const label = status =>
|
const label = status =>
|
||||||
@@ -398,6 +461,9 @@ export default {
|
|||||||
.receipt-flow-page :deep(.el-table) {
|
.receipt-flow-page :deep(.el-table) {
|
||||||
--el-table-border-color: #eff1f7;
|
--el-table-border-color: #eff1f7;
|
||||||
}
|
}
|
||||||
|
.receipt-flow-page :deep(.el-table .cell .el-link + .el-link) {
|
||||||
|
margin-left: 12px;
|
||||||
|
}
|
||||||
.receipt-flow-page :deep(.el-table__row:nth-child(even) > td.el-table__cell) {
|
.receipt-flow-page :deep(.el-table__row:nth-child(even) > td.el-table__cell) {
|
||||||
background: #fafafa;
|
background: #fafafa;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user