From b609f77709c4646daf155341475ae14fc0c7943d Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期五, 27 六月 2025 13:25:30 +0800
Subject: [PATCH] 修改
---
src/views/safetyReview/projectManage/process.vue | 68 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 25 deletions(-)
diff --git a/src/views/safetyReview/projectManage/process.vue b/src/views/safetyReview/projectManage/process.vue
index c904f21..72b6b3d 100644
--- a/src/views/safetyReview/projectManage/process.vue
+++ b/src/views/safetyReview/projectManage/process.vue
@@ -26,7 +26,7 @@
<div class="card-content">
<div :style="'height:' + middleContentHeight + 'px'" style="overflow-y: scroll;">
<basic-info ref="basicRef" v-if="selectedObj.id === 1" :projectId="projectId" @getNextStatus="getNextStatus"></basic-info>
- <expert ref="expertRef" v-if="selectedObj.id === 2" :projectId="projectId" @getNextStatus="getNextStatus"></expert>
+ <expert ref="expertRef" v-if="selectedObj.id === 2" :projectId="projectId" :newProgress="newProgress" @getNextStatus="getNextStatus"></expert>
<approval ref="approvalRef" v-if="selectedObj.id === 3" :projectId="projectId" @getNextStatus="getNextStatus" @back-status="backStatus" ></approval>
<archive ref="archiveRef" v-if="selectedObj.id === 4" :projectId="projectId" @getNextStatus="getNextStatus"></archive>
@@ -34,10 +34,12 @@
<div style="display: flex;align-items: center;justify-content: center;margin-bottom: -30px;margin-top: 10px">
<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 && newProgress !== 4" @click="confirmApproval">确认生成审批单</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.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>
+
</div>
</div>
</el-card>
@@ -47,7 +49,7 @@
<script setup>
-import {onMounted, ref} from "vue";
+import {nextTick, onMounted, ref} from "vue";
import status0Png from '@/assets/images/status0.png'
import status1Png from '@/assets/images/status1.png'
import status2Png from '@/assets/images/status2.png'
@@ -56,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({})
@@ -128,6 +130,7 @@
goRouter(selectedObj.value.id,'add')
}
const confirmApproval = () => {
+
goRouter(selectedObj.value.id,'confirmApproval')
}
@@ -142,15 +145,19 @@
}
break;
case 2:
- if(type === 'add' || type === 'clickEdit'){
- expertRef.value.riskOpen(type,projectId.value);
+ if(type === 'add' || type === 'clickEdit' || type === 'backTwo'){
+ if(type === 'backTwo'){
+ expertRef.value.riskOpen('detail',projectId.value);
+ }else {
+ expertRef.value.riskOpen(type,projectId.value);
+ }
}else if(projectStatus.value === 'view' || projectStatus.value === 'edit' || projectStatus.value === 'add'){
expertRef.value.riskOpen('detail',projectId.value);
}
break;
case 3:
- if(type === 'add' || type === 'clickEdit' || 'confirmApproval'){
- approvalRef.value.riskOpen(type,projectId.value);
+ if(type === 'add' || type === 'clickEdit' || type === 'confirmApproval' || type === 'viewWord'){
+ approvalRef.value.riskOpen(type,projectId.value);
}else if(projectStatus.value === 'view' || projectStatus.value === 'edit' || projectStatus.value === 'add'){
if(projectStatus.value === 'view'){
approvalRef.value.riskOpen('view',projectId.value);
@@ -242,25 +249,31 @@
}else {
ElMessage.warning(res.message)
}
+
}
-const backStatus = (id) => {
- //projectId 项目id，根据id获取当前状态
+const backStatus = async (id) => {
projectId.value = Number(id)
- //调接口
- const res = projectId.value
- newProgress.value = res
- //审核不通过状态回到第二步
- menuList.value.forEach(item => {
- if(item.id <= res){
- item.status = 2
- }else if(item.id == res + 1){
- item.status = 1
- selectedObj.value =item
- }else if(item.id > res + 1){
- item.status = 0
- }
- })
+ const res = await getProjectInfo(projectId.value)
+ if(res.code === 200) {
+ newProgress.value = res.data.step
+ //审核不通过状态回到第二步定位到2
+ menuList.value.forEach(item => {
+ if(item.id == newProgress.value){
+ selectedObj.value =item
+ }
+ if(item.id <= newProgress.value){
+ item.status = 2
+ }else if(item.id == newProgress.value + 1){
+ item.status = 1
+ }else if(item.id > newProgress.value + 1){
+ item.status = 0
+ }
+ })
+ await nextTick(() => {
+ goRouter(selectedObj.value.id,'backTwo')
+ })
+ }
}
const confirm = () => {
@@ -317,6 +330,11 @@
const clickEdit = () => {
goRouter(selectedObj.value.id,'clickEdit')
}
+
+const viewWord = () => {
+ goRouter(selectedObj.value.id,'viewWord')
+}
+
const clickMenu = (item) => {
if(item.status == 0){
setTimeout(() => {
--
Gitblit v1.9.2