From cdd53ad94b779da51c8e9213b504527c182418eb Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 22 十一月 2024 15:09:08 +0800
Subject: [PATCH] 项目管理

---
 src/views/safetyReview/projectManage/process.vue |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/safetyReview/projectManage/process.vue b/src/views/safetyReview/projectManage/process.vue
index 255e7b0..855cead 100644
--- a/src/views/safetyReview/projectManage/process.vue
+++ b/src/views/safetyReview/projectManage/process.vue
@@ -35,7 +35,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' || projectStatus === 'edit') && selectedObj.status ===1 && selectedObj.id !==4 && selectedObj.id !==3 && newProgress !== 4" @click="save">保存</el-button>
             <el-button type="warning" style="width: 110px"  v-if="(projectStatus === 'add' || projectStatus === 'edit')  && selectedObj.id !==4 && (selectedObj.id ===3 && selectedObj.status !==2) && newProgress !== 4" @click="confirmApproval">确认生成审批单</el-button>
-            <el-button type="warning" style="width: 80px" v-if="projectStatus === 'view' || selectedObj.id ===3 && selectedObj.status === 2"  @click="viewWord">查看审批单</el-button>
+            <el-button type="warning" style="width: 80px" v-if="(projectStatus === 'view' &&  selectedObj.id ===3) || selectedObj.id ===3 && selectedObj.status === 2"  @click="viewWord">查看审批单</el-button>
             <el-button type="warning" style="width: 80px"  v-if="(projectStatus === 'add' || projectStatus === 'edit') && selectedObj.status !==1 && selectedObj.id !==3 && newProgress !== 4 " @click="clickEdit">变更</el-button>
             <el-button type="warning" style="width: 80px"   v-if="selectedObj.id === 4 && selectedObj.status === 1 && newProgress !== 4" @click="confirm">确认完结</el-button>
             <el-button type="primary" style="width: 80px" v-if="selectedObj.id !== 4"  @click="next">下一步</el-button>
@@ -58,9 +58,9 @@
 import expert from './components/chooseExpert.vue'
 import approval from './components/projectApproval.vue'
 import archive from  './components/projectArchive.vue'
-import {ElMessage} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
 import {get} from "@vueuse/core";
-import {getProjectInfo} from "@/api/projectManage";
+import {delProject, getProjectInfo} from "@/api/projectManage";
 
 const selectedObj = ref({})
 const nextObj = ref({})
@@ -130,6 +130,7 @@
   goRouter(selectedObj.value.id,'add')
 }
 const confirmApproval = () => {
+
   goRouter(selectedObj.value.id,'confirmApproval')
 }
 

--
Gitblit v1.9.2