From 4bc0d3e1611da659c853a3589d84cf41d91f13d2 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期三, 10 四月 2024 09:55:08 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/process.vue | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/src/views/safetyReview/projectManage/process.vue b/src/views/safetyReview/projectManage/process.vue
index 357da79..5f0f05e 100644
--- a/src/views/safetyReview/projectManage/process.vue
+++ b/src/views/safetyReview/projectManage/process.vue
@@ -57,7 +57,7 @@
</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' && 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 === '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 && reportProcess != 14" @click="confirm">确认完结</el-button>
<el-button type="primary" style="width: 80px" v-if="selectedObj.id !== 14" @click="next">下一步</el-button>
@@ -76,7 +76,7 @@
<script setup>
import {onMounted, ref} from "vue";
-import {ElMessage} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
import rickAnalysis from "./components/riskAnalysis.vue"
import contractManage from "./components/contractManage.vue"
import evaluateTaskNotice from "./components/evaluateTaskNotice.vue"
@@ -102,6 +102,7 @@
import SignConfirm from "./components/signConfirm"
import ConfirmEnd from "./components/confirmEnd"
import Cookies from "js-cookie"
+import {delMonitor} from "@/api/sysUsers";
const route = useRoute()
const menuList = ref([
{
@@ -450,6 +451,7 @@
link.click()
}
+const sixBtn = ref("");
const chooseSubMenu = (val,flag) => {
if(val.status === 0) {
setTimeout(() => {
@@ -494,6 +496,10 @@
}, 10)
}else if (val.status === 4) {
setTimeout(() => {
+ if(val.id === 6){
+ sixBtn.value = Cookies.get('btn')
+ }
+ console.log('sixBtn.value',sixBtn.value)
isShowMenu.value = false;
nextObj.value = selectedObj.value;
selectedObj.value = val;
@@ -517,7 +523,21 @@
}else if (selectedObj.value.id+ 1 >11){
nextMenu(4)
}
- }else {
+ }else if(selectedObj.value.id === 6){
+ if(selectedObj.value.id === 6) {
+ ElMessageBox.confirm(
+ '确定结束现场勘验？',
+ '提示',
+ {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then( async() => {
+ goRouter(selectedObj.value.id,'sixEnd')
+ })
+ }
+ } else {
setTimeout(() => {
isShowMenu.value = false;
ElMessage({
@@ -697,7 +717,22 @@
}
const save = () => {
- goRouter(selectedObj.value.id,'add')
+ // if(selectedObj.value.id === 6) {
+ // ElMessageBox.confirm(
+ // '确定结束现场勘验？',
+ // '提示',
+ // {
+ // confirmButtonText: '确定',
+ // cancelButtonText: '取消',
+ // type: 'warning',
+ // })
+ // .then( async() => {
+ // goRouter(selectedObj.value.id,'add')
+ // })
+ // }else {
+ goRouter(selectedObj.value.id,'add')
+ // }
+
}
const confirm = () => {
@@ -781,7 +816,9 @@
siteCheckRcdRef.value.riskOpen('add',projectId.value);
}else if (type === 'clickEdit'){
siteCheckRcdRef.value.riskOpen('clickEdit',projectId.value);
- }else {
+ }else if (type === 'sixEnd'){
+ siteCheckRcdRef.value.riskOpen('sixEnd',projectId.value);
+ } else {
if(projectStatus.value === 'view' || projectStatus.value === 'add'){
siteCheckRcdRef.value.riskOpen('detail',projectId.value);
}else if(projectStatus.value === 'edit'){
--
Gitblit v1.9.2