From bc80908241e17a99b0704fed672565f2075f6283 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 28 八月 2023 15:19:12 +0800
Subject: [PATCH] 修改
---
src/views/analyse/assessApply/components/reportDialog.vue | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/views/analyse/assessApply/components/reportDialog.vue b/src/views/analyse/assessApply/components/reportDialog.vue
index f8d1257..cce33ea 100644
--- a/src/views/analyse/assessApply/components/reportDialog.vue
+++ b/src/views/analyse/assessApply/components/reportDialog.vue
@@ -131,7 +131,14 @@
</el-checkbox-group>
</td>
</tr>
+
<select-danger ref="selectDangerRef" v-model:data="reportDialogState.reportForm.riskSource" v-model:disabled="reportDialogState.disabled"></select-danger>
+
+<!-- <tr class="m-color b-font required" style="text-align: center">安全风险分析（总结）</tr>-->
+<!-- <tr>-->
+<!-- <el-input type="textarea" :autosize="{ minRows: 3}" :disabled="reportDialogState.disabled" v-model="reportDialogState.reportForm.safeRiskAnalysis" placeholder="1.实验过程中是否有爆炸、火灾、腐蚀、中毒风险、产生危险废弃物等（根据危险源清单，分析实验过程中可能对人身安全、人体健康、实验室环境和周边环境等带来的负面影响）" />-->
+<!-- </tr>-->
+
<tr class="m-color b-font required" style="text-align: center">安全风险分析（总结）</tr>
<tr>
<el-input type="textarea" :autosize="{ minRows: 3}" :disabled="reportDialogState.disabled" v-model="reportDialogState.reportForm.safeRiskAnalysis" placeholder="1.实验过程中是否有爆炸、火灾、腐蚀、中毒风险、产生危险废弃物等（根据危险源清单，分析实验过程中可能对人身安全、人体健康、实验室环境和周边环境等带来的负面影响）" />
@@ -271,6 +278,10 @@
// reportDialogState.reportForm[i] = value[i];
// }
// }
+ reportDialogState.reportForm.riskSource = []
+ setTimeout(()=>{
+ selectDangerRef.value.dangerSourceState.dangerList = []
+ },2000)
}else if(title === '修改'){
reportDialogState.title = '修改报告';
reportDialogState.disabled = false
@@ -283,6 +294,7 @@
// }
// }
}
+ console.log(reportDialogState.reportForm,'form')
};
const isValidKey = (key: string | number | symbol, object:object): key is keyof typeof object =>{
@@ -358,9 +370,14 @@
const onSubmitProject = () => {
reportFormRef.value.validate(async(valid: boolean) => {
if(valid){
- const { id,assessPerson,safeRiskAnalysis,assessLevel,description } = reportDialogState.reportForm
- const data = { id,assessPerson,safeRiskAnalysis,assessLevel,description }
+ reportDialogState.reportForm.riskSource = selectDangerRef.value.dangerSourceState.dangerList
+ const { id,assessPerson,riskSource,safeRiskAnalysis,assessLevel,description } = reportDialogState.reportForm
+ const data = { id,assessPerson,riskSource,safeRiskAnalysis,assessLevel,description }
if(reportDialogState.title === '提交报告'){
+ for(let i in data.riskSource){
+ riskSource[i].reportId = data.id
+ riskSource[i].riskSourceIndex = i + 1
+ }
let res = await assessApplyApi().updateRiskReport(data);
if(res.data.code === 100){
emit('refresh')
--
Gitblit v1.9.2