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

shj

2022-08-10 d3d6b956f529d17f8f2774fcfe6c3252d34d3f00

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

 src/views/accidentManagementSystem/accidentExpress/component/openAdd.vue

@@ -53,7 +53,8 @@
                                <el-radio :label="true">是</el-radio>
                                <el-radio :label="false">否</el-radio>
                            </el-radio-group>
                            <el-button v-if="ruleForm.casualties" type="primary" style="margin-left: 20px" :icon="Edit" @click="openDai" round plain />
                            <el-button v-if="ruleForm.casualties" type="primary" style="margin-left: 20px"
                                       :icon="Edit" @click="openDai" round plain />
                        </el-form-item>
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -101,7 +102,8 @@
            <template #footer>
                <span class="dialog-footer">
                    <el-button @click="resetForm(ruleFormRef)" size="default">关闭</el-button>
                    <el-button size="default" v-if="disabled == true ? false : true" type="primary" @click="submitForm(titles, ruleFormRef)">确定</el-button>
                    <el-button size="default" v-if="disabled == true ? false : true" type="primary"
                               @click="submitForm(titles, ruleFormRef)">确定</el-button>
                </span>
            </template>
        </el-dialog>
@@ -387,7 +389,16 @@
        };
        const ShowUser = ref();
        const openDai = () => {
            ShowUser.value.openDialog(ruleForm.value.id, disabled.value);
            if(ruleForm.value.id==null||ruleForm.value.id==''){
                ElMessage({
                    showClose: true,
                    message: '请先添加事故快报',
                    type: 'info',
                });
            }else {
                ShowUser.value.openDialog(ruleForm.value.id, disabled.value);
            }

        };
        // 应急队伍弹窗
        const Shows = ref();

 src/views/accidentManagementSystem/accidentReport/component/openAdd.vue

@@ -1,12 +1,12 @@
<template>
    <div class="system-edit-user-container">
        <el-dialog :title="titles" v-model="isShowDialog" width="800px" draggable :fullscreen="full" @close="closeDialog(ruleFormRef)">
        <el-dialog :title="titles" v-model="isShowDialog" width="800px" draggable :fullscreen="full" @close="resetForm(ruleFormRef)">
            <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
            <el-form ref="ruleFormRef" :model="ruleForm" size="default" :rules="rules" label-width="140px">
                <el-row :gutter="35">
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="事故快报" prop="accidentName">
                            <el-input v-model="ruleForm.accidentName" :disabled="true" placeholder="请选择" class="input-with-select">
                        <el-form-item label="事故快报" prop="accidentExpressId">
                            <el-input v-model="accidentName" :disabled="true" placeholder="请选择" class="input-with-select">
                                <template #append>
                                    <el-button :icon="Search" @click="daiInpt" />
                                </template>
@@ -16,19 +16,19 @@
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="事故部门" placeholder="请选择" prop="accidentDepartmentId">
                            <!--<el-input v-model="ruleForm.accidentDepartmentName" class="input-with-select" />-->
                            <el-tree-select v-model="ruleForm.accidentDepartmentId" :disabled="true" :data="newTreeList"
                            <el-tree-select v-model="accidentDepartmentId" :disabled="true" :data="newTreeList"
                                            :props="propse" class="w100" placeholder="请选择" />
                        </el-form-item>
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="事故发生地点" prop="occurrencePlace">
                            <el-input v-model="ruleForm.occurrencePlace" :disabled="true" placeholder="请填写发生地点"></el-input>
                            <el-input v-model="occurrencePlace" :disabled="true" placeholder="请填写发生地点"></el-input>
                        </el-form-item>
                    </el-col>
                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
                        <el-form-item label="发生时间" prop="occurrenceTime">
                            <el-date-picker
                                v-model="ruleForm.occurrenceTime"
                                v-model="occurrenceTime"
                                :disabled="true"
                                value-format="YYYY-MM-DD HH:mm:ss"
                                type="datetime"
@@ -240,13 +240,6 @@
        //定义表单
        const ruleForm = ref({
            accidentExpressId:'',
            accidentExpressName:'',
            accidentDepartmentId:'',
            accidentDepartmentName:'',
            occurrencePlace:'',
            occurrenceTime:'',



            accidentType: '',
            accidentGrade: '',
@@ -294,19 +287,17 @@
                    .then((res) => {
                        if (res.data.code == 200) {
                            ruleForm.value = res.data.data;
                            accidentName.value = res.data.data.accidentName
                            accidentDepartmentId.value = res.data.data.accidentDepartmentId
                            occurrencePlace.value = res.data.data.occurrencePlace
                            occurrenceTime.value = res.data.data.occurrenceTime
                        }
                    });
            }
        };
        // 关闭弹窗
        const closeDialog = (formEl: FormInstance | undefined) => {
            formEl.resetFields();
            console.log(ruleForm)
            isShowDialog.value = false;
        };
        // 取消
        const onCancel = (formEl: FormInstance | undefined) => {
            closeDialog(formEl);
            resetForm(formEl);
        };
        //日期选择器
        const value1 = ref('');
