From 5d6dd045d7a83a2388759a422b2408266f08eb97 Mon Sep 17 00:00:00 2001 From: zhouwenxuan <1175765986@qq.com> Date: 星期二, 20 二月 2024 09:16:58 +0800 Subject: [PATCH] bug修改 --- src/views/safetyReview/projectManage/components/siteCheckRcd.vue | 43 ++++++++++++++++++++++++++++++------------- 1 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/views/safetyReview/projectManage/components/siteCheckRcd.vue b/src/views/safetyReview/projectManage/components/siteCheckRcd.vue index 255819d..7a24729 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> @@ -167,7 +167,7 @@ rules: { investigationDate: [{required: true, message: '请选择现场勘验时间', trigger: 'blur'}], location: [{required: true, message: '请选择现场勘验位置', trigger: 'blur'}], - isSafetyCheck: [{required: true, message: '请选择现场勘验位置', trigger: 'blur'}], + 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 +194,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 +234,31 @@ }) 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 riskOpen = async (type,val) => { + state.formData.projectId = val + state.projectId = val + if(type === 'detail' || type === 'edit' ){ + // await getDetail(val) } if(type === 'add' || type === 'clickEdit') { const valid = await formRef.value.validate(); @@ -271,7 +288,7 @@ } } formRef.value.clearValidate(); - emit('getNextStatus', res.data); + emit('getNextStatus', state.projectId); } else { ElMessage.warning(res.message) } @@ -373,7 +390,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