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.vue

@@ -160,14 +160,29 @@
                 >编辑</el-link
               >
               <el-link
-                v-if="hasPermission('payment_application_submit') && row.approvalStatus === 'draft'"
+                v-if="
+                  hasPermission('payment_application_submit') &&
+                  ['draft', 'returned'].includes(row.approvalStatus)
+                "
                 type="primary"
                 @click="handleSubmit(row)"
                 >提交</el-link
               >
               <el-link
                 v-if="
-                  hasPermission('payment_application_approve') && row.approvalStatus === 'reviewing'
+                  mkEnabled &&
+                  hasPermission('payment_application_approve') &&
+                  row.approvalStatus === 'reviewing'
+                "
+                type="primary"
+                @click="handleMkAudit(row)"
+                >流程</el-link
+              >
+              <el-link
+                v-if="
+                  !mkEnabled &&
+                  hasPermission('payment_application_approve') &&
+                  row.approvalStatus === 'reviewing'
                 "
                 type="primary"
                 @click="handleApprove(row)"
@@ -175,18 +190,14 @@
               >
               <el-link
                 v-if="
-                  hasPermission('payment_application_approve') && row.approvalStatus === 'reviewing'
+                  !mkEnabled &&
+                  hasPermission('payment_application_approve') &&
+                  row.approvalStatus === 'reviewing'
                 "
                 type="danger"
                 @click="handleReturn(row)"
                 >驳回</el-link
               >
-              <el-link
-                v-if="hasPermission('payment_application_view') && row.approvalStatus !== 'draft'"
-                type="primary"
-                @click="openFlow(row)"
-                >流程</el-link
-              >
               <el-link
                 v-if="
                   hasPermission('payment_application_void') && row.approvalStatus === 'approved'
@@ -217,22 +228,6 @@
         />
       </div>
     </section>
-    <el-dialog v-model="flowDialog.visible" title="审批流程" width="620px" append-to-body>
-      <el-descriptions :column="1" border>
-        <el-descriptions-item label="付款申请单号">
-          {{ flowDialog.row.paymentNo || '-' }}
-        </el-descriptions-item>
-        <el-descriptions-item label="审核状态">
-          {{ flowDialog.row.approvalStatusName || '-' }}
-        </el-descriptions-item>
-        <el-descriptions-item label="当前节点">
-          {{ flowDialog.row.currentNode || '-' }}
-        </el-descriptions-item>
-        <el-descriptions-item label="当前处理人">
-          {{ flowDialog.row.currentProcessor || '-' }}
-        </el-descriptions-item>
-      </el-descriptions>
-    </el-dialog>
   </basic-container>
 </template>
 
@@ -242,7 +237,8 @@ import { mapGetters } from 'vuex';
 import * as api from '@/api/payment/paymentApplication';
 import { paymentApplicationTableColumns } from '@/option/payment/paymentApplication';
 import organizationSearch from '@/mixins/organization-search';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { getMKApprovalUrl } from '@/api/system/business-process';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
 const emptyQuery = () => ({
   paymentNo: '',
@@ -276,7 +272,7 @@ export default {
       syncLoading: false,
       resultSyncing: false,
       page: { current: 1, size: 10, total: 0 },
-      flowDialog: { visible: false, row: {} },
+      mkEnabled: false,
     };
   },
   computed: {
@@ -288,6 +284,13 @@ export default {
   mounted() {
     this.loadOrganizationOptions();
     this.loadTable();
+    loadMkEnabled()
+      .then(enabled => {
+        this.mkEnabled = !!enabled;
+      })
+      .catch(() => {
+        this.mkEnabled = false;
+      });
   },
   methods: {
     hasPermission(code) {
@@ -372,12 +375,13 @@ export default {
       this.loadTable();
     },
     async handleSubmit(row) {
+      const previousApprovalStatus = row.approvalStatus || '';
       await api.submit({ id: row.id });
       await submitMkApprovalFlow({
         bizType: 'payment-application',
-        formInstanceId: row.id,
+        bizId: row.id,
         subjectName: row.paymentNo || '',
-        approvalStatus: row.approvalStatus || '',
+        approvalStatus: previousApprovalStatus,
       });
       this.$message.success('提交成功');
       this.loadTable();
@@ -387,16 +391,30 @@ export default {
       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 handleReturn(row) {
       const { value } = await this.$prompt('请输入驳回原因', '审批驳回');
       await api.returnBill({ id: row.id, reason: value });
       this.$message.success('已驳回');
       this.loadTable();
     },
-    openFlow(row) {
-      this.flowDialog.row = row;
-      this.flowDialog.visible = true;
-    },
     async handleVoid(row) {
       const { value } = await this.$prompt('请输入作废原因', '作废付款申请');
       await api.voidBill({ id: row.id, reason: value });