@@ -320,18 +311,11 @@
        ];
        // 必填项提示
        const rules = reactive<FormRules>({
            accidentDepartmentId: [
            accidentExpressId: [
                {
                    required: true,
                    message: '事故部门不能为空',
                    message: '快报不能为空',
                    trigger: 'change',
                },
            ],
            occurrenceTime: [
                {
                    required: true,
                    message: '发生时间不能为空',
                    trigger: 'blur',
                },
            ],
            accidentType: [
@@ -420,18 +404,26 @@
                },
            ],
        });
        const accidentDepartmentId = ref()
        const occurrencePlace = ref()
        const occurrenceTime = ref()
        const accidentName = ref()
        //事故快报回填
        const onSelectItem = (item: any) => {
            console.log('item', item[0]);
            ruleForm.value.accidentExpressId = item[0].id
            ruleForm.value.accidentName = item[0].accidentName
            ruleForm.value.accidentDepartmentId = item[0].accidentDepartmentId
            ruleForm.value.accidentDepartmentName = item[0].deptName
            ruleForm.value.occurrencePlace = item[0].occurrencePlace
            ruleForm.value.occurrenceTime = item[0].occurrenceTime
            accidentName.value = item[0].accidentName
            accidentDepartmentId.value = item[0].accidentDepartmentId
            occurrencePlace.value = item[0].occurrencePlace
            occurrenceTime.value = item[0].occurrenceTime
        };
        // 表单提交验证必填项
        const submitForm = async (title: string, formEl: FormInstance | undefined) => {
            delete ruleForm.value.accidentName
            delete ruleForm.value.accidentDepartmentId
            delete ruleForm.value.occurrencePlace
            delete ruleForm.value.occurrenceTime

            if (title == '新建事故报告') {
                if (!formEl) return;
                await formEl.validate((valid, fields) => {
@@ -495,13 +487,6 @@
                formEl.resetFields();
                ruleForm.value = {
                    accidentExpressId:'',
                    accidentExpressName:'',
                    accidentDepartmentId:'',
                    accidentDepartmentName:'',
                    occurrencePlace:'',
                    occurrenceTime:'',



                    accidentType: '',
                    accidentGrade: '',
@@ -531,6 +516,11 @@
            isShowDialog.value = false;
            if (!formEl) return;
            formEl.resetFields();
            // ruleForm.value.accidentExpressId = item[0].id
            accidentName.value = ''
            accidentDepartmentId.value = ''
            occurrencePlace.value = ''
            occurrenceTime.value = ''
        };
        const handleChange = (val: number) => {
            console.log(val);
@@ -602,7 +592,6 @@
        };
        return {
            openDialog,
            closeDialog,
            isShowDialog,
            onCancel,
            fileList,
@@ -635,7 +624,11 @@
            department,
            getTreeList,
            propse,
            statusDisabled
            statusDisabled,
            accidentDepartmentId,
            occurrencePlace,
            occurrenceTime,
            accidentName
        };
    },
});

 src/views/accidentManagementSystem/accidentReport/index.vue

@@ -74,14 +74,15 @@
          </el-table>
          <div class="pages">
            <el-pagination
                v-model:currentPage="pageIndex"
                v-model:page-size="pageSize"
                :page-sizes="[10, 20, 30]"
                :pager-count="5"
                layout="total, sizes, prev, pager, next, jumper"
                :total="40"
                @size-change="handleSizeChange"
                @current-change="handleCurrentChange"
                    v-if="tableData.length == 0 ? false : true"
                    v-model:currentPage="pageIndex"
                    v-model:page-size="pageSize"
                    :page-sizes="[10, 20, 30]"
                    :pager-count="5"
                    layout="total, sizes, prev, pager, next, jumper"
                    :total="total"
                    @size-change="handleSizeChange"
                    @current-change="handleCurrentChange"
            />
          </div>
        </el-tab-pane>

 src/views/accidentManagementSystem/workInjuryDeclaration/component/accidentName.vue

@@ -1,6 +1,6 @@
<template>
    <div>
        <el-dialog v-model="dialogVisible" title="选择事故名称" width="900px" draggable :fullscreen="full">
        <el-dialog v-model="dialogVisible" title="选择事故名称" width="900px" draggable :fullscreen="full" @close="handleClose">
            <el-button @click="toggleFullscreen" size="small" class="pot" :icon="FullScreen"></el-button>
            <el-row>
                <el-col :span="18">
@@ -85,7 +85,7 @@
            </el-row>
            <template #footer>
                <span class="dialog-footer">
                    <el-button @click="dialogVisible = false" size="default">关闭</el-button>
                    <el-button @click="handleClose()" size="default">关闭</el-button>
                    <el-button type="primary" @click="submitForm" size="default">确定</el-button>
                </span>
            </template>
@@ -146,6 +146,7 @@
        const submitForm = () => {
            emit('selectItem', dynamicTags.value);
            dialogVisible.value = false;
            radio1.value=''
        };
        //查询list数据
        const listApi = async () => {