From 514a9cc10622d996c3cfe1f3a2e955d52e7fc0c3 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: Fri, 23 Feb 2024 15:55:36 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/components/siteCheckRcd.vue | 112 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 61 insertions(+), 51 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/siteCheckRcd.vue b/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
index 4dbb3c4..cc1b345 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">
<el-radio :label="1" size="large">是</el-radio>
<el-radio :label="0" size="large">否</el-radio>
</el-radio-group>
@@ -166,8 +166,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'}],
@@ -203,45 +203,53 @@
const getDetail = async (val) => {
const res = await getSiteCheckDetail({projectId: val});
if(res.code == 200){
- state.formData = res.data;
- state.beforeDeviceList = res.data.deviceImages.map(i=>{
- return {
- name: i.fileName,
- url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
- id: i.id,
- projectId: i.projectId,
- moduleType: i.moduleType
- }
- })
- state.siteCheckList = res.data.investingationImages.map(i=>{
- return {
- name: i.fileName,
- url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
- id: i.id,
- projectId: i.projectId,
- moduleType: i.moduleType
- }
- })
- state.companyList = res.data.ccompanyImages.map(i=>{
- return {
- name: i.fileName,
- url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
- id: i.id,
- projectId: i.projectId,
- moduleType: i.moduleType
- }
- })
- state.safetyList = res.data.assAccessoryFiles.map(i=>{
- return {
- name: i.fileName,
- url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
- id: i.id,
- projectId: i.projectId,
- moduleType: i.moduleType
- }
- })
+ if(res.data){
+ state.formData = res.data;
+ state.beforeDeviceList = res.data.deviceImages.map(i=>{
+ return {
+ name: i.fileName,
+ url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
+ id: i.id,
+ projectId: i.projectId,
+ moduleType: i.moduleType
+ }
+ })
+ state.siteCheckList = res.data.investingationImages.map(i=>{
+ return {
+ name: i.fileName,
+ url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
+ id: i.id,
+ projectId: i.projectId,
+ moduleType: i.moduleType
+ }
+ })
+ state.companyList = res.data.ccompanyImages.map(i=>{
+ return {
+ name: i.fileName,
+ url: import.meta.env.VITE_APP_BASE_API + '/' + i.path,
+ id: i.id,
+ projectId: i.projectId,
+ moduleType: i.moduleType
+ }
+ })
+ state.safetyList = res.data.assAccessoryFiles.map(i=>{
+ return {
+ 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)
+ }
+}
+const changeRadio = () => {
+ if(state.formData.isSafetyCheck == 1){
+ getSafetyFiles()
}
}
@@ -268,19 +276,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', state.projectId);
+ emit('getNextStatus', val);
} else {
ElMessage.warning(res.message)
}
@@ -382,7 +392,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,
--
Gitblit v1.9.2