From 32025887cb0e13634d800330bb33e3533fd3f70d Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期四, 22 二月 2024 17:01:12 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/process.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/safetyReview/projectManage/process.vue b/src/views/safetyReview/projectManage/process.vue
index 021d39b..65e713e 100644
--- a/src/views/safetyReview/projectManage/process.vue
+++ b/src/views/safetyReview/projectManage/process.vue
@@ -49,14 +49,14 @@
<upload-review-rcd ref="uploadReviewRef" v-if="selectedObj.id === 9" @getNextStatus="getNextStatus" :projectId="projectId"></upload-review-rcd>
<rate-conclusion ref="rateConRef" v-if="selectedObj.id === 10" @getNextStatus="getNextStatus" :projectId="projectId"></rate-conclusion>
<process-ctrl-review ref="proCtrlRef" v-if="selectedObj.id === 11" @getNextStatus="getNextStatus" :projectId="projectId"></process-ctrl-review>
- <project-archive ref="proArchRef" v-if="selectedObj.id === 12" @getNextStatus="getNextStatus"></project-archive>
- <sign-confirm ref="signConfirmRef" v-if="selectedObj.id === 13" @getNextStatus="getNextStatus"></sign-confirm>
- <confirm-end ref="confirmEndRef" v-if="selectedObj.id === 14" @getNextStatus="getNextStatus"></confirm-end>
+ <project-archive ref="proArchRef" v-if="selectedObj.id === 12" @getNextStatus="getNextStatus" :projectId="projectId"></project-archive>
+ <sign-confirm ref="signConfirmRef" v-if="selectedObj.id === 13" @getNextStatus="getNextStatus" :projectId="projectId"></sign-confirm>
+ <confirm-end ref="confirmEndRef" v-if="selectedObj.id === 14" @getNextStatus="getNextStatus" :projectId="projectId"></confirm-end>
</div>
<div style="display: flex;align-items: center;justify-content: center;margin-bottom: -20px">
<el-button type="primary" v-if="selectedObj.id !== 1" style="width: 80px" @click="back">上一步</el-button>
<el-button type="warning" style="width: 80px" v-if="(projectStatus === 'add' && selectedObj.status === 1 && selectedObj.id !== 14)||(projectStatus === 'edit' && selectedObj.status === 1 && selectedObj.id !== 14) " @click="save">保存</el-button>
- <el-button type="warning" style="width: 80px" v-if="(projectStatus === 'edit' && selectedObj.status !== 1 && selectedObj.id !== 13 && selectedObj.id !== 14) || (projectStatus === 'add' && selectedObj.status !== 1 && selectedObj.id !== 14) " @click="clickEdit">变更</el-button>
+ <el-button type="warning" style="width: 80px" v-if="(projectStatus === 'edit' && selectedObj.status !== 1 && selectedObj.id !== 13 && selectedObj.id !== 14 && reportProcess != 14) || (projectStatus === 'add' && selectedObj.status !== 1 && selectedObj.id !== 14 && reportProcess != 14) " @click="clickEdit">变更</el-button>
<el-button type="warning" style="width: 80px" v-if="selectedObj.id === 14 && selectedObj.status === 1" @click="confirm">确认完结</el-button>
<el-button type="primary" style="width: 80px" v-if="selectedObj.id !== 14" @click="next">下一步</el-button>
</div>
@@ -230,6 +230,7 @@
const projectId = ref()
const projectStatus = ref()
const toPath = ref();
+const reportProcess = ref();
onMounted(() => {
middleHeight.value = window.innerHeight - 250;
middleContentHeight.value = window.innerHeight - 385;
@@ -242,6 +243,7 @@
projectStatus.value = route.query.type;
projectId.value = route.query.id;
toPath.value = route.query.toPath;
+ reportProcess.value = route.query.process;
getStatus(projectId.value);
}else {
projectStatus.value = route.query.type;
@@ -261,6 +263,7 @@
const getStatus = async (projectId) => {
const res = await getProjectStatus(projectId);
if(res.code == 200){
+ reportProcess.value = res.data
let fiveObj = {}
if(toPath.value && toPath.value === 'toFive' ){
fiveObj = menuList.value[1].subMenus[0]
@@ -395,7 +398,7 @@
nextObj.value = item;
}
}
- if(item.id === res.data && item.id !== 14){
+ if(item.id === res.data){
item.status = 3;
selectedObj.value =item;
setTimeout(() => {
@@ -495,8 +498,6 @@
selectedObj.value.status = 1;
nextObj.value.status = 2;
nextObj.value = val;
- Cookies.set('projectId',projectId.value);
- console.log("CookiesprojectId",Cookies.get('projectId'))
//跳转
}, 10)
}
@@ -570,6 +571,7 @@
projectId.value = val
const res = await getProjectStatus(val);
if(res.code == 200){
+ reportProcess.value = res.data
if(res.data <=4){
menuList.value[0].subMenus.forEach(item => {
if(item.id <= res.data){
--
Gitblit v1.9.2