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/components/pre-settlement-editor.vue

@@ -966,6 +966,7 @@ import {
 import { downloadFileByUrl } from '@/utils/util';
 import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import * as XLSX from 'xlsx';
+import { isAdministrator } from '@/utils/auth';
 
 export default {
   name: 'PreSettlementEditor',
@@ -1164,10 +1165,7 @@ export default {
       return !this.readonly && ['draft', 'returned'].includes(this.form.approvalStatus);
     },
     isAdmin() {
-      const authority = this.userInfo?.authority;
-      return Array.isArray(authority)
-        ? authority.includes('admin')
-        : String(authority || '').includes('admin');
+      return isAdministrator(this.userInfo);
     },
     canAdjustDetail() {
       return this.editable && this.hasPermission('pre_settlement_adjust');
@@ -1611,12 +1609,13 @@ export default {
         await this.loadDetail();
         await this.persistPendingAdjustments();
         if (shouldSubmit) {
+          const previousApprovalStatus = this.form.approvalStatus || '';
           await submit({ id: this.form.id });
           await submitMkApprovalFlow({
             bizType: 'pre-settlement',
-            formInstanceId: this.form.id,
+            bizId: this.form.id,
             subjectName: this.form.preSettlementNo || this.form.contractName || '',
-            approvalStatus: this.form.approvalStatus || '',
+            approvalStatus: previousApprovalStatus,
           });
           this.$message.success('审批流程已发起');
           this.visible = false;