From cc3e08bda13360c88b7189e8f8d043b60783c7fb Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期四, 21 十一月 2024 16:46:32 +0800
Subject: [PATCH] 新增
---
src/views/safetyReview/projectManage/process.vue | 130 ++++++++++++++++++++++++++++---------------
1 files changed, 85 insertions(+), 45 deletions(-)
diff --git a/src/views/safetyReview/projectManage/process.vue b/src/views/safetyReview/projectManage/process.vue
index 83c6b5c..c904f21 100644
--- a/src/views/safetyReview/projectManage/process.vue
+++ b/src/views/safetyReview/projectManage/process.vue
@@ -27,14 +27,15 @@
<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>
- <approval ref="approvalRef" v-if="selectedObj.id === 3" :projectId="projectId" @getNextStatus="getNextStatus"></approval>
+ <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>
</div>
<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 && newProgress !== 4" @click="save">保存</el-button>
- <el-button type="warning" style="width: 80px" v-if="(projectStatus === 'add' || projectStatus === 'edit') && selectedObj.status !==1 && newProgress !== 4 " @click="clickEdit">变更</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: 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>
@@ -57,6 +58,7 @@
import archive from './components/projectArchive.vue'
import {ElMessage} from "element-plus";
import {get} from "@vueuse/core";
+import {getProjectInfo} from "@/api/projectManage";
const selectedObj = ref({})
const nextObj = ref({})
@@ -125,6 +127,10 @@
const save = () => {
goRouter(selectedObj.value.id,'add')
}
+const confirmApproval = () => {
+ goRouter(selectedObj.value.id,'confirmApproval')
+}
+
const goRouter = (selectId,type) => {
switch (selectId){
@@ -143,82 +149,116 @@
}
break;
case 3:
- if(type === 'add' || type === 'clickEdit'){
+ if(type === 'add' || type === 'clickEdit' || 'confirmApproval'){
approvalRef.value.riskOpen(type,projectId.value);
}else if(projectStatus.value === 'view' || projectStatus.value === 'edit' || projectStatus.value === 'add'){
- approvalRef.value.riskOpen('detail',projectId.value);
+ if(projectStatus.value === 'view'){
+ approvalRef.value.riskOpen('view',projectId.value);
+ }else{
+ approvalRef.value.riskOpen('detail',projectId.value);
+ }
}
break;
case 4:
if(type === 'add' || type === 'clickEdit' || type === 'confirm'){
archiveRef.value.riskOpen(type,projectId.value);
} else if(projectStatus.value === 'view' || projectStatus.value === 'edit' || projectStatus.value === 'add'){
- archiveRef.value.riskOpen('detail',projectId.value);
+ if(projectStatus.value === 'view'){
+ archiveRef.value.riskOpen('view',projectId.value);
+ }else{
+ archiveRef.value.riskOpen('detail',projectId.value);
+ }
}
break;
}
}
-const getStatus = (id) => {
+const getStatus = async (id) => {
//projectId 项目id，根据id获取当前状态
projectId.value = Number(id)
- //调接口
- const res = projectId.value
- //当前项目状态，编辑、查看的时候定位到最新状态
- newProgress.value = res
- menuList.value.forEach(item => {
- if(projectStatus.value === 'edit'){
- if(item.id <= res){
- item.status = 2
+ const res = await getProjectInfo(projectId.value)
+ if(res.code === 200) {
+ //当前项目状态，编辑、查看的时候定位到最新状态
+ newProgress.value = res.data.step
+ menuList.value.forEach(item => {
+ if(projectStatus.value === 'edit'){
+ if(item.id <= newProgress.value){
+ item.status = 2
+ }
+ if(item.id == newProgress.value){
+ selectedObj.value =item
+ setTimeout(() => {
+ goRouter(selectedObj.value.id)
+ }, 10)
+ }
+ if(item.id == newProgress.value +1){
+ item.status = 1
+ }
+ }else if(projectStatus.value === 'view'){
+ if(item.id <= newProgress.value){
+ item.status = 2
+ }
+ if(item.id == newProgress.value){
+ selectedObj.value =item
+ setTimeout(() => {
+ goRouter(selectedObj.value.id)
+ }, 10)
+ }
}
- if(item.id == res){
+ if( newProgress.value == 4 && item.id == 4){
+ item.status = 2
selectedObj.value =item
setTimeout(() => {
goRouter(selectedObj.value.id)
}, 10)
}
- if(item.id == res +1){
- item.status = 1
- }
- }else if(projectStatus.value === 'view'){
- if(item.id <= res){
- item.status = 2
- }
- if(item.id == res){
- selectedObj.value =item
- setTimeout(() => {
- goRouter(selectedObj.value.id)
- }, 10)
- }
- }
- if(res == 4 && item.id == 4){
- item.status = 2
- selectedObj.value =item
- setTimeout(() => {
- goRouter(selectedObj.value.id)
- }, 10)
- }
- })
+ })
+ }
+ else {
+ ElMessage.warning(res.message)
+ }
console.log('menuList.value',menuList.value)
}
-const getNextStatus = (id) => {
+const getNextStatus = async (id) => {
+ projectId.value = Number(id)
+ //调接口
+ const res = await getProjectInfo(projectId.value)
+ if(res.code === 200) {
+ newProgress.value = res.data.step
+ //定位到下一步状态
+ menuList.value.forEach(item => {
+ if(item.id <= newProgress.value){
+ item.status = 2
+ }else if(item.id == newProgress.value + 1){
+ item.status = 1
+ selectedObj.value =item
+ }
+
+ if( newProgress.value == 4 && item.id == 4){
+ item.status = 2
+ selectedObj.value =item
+ }
+ })
+ }else {
+ ElMessage.warning(res.message)
+ }
+}
+
+const backStatus = (id) => {
//projectId 项目id，根据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
- }
-
- if(res == 4 && item.id == 4){
- item.status = 2
- selectedObj.value =item
+ }else if(item.id > res + 1){
+ item.status = 0
}
})
}
--
Gitblit v1.9.2