From 7156e34fde544a9cd736b9cb1aa8da3f1723dced Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Fri, 24 May 2024 00:12:53 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E4=BF=AE=E5=A4=8D=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/summary/detail.vue   | 24 +++++++++++++++++--
 .../project-management/filing/detail.vue      |  2 +-
 src/views/project-management/filing/index.vue |  3 ++-
 .../implementation/detail.vue                 |  4 +++-
 .../implementation/index.vue                  |  3 ++-
 .../project-management/initiation/detail.vue  |  7 +++++-
 .../project-management/initiation/index.vue   |  2 +-
 7 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/views/project-demand/summary/detail.vue b/src/views/project-demand/summary/detail.vue
index 2787ba2..518d90b 100644
--- a/src/views/project-demand/summary/detail.vue
+++ b/src/views/project-demand/summary/detail.vue
@@ -1,11 +1,15 @@
 <template>
-  <steps :active="active" @setDetail="setDetail" @stepChange="stepChange">
+  <steps :active="'1'" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
       <collection-detail v-show="showActive == '00'" :formData="summaryData.formData" :data="summaryData"
                          :processViewer="summaryProcessViewer" :companyOption="companyOption" :loading="loading"/>
       <summary-detail v-show="showActive == '10'" :formData="summaryData.formData" :data="summaryData"
                       :processViewer="summaryProcessViewer" :loading="loading"/>
       <ApprovalDetail v-show="showActive == '20'" :formData="summaryData.formData" :data="summaryData" :processViewer="summaryProcessViewer" :loading="loading"></ApprovalDetail>
+      <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="summaryData.formData" :data="summaryData"
+                      :processViewer="summaryProcessViewer" :loading="loading"></ApprovalDetail>
+      <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="summaryData.formData" :data="summaryData"
+                      :processViewer="summaryProcessViewer" :loading="loading"></ApprovalDetail>
 
     </template>
   </steps>
@@ -59,7 +63,22 @@ const getInfo = async (state) => {
     })
   }
 }
-
+// const back = () => {
+//   switch (route.name) {
+//     case 'Summary/detail':
+//       setDetail('1')
+//       break;
+//     case 'Initiation/detail':
+//       setDetail('2')
+//       break;
+//     case 'Implementation/detail':
+//       setDetail('3')
+//       break;
+//     case 'Filing/detail':
+//       setDetail('4')
+//       break;
+//   }
+// }
 const setDetail = (active) => {
   showActive.value = active
   getInfo(active)
@@ -69,6 +88,7 @@ const stepChange = (data) => {
   showActive.value = data.active
   getInfo(data.active)
 }
+// back()
 </script>
 
 <style scoped>
diff --git a/src/views/project-management/filing/detail.vue b/src/views/project-management/filing/detail.vue
index 3b89619..31a7898 100644
--- a/src/views/project-management/filing/detail.vue
+++ b/src/views/project-management/filing/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <steps :active="'0'" @setDetail="setDetail" @stepChange="stepChange">
+  <steps :active="'4'" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
       <collection-detail
           :formData="commonForm.formData"
diff --git a/src/views/project-management/filing/index.vue b/src/views/project-management/filing/index.vue
index a882fb2..530ae3f 100644
--- a/src/views/project-management/filing/index.vue
+++ b/src/views/project-management/filing/index.vue
@@ -203,7 +203,8 @@ const handleDetail = (row) => {
     name:'Filing/detail',
     query: {
       id: row.requirementId,
-      projectId: row.projectId
+      projectId: row.projectId,
+      state: row.state
     }
   })
 }
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index a9f1f23..806359d 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <steps :active="'0'" @setDetail="setDetail" @stepChange="stepChange">
+  <steps :active="'3'" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
       <collection-detail
         :formData="commonForm.formData"
@@ -12,6 +12,8 @@
       <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"/>
       <ApprovalDetail type="approval" v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
       <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
+      <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
+                      :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
 
     </template>
   </steps>
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 442eaff..c7128f9 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -219,7 +219,8 @@ const handleDetail = (row) => {
     name: 'Implementation/detail',
     query: {
       id: row.requirementId,
-      projectId: row.projectId
+      projectId: row.projectId,
+      state: row.state
     }
   })
 }
diff --git a/src/views/project-management/initiation/detail.vue b/src/views/project-management/initiation/detail.vue
index e50a3da..ff63110 100644
--- a/src/views/project-management/initiation/detail.vue
+++ b/src/views/project-management/initiation/detail.vue
@@ -1,5 +1,5 @@
 <template>
-  <steps :active="'0'" @setDetail="setDetail" @stepChange="stepChange">
+  <steps :active="'2'" @setDetail="setDetail" @stepChange="stepChange">
     <template #content>
       <collection-detail
         :formData="commonForm.formData"
@@ -11,6 +11,10 @@
       />
       <summary-detail v-show="showActive == '10'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"/>
       <ApprovalDetail v-show="showActive == '20'" :formData="commonForm.formData" :data="commonForm" :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
+      <ApprovalDetail type="execute" v-show="showActive == '40'" :formData="commonForm.formData" :data="commonForm"
+                      :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
+      <ApprovalDetail type="archivist" v-show="showActive == '50'" :formData="commonForm.formData" :data="commonForm"
+                      :processViewer="commonProvessViewer" :loading="loading"></ApprovalDetail>
 
     </template>
   </steps>
@@ -35,6 +39,7 @@ const collectionData = ref({})
 const summaryData = ref({})
 const collectionProcessViewer = ref(true)
 const loading = ref(false)
+const active = ref(route.query.state)
 const summaryProcessViewer = ref(true)
 const processStore = useProcessStore()
 const companyOption = ref([])
diff --git a/src/views/project-management/initiation/index.vue b/src/views/project-management/initiation/index.vue
index 71b70f5..39a465c 100644
--- a/src/views/project-management/initiation/index.vue
+++ b/src/views/project-management/initiation/index.vue
@@ -204,7 +204,7 @@ const handleDetail = (row) => {
     query: {
       id: row.requirementId,
       projectId: row.projectId,
-      state: 2
+      state: row.state
     }
   })
 }