Merge remote-tracking branch 'websoft/master'

src/views/vehicle/customer-archive.vue

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