From 8e91feb616a7933e3beeb9ee579fd1e2626c3748 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Thu, 18 Jul 2024 16:15:11 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DetailComponent/ApprovalDetail.vue        |  1 +
 .../DetailComponent/ProjectApply.vue          | 11 +++++---
 src/components/steps/index.vue                | 28 ++++++++++++++++---
 .../implementation/attachment.vue             |  3 ++
 .../implementation/detail.vue                 |  3 +-
 .../implementation/index.vue                  |  3 +-
 .../implementation/upload.vue                 |  4 +--
 7 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/components/DetailComponent/ApprovalDetail.vue b/src/components/DetailComponent/ApprovalDetail.vue
index 5067649..026d404 100644
--- a/src/components/DetailComponent/ApprovalDetail.vue
+++ b/src/components/DetailComponent/ApprovalDetail.vue
@@ -429,6 +429,7 @@ watchEffect(() => {
   }
 })
 
+
 watch(() => props.loading, (newVal) => {
   props.loading = newVal
 }, {deep: true})
diff --git a/src/components/DetailComponent/ProjectApply.vue b/src/components/DetailComponent/ProjectApply.vue
index 074d0a7..deed745 100644
--- a/src/components/DetailComponent/ProjectApply.vue
+++ b/src/components/DetailComponent/ProjectApply.vue
@@ -394,10 +394,6 @@ const handleSearch = () => {
     }
   })
 }
-if(props.title&&props.title==='check'){
-  handleSearch()
-  getTagsOption()
-}
 const handleUpload = () => {
   router.push({
     name: 'Implementation/upload',
@@ -684,6 +680,10 @@ const handleSubmit = async () => {
   }
 }
 const init = async () => {
+  if(props.title&&props.title==='check'){
+    handleSearch()
+    getTagsOption()
+  }
   let id = projectId.value
   if (!id) return;
   processDiagramViewer.value = false
@@ -742,6 +742,9 @@ watchEffect(() => {
   // console.log('projectPersonUserList.value',projectPersonUserList.value)
   return flag
 })
+onActivated(()=>{
+  init()
+})
 onMounted(async () => {
   await init()
 })
diff --git a/src/components/steps/index.vue b/src/components/steps/index.vue
index 48770f2..4fd108f 100644
--- a/src/components/steps/index.vue
+++ b/src/components/steps/index.vue
@@ -2,7 +2,7 @@
   <baseTitle title="基础信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
   <div class="steps-box">
-    <el-steps :active="localActive" finish-status="success">
+    <el-steps v-if="stepsShow" :active="localActive" finish-status="success">
       <el-step
           v-for="(item, index) in localSteps"
           :key="item.key"
@@ -34,7 +34,7 @@
 
 <script setup lang="jsx">
 import {ElLoading, ElNotification} from 'element-plus';
-import {computed, reactive, ref, watchEffect} from 'vue';
+import {computed, onMounted, reactive, ref, watchEffect} from 'vue';
 import {useRoute} from 'vue-router';
 import {getBaseInfoApi} from './api';
 
@@ -69,6 +69,8 @@ const localData = reactive({})
 
 const localActive = ref(0) // 当前激活步骤
 
+const stepsShow = ref(false)
+
 const localSteps = ref([
   {
     title: '需求征集',
@@ -280,9 +282,10 @@ const handleStep = (key, index) => {
 
 const getBaseInfo = async () => {
   const loading = ElLoading.service({fullscreen: true})
+  stepsShow.value = false
   try {
     const {code, data} = await getBaseInfoApi(route.query.projectId)
-    // console.log('data.procedure',data.procedure,route.query.step)
+    console.log('data.procedure', data.procedure, route.query.step)
     if (route.query.step === '40') {
       if (data.procedure.indexOf('40') == -1) {
         data.procedure.push('40')
@@ -296,19 +299,34 @@ const getBaseInfo = async () => {
     baseForm.value.setValues(data)
     emits('setDetail', formatActive(localActive.value))
     loading.close()
+    nextTick(() => {
+      stepsShow.value = true
+    })
   } catch {
     loading.close()
+    nextTick(() => {
+      stepsShow.value = true
+    })
   }
 }
 
 getBaseInfo()
 
+// onActivated(() => {
+//   getBaseInfo()
+// })
 watchEffect(() => {
   localActive.value = props.active
 })
 watchEffect(() => {
   if (props.reportType === 'direct') {
-    localSteps.value = localSteps.value.slice(1)
+    let steps = []
+    for (const step of localSteps.value) {
+      if (step.key !== 'collect'){
+        steps.push(step)
+      }
+    }
+    localSteps.value = steps
   }
 })
 </script>
@@ -333,9 +351,11 @@ watchEffect(() => {
 .is-end {
   color: #BEA266;
 }
+
 :deep(.el-step__title.is-success) {
   color: #A8abb2;
 }
+
 :deep(.el-step__head.is-success) {
   border-color: #A8abb2;
 }
diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue
index f9173a2..2ff354a 100644
--- a/src/views/project-management/implementation/attachment.vue
+++ b/src/views/project-management/implementation/attachment.vue
@@ -189,6 +189,9 @@ const handleDownload = (row) => {
   })
 }
 
+onActivated(()=>{
+  handleSearch()
+})
 handleSearch()
 getTagsOption()
 </script>
diff --git a/src/views/project-management/implementation/detail.vue b/src/views/project-management/implementation/detail.vue
index e233dde..f903fbf 100644
--- a/src/views/project-management/implementation/detail.vue
+++ b/src/views/project-management/implementation/detail.vue
@@ -75,7 +75,6 @@ route.query.step == '50' && (currentStep.value = 4)
 const showActive = ref()
 const detailData = ref({})
 const commonProvessViewer = ref(true)
-console.log('刷新详情')
 localStorage.removeItem('singleFile')
 localStorage.removeItem('otherFileList')
 localStorage.removeItem('preProcess')
@@ -143,6 +142,8 @@ const stepChange = (data) => {
   showActive.value = data.active
   getAllInfo(data.active)
 }
+
+
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/project-management/implementation/index.vue b/src/views/project-management/implementation/index.vue
index 7761882..15c8ef5 100644
--- a/src/views/project-management/implementation/index.vue
+++ b/src/views/project-management/implementation/index.vue
@@ -352,10 +352,11 @@ const handleStandingBook = (row) => {
   })
 }
 const handleAttachment = (row) => {
+  console.log('row',row)
   router.push({
     name: 'Implementation/attachment',
     query: {
-      id: row.projectId
+      id: row.projectId,
     }
   })
 }
diff --git a/src/views/project-management/implementation/upload.vue b/src/views/project-management/implementation/upload.vue
index 4fa2fa2..1c06dcf 100644
--- a/src/views/project-management/implementation/upload.vue
+++ b/src/views/project-management/implementation/upload.vue
@@ -247,11 +247,11 @@ const handleSubmit = async (instance) => {
           }
         })
       } else {
-        if (router.query.type !== '40') {
+        if (router.query.type || router.query.type !== '40') {
           router.push({
             name: 'Implementation/attachment',
             query: {
-              id: route.query.id
+              projectId: route.query.projectId
             }
           })
         } else {