Merge remote-tracking branch 'origin/feature/kingdee-attachment-sync' into feature/bfi-api-rate
# Conflicts: # src/api/payment/invoiceApplication.js # src/api/payment/invoiceReceipt.js # src/api/payment/paymentApplication.js # src/api/settlement/formalSettlement.js # src/views/payment/invoice-application.vue # src/views/payment/invoice-receipt.vue # src/views/payment/payment-application-form.vue # src/views/payment/payment-application.vue # src/views/settlement/formal-settlement.vue
This commit is contained in:
@@ -406,7 +406,8 @@ export default {
|
||||
async handleSyncRow(row) {
|
||||
const data = this.unwrapData(await api.syncKingdee(row.id));
|
||||
this.$message.success(`已生成金蝶付款单:${data}`);
|
||||
this.loadTable();
|
||||
await this.loadTable();
|
||||
this.warnAttachmentNotUploaded([row.id]);
|
||||
},
|
||||
async handleSync() {
|
||||
if (this.syncLoading) return;
|
||||
@@ -428,11 +429,25 @@ export default {
|
||||
} else {
|
||||
this.$message.success(`已同步${data.length}条付款申请`);
|
||||
}
|
||||
this.loadTable();
|
||||
await this.loadTable();
|
||||
this.warnAttachmentNotUploaded(rows.map(row => row.id));
|
||||
} finally {
|
||||
this.syncLoading = false;
|
||||
}
|
||||
},
|
||||
// 附件联带同步提示:同步成功但附件未全部上传时追加 warning,重推即自动补传
|
||||
warnAttachmentNotUploaded(ids) {
|
||||
const idSet = new Set(ids.map(String));
|
||||
const pendingCount = (this.rows || []).filter(row => idSet.has(String(row.id))
|
||||
&& ['pending', 'partial'].includes(row.attachmentSyncStatus)).length;
|
||||
if (pendingCount) {
|
||||
this.$message({
|
||||
type: 'warning',
|
||||
message: `其中${pendingCount}单附件未全部上传,可重推补传`,
|
||||
duration: 8000,
|
||||
});
|
||||
}
|
||||
},
|
||||
async handleSyncResult() {
|
||||
if (this.resultSyncing) return;
|
||||
this.resultSyncing = true;
|
||||
|
||||
Reference in New Issue
Block a user