From 27d6c869e1fac29b6e267f1ccfb1373658bbdffa Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: Thu, 19 May 2022 17:42:28 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/ztqt
---
src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 66 insertions(+), 5 deletions(-)
diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
index 0538c5d..a1749f7 100644
--- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
+++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue
@@ -2,7 +2,29 @@
<div class="app-container">
<div class="filter-container">
<div class="basic_search">
- <span>单位名称：</span>
+ <span>责任部门：</span>
+ <el-select v-model="listQuery.filter.hazardDep" clearable filterable style="width:200px">
+ <el-option
+ v-for="item in departmentList"
+ :key="item.id"
+ :label="item.department"
+ :value="item.department"
+ ></el-option>
+ </el-select>
+ </div>
+ <div class="basic_search">
+ <span>责任人：</span>
+ <el-select v-model="listQuery.filter.hazardLiablePerson" clearable filterable style="width:200px">
+ <el-option
+ v-for="item in userList"
+ :key="item.id"
+ :label="item.realname"
+ :value="item.realname"
+ ></el-option>
+ </el-select>
+ </div>
+ <div class="basic_search">
+ <span>单元名称：</span>
<el-input v-model="listQuery.filter.riskUnitName" style="width:200px">
</el-input>
</div>
@@ -60,17 +82,24 @@
<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" class="analyseUnit_input">
+ <el-select v-model="analyseUnitForm.hazardDep" value-key="item" class="analyseUnit_input" @change="departmentChange" @clear="departmentClear">
<el-option
v-for="item in departmentList"
:key="item.id"
- :value="item.department"
+ :value="item"
:label="item.department"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="责任人" prop="hazardLiablePerson">
- <el-input v-model="analyseUnitForm.hazardLiablePerson" class="analyseUnit_input"></el-input>
+ <el-select v-model="analyseUnitForm.hazardLiablePerson" value-key="item" class="analyseUnit_input"@change="personChange" @clear="personClear" >
+ <el-option
+ v-for="item in userList"
+ :key="item.id"
+ :label="item.realname"
+ :value="item"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="安全风险分析对象编码" prop="hazardCode">
<el-input v-model="analyseUnitForm.hazardCode" class="analyseUnit_input"></el-input>
@@ -92,6 +121,7 @@
import { computePageCount } from '@/utils'
import { addAnalyseUnit, deleteAnalyseUnit, getAnalyseUnitList, updateAnalyseUnit } from '@/api/riskLevelManage'
import {getAllDepartment, getDepartmentList} from "../../../../api/departmentManage";
+ import {safetyInspectionItemName} from "../../../../api/safetySelfInspection";
export default {
name: 'index',
filters: {
@@ -113,6 +143,7 @@
tableKey: 0,
analyseUnitData: [],
departmentList:[],
+ userList:[],
listLoading: false,
pageSize: 10,
recordTotal: 0,
@@ -146,7 +177,9 @@
pageIndex:1,
pageSize:10,
filter:{
- riskUnitName:'',
+ hazardLiablePerson:'',
+ hazardDep:'',
+ riskUnitName:''
}
},
}
@@ -154,6 +187,7 @@
created() {
this.getAnalyseUnitData()
this.getDepartment()
+ this.getUser()
},
methods: {
async getAnalyseUnitData(){
@@ -177,6 +211,17 @@
let res = await getDepartmentList({pageSize:1000,pageIndex:1})
if(res.data.code === '200'){
this.departmentList = res.data.result.result
+ }else{
+ this.$message({
+ message:res.data.message,
+ type:'warning'
+ })
+ }
+ },
+ async getUser(){
+ let res = await safetyInspectionItemName()
+ if(res.data.code === '200'){
+ this.userList = res.data.result
}else{
this.$message({
message:res.data.message,
@@ -276,6 +321,22 @@
})
})
},
+ personChange(val){
+ this.analyseUnitForm.hazardLiablePerson = val.realname
+ this.analyseUnitForm.hazardLiablePersonId = val.id
+ },
+ departmentChange(val){
+ this.analyseUnitForm.hazardDep = val.department
+ this.analyseUnitForm.hazardDepId = val.id
+ },
+ personClear(){
+ this.analyseUnitForm.hazardLiablePerson = null
+ this.analyseUnitForm.hazardLiablePersonId = null
+ },
+ departmentClear(){
+ this.analyseUnitForm.hazardDep = null
+ this.analyseUnitForm.hazardDepId = null
+ },
refreshHandle(){
this.getAnalyseUnitData()
},
--
Gitblit v1.9.2