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 @@
baseForm = e">
-
+
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
}
})
@@ -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()
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)
}
+
+