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
2026-09-28 10:07:19 +08:00
parent 7fd8140761 f49f36fb60
commit 9b40800aab
15 changed files with 314 additions and 15 deletions
@@ -378,8 +378,13 @@ export default {
      this.pushLoading = true;
      try {
        const summary = this.unwrapData(await api.pushKingdee(rows.map(row => row.id)));
-        this.$alert(summary || '推送完成', '推送结果', { confirmButtonText: '知道了' });
-        this.loadTable();
+        await this.loadTable();
+        // 附件联带同步提示：推送成功但附件未全部上传时在结果弹窗追加说明，重推即自动补传
+        const idSet = new Set(rows.map(row => String(row.id)));
+        const pendingCount = (this.rows || []).filter(row => idSet.has(String(row.id))
+          && ['pending', 'partial'].includes(row.attachmentSyncStatus)).length;
+        const attachmentTip = pendingCount ? `\n其中${pendingCount}单附件未全部上传，可重推补传` : '';
+        this.$alert((summary || '推送完成') + attachmentTip, '推送结果', { confirmButtonText: '知道了' });
      } finally {
        this.pushLoading = false;
      }