From 8db1be8ebb65735d0f9880cf81703df98fc81ec6 Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期四, 19 五月 2022 16:12:22 +0800 Subject: [PATCH] 风险缝隙单元:v1 --- src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue | 189 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 133 insertions(+), 56 deletions(-) diff --git a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue index 81a0abf..a1749f7 100644 --- a/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue +++ b/src/views/doublePreventAction/riskLevelManage/analyseUnit/index.vue @@ -2,12 +2,34 @@ <div class="app-container"> <div class="filter-container"> <div class="basic_search"> - <span>单位名称:</span> - <el-input v-model="listQuery.filter.riskUintName" style="width:200px"> + <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> <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="showUnitForm('','新增')">新增</el-button> + <el-button class="filter-item" style="margin-left: 10px;margin-top: 10px" type="primary" icon="el-icon-plus" @click="showAnalyseUnitForm('','新增')">新增</el-button> </div> <div class="table_content"> <el-table @@ -19,15 +41,13 @@ highlight-current-row style="width: 100%;" > - <el-table-column label="安全风险分析单元ID" prop="hazardLiablePersonId" align="center"> - </el-table-column> <el-table-column label="安全风险分析对象编码" prop="hazardCode" align="center"> </el-table-column> <el-table-column label="责任部门" prop="hazardDep" align="center"> </el-table-column> <el-table-column label="责任人" prop="hazardLiablePerson" align="center"> </el-table-column> - <el-table-column label="安全风险分析单元名称" prop="riskUintName" align="center"> + <el-table-column label="安全风险分析单元名称" prop="riskUnitName" align="center"> </el-table-column> <el-table-column label="创建人" prop="createBy" align="center"> </el-table-column> @@ -39,7 +59,7 @@ </el-table-column> <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width"> <template slot-scope="scope"> - <el-button type="text" @click="showUnitForm(scope.row,'编辑')">编辑</el-button> + <el-button type="text" @click="showAnalyseUnitForm(scope.row,'编辑')">编辑</el-button> <el-button type="text" style="color: red" @click="deleteById(scope.row)">删除</el-button> </template> </el-table-column> @@ -60,30 +80,37 @@ <br> </div> <el-dialog :title="title" :visible.sync="analyseUnitVisible" :modal-append-to-body="false" :close-on-click-modal="false" width="600px"> - <el-form ref="dataForm" :rules="analyseUnitFormRules" :model="analyseUnitForm" label-position="right" label-width="160px"> - <el-form-item label="责任部门"> - <el-select v-model="analyseUnitForm.hazardDep" class="analyseUnit_input"> + <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-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="责任人"> - <el-input v-model="analyseUnitForm.hazardLiablePerson" class="analyseUnit_input"></el-input> + <el-form-item label="责任人" prop="hazardLiablePerson"> + <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="安全风险分析对象编码"> + <el-form-item label="安全风险分析对象编码" prop="hazardCode"> <el-input v-model="analyseUnitForm.hazardCode" class="analyseUnit_input"></el-input> </el-form-item> - <el-form-item label="安全分线分析单元名称"> - <el-input v-model="analyseUnitForm.riskUintName" class="analyseUnit_input"></el-input> + <el-form-item label="安全风险分析单元名称" prop="riskUnitName"> + <el-input v-model="analyseUnitForm.riskUnitName" class="analyseUnit_input"></el-input> </el-form-item> </el-form> <div align="right"> <el-button @click="unitFormVisible = false">取消</el-button> - <el-button type="primary" @click="submitUnit()">确认</el-button> + <el-button type="primary" @click="submitAnalyseUnit()">确认</el-button> </div> </el-dialog> </div> @@ -94,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: { @@ -115,6 +143,7 @@ tableKey: 0, analyseUnitData: [], departmentList:[], + userList:[], listLoading: false, pageSize: 10, recordTotal: 0, @@ -124,13 +153,18 @@ company:'', code:'', analyseUnitVisible:false, - analyseUnitFormRules:{}, + analyseUnitFormRules:{ + hazardDep: [{ required: true, message: '责任部门不能为空', trigger: 'change' }], + hazardLiablePerson: [{ required: true, message: '责任人不能为空', trigger: 'blur' }], + hazardCode: [{ required: true, message: '安全风险分析对象编码不能为空', trigger: 'blur' }], + riskUnitName: [{ required: true, message: '安全风险分析单元名称不能为空', trigger: 'blur' }], + }, analyseUnitForm:{ id: null, hazardCode: "", hazardDep: "", hazardLiablePerson: "", - riskUintName: "", + riskUnitName: "", createTime: "", updateTime: "", createBy: "", @@ -143,7 +177,9 @@ pageIndex:1, pageSize:10, filter:{ - riskUnitName:'', + hazardLiablePerson:'', + hazardDep:'', + riskUnitName:'' } }, } @@ -151,6 +187,7 @@ created() { this.getAnalyseUnitData() this.getDepartment() + this.getUser() }, methods: { async getAnalyseUnitData(){ @@ -181,8 +218,22 @@ }) } }, - showUnitForm(value,type){ + 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(() =>{ + this.$refs["analyseUnitForm"].clearValidate() + }) if(type === '新增'){ this.title = '新增' this.analyseUnitForm = { @@ -190,7 +241,7 @@ hazardCode: "", hazardDep: "", hazardLiablePerson: "", - riskUintName: "", + riskUnitName: "", createTime: "", updateTime: "", createBy: "", @@ -204,44 +255,54 @@ this.analyseUnitForm = value } }, - submitUnit(){ - if(this.title === '新增'){ - addAnalyseUnit(this.analyseUnitForm).then((res)=>{ - if(res.data.code === '200'){ - this.analyseUnitVisible = false - this.getAnalyseUnitData() - this.$notify({ - type:'success', - duration:2000, - message:'新增成功', - title:'成功' + submitAnalyseUnit(){ + this.$refs["analyseUnitForm"].validate((valid) =>{ + if(valid){ + if(this.title === '新增'){ + addAnalyseUnit(this.analyseUnitForm).then((res)=>{ + if(res.data.code === '200'){ + this.analyseUnitVisible = false + this.getAnalyseUnitData() + this.$notify({ + type:'success', + duration:2000, + message:'新增成功', + title:'成功' + }) + }else{ + this.$message({ + type:'warning', + message:res.data.message + }) + } }) }else{ - this.$message({ - type:'warning', - message:res.data.message + updateAnalyseUnit(this.analyseUnitForm).then((res)=>{ + if(res.data.code === '200'){ + this.analyseUnitVisible = false + this.getAnalyseUnitData() + this.$notify({ + type:'success', + duration:2000, + title:'成功', + message:'编辑成功' + }) + }else{ + this.$message({ + type:'warning', + message:res.data.message + }) + } }) } - }) - }else{ - updateAnalyseUnit(this.analyseUnitForm).then((res)=>{ - if(res.data.code === '200'){ - this.analyseUnitVisible = false - this.getAnalyseUnitData() - this.$notify({ - type:'success', - duration:2000, - title:'成功', - message:'编辑成功' - }) - }else{ - this.$message({ - type:'warning', - message:res.data.message - }) - } - }) - } + }else{ + this.$message({ + type:'warning', + message:'请完善基本信息' + }) + } + }) + }, deleteById(val){ this.$confirm('删除此条信息,是否继续','提示',{ @@ -260,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