Merge pull request 'fix : 修复详情渲染细节' (#228) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/228

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>

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"

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
     }
   })
 }

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>

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
     }
   })
 }

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([])

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
     }
   })
 }