Merge remote-tracking branch 'websoft/master'

src/views/payment/invoice-application.vue

@@ -505,6 +505,16 @@ export default {
           tip: row.kingdeeLockFailReason || '系统将自动补偿重锁',
         };
       }
+      // 金蝶解锁终态标识：删单解锁的源单已作废，此标签用于区分人工作废与金蝶删单
+      if (row.kingdeeUnlockTime) {
+        const isDelete = row.kingdeeUnlockOperationName === '金蝶删单';
+        return {
+          show: true,
+          type: isDelete ? 'danger' : 'warning',
+          label: row.kingdeeUnlockOperationName || '金蝶解锁',
+          tip: `${row.kingdeeUnlockOperator || '-'} 于 ${this.$dayjs(row.kingdeeUnlockTime).format('YYYY-MM-DD HH:mm:ss')} 解锁`,
+        };
+      }
       return { show: false };
     },
     displayValue(value) {

src/views/payment/payment-application.vue

@@ -442,6 +442,16 @@ export default {
           tip: row.kingdeeLockFailReason || '系统将自动补偿重锁',
         };
       }
+      // 金蝶解锁终态标识：后端按 unlocked 锁记录回填（付款申请不作废，仅此标识可区分金蝶删单与推送失败）
+      if (row.kingdeeUnlockTime) {
+        const isDelete = row.kingdeeUnlockOperationName === '金蝶删单';
+        return {
+          show: true,
+          type: isDelete ? 'danger' : 'warning',
+          label: row.kingdeeUnlockOperationName || '金蝶解锁',
+          tip: `${row.kingdeeUnlockOperator || '-'} 于 ${this.$dayjs(row.kingdeeUnlockTime).format('YYYY-MM-DD HH:mm:ss')} 解锁`,
+        };
+      }
       return { show: false };
     },
     displayValue(value) {

src/views/settlement/components/formal-settlement-table-panel.vue

@@ -295,6 +295,16 @@ export default {
           tip: row.kingdeeLockFailReason || '系统将自动补偿重锁',
         };
       }
+      // 金蝶解锁终态标识：删单解锁的源单已作废，此标签用于区分人工作废与金蝶删单
+      if (row.kingdeeUnlockTime) {
+        const isDelete = row.kingdeeUnlockOperationName === '金蝶删单';
+        return {
+          show: true,
+          type: isDelete ? 'danger' : 'warning',
+          label: row.kingdeeUnlockOperationName || '金蝶解锁',
+          tip: `${row.kingdeeUnlockOperator || '-'} 于 ${this.$dayjs(row.kingdeeUnlockTime).format('YYYY-MM-DD HH:mm:ss')} 解锁`,
+        };
+      }
       return { show: false };
     },
     displayValue(value) {

src/views/vehicle/customer-archive.vue

@@ -5224,17 +5224,20 @@ export default {
           this.$message.error('获取审核跳转地址失败');
         });
     },
-    handleApprove(row) {
+    async handleApprove(row) {
-      this.$confirm('是否确认审核通过?', '提示', {
+      await this.$confirm('是否确认审核通过?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      })
+      });
-        .then(() => approve(row.id))
+      const res = await approve(row.id);
-        .then(() => {
+      // data=false 表示审核已通过但推送金蝶失败，msg 带具体原因
-          this.onLoad(this.page);
+      if (res.data.data === false) {
-          this.$message({ type: 'success', message: '审核通过!' });
+        this.$message.warning(res.data.msg);
-        });
+      } else {
+        this.$message.success(res.data.msg || '审核通过!');
+      }
+      this.onLoad(this.page);
     },
     async handleSyncKingdee(row) {
       if (this.kingdeeSyncingId) return;