From 729011ee47e2074da398b71aa4135ce357831658 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: Thu, 10 Oct 2024 10:18:09 +0800
Subject: [PATCH] bug修改
---
src/views/safetyReview/projectManage/components/evaluatePlan.vue | 90 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/src/views/safetyReview/projectManage/components/evaluatePlan.vue b/src/views/safetyReview/projectManage/components/evaluatePlan.vue
index 378932d..d0300d5 100644
--- a/src/views/safetyReview/projectManage/components/evaluatePlan.vue
+++ b/src/views/safetyReview/projectManage/components/evaluatePlan.vue
@@ -29,7 +29,7 @@
<el-col :span="6">
<el-form-item prop="auser.name" label="机构评价负责人">
<el-input
- v-model="state.formData.auser.name"
+ v-model.trim="state.formData.auser.name"
size="large"
placeholder="请选择机构评价负责人"
@focus="openExperts('机构评价负责人')"
@@ -43,7 +43,7 @@
</el-row>
<el-row>
<el-col :span="18">
- <div style="display: flex;align-items: center">评价日程安排</div>
+ <div style="display: flex;align-items: center">评价日程安排<el-icon style="margin-left: 10px;margin-right: 4px"><InfoFilled /></el-icon><span style="font-size: 13px">不涉及的日程安排日期可不填</span></div>
</el-col>
</el-row>
<el-table :data="state.formData.estimateSchedules" :border="true" style="margin: 20px 0">
@@ -254,8 +254,8 @@
devices: [],
rules: {
"auser.name": [{required: true, message: '请填写机构评价负责人', trigger: 'change'}],
- startDate: [{required: true, message: '请选择评价开始时间', trigger: 'blur'}],
- endDate: [{required: true, message: '请选择评价结束时间', trigger: 'blur'}]
+ startDate: [{required: true, message: '请选择评价开始时间', trigger: 'change'}],
+ endDate: [{required: true, message: '请选择评价结束时间', trigger: 'change'}]
},
workList: [
{value: '报告编制',label: '报告编制'},
@@ -316,7 +316,49 @@
}
if(type === 'add'){
const {id, ...data} = JSON.parse(JSON.stringify(state.formData))
- console.log(data)
+
+ const params = Object.assign({}, state.formData.estimateSchedules);
+ let i = 0
+
+ for (const key in params) {
+ if ((params[key].startDate == '' || params[key].startDate == null ) && (params[key].endDate == '' || params[key].endDate == null)) {
+ delete params[key].startDate;
+ delete params[key].endDate;
+ i++
+ }
+
+ }
+ console.log('data',params)
+ const finData = Object.entries(params).map(([key, value]) => ({
+ ...value,
+ }));
+ if(i == finData.length){
+ ElMessage.warning("请选择至少一个的日程安排日期");
+ return;
+ }
+ try {
+ finData.forEach(item =>{
+ // debugger
+ console.log(item.endDate,'item.endDate')
+ if(item.startDate && (item.startDate !='' || item.startDate !=null)){
+ if(item.endDate =='' || item.endDate ==null){
+ ElMessage.warning("请完善涉及的日程安排结束日期");
+ throw new Error('Loop stopped')
+ }
+ }
+ if(item.endDate && (item.endDate !='' || item.endDate !=null)){
+ if(item.startDate =='' || item.startDate ==null){
+ ElMessage.warning("请完善涉及的日程安排开始日期");
+ throw new Error('Loop stopped')
+ }
+ }
+ })
+ }catch (e) {
+ throw new Error(e)
+ }
+
+ data.estimateSchedules = finData
+
const res = await addRecord(data);
if (res.code == 200) {
ElMessage.success('保存成功')
@@ -328,6 +370,44 @@
}
}else if(type === 'clickEdit'){
const { ...data} = JSON.parse(JSON.stringify(state.formData))
+ const params = Object.assign({}, state.formData.estimateSchedules);
+ let i = 0
+ for (const key in params) {
+ if (params[key].startDate == '' && params[key].endDate == '') {
+ delete params[key].startDate;
+ delete params[key].endDate;
+ i++;
+ }
+ }
+ const finData = Object.entries(params).map(([key, value]) => ({
+ ...value,
+ }));
+ if(i == finData.length){
+ ElMessage.warning("请选择至少一个的日程安排日期");
+ return;
+ }
+ try {
+ finData.forEach(item =>{
+ // debugger
+ console.log(item.endDate,'item.endDate')
+ if(item.startDate && (item.startDate !='' || item.startDate !=null)){
+ if(item.endDate =='' || item.endDate ==null){
+ ElMessage.warning("请完善涉及的日程安排结束日期");
+ throw new Error('Loop stopped')
+ }
+ }
+ if(item.endDate && (item.endDate !='' || item.endDate !=null)){
+ if(item.startDate =='' || item.startDate ==null){
+ ElMessage.warning("请完善涉及的日程安排开始日期");
+
+ throw new Error('Loop stopped')
+ }
+ }
+ })
+ }catch (e) {
+ throw new Error(e)
+ }
+ data.estimateSchedules = finData
const res = await editRecord(data);
if (res.code == 200) {
ElMessage.success('变更成功')
--
Gitblit v1.9.2