fix: 审批通过提示改用后端返回文案，金蝶自动同步失败弹警告

src/option/payment/invoiceApplication.js

@@ -13,7 +13,6 @@ export const invoiceApplicationTableColumns = [
   { prop: 'currentProcessor', label: '当前处理人', minWidth: 130 },
   { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 150 },
   { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 140 },
-  { prop: 'kingdeeLockStatus', label: '金蝶锁状态', minWidth: 150 },
   { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];
 

src/option/payment/paymentApplication.js

@@ -17,6 +17,5 @@ export const paymentApplicationTableColumns = [
   { prop: 'currentProcessor', label: '当前处理人', minWidth: 120 },
   { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 130 },
   { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 130 },
-  { prop: 'kingdeeLockStatus', label: '金蝶锁状态', minWidth: 150 },
   { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];

src/option/settlement/formalSettlementTable.js

@@ -21,7 +21,6 @@ export const formalSettlementTableColumns = [
   { label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
   { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
   { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
-  { label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 },
   { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 },
   { label: '创建人', prop: 'createUserName', minWidth: 110 },
   { label: '创建时间', prop: 'createTime', minWidth: 170 },

src/views/payment/invoice-application.vue

@@ -115,12 +115,6 @@
               {{ displayValue(row[column.prop]) }}
             </el-tag>
             <span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
-            <template v-else-if="column.prop === 'kingdeeLockStatus'">
-              <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
-                <el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
-              </el-tooltip>
-              <span v-else>-</span>
-            </template>
             <span v-else>{{ displayValue(row[column.prop]) }}</span>
           </template>
         </el-table-column>
@@ -189,9 +183,7 @@
               >
               <el-link
                 v-if="
-                  hasPermission('invoice_application_void') &&
+                  hasPermission('invoice_application_void') && row.approvalStatus === 'approved'
-                  row.approvalStatus === 'approved' &&
-                  row.kingdeeLockStatus !== 'locked'
                 "
                 type="danger"
                 @click="handleVoid(row)"
@@ -385,8 +377,13 @@ export default {
     },
     async handleApprove(row) {
       await this.$confirm('确认审批通过该开票申请？', '提示', { type: 'warning' });
-      await api.approve({ id: row.id });
+      const res = await api.approve({ id: row.id });
-      this.$message.success('审批通过');
+      // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
+      if (res.data.data === false) {
+        this.$message.warning(res.data.msg);
+      } else {
+        this.$message.success(res.data.msg || '审批通过');
+      }
       this.loadTable();
     },
     async handleReturn(row) {
@@ -456,28 +453,6 @@ export default {
         ''
       );
     },
-    lockTag(row) {
-      if (row.kingdeeLockStatus === 'locked') {
-        return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定，不可编辑/作废' };
-      }
-      if (row.kingdeeLockStatus === 'failed') {
-        if ((row.kingdeeTryCount || 0) >= 5) {
-          return {
-            show: true,
-            type: 'danger',
-            label: '锁定失败·已达上限',
-            tip: row.kingdeeLockFailReason || '自动补偿次数已用完，请重推「同步金蝶」立即补锁',
-          };
-        }
-        return {
-          show: true,
-          type: 'warning',
-          label: '锁定失败·补偿中',
-          tip: row.kingdeeLockFailReason || '系统将自动补偿重锁',
-        };
-      }
-      return { show: false };
-    },
     displayValue(value) {
       return value === null || value === undefined || value === '' ? '-' : value;
     },

src/views/payment/invoice-receipt.vue

@@ -342,8 +342,13 @@ export default {
     },
     async handleApprove(row) {
       await this.$confirm('确认审批通过该收票登记？', '提示', { type: 'warning' });
-      await api.approve({ id: row.id });
+      const res = await api.approve({ id: row.id });
-      this.$message.success('审批通过');
+      // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
+      if (res.data.data === false) {
+        this.$message.warning(res.data.msg);
+      } else {
+        this.$message.success(res.data.msg || '审批通过');
+      }
       this.loadTable();
     },
     async handleReturn(row) {

src/views/payment/payment-application.vue

@@ -138,12 +138,6 @@
               >{{ row[column.prop] || '-' }}</el-tag
             >
             <span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
-            <template v-else-if="column.prop === 'kingdeeLockStatus'">
-              <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
-                <el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
-              </el-tooltip>
-              <span v-else>-</span>
-            </template>
             <span v-else>{{ displayValue(row[column.prop]) }}</span>
           </template>
         </el-table-column>
@@ -206,9 +200,7 @@
               >
               <el-link
                 v-if="
-                  hasPermission('payment_application_void') &&
+                  hasPermission('payment_application_void') && row.approvalStatus === 'approved'
-                  row.approvalStatus === 'approved' &&
-                  row.kingdeeLockStatus !== 'locked'
                 "
                 type="danger"
                 @click="handleVoid(row)"
@@ -395,8 +387,13 @@ export default {
       this.loadTable();
     },
     async handleApprove(row) {
-      await api.approve({ id: row.id });
+      const res = await api.approve({ id: row.id });
-      this.$message.success('审批通过');
+      // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
+      if (res.data.data === false) {
+        this.$message.warning(res.data.msg);
+      } else {
+        this.$message.success(res.data.msg || '审批通过');
+      }
       this.loadTable();
     },
     handleMkAudit(row) {
@@ -504,28 +501,6 @@ export default {
         ''
       );
     },
-    lockTag(row) {
-      if (row.kingdeeLockStatus === 'locked') {
-        return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定，不可编辑/作废' };
-      }
-      if (row.kingdeeLockStatus === 'failed') {
-        if ((row.kingdeeTryCount || 0) >= 5) {
-          return {
-            show: true,
-            type: 'danger',
-            label: '锁定失败·已达上限',
-            tip: row.kingdeeLockFailReason || '自动补偿次数已用完，请重推「同步金蝶」立即补锁',
-          };
-        }
-        return {
-          show: true,
-          type: 'warning',
-          label: '锁定失败·补偿中',
-          tip: row.kingdeeLockFailReason || '系统将自动补偿重锁',
-        };
-      }
-      return { show: false };
-    },
     displayValue(value) {
       return value === null || value === undefined || value === '' ? '-' : value;
     },

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

@@ -88,12 +88,6 @@
           <span v-else-if="column.prop === 'kingdeeSyncStatus'">{{
             kingdeeSyncName(row.kingdeeSyncStatus)
           }}</span>
-          <template v-else-if="column.prop === 'kingdeeLockStatus'">
-            <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
-              <el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
-            </el-tooltip>
-            <span v-else>-</span>
-          </template>
           <span v-else>{{ displayValue(row[column.prop]) }}</span>
         </template>
       </el-table-column>
@@ -232,28 +226,6 @@ export default {
     kingdeeSyncName(value) {
       return kingdeeSyncStatusOptions.find(item => item.value === value)?.label || value || '-';
     },
-    lockTag(row) {
-      if (row.kingdeeLockStatus === 'locked') {
-        return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定，不可编辑/作废' };
-      }
-      if (row.kingdeeLockStatus === 'failed') {
-        if ((row.kingdeeTryCount || 0) >= 5) {
-          return {
-            show: true,
-            type: 'danger',
-            label: '锁定失败·已达上限',
-            tip: row.kingdeeLockFailReason || '自动补偿次数已用完，请重推「同步金蝶」立即补锁',
-          };
-        }
-        return {
-          show: true,
-          type: 'warning',
-          label: '锁定失败·补偿中',
-          tip: row.kingdeeLockFailReason || '系统将自动补偿重锁',
-        };
-      }
-      return { show: false };
-    },
     displayValue(value) {
       return value === null || value === undefined || value === '' ? '-' : value;
     },

src/views/settlement/formal-settlement.vue

@@ -387,8 +387,13 @@ export default {
         '提示',
         { type: 'warning' }
       );
-      await api.approve({ id: row.id });
+      const res = await api.approve({ id: row.id });
-      this.$message.success('审批通过');
+      // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
+      if (res.data.data === false) {
+        this.$message.warning(res.data.msg);
+      } else {
+        this.$message.success(res.data.msg || '审批通过');
+      }
       this.loadTable();
     },
     async handleReturn(row) {