From 63747f027dae973326970afeef696a382b45affd Mon Sep 17 00:00:00 2001 From: lyfO_o <764716047@qq.com> Date: 星期三, 11 五月 2022 13:43:01 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master --- src/views/contractor/userManage/components/workLicense/index.vue | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/views/contractor/userManage/components/workLicense/index.vue b/src/views/contractor/userManage/components/workLicense/index.vue index 2a8acb9..3da573b 100644 --- a/src/views/contractor/userManage/components/workLicense/index.vue +++ b/src/views/contractor/userManage/components/workLicense/index.vue @@ -61,17 +61,29 @@ <el-input v-model.trim="licenseForm.idcard" :disabled="true"/> </el-form-item> <el-form-item label="特种作业工种:" prop="branch"> - <el-select v-model.trim="licenseForm.branch"/> + <el-select v-model.trim="licenseForm.branch"> <el-option - v-for="item in branchList" - :key="item.id" - :label="item.name" - :value="item.name" + v-for="item in branchList" + :key="item.id" + :label="item.name" + :value="item.name" > </el-option> + </el-select> </el-form-item> <el-form-item label="特种作业证件号:" prop="certname"> <el-input v-model.trim="licenseForm.certname"/> + </el-form-item> + <el-form-item label="受否人员安全健康证:" prop="ishealth"> + <el-select v-model.trim="licenseForm.ishealth"> + <el-option + v-for="item in isHealthList" + :key="item.id" + :value="item.id" + :label="item.name" + > + </el-option> + </el-select> </el-form-item> <el-form-item label="有效期开始时间:" prop="starttime"> <el-date-picker @@ -102,9 +114,8 @@ </template> <script> -import { addWorkLicense, deleteWorkLicense, getWorkLicenseList, updateWorkLicense } from '../../../../../api/user' -import { parseError } from '../../../../../utils/messageDialog' -import { deleteUnit } from '../../../../../api/unitManage' +import { addWorkLicense, deleteWorkLicense, getWorkLicenseList, updateWorkLicense } from '@/api/user' +import { parseError } from '@/utils/messageDialog' export default { name: 'index', @@ -116,6 +127,7 @@ mobile:'', listLoading:false, workLicenseData:[], + isHealthList:[{id:1,name:'是'},{id:0,name:'否'},], branchList:[{id:1,name:'电工作业'},{id:2,name:'焊接与热切割作业'},{id:3,name:'高处作业'},{id:4,name:'制冷与空调作业'},{id:5,name:'煤矿安全作业'},{id:6,name:'压力容器作业'},{id:7,name:'采掘(剥)作业'},{id:8,name:'矿山提升运输作业'},{id:9,name:'矿山安全检查作业'},{id:10,name:'矿山通风作业'},{id:11,name:'矿山排水作业'},], workLicenseDialog:false, LicenseFormDialog:false, @@ -128,6 +140,7 @@ starttime:'', endtime:'', branch:'', + ishealth:0, }, licenseRules:{ @@ -161,6 +174,7 @@ this.licenseForm.starttime = '' this.licenseForm.endtime = '' this.licenseForm.branch = '' + this.licenseForm.ishealth = 0 this.title = '新增' }else{ this.title = '编辑' -- Gitblit v1.9.2