Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

shj

2022-08-10 0065d87453f07f63ec6b4f0a818b65ca07905f45

Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

 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 = ''

 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
        };
    },
});

 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)

 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) => {