调试mk

2026-09-21 11:14:51 +08:00
parent 7078de6385
commit 57368f0179
15 changed files with 647 additions and 39 deletions
@@ -1035,6 +1035,7 @@ import { getDictionary as getBizDictionary } from '@/api/system/dictbiz';
 import { config, option } from '@/option/business/contract-manage';
 import { getToken } from '@/utils/auth';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
+import { submitMkApprovalFlow } from '@/utils/mk-approval';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
 import ContractAttachmentSection, {
  attachmentName as sharedAttachmentName,
@@ -1824,9 +1825,17 @@ export default {
          const id = saved.id || this.form.id;
          if (action === 'temporary' || action === 'formal') {
            if (!id) throw new Error('合同保存成功但未返回主键，无法提交合同');
-            return action === 'temporary'
+            return (action === 'temporary'
              ? this.api.toTemporary(id)
-              : this.api.submitFormal(id);
+              : this.api.submitFormal(id)
+            ).then(() =>
+              submitMkApprovalFlow({
+                bizType: 'contract-manage',
+                formInstanceId: id,
+                subjectName: saved.contractName || submit.contractName || '',
+                approvalStatus: saved.approvalStatus || submit.approvalStatus || '',
+              })
+            );
          }
          return null;
        })
@@ -1853,8 +1862,20 @@ export default {
        : this.api.submit(payload);
      request
        .then(() => {
-          this.$message.success(isChangeRejected ? '已重新提交变更审批' : '修改成功');
-          this.closeForm();
+          if (!isChangeRejected) {
+            this.$message.success('修改成功');
+            this.closeForm();
+            return;
+          }
+          return submitMkApprovalFlow({
+            bizType: 'contract-manage',
+            formInstanceId: payload.id || this.form.id,
+            subjectName: payload.contractName || this.form.contractName || '',
+            approvalStatus: this.form.approvalStatus || 'change_rejected',
+          }).then(() => {
+            this.$message.success('已重新提交变更审批');
+            this.closeForm();
+          });
        })
        .finally(() => {
          this.submitAction = '';
@@ -2698,7 +2719,19 @@ export default {
      }
      const run = value => {
        const args = operation.prompt ? [row.id, value] : [row.id];
-        this.api[operation.action](...args).then(() => {
+        const request = () => this.api[operation.action](...args);
+        const afterMk =
+          operation.action === 'submitFormal'
+            ? request().then(() =>
+                submitMkApprovalFlow({
+                  bizType: 'contract-manage',
+                  formInstanceId: row.id,
+                  subjectName: row.contractName || '',
+                  approvalStatus: row.approvalStatus || '',
+                })
+              )
+            : request();
+        afterMk.then(() => {
          this.$message.success(operation.successMessage || `${operation.label}成功`);
          this.onLoad(this.page, this.query);
        });