From 77b083d347eb8e75eb29a4146238b3f7304489f6 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:54:07 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_pro2.0' into fix/hsy/20260812

---
 src/views/mes/pd/project/detail/index.vue |   58 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/src/views/mes/pd/project/detail/index.vue b/src/views/mes/pd/project/detail/index.vue
index 36da5ce..97f7f8b 100644
--- a/src/views/mes/pd/project/detail/index.vue
+++ b/src/views/mes/pd/project/detail/index.vue
@@ -13,8 +13,8 @@
 
 import {
   archivePdProject,
-  auditPdProject,
   getPdProject,
+  getPdProjectApproveProcessList,
   publishPdProject,
   uploadPdProject,
 } from '#/api/mes/pd/project';
@@ -25,6 +25,7 @@
 import Form from '../modules/form.vue';
 import DocumentAuditList from '../modules/document-audit-list.vue';
 import DocumentList from '../modules/document-list.vue';
+import ProcessSelectModal from '../modules/process-select-modal.vue';
 import WorkflowTimeline from '../modules/workflow-timeline.vue';
 import TaskDraftBanner from '../modules/task-draft-banner.vue';
 import { useDetailSchema } from './data';
@@ -50,6 +51,9 @@
 const isPendingArchive = computed(
   () => project.value.status === MesPdProjectStatusEnum.PENDING_ARCHIVE,
 );
+const isApproving = computed(
+  () => project.value.status === MesPdProjectStatusEnum.APPROVING,
+);
 const isArchived = computed(
   () => project.value.status === MesPdProjectStatusEnum.ARCHIVED,
 );
@@ -70,6 +74,11 @@
 
 const [FormModal, formModalApi] = useVbenModal({
   connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const [ProcessModal, processModalApi] = useVbenModal({
+  connectedComponent: ProcessSelectModal,
   destroyOnClose: true,
 });
 
@@ -119,16 +128,38 @@
   }
 }
 
-async function handleAudit() {
-  const hideLoading = message.loading({ content: '瀹℃牳涓��', duration: 0 });
+/** 鎻愪氦瀹℃壒 - 鍏堣幏鍙栨祦绋嬪垪琛� */
+async function handleSubmit() {
+  const hideLoading = message.loading({ content: '鑾峰彇瀹℃壒娴佺▼...', duration: 0 });
   try {
-    await auditPdProject(projectId.value);
-    message.success('瀹℃牳閫氳繃锛岃繘鍏ュ緟褰掓。鐘舵��');
-    tabs.closeCurrentTab();
-    router.back();
-  } finally {
+    const processList = await getPdProjectApproveProcessList();
+    hideLoading();
+    if (!processList || processList.length === 0) {
+      message.warning('鏆傛棤鍙敤瀹℃壒娴佺▼锛岃鍏堥厤缃� BPM 娴佺▼');
+      return;
+    }
+    // 鎵撳紑娴佺▼閫夋嫨寮圭獥
+    processModalApi.setData({ id: projectId.value, processList }).open();
+  } catch {
     hideLoading();
   }
+}
+
+/** 鏌ョ湅瀹℃壒璇︽儏 */
+function handleProcessDetail() {
+  if (!project.value.processInstanceId) {
+    message.warning('璇ラ」鐩皻鏈彁浜ゅ鎵�');
+    return;
+  }
+  router.push({
+    name: 'BpmProcessInstanceDetail',
+    query: { id: project.value.processInstanceId },
+  });
+}
+
+/** 鎻愪氦瀹℃壒鎴愬姛鍚庡埛鏂拌鎯� */
+function handleSubmitSuccess() {
+  loadProjectDetail();
 }
 
 async function handleArchive() {
@@ -155,6 +186,7 @@
     :title="project.taskName || '璁捐浠诲姟璇︽儏'"
   >
     <FormModal @success="loadProjectDetail" />
+    <ProcessModal @success="handleSubmitSuccess" />
 
     <template #extra>
       <TableAction
@@ -185,10 +217,16 @@
             onClick: handleUpload,
           },
           {
-            label: '瀹℃牳閫氳繃',
+            label: '鎻愪氦瀹℃壒',
             type: 'primary',
             ifShow: isPendingAudit,
-            onClick: handleAudit,
+            onClick: handleSubmit,
+          },
+          {
+            label: '鏌ョ湅瀹℃壒',
+            type: 'primary',
+            ifShow: isApproving,
+            onClick: handleProcessDetail,
           },
           {
             label: '褰掓。',

--
Gitblit v1.9.3