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/payment/payment-application-form.vue

@@ -2672,12 +2672,13 @@ export default {
       // 提交前静默保存，避免同时弹出「保存成功」与材料缺失 toast
       const saved = await this.saveDraft({ showSuccess: false });
       if (!saved) return;
+      const previousApprovalStatus = this.form.approvalStatus || '';
       await api.submit({ id: this.form.id });
       await submitMkApprovalFlow({
         bizType: 'payment-application',
-        formInstanceId: this.form.id,
+        bizId: this.form.id,
         subjectName: this.form.paymentNo || '',
-        approvalStatus: this.form.approvalStatus || '',
+        approvalStatus: previousApprovalStatus,
       });
       this.$message.success('提交成功');
       this.goBack();