From 68cd58de3a45d79ea241fa4d79e550217072e494 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期五, 15 三月 2024 15:09:19 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/components/employNoticeRecord.vue | 7 +-
src/views/safetyReview/projectManage/components/evaluatePlan.vue | 19 +++--
src/views/safetyReview/projectManage/components/mapLocation.vue | 26 ++++++--
src/views/safetyReview/projectManage/components/confirmEnd.vue | 15 +++-
src/views/safetyReview/projectManage/components/projectArchive.vue | 8 ++
src/views/safetyReview/projectManage/components/siteCheckRcd.vue | 16 +++--
src/views/safetyReview/projectManage/components/signConfirm.vue | 1
src/views/safetyReview/projectManage/components/uploadReviewRcd.vue | 10 ++-
.env.staging | 2
.env.development | 2
.env.production | 2
src/views/safetyReview/projectManage/process.vue | 2
src/views/safetyReview/projectManage/components/processCtrlReview.vue | 8 ++
src/views/safetyReview/projectManage/components/rateConclusion.vue | 8 ++
src/views/safetyReview/projectManage/index.vue | 1
15 files changed, 85 insertions(+), 42 deletions(-)
diff --git a/.env.development b/.env.development
index 4f5599a..c620137 100644
--- a/.env.development
+++ b/.env.development
@@ -12,4 +12,4 @@
VITE_APP_BASE_API = 'http://192.168.0.77:8088/api'
#线上
-#VITE_APP_BASE_API = 'http://121.239.169.30:8086/api'
\ No newline at end of file
+#VITE_APP_BASE_API = 'http://106.15.95.149:8088/api'
diff --git a/.env.production b/.env.production
index d03b582..e42547e 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
VITE_APP_ENV = 'production'
# 智慧安评/生产环境
-VITE_APP_BASE_API = 'http://121.239.169.30:8088/api'
+VITE_APP_BASE_API = 'http://106.15.95.149:8088/api'
# 是否在打包时开启压缩，支持 gzip 和 brotli
VITE_BUILD_COMPRESS = gzip
diff --git a/.env.staging b/.env.staging
index f6c5988..49092a9 100644
--- a/.env.staging
+++ b/.env.staging
@@ -8,4 +8,4 @@
VITE_APP_BASE_API = '/stage-api'
# 是否在打包时开启压缩，支持 gzip 和 brotli
-VITE_BUILD_COMPRESS = gzip
\ No newline at end of file
+VITE_BUILD_COMPRESS = gzip
diff --git a/src/views/safetyReview/projectManage/components/confirmEnd.vue b/src/views/safetyReview/projectManage/components/confirmEnd.vue
index a21b20d..ba9992e 100644
--- a/src/views/safetyReview/projectManage/components/confirmEnd.vue
+++ b/src/views/safetyReview/projectManage/components/confirmEnd.vue
@@ -3,7 +3,7 @@
<el-form ref="formRef" :model="state.formData" :rules="state.rules" class="register-form" label-position="top">
<el-row :gutter="30">
<el-col :span="6">
- <el-button type="primary" @click="addRectify('add',{})" :disabled="projectType.value ==='detail'">新增整改</el-button>
+ <el-button type="primary" @click="addRectify('add',{})" :disabled="projectType ==='view' || isEnd ">新增整改</el-button>
</el-col>
</el-row>
<el-table :data="state.recitificationList" :border="true" style="margin: 20px 0">
@@ -19,8 +19,8 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
- <el-button link type="primary" @click="addRectify('edit',scope.row)" :disabled="projectType.value ==='detail'">编辑</el-button>
- <el-button link type="danger" @click="del(scope.row)" :disabled="projectType.value ==='detail'">删除</el-button>
+ <el-button link type="primary" @click="addRectify('edit',scope.row)" :disabled="projectType ==='view' || isEnd ">编辑</el-button>
+ <el-button link type="danger" @click="del(scope.row)" :disabled="projectType ==='view' || isEnd ">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -51,7 +51,8 @@
import {delProject, getAccessoryFile} from "@/api/projectManage/project";
import {delRecitification, doConfirm, getRecognitionList} from "@/api/projectManage/riskAnalysis";
import axios from "axios";
-
+import { useRoute } from 'vue-router'
+const route = useRoute()
const confirmRef = ref(null);
const emit = defineEmits(["getNextStatus"]);
const props = defineProps(['projectId'])
@@ -90,14 +91,18 @@
}
const projectType = ref('')
+const isEnd = ref(false)
const riskOpen = async (type,val) => {
// await getList(val);
- projectType.value = type;
+ projectType.value = route.query.type;
state.formData.projectId = val;
+
if(type === 'confirm') {
const res = await doConfirm({projectId: val});
if (res.code == 200) {
ElMessage.success('保存成功')
+ Cookies.set('end',true)
+ isEnd.value = true;
formRef.value.clearValidate();
emit('getNextStatus', state.formData.projectId);
} else {
diff --git a/src/views/safetyReview/projectManage/components/employNoticeRecord.vue b/src/views/safetyReview/projectManage/components/employNoticeRecord.vue
index 9811559..679ceb6 100644
--- a/src/views/safetyReview/projectManage/components/employNoticeRecord.vue
+++ b/src/views/safetyReview/projectManage/components/employNoticeRecord.vue
@@ -51,7 +51,7 @@
<el-table-column label="未到现场勘验原因" prop="reason" align="center" class-name="small-padding fixed-width"></el-table-column>
<el-table-column label="是否已告知" align="center" class-name="small-padding fixed-width">
<template #default="scope">
- <el-radio-group v-model="scope.row.informed" size="large" @change="(value)=>changePerson(value,scope.row)" :disabled="projectType==='detail'">
+ <el-radio-group v-model="scope.row.informed" size="large" @change="(value)=>changePerson(value,scope.row)" :disabled="projectType==='view'">
<el-radio :label="1" size="large">是</el-radio>
<el-radio :label="0" size="large">否</el-radio>
</el-radio-group>
@@ -71,7 +71,8 @@
import Cookies from "js-cookie"
const props = defineProps(['projectId'])
const emit = defineEmits(["getNextStatus"])
-
+import { useRoute } from 'vue-router'
+const route = useRoute()
const state = reactive({
formData: {
id: null,
@@ -106,7 +107,7 @@
const riskOpen = async (type,val) => {
state.formData.projectId = val
state.projectId = val
- projectType.value = type;
+ projectType.value = route.query.type;
// await getWorksList(val)
if(type === 'detail' || type === 'edit' ){
const res = await getWorkDetail({projectId: val})
diff --git a/src/views/safetyReview/projectManage/components/evaluatePlan.vue b/src/views/safetyReview/projectManage/components/evaluatePlan.vue
index b177222..6079e74 100644
--- a/src/views/safetyReview/projectManage/components/evaluatePlan.vue
+++ b/src/views/safetyReview/projectManage/components/evaluatePlan.vue
@@ -80,7 +80,7 @@
</el-col>
<el-col :span="6">
<div style="width: 100%;display: flex;justify-content: right">
- <el-button type="primary" icon="Plus" @click="openWorksDialog('add',{})" :disabled="projectType==='detail'">添加成员</el-button>
+ <el-button type="primary" icon="Plus" @click="openWorksDialog('add',{})" :disabled="projectType==='view' || isEnd">添加成员</el-button>
</div>
</el-col>
</el-row>
@@ -102,8 +102,8 @@
<el-table-column label="未到现场勘验原因" prop="reason" align="center" class-name="small-padding fixed-width"></el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
- <el-button link @click="openWorksDialog('edit',scope.row)" :disabled="projectType==='detail'">修改</el-button>
- <el-button link type="danger" @click="delMember(scope.row)" :disabled="projectType==='detail'">删除</el-button>
+ <el-button link @click="openWorksDialog('edit',scope.row)" :disabled="projectType==='view' || isEnd">修改</el-button>
+ <el-button link type="danger" @click="delMember(scope.row)" :disabled="projectType==='view' || isEnd">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -113,7 +113,7 @@
</el-col>
<el-col :span="6">
<div style="width: 100%;display: flex;justify-content: right">
- <el-button type="primary" icon="Plus" @click="openDeviceDialog('add',{})" :disabled="projectType==='detail'">添加设备</el-button>
+ <el-button type="primary" icon="Plus" @click="openDeviceDialog('add',{})" :disabled="projectType==='view' || isEnd">添加设备</el-button>
</div>
</el-col>
</el-row>
@@ -132,8 +132,8 @@
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
- <el-button link @click="openDeviceDialog('edit',scope.row)" :disabled="projectType==='detail'">修改</el-button>
- <el-button link type="danger" @click="delDeviceItem(scope.row)" :disabled="projectType==='detail'">删除</el-button>
+ <el-button link @click="openDeviceDialog('edit',scope.row)" :disabled="projectType==='view' || isEnd">修改</el-button>
+ <el-button link type="danger" @click="delDeviceItem(scope.row)" :disabled="projectType==='view' || isEnd">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -155,7 +155,8 @@
import DeviceDialog from './deviceDialog'
const props = defineProps(['projectId'])
const emit = defineEmits(["getNextStatus"])
-
+import { useRoute } from 'vue-router'
+const route = useRoute()
const state = reactive({
formData: {
id: null,
@@ -280,10 +281,12 @@
})
const projectType = ref('');
+const isEnd = ref('')
const riskOpen = async (type,val) => {
state.formData.projectId = val
+ isEnd.value = Cookies.get('end')
state.projectId = val
- projectType.value = type;
+ projectType.value = route.query.type;
for(let i of state.formData.estimateSchedules){
i.projectId = val
}
diff --git a/src/views/safetyReview/projectManage/components/mapLocation.vue b/src/views/safetyReview/projectManage/components/mapLocation.vue
index 50790c8..dcb20b3 100644
--- a/src/views/safetyReview/projectManage/components/mapLocation.vue
+++ b/src/views/safetyReview/projectManage/components/mapLocation.vue
@@ -60,8 +60,8 @@
mapLocationVisible: false,
zoom: 7,
center: {
- lng: '87.62472586600425',
- lat: '43.82743324701045'
+ lng: '116.42585576793277',
+ lat: '39.88973394962104'
},
keyword:'',
location: ''
@@ -80,13 +80,23 @@
}
const openMapLocation=(longitude,latitude)=>{
- state.longitude = longitude
- state.latitude = latitude
- state.zoom = 13
- state.center = {
- lng: longitude,
- lat: latitude
+ if(longitude != ""){
+ state.longitude = longitude
+ state.latitude = latitude
+ state.zoom = 13
+ state.center = {
+ lng: longitude,
+ lat: latitude
+ }
+ }else {
+
+ state.zoom = 7
+ state.center = {
+ lng: '87.61552721758208',
+ lat: '43.839018284106565'
+ }
}
+
state.mapLocationVisible = true
}
diff --git a/src/views/safetyReview/projectManage/components/processCtrlReview.vue b/src/views/safetyReview/projectManage/components/processCtrlReview.vue
index f04ff2c..da77470 100644
--- a/src/views/safetyReview/projectManage/components/processCtrlReview.vue
+++ b/src/views/safetyReview/projectManage/components/processCtrlReview.vue
@@ -71,7 +71,7 @@
<el-row :gutter="30">
<el-col :span="18">
<el-form-item label="附件上传" prop="assAccessoryFiles">
- <el-upload accept="image/*,.pdf,.doc,.docx,.xlsx,.xls" :action="state.uploadUrl" :data="{moduleType: 8,projectId: props.projectId}" :headers="state.header" method="post" :on-success="handleAvatarSuccess" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='1' v-model:file-list="state.fileList" :before-upload="picSize" :disabled="state.disabled" :on-remove="handleRemove" >
+ <el-upload accept="image/*,.pdf,.doc,.docx,.xlsx,.xls" :action="state.uploadUrl" :data="{moduleType: 8,projectId: props.projectId}" :headers="state.header" method="post" :on-success="handleAvatarSuccess" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='1' v-model:file-list="state.fileList" :before-upload="picSize" :disabled="projectType === 'view' || isEnd" :on-remove="handleRemove" >
<el-button type="primary">附件上传</el-button>
<template #tip>
<div class="el-upload__tip">上传文件尺寸小于5M,最多可上传1份</div>
@@ -99,6 +99,8 @@
import Cookies from "js-cookie"
import ExpertsList from "./expertsList";
import axios from "axios";
+import { useRoute } from 'vue-router'
+const route = useRoute()
const props = defineProps(['projectId'])
const emit = defineEmits(["getNextStatus"]);
@@ -150,8 +152,12 @@
getProcessFiles(props.projectId)
})
+const projectType = ref('');
+const isEnd = ref('')
const riskOpen = async (type,val) => {
state.formData.projectId = val
+ isEnd.value = Cookies.get('end')
+ projectType.value = route.query.type;
if(type === 'detail' || type === 'edit' ){
if(type === 'detail'){
state.disabled = true
diff --git a/src/views/safetyReview/projectManage/components/projectArchive.vue b/src/views/safetyReview/projectManage/components/projectArchive.vue
index 94f3b59..c34a031 100644
--- a/src/views/safetyReview/projectManage/components/projectArchive.vue
+++ b/src/views/safetyReview/projectManage/components/projectArchive.vue
@@ -32,7 +32,7 @@
<template #default="scope">
<el-upload accept=".pdf,.doc,.docx"
:action="state.uploadUrl"
- :disabled="projectType === 'detail'"
+ :disabled="projectType === 'view' || isEnd"
:headers="state.header"
method="post"
:on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,scope.row)"
@@ -103,6 +103,8 @@
import axios from "axios";
import {delAccessoryFile, getAccessoryFile} from "@/api/projectManage/project";
import {addProcessMaterial, getProcessMaterialDetail, editProcessMaterial} from "@/api/projectManage/riskAnalysis";
+import { useRoute } from 'vue-router'
+const route = useRoute()
const props = defineProps(['projectId'])
const emit = defineEmits(["getNextStatus"]);
const state = reactive({
@@ -172,8 +174,10 @@
}
const projectType = ref('')
+const isEnd = ref('')
const riskOpen = async (type,val) => {
- projectType.value = type;
+ projectType.value = route.query.type;
+ isEnd.value = Cookies.get('end')
state.uploadData.projectId = val;
if(type === 'detail' || type === 'edit' ){
const res = await getProcessMaterialDetail({projectId: val});
diff --git a/src/views/safetyReview/projectManage/components/rateConclusion.vue b/src/views/safetyReview/projectManage/components/rateConclusion.vue
index 0496c97..6cfc327 100644
--- a/src/views/safetyReview/projectManage/components/rateConclusion.vue
+++ b/src/views/safetyReview/projectManage/components/rateConclusion.vue
@@ -27,7 +27,7 @@
v-if="state.formData.isReviseManual === 1"
accept="image/*,.pdf,.doc,.docx,.xlsx,.xls"
:action="state.uploadUrl"
- :disabled="state.disabled"
+ :disabled="projectType === 'view' || isEnd"
:headers="state.header"
method="post"
:on-success="handleAvatarSuccess"
@@ -61,6 +61,8 @@
import {delAccessoryFile, getAccessoryFile} from "@/api/projectManage/project";
import axios from "axios";
import {delFile, getFiles} from "@/api/projectManage/siteCheckRcd";
+import { useRoute } from 'vue-router'
+const route = useRoute()
const emit = defineEmits(["getNextStatus"]);
const prop = defineProps(['projectId'])
const state = reactive({
@@ -100,8 +102,12 @@
}
})
+const projectType = ref('');
+const isEnd = ref('')
const riskOpen = async (type,val) => {
state.uploadData.projectId = val;
+ projectType.value = route.query.type;
+ isEnd.value = Cookies.get('end')
if(type === 'detail' || type === 'edit' ){
if(type === 'detail'){
state.disabled = true
diff --git a/src/views/safetyReview/projectManage/components/signConfirm.vue b/src/views/safetyReview/projectManage/components/signConfirm.vue
index c529f8d..b5887a1 100644
--- a/src/views/safetyReview/projectManage/components/signConfirm.vue
+++ b/src/views/safetyReview/projectManage/components/signConfirm.vue
@@ -157,7 +157,6 @@
const res = await addFaceRecognition({projectId: val});
if (res.code == 200) {
ElMessage.success('保存成功')
- formRef.value.clearValidate();
emit('getNextStatus', val);
} else {
ElMessage.warning(res.message)
diff --git a/src/views/safetyReview/projectManage/components/siteCheckRcd.vue b/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
index 5ccb7de..0f63da0 100644
--- a/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
+++ b/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
@@ -38,7 +38,7 @@
</el-col>
<el-col :span="6">
<el-form-item prop="isSafetyCheck" label="编制现场安全检查表">
- <el-radio-group v-model="state.formData.isSafetyCheck" size="large" @change="changeRadio" :disabled="projectType==='detail'">
+ <el-radio-group v-model="state.formData.isSafetyCheck" size="large" @change="changeRadio" :disabled="projectType==='view' || isEnd">
<el-radio :label="1" size="large">是</el-radio>
<el-radio :label="0" size="large">否</el-radio>
</el-radio-group>
@@ -48,7 +48,7 @@
<el-row :gutter="30">
<el-col :span="24" v-if="state.formData.isSafetyCheck == 1">
<el-form-item label="安全检查表上传" prop="assAccessoryFiles">
- <el-upload :disabled="projectType==='detail'" accept="image/*,.pdf,.doc,.docx,.xlsx,.xls" :action="state.uploadUrl" :data="{moduleType: 5,projectId: props.projectId}" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,5)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='1' v-model:file-list="state.safetyList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,5)">
+ <el-upload :disabled="projectType==='view' || isEnd" accept="image/*,.pdf,.doc,.docx,.xlsx,.xls" :action="state.uploadUrl" :data="{moduleType: 5,projectId: props.projectId}" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,5)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='1' v-model:file-list="state.safetyList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,5)">
<el-button type="primary">附件上传</el-button>
<template #tip>
<div class="el-upload__tip">上传文件尺寸小于5M,最多可上传1份</div>
@@ -71,7 +71,7 @@
<el-row style="border: 1px dashed #999;border-radius: 4px;padding: 10px;margin-top: 20px">
<el-col :span="24">
<el-form-item label="主要装置前合影照片" prop="deviceImages">
- <el-upload accept="image/*" :disabled="projectType === 'detail'" :action="state.uploadUrl" :data="{moduleType: 1,projectId: props.projectId}" list-type="picture-card" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,1)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='10' v-model:file-list="state.beforeDeviceList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,1)" >
+ <el-upload accept="image/*" :disabled="projectType === 'view' || isEnd" :action="state.uploadUrl" :data="{moduleType: 1,projectId: props.projectId}" list-type="picture-card" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,1)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='10' v-model:file-list="state.beforeDeviceList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,1)" >
<el-icon><Plus /></el-icon>
<template #tip>
<div class="el-upload__tip">上传照片尺寸小于5M,最多可上传10张</div>
@@ -83,7 +83,7 @@
<el-row style="border: 1px dashed #999;border-radius: 4px;padding: 10px;margin-top: 20px">
<el-col :span="24">
<el-form-item label="现场勘验照片" prop="investingationImages">
- <el-upload accept="image/*" :disabled="projectType === 'detail'" :action="state.uploadUrl" :data="{moduleType: 2,projectId: props.projectId}" list-type="picture-card" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,2)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='10' v-model:file-list="state.siteCheckList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,2)" >
+ <el-upload accept="image/*" :disabled="projectType === 'view' || isEnd" :action="state.uploadUrl" :data="{moduleType: 2,projectId: props.projectId}" list-type="picture-card" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,2)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='10' v-model:file-list="state.siteCheckList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,2)" >
<el-icon><Plus /></el-icon>
<template #tip>
<div class="el-upload__tip">上传照片尺寸小于5M,最多可上传10张</div>
@@ -95,7 +95,7 @@
<el-row style="border: 1px dashed #999;border-radius: 4px;padding: 10px;margin-top: 20px;margin-bottom: 20px">
<el-col :span="24">
<el-form-item label="企业陪同人员照片" prop="ccompanyImages">
- <el-upload :disabled="projectType === 'detail'" accept="image/*" :action="state.uploadUrl" :data="{moduleType: 3,projectId: props.projectId}" list-type="picture-card" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,3)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='10' v-model:file-list="state.companyList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,3)" >
+ <el-upload :disabled="projectType === 'view' || isEnd" accept="image/*" :action="state.uploadUrl" :data="{moduleType: 3,projectId: props.projectId}" list-type="picture-card" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile,3)" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='10' v-model:file-list="state.companyList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles,3)" >
<el-icon><Plus /></el-icon>
<template #tip>
<div class="el-upload__tip">上传照片尺寸小于5M,最多可上传10张</div>
@@ -119,6 +119,8 @@
import {addSiteCheck,editSiteCheck,getSiteCheckDetail, delFile, getFiles} from "@/api/projectManage/siteCheckRcd";
import { getToken } from "@/utils/auth";
import Cookies from "js-cookie"
+import { useRoute } from 'vue-router'
+const route = useRoute()
const props = defineProps(['projectId'])
const emit = defineEmits(["getNextStatus"])
import MapLocation from "./mapLocation.vue"
@@ -254,10 +256,12 @@
}
const projectType = ref('');
+const isEnd = ref('')
const riskOpen = async (type,val) => {
state.formData.projectId = val
+ isEnd.value = Cookies.get('end')
state.projectId = val
- projectType.value = type;
+ projectType.value = route.query.type;
if(type === 'detail' || type === 'edit' ){
// await getDetail(val)
}
diff --git a/src/views/safetyReview/projectManage/components/uploadReviewRcd.vue b/src/views/safetyReview/projectManage/components/uploadReviewRcd.vue
index dd293c2..f67dd19 100644
--- a/src/views/safetyReview/projectManage/components/uploadReviewRcd.vue
+++ b/src/views/safetyReview/projectManage/components/uploadReviewRcd.vue
@@ -4,7 +4,7 @@
<el-row :gutter="30">
<el-col :span="18">
<el-form-item label="附件上传">
- <el-upload :disabled="projectType === 'detail'" accept="image/*,.pdf,.doc,.docx" :action="state.uploadUrl" :data="{moduleType: 6,projectId: props.projectId}" :headers="state.header" method="post" :on-success="handleAvatarSuccess" :on-exceed="showTip" v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="handleRemove">
+ <el-upload :disabled="projectType === 'view' || isEnd" accept="image/*,.pdf,.doc,.docx" :action="state.uploadUrl" :data="{moduleType: 6,projectId: props.projectId}" :headers="state.header" method="post" :on-success="handleAvatarSuccess" :on-exceed="showTip" v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="handleRemove">
<el-button type="primary">上传评审记录</el-button>
<template #tip>
<div class="el-upload__tip">上传文件尺寸尺寸小于2M</div>
@@ -19,7 +19,7 @@
<el-table-column label="操作" header-align="center" class-name="small-padding fixed-width" width="120">
<template #default="scope">
<el-button link type="primary" @click="checkFile(scope.row)">查看</el-button>
- <el-button link type="danger" @click="handleRemove(scope.row,[])" :disabled="projectType === 'detail'">删除</el-button>
+ <el-button link type="danger" @click="handleRemove(scope.row,[])" :disabled="projectType === 'view'">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -35,6 +35,8 @@
import { getToken } from "@/utils/auth";
import Cookies from "js-cookie"
import axios from 'axios'
+import { useRoute } from 'vue-router'
+const route = useRoute()
const emit = defineEmits(["getNextStatus"]);
const props = defineProps(['projectId'])
const state = reactive({
@@ -59,8 +61,10 @@
})
const projectType = ref('');
+const isEnd = ref('')
const riskOpen = async (type,val) => {
- projectType.value = type;
+ projectType.value = route.query.type;
+ isEnd.value = Cookies.get('end')
if(type === 'detail' || type === 'edit' ){
await getReviewFiles
}
diff --git a/src/views/safetyReview/projectManage/index.vue b/src/views/safetyReview/projectManage/index.vue
index c1fe209..5f2280b 100644
--- a/src/views/safetyReview/projectManage/index.vue
+++ b/src/views/safetyReview/projectManage/index.vue
@@ -289,6 +289,7 @@
onMounted(() => {
Cookies.remove('projectId')
+ Cookies.remove('end')
getList();
getStatistics();
getArea();
diff --git a/src/views/safetyReview/projectManage/process.vue b/src/views/safetyReview/projectManage/process.vue
index ce05957..172e011 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" @click="confirm">确认完结</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="primary" style="width: 80px" v-if="selectedObj.id !== 14" @click="next">下一步</el-button>
</div>
</div>
--
Gitblit v1.9.2