From d631c106b43e282a74d37988b7c8989916f0fcf6 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期五, 15 三月 2024 15:18:22 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/components/confirmEnd.vue | 17 +++++++++++++++--
src/views/safetyReview/projectManage/process.vue | 2 +-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/confirmEnd.vue b/src/views/safetyReview/projectManage/components/confirmEnd.vue
index ba9992e..b6aec5b 100644
--- a/src/views/safetyReview/projectManage/components/confirmEnd.vue
+++ b/src/views/safetyReview/projectManage/components/confirmEnd.vue
@@ -48,7 +48,7 @@
import Cookies from "js-cookie";
import { getToken } from "@/utils/auth";
import confirmEndDialog from './confirmEndDialog.vue'
-import {delProject, getAccessoryFile} from "@/api/projectManage/project";
+import {delProject, getAccessoryFile, getProjectStatus} from "@/api/projectManage/project";
import {delRecitification, doConfirm, getRecognitionList} from "@/api/projectManage/riskAnalysis";
import axios from "axios";
import { useRoute } from 'vue-router'
@@ -65,6 +65,7 @@
recitificationList: [],
})
+const isEnd = ref(false)
const total = ref(0);
const isAmin = ref(false)
const formRef = ref();
@@ -76,8 +77,20 @@
if(props.projectId){
state.formData.projectId = props.projectId;
getList(state.formData.projectId);
+ getStatus(state.formData.projectId);
}
+
+
});
+const getStatus = async (projectId) => {
+ const res = await getProjectStatus(projectId);
+ if(res.code == 200){
+ if(res.data === 14){
+ isEnd.value = true
+ }
+ }
+}
+
const getList = async (val) => {
@@ -91,7 +104,7 @@
}
const projectType = ref('')
-const isEnd = ref(false)
+
const riskOpen = async (type,val) => {
// await getList(val);
projectType.value = route.query.type;
diff --git a/src/views/safetyReview/projectManage/process.vue b/src/views/safetyReview/projectManage/process.vue
index 172e011..357da79 100644
--- a/src/views/safetyReview/projectManage/process.vue
+++ b/src/views/safetyReview/projectManage/process.vue
@@ -59,7 +59,7 @@
<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 && 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 && selectedObj.status !== 14" @click="confirm">确认完结</el-button>
+ <el-button type="warning" style="width: 80px" v-if="selectedObj.id === 14 && selectedObj.status === 1 && reportProcess != 14" @click="confirm">确认完结</el-button>
<el-button type="primary" style="width: 80px" v-if="selectedObj.id !== 14" @click="next">下一步</el-button>
</div>
</div>
--
Gitblit v1.9.2