From fb93e73a51fe588534a04a28d1aab35ae24eb374 Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期四, 19 五月 2022 16:57:07 +0800 Subject: [PATCH] 风险分析单元:v2 --- src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue | 65 +++++++++++++++++++++++++++----- 1 files changed, 54 insertions(+), 11 deletions(-) diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue index 4c6825c..49c059c 100644 --- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue +++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue @@ -3,13 +3,25 @@ <div class="filter-container"> <div class="basic_search"> <span>责任部门:</span> - <el-input v-model="listQuery.filter.riskUnitName" style="width:200px"> - </el-input> + <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-input v-model="listQuery.filter.hazardLiablePerson" style="width:200px"> - </el-input> + <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> @@ -69,18 +81,25 @@ </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" class="analyseUnit_input"> + <el-form-item label="责任部门" prop="hazardDepId"> + <el-select v-model="analyseUnitForm.hazardDepId" class="analyseUnit_input" > <el-option v-for="item in departmentList" :key="item.id" - :value="item.department" + :value="item.id" :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> @@ -102,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: { @@ -123,6 +143,7 @@ tableKey: 0, analyseUnitData: [], departmentList:[], + userList:[], listLoading: false, pageSize: 10, recordTotal: 0, @@ -133,7 +154,7 @@ code:'', analyseUnitVisible:false, analyseUnitFormRules:{ - hazardDep: [{ required: true, message: '责任部门不能为空', trigger: 'change' }], + hazardDepId: [{ required: true, message: '责任部门不能为空', trigger: 'change' }], hazardLiablePerson: [{ required: true, message: '责任人不能为空', trigger: 'blur' }], hazardCode: [{ required: true, message: '安全风险分析对象编码不能为空', trigger: 'blur' }], riskUnitName: [{ required: true, message: '安全风险分析单元名称不能为空', trigger: 'blur' }], @@ -150,7 +171,7 @@ updateBy: "", validFlag: null, hazardLiablePersonId: null, - hazardDepId: 1 + hazardDepId: null }, listQuery:{ pageIndex:1, @@ -166,6 +187,7 @@ created() { this.getAnalyseUnitData() this.getDepartment() + this.getUser() }, methods: { async getAnalyseUnitData(){ @@ -196,6 +218,17 @@ }) } }, + async getUser(){ + let res = await safetyInspectionItemName() + if(res.data.code === '200'){ + this.userList = res.data.result + }else{ + this.$message({ + message:res.data.message, + type:'warning' + }) + } + }, showAnalyseUnitForm(value,type){ this.analyseUnitVisible = true this.$nextTick(() =>{ @@ -215,7 +248,7 @@ updateBy: "", validFlag: null, hazardLiablePersonId: null, - hazardDepId: 1 + hazardDepId: null } }else{ this.title = '修改' @@ -288,6 +321,16 @@ }) }) }, + personChange(val){ + this.analyseUnitForm.hazardLiablePerson = val.realname + this.analyseUnitForm.hazardLiablePersonId = val.id + }, + + personClear(){ + this.analyseUnitForm.hazardLiablePerson = null + this.analyseUnitForm.hazardLiablePersonId = null + }, + refreshHandle(){ this.getAnalyseUnitData() }, -- Gitblit v1.9.2