From 0065d87453f07f63ec6b4f0a818b65ca07905f45 Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期三, 10 八月 2022 14:17:15 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut
---
src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/openAdd.vue | 5 +++++
src/views/accidentManagementSystem/accidentReport/component/openAdd.vue | 1 +
src/views/accidentManagementSystem/workInjuryDeclaration/component/accidentName.vue | 7 ++++++-
src/views/contingencyManagement/contingency/component/openAdd.vue | 3 ++-
4 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/views/accidentManagementSystem/accidentReport/component/openAdd.vue b/src/views/accidentManagementSystem/accidentReport/component/openAdd.vue
index 1854293..a17ed5e 100644
--- a/src/views/accidentManagementSystem/accidentReport/component/openAdd.vue
+++ b/src/views/accidentManagementSystem/accidentReport/component/openAdd.vue
@@ -517,6 +517,7 @@
if (!formEl) return;
formEl.resetFields();
// ruleForm.value.accidentExpressId = item[0].id
+ ruleForm.value = {}
accidentName.value = ''
accidentDepartmentId.value = ''
occurrencePlace.value = ''
diff --git a/src/views/accidentManagementSystem/workInjuryDeclaration/component/accidentName.vue b/src/views/accidentManagementSystem/workInjuryDeclaration/component/accidentName.vue
index 603be72..86cd9a6 100644
--- a/src/views/accidentManagementSystem/workInjuryDeclaration/component/accidentName.vue
+++ b/src/views/accidentManagementSystem/workInjuryDeclaration/component/accidentName.vue
@@ -85,7 +85,7 @@
</el-row>
<template #footer>
<span class="dialog-footer">
- <el-button @click="handleClose()" size="default">关闭</el-button>
+ <el-button @click="closeDialog()" size="default">关闭</el-button>
<el-button type="primary" @click="submitForm" size="default">确定</el-button>
</span>
</template>
@@ -162,6 +162,10 @@
};
// 右方点击添加后显示标签
const dynamicTags = ref([]);
+ const closeDialog=()=>{
+ dialogVisible.value = false
+ handleClose()
+ };
const handleClose = () => {
dynamicTags.value = [];
radio1.value = '';
@@ -197,6 +201,7 @@
checkedItem,
submitReset,
submitForm,
+ closeDialog
};
},
});
diff --git a/src/views/contingencyManagement/contingency/component/openAdd.vue b/src/views/contingencyManagement/contingency/component/openAdd.vue
index af898bc..d5495f2 100644
--- a/src/views/contingencyManagement/contingency/component/openAdd.vue
+++ b/src/views/contingencyManagement/contingency/component/openAdd.vue
@@ -53,7 +53,7 @@
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
<el-form-item label="相关附件" prop="fileList">
<el-upload
- v-model:file-list="ruleForm.fileList"
+ v-model:file-list="fileList"
class="upload-demo"
action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15"
:on-change="handleChange"
@@ -346,6 +346,7 @@
if (!formEl) return;
await formEl.validate((valid, fields) => {
if (valid) {
+ ruleForm.value.fileList=[]
isShowDialog.value = false;
contingencyApi()
.editEmergencyTeam(ruleForm.value)
diff --git a/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/openAdd.vue b/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/openAdd.vue
index a1a8412..1533b41 100644
--- a/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/openAdd.vue
+++ b/src/views/contingencyManagement/emergencyDrill/releaseOfDrillPlan/component/openAdd.vue
@@ -319,6 +319,11 @@
// 表单提交验证必填项
const submitForm = async (title: string, formEl: FormInstance | undefined) => {
ruleForm.value.userList = ruleForm.value.userList.concat(ruleForm.value.chargeUserList)
+ delete ruleForm.value.planName
+ delete ruleForm.value.chargeUserListString
+ delete ruleForm.value.userListString
+ delete ruleForm.value.chargeUserList
+ delete ruleForm.value.gmtModitify
if (title == '新建应急演练计划发布') {
if (!formEl) return;
await formEl.validate((valid, fields) => {
--
Gitblit v1.9.2