From eee656c8d1aab0b5aa8935bf1630f782321fc7f4 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: Wed, 21 Feb 2024 16:53:35 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/components/siteCheckRcd.vue | 63 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 22 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/siteCheckRcd.vue b/src/views/safetyReview/projectManage/components/siteCheckRcd.vue
index 255819d..9f7626f 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();
@@ -259,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', res.data);
+ emit('getNextStatus', val);
} else {
ElMessage.warning(res.message)
}
@@ -373,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