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
2026-10-01 13:46:44 +08:00
parent 7fca74907f 0b81001ce7
commit 0484c2359d
139 changed files with 10731 additions and 2593 deletions
@@ -147,14 +147,20 @@
                >提交</el-link
              >
              <el-link
-                v-if="hasPermission('invoice_receipt_view') && row.approvalStatus !== 'draft'"
+                v-if="
+                  mkEnabled &&
+                  hasPermission('invoice_receipt_approve') &&
+                  row.approvalStatus === 'reviewing'
+                "
                type="primary"
-                @click="openFlow(row)"
+                @click="handleMkAudit(row)"
                >流程</el-link
              >
              <el-link
                v-if="
-                  hasPermission('invoice_receipt_approve') && row.approvalStatus === 'reviewing'
+                  !mkEnabled &&
+                  hasPermission('invoice_receipt_approve') &&
+                  row.approvalStatus === 'reviewing'
                "
                type="primary"
                @click="handleApprove(row)"
@@ -162,7 +168,9 @@
              >
              <el-link
                v-if="
-                  hasPermission('invoice_receipt_approve') && row.approvalStatus === 'reviewing'
+                  !mkEnabled &&
+                  hasPermission('invoice_receipt_approve') &&
+                  row.approvalStatus === 'reviewing'
                "
                type="danger"
                @click="handleReturn(row)"
@@ -191,42 +199,6 @@
        />
      </div>
    </section>
-
-    <el-dialog v-model="flowDialog.visible" title="审批流程" width="900px" append-to-body>
-      <el-descriptions :column="2" border>
-        <el-descriptions-item label="发票号码">
-          {{ flowDialog.row.invoiceNo || '-' }}
-        </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-table
-        v-loading="flowDialog.loading"
-        :data="flowDialog.records"
-        border
-        class="receipt-page__flow-table"
-      >
-        <el-table-column type="index" label="序号" width="64" align="center" />
-        <el-table-column prop="actionName" label="操作" min-width="110" align="center" />
-        <el-table-column label="原状态" min-width="100" align="center">
-          <template #default="{ row }">{{ statusName(row.fromStatus) }}</template>
-        </el-table-column>
-        <el-table-column label="新状态" min-width="100" align="center">
-          <template #default="{ row }">{{ statusName(row.toStatus) }}</template>
-        </el-table-column>
-        <el-table-column prop="operatorName" label="操作人" min-width="110" align="center" />
-        <el-table-column prop="createTime" label="操作时间" min-width="170" align="center" />
-        <el-table-column prop="reason" label="原因" min-width="160" show-overflow-tooltip />
-        <el-table-column prop="kingdeeBillNo" label="金蝶单据号" min-width="150" />
-      </el-table>
-    </el-dialog>
  </basic-container>
 </template>

@@ -237,6 +209,8 @@ import * as XLSX from 'xlsx';
 import * as api from '@/api/payment/invoiceReceipt';
 import { invoiceReceiptTableColumns } from '@/option/payment/invoiceReceipt';
 import organizationSearch from '@/mixins/organization-search';
+import { getMKApprovalUrl } from '@/api/system/business-process';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';

 const emptyQuery = () => ({
  invoiceNo: '',
@@ -266,7 +240,7 @@ export default {
      loading: false,
      pushLoading: false,
      page: { current: 1, size: 10, total: 0 },
-      flowDialog: { visible: false, loading: false, row: {}, records: [] },
+      mkEnabled: false,
    };
  },
  computed: {
@@ -275,6 +249,13 @@ export default {
  mounted() {
    this.loadOrganizationOptions();
    this.loadTable();
+    loadMkEnabled()
+      .then(enabled => {
+        this.mkEnabled = !!enabled;
+      })
+      .catch(() => {
+        this.mkEnabled = false;
+      });
  },
  methods: {
    hasPermission(code) {
@@ -323,19 +304,6 @@ export default {
        query: { mode: 'view', id: row.id },
      });
    },
-    async openFlow(row) {
-      this.flowDialog.row = { ...row };
-      this.flowDialog.records = [];
-      this.flowDialog.visible = true;
-      this.flowDialog.loading = true;
-      try {
-        const detail = this.unwrapData(await api.getDetail(row.id));
-        this.flowDialog.row = { ...row, ...detail };
-        this.flowDialog.records = detail.records || [];
-      } finally {
-        this.flowDialog.loading = false;
-      }
-    },
    async handleDelete(row) {
      await this.$confirm('确认删除该收票登记？', '提示', { type: 'warning' });
      await api.remove(row.id);
@@ -343,10 +311,35 @@ export default {
      this.loadTable();
    },
    async handleSubmit(row) {
+      const previousApprovalStatus = row.approvalStatus || '';
      await api.submit({ id: row.id });
+      await submitMkApprovalFlow({
+        bizType: 'invoice-receipt',
+        bizId: row.id,
+        subjectName: row.invoiceNo || '',
+        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('确认审批通过该收票登记？', '提示', { type: 'warning' });
      await api.approve({ id: row.id });
@@ -418,19 +411,6 @@ export default {
        ''
      );
    },
-    statusName(status) {
-      return (
-        {
-          draft: '草稿',
-          reviewing: '审批中',
-          approved: '审批通过',
-          returned: '已驳回',
-          voided: '已作废',
-        }[status] ||
-        status ||
-        '-'
-      );
-    },
    displayValue(value) {
      return value === null || value === undefined || value === '' ? '-' : value;
    },