Merge remote-tracking branch 'refs/remotes/origin/master' into feature/bfi-api-rate

# Conflicts:
#	pnpm-lock.yaml
#	src/axios.js
#	src/views/settlement/formal-settlement.vue
#	src/views/vehicle/customer-archive.vue

src/views/settlement/formal-settlement.vue

@@ -65,6 +65,7 @@
             :page="page"
             :has-permission="hasPermissionFn"
             :sync-loading="syncLoading"
+            :mk-enabled="mkEnabled"
             @create="openCreate"
             @payment="openPaymentDialog"
             @sync="handleSync"
@@ -84,6 +85,7 @@
             :page="page"
             :has-permission="hasPermissionFn"
             :sync-loading="syncLoading"
+            :mk-enabled="mkEnabled"
             @create="openCreate"
             @payment="openPaymentDialog"
             @sync="handleSync"
@@ -184,7 +186,8 @@ import organizationSearch from '@/mixins/organization-search';
 import { formalSettlementTableColumns } from '@/option/settlement/formalSettlementTable';
 import FormalSettlementEditor from './components/formal-settlement-editor.vue';
 import FormalSettlementTablePanel from './components/formal-settlement-table-panel.vue';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { submitMkApprovalFlow, loadMkEnabled } from '@/utils/mk-approval';
+import { getMKApprovalUrl } from '@/api/system/business-process';
 
 const emptyQuery = () => ({
   formalSettlementNo: '',
@@ -227,6 +230,7 @@ export default {
         rows: [],
         form: { appliedAmount: 0, remark: '' },
       },
+      mkEnabled: false,
     };
   },
   computed: {
@@ -250,6 +254,13 @@ export default {
     this.loadOrganizationOptions();
     this.loadTable();
     this.openRouteDetail();
+    loadMkEnabled()
+      .then(enabled => {
+        this.mkEnabled = !!enabled;
+      })
+      .catch(() => {
+        this.mkEnabled = false;
+      });
   },
   methods: {
     hasPermission(code) {
@@ -293,6 +304,7 @@ export default {
         edit: () => this.openEdit(row),
         delete: () => this.handleDelete(row),
         submit: () => this.handleSubmit(row),
+        mkAudit: () => this.handleMkAudit(row),
         approve: () => this.handleApprove(row),
         return: () => this.handleReturn(row),
         void: () => this.handleVoid(row),
@@ -340,16 +352,35 @@ export default {
     },
     async handleSubmit(row) {
       await this.$confirm('提交后来源预结算将保持锁定，确认提交？', '提示', { type: 'warning' });
+      const previousApprovalStatus = row.approvalStatus || '';
       await api.submit({ id: row.id });
       await submitMkApprovalFlow({
         bizType: 'formal-settlement',
-        formInstanceId: row.id,
+        bizId: row.id,
         subjectName: row.formalSettlementNo || '',
-        approvalStatus: row.approvalStatus || '',
+        approvalStatus: previousApprovalStatus,
       });
       this.$message.success('提交成功');
       this.loadTable();
     },
+    handleMkAudit(row) {
+      if (!row?.id) {
+        this.$message.warning('正式结算单ID为空，无法打开审核页');
+        return;
+      }
+      getMKApprovalUrl({ bizId: String(row.id) })
+        .then(res => {
+          const url = res?.data?.data;
+          if (!url) {
+            this.$message.error('获取审核跳转地址失败');
+            return;
+          }
+          window.open(url, '_blank');
+        })
+        .catch(() => {
+          this.$message.error('获取审核跳转地址失败');
+        });
+    },
     async handleApprove(row) {
       await this.$confirm(
         '审核通过后正式结算生效，金额只能通过结算调整单处理，确认通过？',