From 4f23d16c5f9788e44b83280bf6d3c2e1d2280a07 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期二, 19 七月 2022 16:06:25 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt
---
src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue | 150 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 121 insertions(+), 29 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
index 57b9f9b..e446d95 100644
--- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
@@ -31,6 +31,8 @@
<el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-refresh" @click="refreshHandle">搜索</el-button>
<el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showAnalyseUnitForm('','新增')">新增</el-button>
<el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="showDepartmentChart()">图表</el-button>
+ <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="showImportDialog()">导入</el-button>
+ <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" @click="exportToExcel()">导出</el-button>
</div>
<div class="table_content">
<el-table
@@ -82,23 +84,23 @@
</div>
<el-dialog :title="title" :visible.sync="analyseUnitVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px">
<el-form ref="analyseUnitForm" :rules="analyseUnitFormRules" :model="analyseUnitForm" label-position="right" label-width="165px">
- <el-form-item label="责任部门" prop="hazardDep">
- <el-select v-model="analyseUnitForm.hazardDep" value-key="item" class="analyseUnit_input" @change="departmentChange" @clear="departmentClear">
+ <el-form-item label="责任部门" prop="hazardDepId">
+ <el-select v-model="analyseUnitForm.hazardDepId" class="analyseUnit_input" @change="departmentChange" clearable filterable>
<el-option
v-for="item in departmentList"
:key="item.id"
- :value="item"
+ :value="item.id"
:label="item.department"
></el-option>
</el-select>
</el-form-item>
- <el-form-item label="责任人" prop="hazardLiablePerson">
- <el-select v-model="analyseUnitForm.hazardLiablePerson" value-key="item" class="analyseUnit_input"@change="personChange" @clear="personClear" >
+ <el-form-item label="责任人" prop="hazardLiablePersonId">
+ <el-select v-model="analyseUnitForm.hazardLiablePersonId" class="analyseUnit_input" clearable filterable>
<el-option
- v-for="item in userList"
+ v-for="item in departmentUserList"
:key="item.id"
:label="item.realname"
- :value="item"
+ :value="item.id"
></el-option>
</el-select>
</el-form-item>
@@ -114,6 +116,32 @@
<el-button type="primary" @click="submitAnalyseUnit()">确认</el-button>
</div>
</el-dialog>
+ <el-dialog
+ :visible.sync="importDialogFormVisible"
+ :modal-append-to-body="false"
+ :close-on-click-modal="false"
+ title="用户导入"
+ width="700px"
+ >
+ <el-form
+ ref="importForm"
+ label-position="right"
+ label-width="120px"
+ style="margin-left:50px;width:500px;"
+ element-loading-text="导入中..."
+ >
+ <el-form-item label="导入文件:">
+ <input ref="importLabInput" type="file" accept=".xls, .xlsx" >
+ </el-form-item>
+ <el-form-item label="excel参考模板:">
+ <el-button type="text" @click="viewHandle">下载模板</el-button>
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="importDialogFormVisible = false">取消</el-button>
+ <el-button type="primary" @click="importToTable()">导入</el-button>
+ </div>
+ </el-dialog>
<department-chart ref="chart"></department-chart>
</div>
@@ -126,7 +154,9 @@
import { addAnalyseUnit, deleteAnalyseUnit, getAnalyseUnitList, updateAnalyseUnit } from '@/api/riskLevelManage'
import {getAllDepartment, getDepartmentList} from "../../../../api/departmentManage";
import {safetyInspectionItemName} from "../../../../api/safetySelfInspection";
- import {getDepartmentChart} from "../../../../api/riskLevelManage";
+ import {exportAnalyseUnit, getDepartmentChart, importAnalyseUnit} from "../../../../api/riskLevelManage";
+ import {parseError} from "../../../../utils/messageDialog";
+ const exampleFile = require('@/assets/example/riskAnaUnit.xlsx')
export default {
name: 'index',
filters: {
@@ -152,6 +182,7 @@
analyseUnitData: [],
departmentList:[],
userList:[],
+ departmentUserList:[],
listLoading: false,
pageSize: 10,
recordTotal: 0,
@@ -160,18 +191,17 @@
title:'',
company:'',
code:'',
+ importDialogFormVisible:false,
analyseUnitVisible:false,
analyseUnitFormRules:{
- hazardDep: [{ required: true, message: '责任部门不能为空', trigger: 'change' }],
- hazardLiablePerson: [{ required: true, message: '责任人不能为空', trigger: 'blur' }],
+ hazardDepId: [{ required: true, message: '责任部门不能为空', trigger: 'change' }],
+ hazardLiablePersonId: [{ required: true, message: '责任人不能为空', trigger: 'blur' }],
hazardCode: [{ required: true, message: '安全风险分析对象编码不能为空', trigger: 'blur' }],
riskUnitName: [{ required: true, message: '安全风险分析单元名称不能为空', trigger: 'blur' }],
},
analyseUnitForm:{
id: null,
hazardCode: "",
- hazardDep: "",
- hazardLiablePerson: "",
riskUnitName: "",
createTime: "",
updateTime: "",
@@ -179,7 +209,7 @@
updateBy: "",
validFlag: null,
hazardLiablePersonId: null,
- hazardDepId: 1
+ hazardDepId: null
},
listQuery:{
pageIndex:1,
@@ -250,8 +280,6 @@
this.analyseUnitForm = {
id: null,
hazardCode: "",
- hazardDep: "",
- hazardLiablePerson: "",
riskUnitName: "",
createTime: "",
updateTime: "",
@@ -259,11 +287,13 @@
updateBy: "",
validFlag: null,
hazardLiablePersonId: null,
- hazardDepId: 1
+ hazardDepId: null
}
}else{
this.title = '修改'
- this.analyseUnitForm = value
+ this.analyseUnitForm.hazardDepId = value.hazardDepId
+ this.departmentChange()
+ this.analyseUnitForm = JSON.parse(JSON.stringify(value))
}
},
submitAnalyseUnit(){
@@ -332,21 +362,83 @@
})
})
},
- personChange(val){
- this.analyseUnitForm.hazardLiablePerson = val.realname
- this.analyseUnitForm.hazardLiablePersonId = val.id
+
+ viewHandle() {
+ window.open(exampleFile, '_blank')
},
- departmentChange(val){
- this.analyseUnitForm.hazardDep = val.department
- this.analyseUnitForm.hazardDepId = val.id
+
+ showImportDialog(){
+ this.importDialogFormVisible = true
},
- personClear(){
- this.analyseUnitForm.hazardLiablePerson = null
+
+ importToTable(){
+ const formData = new FormData()
+ const files = this.$refs['importLabInput'].files
+ if (files && files.length > 0) {
+ formData.append('file', files[0])
+ }
+ importAnalyseUnit(formData).then((response) => {
+ const res = response.data
+ if (res.code == 200) {
+ this.importDialogFormVisible = false
+ this.$message({
+ message: '导入成功',
+ type: 'success'
+ })
+ this.getAnalyseUnitData()
+ } else {
+ parseError({ error: res.message, vm: this })
+ }
+ }).catch((error) => {
+ parseError({ error: error, vm: this })
+ })
+ },
+
+ exportToExcel() {
+ exportAnalyseUnit(this.listQuery.filter).then(res=>{
+ if (res.data.code === '200') {
+ if(res.data.result === null ||res.data.result === [] || res.data.result.length === 0){
+ this.$message({
+ type:'warning',
+ message:'无数据可导出'
+ })
+ }
+ else{
+ let allData = res.data.result
+ import('@/vendor/Export2Excel').then((excel) => {
+ const tHeader = [
+ '安全风险分析对象编码',
+ '安全风险分析单元名称',
+ '责任部门',
+ '责任人',
+ ]
+ const filterVal = [
+ 'hazardCode',
+ 'riskUnitName',
+ 'hazardDep',
+ 'hazardLiablePerson',
+ ]
+ const data = this.formatJson(filterVal, allData)
+ excel.export_json_to_excel({
+ header: tHeader,
+ data,
+ filename: '安全风险分析单元数据'
+ })
+ })
+
+ }
+ }
+ })
+ },
+
+ formatJson(filterVal, jsonData) {
+ return jsonData.map(v => filterVal.map(j => v[j]))
+ },
+
+ departmentChange(){
this.analyseUnitForm.hazardLiablePersonId = null
- },
- departmentClear(){
- this.analyseUnitForm.hazardDep = null
- this.analyseUnitForm.hazardDepId = null
+ this.departmentUserList = this.userList.filter( item => item.department === this.analyseUnitForm.hazardDepId)
+ console.log(this.departmentUserList)
},
refreshHandle(){
this.getAnalyseUnitData()
--
Gitblit v1.9.2