From 68cd58de3a45d79ea241fa4d79e550217072e494 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: Fri, 15 Mar 2024 15:09:19 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/components/siteCheckRcd.vue | 161 +++++++++++++++++++++++++++++++----------------------
1 files changed, 94 insertions(+), 67 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/siteCheckRcd.vue b/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
index 255819d..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">
+ <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 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/*" :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/*" :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 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"
@@ -166,8 +168,8 @@
planPersons: [],
rules: {
investigationDate: [{required: true, message: '请选择现场勘验时间', trigger: 'blur'}],
- location: [{required: true, message: '请选择现场勘验位置', trigger: 'blur'}],
- isSafetyCheck: [{required: true, message: '请选择现场勘验位置', trigger: 'blur'}],
+ location: [{required: true, message: '请选择现场勘验位置', trigger: 'change'}],
+ isSafetyCheck: [{required: true, message: '请选择是否编制现场安全检查表', trigger: 'blur'}],
recordData: [{required: true, message: '请填写现场勘验记录', trigger: 'blur'}],
assAccessoryFiles: [{required: true, validator: checkSafetyFiles, trigger: 'blur'}],
// investingationImages: [{required: true, validator: checkInvestFiles, trigger: 'blur'}],
@@ -194,14 +196,16 @@
if(userInfo.identity === 0){
isAmin.value = true;
}
+ if(props.projectId){
+ getDetail(props.projectId)
+ }
+
});
-const riskOpen = async (type,val) => {
- state.formData.projectId = val
- state.projectId = val
- if(type === 'detail' || type === 'edit' ){
- const res = await getSiteCheckDetail({projectId: val});
- if(res.code == 200){
+const getDetail = async (val) => {
+ const res = await getSiteCheckDetail({projectId: val});
+ if(res.code == 200){
+ if(res.data){
state.formData = res.data;
state.beforeDeviceList = res.data.deviceImages.map(i=>{
return {
@@ -232,16 +236,34 @@
})
state.safetyList = res.data.assAccessoryFiles.map(i=>{
return {
- name: i.fileName,
+ name: i.originName,
url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
id: i.id,
projectId: i.projectId,
moduleType: i.moduleType
}
})
- }else {
- ElMessage.warning(res.message)
}
+
+ }else {
+ ElMessage.warning(res.message)
+ }
+}
+const changeRadio = () => {
+ if(state.formData.isSafetyCheck == 1){
+ getSafetyFiles()
+ }
+}
+
+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 = route.query.type;
+ if(type === 'detail' || type === 'edit' ){
+ // await getDetail(val)
}
if(type === 'add' || type === 'clickEdit') {
const valid = await formRef.value.validate();
@@ -259,19 +281,21 @@
if (res.code == 200) {
ElMessage.success('保存成功')
if(state.formData.isSafetyCheck == 0){
- const res = await delFile(state.safetyList[0].id)
- if(res.code == 200){
- console.log('删除原有附件')
- await getSafetyFiles()
- }else{
- ElMessage({
- type: 'warning',
- message: res.message
- })
+ if(state.safetyList && state.safetyList.length >0){
+ const res = await delFile(state.safetyList[0].id)
+ if(res.code == 200){
+ console.log('删除原有附件')
+ await getSafetyFiles()
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.message
+ })
+ }
}
}
formRef.value.clearValidate();
- emit('getNextStatus', res.data);
+ emit('getNextStatus', val);
} else {
ElMessage.warning(res.message)
}
@@ -373,7 +397,7 @@
if(res.data && res.data.length>0){
state.safetyList = res.data.map(i=>{
return {
- name: i.fileName,
+ name: i.originName,
url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
id: i.id,
projectId: i.projectId,
@@ -445,54 +469,56 @@
}
const handleRemove = async (file, uploadFiles,type) => {
- ElMessageBox.confirm(
- '确定删除该附件？',
- '提示',
- {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning',
- })
- .then( async() => {
- const res = await delFile(file.id)
- if(res.code == 200){
- ElMessage({
- type: 'success',
- message: '文件已删除'
- })
+
+ ElMessageBox.confirm(
+ '确定删除该附件？',
+ '提示',
+ {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning',
+ })
+ .then( async() => {
+ const res = await delFile(file.id)
+ if(res.code == 200){
+ ElMessage({
+ type: 'success',
+ message: '文件已删除'
+ })
+ if(type == 1){
+ await getBeforeFiles()
+ }
+ if(type == 2){
+ await getSiteCheckFiles()
+ }
+ if(type == 3){
+ await getCompanyFiles()
+ }
+ if(type == 5){
+ await getSafetyFiles()
+ }
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.message
+ })
+ }
+ })
+ .catch(()=>{
if(type == 1){
- await getBeforeFiles()
+ getBeforeFiles()
}
if(type == 2){
- await getSiteCheckFiles()
+ getSiteCheckFiles()
}
if(type == 3){
- await getCompanyFiles()
+ getCompanyFiles()
}
if(type == 5){
- await getSafetyFiles()
+ getSafetyFiles()
}
- }else{
- ElMessage({
- type: 'warning',
- message: res.message
- })
- }
- })
- .catch(()=>{
- if(type == 1){
- getBeforeFiles()
- }
- if(type == 2){
- getSiteCheckFiles()
- }
- if(type == 3){
- getCompanyFiles()
- }
- if(type == 5){
- getSafetyFiles()
- }
- })
+ })
+
}
defineExpose({
@@ -508,4 +534,5 @@
}
}
+
</style>
--
Gitblit v1.9.2