From cefcb88c6cd0690052e503d5f1c943cb7f8a03cb Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 30 十一月 2022 09:18:32 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt
---
src/views/accidentManagementSystem/accidentReport/component/openAdd.vue | 270 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 164 insertions(+), 106 deletions(-)
diff --git a/src/views/accidentManagementSystem/accidentReport/component/openAdd.vue b/src/views/accidentManagementSystem/accidentReport/component/openAdd.vue
index de8cecb..11591fe 100644
--- a/src/views/accidentManagementSystem/accidentReport/component/openAdd.vue
+++ b/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,18 @@
<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"
- :props="propse" class="w100" placeholder="请选择" />
+ <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"
@@ -40,21 +39,21 @@
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="事故类别" prop="accidentType">
<el-select v-model="ruleForm.accidentType" :disabled="disabled" class="w100" placeholder="请选择">
- <el-option label="人员伤亡事故" value="人员伤亡事故"></el-option>
- <el-option label="火灾爆炸事故" value="火灾爆炸事故"></el-option>
- <el-option label="危险品泄露事故" value="危险品泄露事故"></el-option>
- <el-option label="设备事故" value="设备事故"></el-option>
- <el-option label="工艺事故" value="工艺事故"></el-option>
+ <el-option label="人员伤亡事故" value="1"></el-option>
+ <el-option label="火灾爆炸事故" value="2"></el-option>
+ <el-option label="危险品泄露事故" value="3"></el-option>
+ <el-option label="设备事故" value="4"></el-option>
+ <el-option label="工艺事故" value="5"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="事故等级" prop="accidentGrade">
<el-select v-model="ruleForm.accidentGrade" :disabled="disabled" class="w100" placeholder="请选择">
- <el-option label="特别重大" value="人员伤亡事故"></el-option>
- <el-option label="重大" value="重大"></el-option>
- <el-option label="较大" value="较大"></el-option>
- <el-option label="一般" value="一般"></el-option>
+ <el-option label="一级" value="1"></el-option>
+ <el-option label="二级" value="2"></el-option>
+ <el-option label="三级" value="3"></el-option>
+ <el-option label="四级" value="4"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -98,10 +97,10 @@
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="事故级别" prop="accidentLevel">
<el-select v-model="ruleForm.accidentLevel" :disabled="disabled" class="w100" placeholder="请选择">
- <el-option label="特大事故" value="特大事故"></el-option>
- <el-option label="重大事故" value="重大事故"></el-option>
- <el-option label="较大事故" value="较大事故"></el-option>
- <el-option label="一般事故" value="一般事故"></el-option>
+ <el-option label="特大事故" value="1"></el-option>
+ <el-option label="重大事故" value="2"></el-option>
+ <el-option label="较大事故" value="3"></el-option>
+ <el-option label="一般事故" value="4"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -134,20 +133,29 @@
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="整改措施" prop="rectificationMeasures">
- <el-input v-model="ruleForm.rectificationMeasures" :disabled="disabled"
- type="textarea" placeholder="请填写整改措施" maxlength="150"></el-input>
+ <el-input
+ v-model="ruleForm.rectificationMeasures"
+ :disabled="disabled"
+ type="textarea"
+ placeholder="请填写整改措施"
+ maxlength="150"
+ ></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="accidentHandling">
- <el-input v-model="ruleForm.accidentHandling" :disabled="disabled"
- type="textarea" placeholder="请填写事故处理" maxlength="150"></el-input>
+ <el-input
+ v-model="ruleForm.accidentHandling"
+ :disabled="disabled"
+ type="textarea"
+ placeholder="请填写事故处理"
+ maxlength="150"
+ ></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="fillInUserName">
- <el-input v-model="ruleForm.fillInUserName" :disabled="true"
- placeholder="请选择" class="input-with-select">
+ <el-input v-model="ruleForm.fillInUserName" :disabled="true" placeholder="请选择" class="input-with-select">
<template #append>
<el-button :icon="Search" @click="openUser" />
</template>
@@ -166,15 +174,20 @@
/>
</el-form-item>
</el-col>
- <!-- <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">-->
- <!-- <el-form-item label="事故照片">-->
- <!-- <el-input v-model="ruleForm.describe" type="textarea" placeholder="请填写应急防范措施" maxlength="150"></el-input>-->
- <!-- </el-form-item>-->
- <!-- </el-col>-->
+ <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
+ <el-form-item label="事故照片">
+ <uploaderImg :fileList="ruleForm.expressFileList" :disabled="true"></uploaderImg>
+ </el-form-item>
+ </el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="相关人员笔录" prop="relevantPersonnelRecords">
- <el-input v-model="ruleForm.relevantPersonnelRecords" :disabled="disabled"
- type="textarea" placeholder="请填写相关人员笔录" maxlength="150"></el-input>
+ <el-input
+ v-model="ruleForm.relevantPersonnelRecords"
+ :disabled="disabled"
+ type="textarea"
+ placeholder="请填写相关人员笔录"
+ maxlength="150"
+ ></el-input>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -186,14 +199,24 @@
</el-form-item>
</el-col>
<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
- <el-form-item label="事故分析会议纪要" prop="fileList">
- <uploaderImg :fileList="fileList" :disabled="disabled"></uploaderImg>
+ <el-form-item label="事故分析会议纪要">
+ <uploaderFile
+ :fileList="fileList"
+ :systemName="'INCIDENT_MANAGE'"
+ :disabled="disabled"
+ @successUploader="successUploader"
+ ></uploaderFile>
</el-form-item>
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="其他材料" prop="otherMaterials">
- <el-input v-model="ruleForm.otherMaterials" :disabled="disabled"
- type="textarea" placeholder="请填写其他材料" maxlength="150"></el-input>
+ <el-input
+ v-model="ruleForm.otherMaterials"
+ :disabled="disabled"
+ type="textarea"
+ placeholder="请填写其他材料"
+ maxlength="150"
+ ></el-input>
</el-form-item>
</el-col>
</el-row>
@@ -206,13 +229,13 @@
</template>
</el-dialog>
<AccidentName @selectItem="onSelectItem" ref="Shows" />
- <DailogSearchUserManger @SearchUser="onUser" ref="userRef" />
+ <DailogSearchUserManger @SearchUser="onUser" ref="userRef" />
<RegionsDialog ref="openRef" />
</div>
</template>
<script lang="ts">
-import { reactive, ref, defineComponent,onMounted } from 'vue';
+import { reactive, ref, defineComponent, onMounted } from 'vue';
import type { UploadUserFile, FormInstance, FormRules } from 'element-plus';
import { ElMessage } from 'element-plus';
@@ -221,6 +244,7 @@
import AccidentName from '/@/views/accidentManagementSystem/workInjuryDeclaration/component/accidentName.vue';
import RegionsDialog from '/@/components/regionsDialog/index.vue';
import uploaderImg from '/@/components/uploaderImg/index.vue';
+import uploaderFile from '/@/components/uploaderFile/index.vue';
import { emergencySuppliesApi } from '/@/api/contingencyManagement/emergencyResources';
import { accidentManagementSystemApi } from '/@/api/workInjuryDeclaration';
import { goalManagementApi } from '/@/api/goalManagement';
@@ -231,7 +255,8 @@
AccidentName,
DailogSearchUserManger,
RegionsDialog,
- uploaderImg
+ uploaderImg,
+ uploaderFile,
},
setup(props, { emit }) {
const isShowDialog = ref(false);
@@ -239,14 +264,7 @@
const ruleFormRef = ref<FormInstance>();
//定义表单
const ruleForm = ref({
- accidentExpressId:'',
- accidentExpressName:'',
- accidentDepartmentId:'',
- accidentDepartmentName:'',
- occurrencePlace:'',
- occurrenceTime:'',
-
-
+ accidentExpressId: '',
accidentType: '',
accidentGrade: '',
@@ -263,30 +281,32 @@
rectificationMeasures: '',
accidentHandling: '',
fillInUserUid: '',
- fillInUserName:'',
+ fillInUserName: '',
fillInTime: '',
relevantPersonnelRecords: '',
otherMaterials: '',
fileList: [],
- status:''
+ status: '',
});
const titles = ref();
const disabled = ref();
- const statusDisabled = ref(true)
+ const statusDisabled = ref(true);
+ // 上传附件
+ const fileList = ref([]);
// 打开弹窗
- const openDialog = (title: string, id: number, type: boolean,statusDisabledFlag:string) => {
+ const openDialog = (title: string, id: number, type: boolean, statusDisabledFlag: string) => {
isShowDialog.value = true;
titles.value = title;
disabled.value = type;
- if(statusDisabledFlag.value=='first'){
- ruleForm.value.status = 1
- }else if(statusDisabledFlag.value=='second'){
- ruleForm.value.status = 2
+ if (statusDisabledFlag.value == 'first') {
+ ruleForm.value.status = 1;
+ } else if (statusDisabledFlag.value == 'second') {
+ ruleForm.value.status = 2;
}
if (title == '修改事故报告') {
- statusDisabled.value = false
- }else {
- statusDisabled.value = true
+ statusDisabled.value = false;
+ } else {
+ statusDisabled.value = true;
}
if (title == '查看事故报告' || title == '修改事故报告') {
accidentManagementSystemApi()
@@ -294,44 +314,67 @@
.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;
+ fileList.value = res.data.data.fileList ? res.data.data.fileList : [];
+ initFileListData();
}
});
}
};
- // 关闭弹窗
- const closeDialog = (formEl: FormInstance | undefined) => {
- formEl.resetFields();
- console.log(ruleForm)
- isShowDialog.value = false;
+ const initFileListData = async () => {
+ //事故照片
+ if (ruleForm.value.expressFileList) {
+ for (var a = 0; a < ruleForm.value.expressFileList.length; a++) {
+ await goalManagementApi()
+ .searchFile(ruleForm.value.expressFileList[a].fileName)
+ .then((res) => {
+ ruleForm.value.expressFileList[a].url = res.data;
+ console.log('ruleForm', ruleForm);
+ });
+ }
+ } else {
+ ruleForm.value.expressFileList = [];
+ }
+
+ // 事故分析会议纪要
+ for (var a = 0; a < fileList.value.length; a++) {
+ fileList.value[a].name = fileList.value[a].fileName;
+ }
+ };
+ // 上传成功组装数据
+ const successUploader = (list) => {
+ fileList.value = list;
+ const formFileList = [];
+ for (var a = 0; a < fileList.value.length; a++) {
+ formFileList.push({
+ fileName: fileList.value[a].fileName,
+ fileUrl: '',
+ });
+ }
+ ruleForm.value.fileList = formFileList;
};
// 取消
const onCancel = (formEl: FormInstance | undefined) => {
- closeDialog(formEl);
+ resetForm(formEl);
};
//日期选择器
const value1 = ref('');
- // 上传附件
- const fileList = ref<UploadUserFile[]>([]);
+
// 可选择树
const treeSelect = ref();
//定义树形下拉框
const responsibleDepartment = ref();
- const data = [
- ];
+ const data = [];
// 必填项提示
const rules = reactive<FormRules>({
- accidentDepartmentId: [
+ accidentExpressId: [
{
required: true,
- message: '事故部门不能为空',
+ message: '快报不能为空',
trigger: 'change',
- },
- ],
- occurrenceTime: [
- {
- required: true,
- message: '发生时间不能为空',
- trigger: 'blur',
},
],
accidentType: [
@@ -420,18 +463,28 @@
},
],
});
+ 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
+ ruleForm.value.accidentExpressId = item[0].id;
+ 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 (!ruleForm.value.fileList) {
+ ruleForm.value.fileList = [];
+ }
if (title == '新建事故报告') {
if (!formEl) return;
await formEl.validate((valid, fields) => {
@@ -466,7 +519,6 @@
await formEl.validate((valid, fields) => {
if (valid) {
//TODO 上传组件待定
- ruleForm.value.fileList = []
isShowDialog.value = false;
accidentManagementSystemApi()
.editAccidentReport(ruleForm.value)
@@ -494,14 +546,7 @@
});
formEl.resetFields();
ruleForm.value = {
- accidentExpressId:'',
- accidentExpressName:'',
- accidentDepartmentId:'',
- accidentDepartmentName:'',
- occurrencePlace:'',
- occurrenceTime:'',
-
-
+ accidentExpressId: '',
accidentType: '',
accidentGrade: '',
@@ -518,19 +563,27 @@
rectificationMeasures: '',
accidentHandling: '',
fillInUserUid: '',
- fillInUserName:'',
+ fillInUserName: '',
fillInTime: '',
relevantPersonnelRecords: '',
otherMaterials: '',
fileList: [],
- status:''
+ status: '',
};
}
};
+
const resetForm = (formEl: FormInstance | undefined) => {
isShowDialog.value = false;
if (!formEl) return;
formEl.resetFields();
+ // ruleForm.value.accidentExpressId = item[0].id
+ ruleForm.value = {};
+ fileList.value = [];
+ accidentName.value = '';
+ accidentDepartmentId.value = '';
+ occurrencePlace.value = '';
+ occurrenceTime.value = '';
};
const handleChange = (val: number) => {
console.log(val);
@@ -563,15 +616,15 @@
//得到部门树
const department = async () => {
await goalManagementApi()
- .getTreedepartment()
- .then((res) => {
- if (res.data.code == 200) {
- data.value = res.data.data;
- getTreeList(res.data.data, newTreeList);
- } else {
- ElMessage.error(res.data.msg);
- }
- });
+ .getTreedepartment()
+ .then((res) => {
+ if (res.data.code == 200) {
+ data.value = res.data.data;
+ getTreeList(res.data.data, newTreeList);
+ } else {
+ ElMessage.error(res.data.msg);
+ }
+ });
};
// 递归树状数据且修改字段名
const getTreeList = (treeList, newTreeList) => {
@@ -602,7 +655,6 @@
};
return {
openDialog,
- closeDialog,
isShowDialog,
onCancel,
fileList,
@@ -635,7 +687,13 @@
department,
getTreeList,
propse,
- statusDisabled
+ statusDisabled,
+ accidentDepartmentId,
+ occurrencePlace,
+ occurrenceTime,
+ accidentName,
+ successUploader,
+ initFileListData,
};
},
});
--
Gitblit v1.9.2