+
- 认领
- 推送金蝶
- -
+ 认领
+ -
@@ -201,13 +178,13 @@
>
-
+
{{ displayValue(detailDialog.data.receiptNoticeNo) }}
{{ displayValue(detailDialog.data.payerName) }}
-
+
{{ formatMoney(detailDialog.data.receiptAmount) }}
@@ -236,13 +213,8 @@
{{ formatMoney(detailDialog.data.remainingAmount) }}
-
- {{ formatMoney(detailDialog.data.unclaimedAmount) }}
-
-
-
- {{ displayValue(detailDialog.data.pushStatusName) }}
-
+
+ {{ formatMoney(detailDialog.data.unmatchAmountRec) }}
{{ displayValue(detailDialog.data.kingdeeBillNo) }}
@@ -250,9 +222,6 @@
{{ displayValue(detailDialog.data.kingdeeBillStatusName) }}
-
- {{ displayValue(detailDialog.data.pushFailReason) }}
-
{{ displayValue(detailDialog.data.summary) }}
@@ -267,9 +236,7 @@
-
- {{ row.actionType === 'push' ? row.actionName : claimStatusChange(row) }}
-
+ {{ claimStatusChange(row) }}
@@ -297,7 +264,6 @@ const emptyQuery = () => ({
summary: '',
detailSerialNo: '',
claimStatus: '',
- pushStatus: '',
kingdeeBillStatus: '',
receiptAmountStart: undefined,
receiptAmountEnd: undefined,
@@ -314,7 +280,6 @@ export default {
ArrowUp,
query: emptyQuery(),
claimStatusOptions: api.claimStatusOptions,
- pushStatusOptions: api.pushStatusOptions,
kingdeeBillStatusOptions: api.kingdeeBillStatusOptions,
columns: receiptFlowTableColumns,
visibleColumnKeys: receiptFlowTableColumns.map(column => column.prop),
@@ -324,7 +289,6 @@ export default {
selectedRows: [],
loading: false,
syncing: false,
- pushingId: null,
searchExpanded: false,
// 与 avue-crud 一致:搜索项数量超过 searchIndex(默认一行 4 项)时才显示“展开/收起”
searchIndex: 4,
@@ -389,7 +353,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;
@@ -448,38 +412,7 @@ 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] || ''
);
diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue
index dd85e42..5520a8e 100644
--- a/src/views/settlement/components/formal-settlement-editor.vue
+++ b/src/views/settlement/components/formal-settlement-editor.vue
@@ -559,7 +559,7 @@
diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue
index 7654dfd..59bbbb3 100644
--- a/src/views/settlement/components/formal-settlement-table-panel.vue
+++ b/src/views/settlement/components/formal-settlement-table-panel.vue
@@ -60,7 +60,17 @@
}}
- {{ kingdeeSyncName(row.kingdeeSyncStatus) }}
+
+
+ {{
+ kingdeeSyncName(row.kingdeeSyncStatus)
+ }}
+
+
@@ -84,6 +94,7 @@