From baf475f44f0a940bbdc2dde36fff9cdf97da58bc Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期四, 17 八月 2023 16:43:28 +0800 Subject: [PATCH] 证书修改 --- src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue | 317 ++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 253 insertions(+), 64 deletions(-) diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue index 008a6a7..ec18d58 100644 --- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue +++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/fire.vue @@ -55,15 +55,16 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="作业人及证件编号" prop="operatorUids"> - <el-select v-model="form.operatorUids" filterable multiple clearable> - <el-option - v-for="item in spList.opList" - :key="item.uid" - :label="item.realName" - :value="item.uid" - /> - </el-select> + <el-form-item label="作业人" prop="operatorUids"> +<!-- <el-select v-model="form.operatorUids" filterable multiple clearable>--> +<!-- <el-option--> +<!-- v-for="item in spList.opList"--> +<!-- :key="item.uid"--> +<!-- :label="item.realName"--> +<!-- :value="item.uid"--> +<!-- />--> +<!-- </el-select>--> + <el-cascader style="width: 100%" v-model="form.operatorUids" :options="spList.opList" :props="cas2Props" @change="singleSelect($event,'作业人')" filterable :show-all-levels="false"/> </el-form-item> </el-col> </el-row> @@ -75,28 +76,30 @@ </el-col> <el-col :span="12"> <el-form-item label="作业负责人" prop="headUids"> - <el-select v-model="form.headUids" multiple filterable @change="getStartEndIds" clearable> - <el-option - v-for="item in workerList" - :key="item.uid" - :label="item.username" - :value="item.uid" - /> - </el-select> +<!-- <el-select v-model="form.headUids" multiple filterable @change="getStartEndIds" clearable>--> +<!-- <el-option--> +<!-- v-for="item in workerList"--> +<!-- :key="item.uid"--> +<!-- :label="item.username"--> +<!-- :value="item.uid"--> +<!-- />--> +<!-- </el-select>--> + <el-cascader style="width: 100%" v-model="form.headUids" :options="workerList" :props="casProps" @change="getStartEndIds" filterable :show-all-levels="false"/> </el-form-item> </el-col> </el-row> <el-row> <el-col :span="12"> <el-form-item label="分析人" prop="analystUids"> - <el-select v-model="form.analystUids" filterable multiple clearable> - <el-option - v-for="item in workerList" - :key="item.uid" - :label="item.username" - :value="item.uid" - /> - </el-select> +<!-- <el-select v-model="form.analystUids" filterable multiple clearable>--> +<!-- <el-option--> +<!-- v-for="item in workerList"--> +<!-- :key="item.uid"--> +<!-- :label="item.username"--> +<!-- :value="item.uid"--> +<!-- />--> +<!-- </el-select>--> + <el-cascader style="width: 100%" v-model="form.analystUids" :options="workerList" :props="casProps" filterable @change="singleSelect($event,'分析人')" :show-all-levels="false"/> </el-form-item> </el-col> <el-col :span="12" class="valueSelect"> @@ -111,14 +114,15 @@ <el-row> <el-col :span="12"> <el-form-item label="监护人" prop="guardianUids"> - <el-select v-model="form.guardianUids" filterable multiple @change="getSafetyIds" clearable> - <el-option - v-for="item in spList.jhList" - :key="item.uid" - :label="item.realName" - :value="item.uid" - /> - </el-select> +<!-- <el-select v-model="form.guardianUids" filterable multiple @change="getSafetyIds" clearable>--> +<!-- <el-option--> +<!-- v-for="item in spList.jhList"--> +<!-- :key="item.uid"--> +<!-- :label="item.realName"--> +<!-- :value="item.uid"--> +<!-- />--> +<!-- </el-select>--> + <el-cascader style="width: 100%" v-model="form.guardianUids" :options="spList.jhList" :props="cas3Props" filterable @change="singleSelect($event,'监护人')" :show-all-levels="false"/> </el-form-item> </el-col> <el-col :span="12"> @@ -212,14 +216,15 @@ <el-row> <el-col :span="12"> <el-form-item label="安全措施确认人" prop="safetyMeasureUids"> - <el-select v-model="form.safetyMeasureUids" filterable multiple clearable> - <el-option - v-for="item in workerList" - :key="item.uid" - :label="item.username" - :value="item.uid" - /> - </el-select> +<!-- <el-select v-model="form.safetyMeasureUids" filterable multiple clearable>--> +<!-- <el-option--> +<!-- v-for="item in workerList"--> +<!-- :key="item.uid"--> +<!-- :label="item.username"--> +<!-- :value="item.uid"--> +<!-- />--> +<!-- </el-select>--> + <el-cascader style="width: 100%" v-model="form.safetyMeasureUids" :options="workerList" :props="casProps" filterable @change="singleSelect($event,'确认人')" :show-all-levels="false"/> </el-form-item> </el-col> </el-row> @@ -274,26 +279,28 @@ <el-row> <el-col :span="12"> <el-form-item label="完工验收" prop="acceptUid"> - <el-select v-model="form.acceptUid" filterable clearable> - <el-option - v-for="item in workerList" - :key="item.uid" - :label="item.username" - :value="item.uid" - /> - </el-select> +<!-- <el-select v-model="form.acceptUid" filterable clearable>--> +<!-- <el-option--> +<!-- v-for="item in workerList"--> +<!-- :key="item.uid"--> +<!-- :label="item.username"--> +<!-- :value="item.uid"--> +<!-- />--> +<!-- </el-select>--> + <el-cascader style="width: 100%" v-model="form.acceptUid" :options="workerList" :props="cas4Props" filterable :show-all-levels="false"/> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="现场开始结束确认人" prop="startOrEndUids"> - <el-select v-model="form.startOrEndUids" filterable multiple clearable> - <el-option - v-for="item in workerList" - :key="item.uid" - :label="item.username" - :value="item.uid" - /> - </el-select> +<!-- <el-select v-model="form.startOrEndUids" filterable multiple clearable>--> +<!-- <el-option--> +<!-- v-for="item in workerList"--> +<!-- :key="item.uid"--> +<!-- :label="item.username"--> +<!-- :value="item.uid"--> +<!-- />--> +<!-- </el-select>--> + <el-cascader style="width: 100%" v-model="form.startOrEndUids" :options="workerList" :props="casProps" filterable @change="singleSelect($event,'结束人')" :show-all-levels="false"/> </el-form-item> </el-col> </el-row> @@ -317,12 +324,17 @@ import type { FormInstance, FormRules } from 'element-plus' import { workApplyApi } from '/@/api/specialWorkSystem/workApply'; import workSelect from "/@/views/newSpecialWorkSystem/workTicket/zysq/components/workSelect.vue"; + import {userApi} from "/@/api/systemManage/user"; interface stateType { form: Object, workLevelList: Array<any>, equipmentDialog: boolean, - props:{}, - depProps:{}, + props:{} + depProps:{} + casProps:{} + cas2Props: {} + cas3Props: {} + cas4Props: {} safetyMeasureBasicList: [] } export default defineComponent({ @@ -374,6 +386,122 @@ value: 3 } ], + casProps: { + value: 'uid', + label: 'username', + multiple: true, + lazy: true, + async lazyLoad(node, resolve){ + const { value, level } = node + let nodes = [] + if(value == 0){ + nodes = props.workerList + }else{ + let res = await userApi().getCtf({uid: value}) + if(res.data.code == 200){ + nodes = res.data.data + }else{ + ElMessage({ + type: 'warning', + message: res.data.msg + }) + } + } + nodes=nodes.map(item => ({ + uid: item.certNo +','+ item.certExpiredAt+','+item.certTypeName, + username: node.label + '(' +item.certTypeName +' ' + item.certExpiredAt + ')', + leaf: level >= 1 + })) + resolve(nodes) + } + }, + cas2Props: { + value: 'uid', + label: 'realName', + multiple: true, + checkStrictly: false, + lazy: true, + async lazyLoad(node, resolve){ + const { value, level } = node + let nodes = [] + if(value == 0){ + nodes = props.spList.opList + }else{ + let res = await userApi().getCtf({uid: value}) + if(res.data.code == 200){ + nodes = res.data.data + }else{ + ElMessage({ + type: 'warning', + message: res.data.msg + }) + } + } + nodes=nodes.map(item => ({ + uid: item.certNo +','+ item.certExpiredAt+','+item.certTypeName, + realName: node.label + '(' +item.certTypeName +' ' + item.certExpiredAt + ')', + leaf: level >= 1 + })) + resolve(nodes) + } + }, + cas3Props: { + value: 'uid', + label: 'realName', + multiple: true, + lazy: true, + async lazyLoad(node, resolve){ + const { value, level } = node + let nodes = [] + if(value == 0){ + nodes = props.spList.jhList + }else{ + let res = await userApi().getCtf({uid: value}) + if(res.data.code == 200){ + nodes = res.data.data + }else{ + ElMessage({ + type: 'warning', + message: res.data.msg + }) + } + } + nodes=nodes.map(item => ({ + uid: item.certNo +','+ item.certExpiredAt+','+item.certTypeName, + realName: node.label + '(' +item.certTypeName +' ' + item.certExpiredAt + ')', + leaf: level >= 1 + })) + resolve(nodes) + } + }, + cas4Props: { + value: 'uid', + label: 'username', + lazy: true, + async lazyLoad(node, resolve){ + const { value, level } = node + let nodes = [] + if(value == 0){ + nodes = props.workerList + }else{ + let res = await userApi().getCtf({uid: value}) + if(res.data.code == 200){ + nodes = res.data.data + }else{ + ElMessage({ + type: 'warning', + message: res.data.msg + }) + } + } + nodes=nodes.map(item => ({ + uid: item.certNo +','+ item.certExpiredAt+','+item.certTypeName, + username: node.label + '(' +item.certTypeName +' ' + item.certExpiredAt + ')', + leaf: level >= 1 + })) + resolve(nodes) + } + }, props:{ expandTrigger: 'hover', label: 'depName', @@ -413,7 +541,7 @@ // 页面载入时执行方法 onMounted(() => { getBasicData() - }); + }) const openWorkSelect = ()=>{ workSelectRef.value.openDialog(state.form.involveOtherWork) @@ -451,9 +579,22 @@ } }; - const getStartEndIds = ()=>{ + const getStartEndIds = (value)=>{ + let selected = value + if(selected.length>1){ + const temp = [] + for(let i of selected){ + const index = temp.findIndex(item => item[0] === i[0]); + if (index !== -1) { + temp[index] = i + }else{ + temp.push(i) + } + } + state.form.headUids = temp + } state.form.startOrEndUids = state.form.headUids - state.form.approvalDepBasicList[0].approvalUids = state.form.headUids + state.form.approvalDepBasicList[0].approvalUids = [...new Set(state.form.headUids.map((i)=>i[0]))] } const getSafetyIds = ()=>{ @@ -464,8 +605,47 @@ return index === 0; } + const transformArr = (arr: Array<any>)=>{ + return arr.map((i)=>{ + return { + uid: i[0], + certificate: i[1].split(',')[0], + certExpiredAt: i[1].split(',')[1], + certTypeName: i[1].split(',')[2] + } + }) + } + + const transform2Obj = (arr: Array<any>)=>{ + return { + uid: arr[0], + certificate: arr[1].split(',')[0], + certExpiredAt: arr[1].split(',')[1], + certTypeName: arr[1].split(',')[2] + } + } + + const singleSelect=(value,type)=>{ + let selected = value + if(selected.length>1){ + const temp = [] + for(let i of selected){ + const index = temp.findIndex(item => item[0] === i[0]); + if (index !== -1) { + temp[index] = i + }else{ + temp.push(i) + } + } + if(type == '作业人'){state.form.operatorUids = temp} + if(type == '分析人'){state.form.analystUids = temp} + if(type == '监护人'){state.form.guardianUids = temp} + if(type == '确认人'){state.form.safetyMeasureUids = temp} + if(type == '结束人'){state.form.startOrEndUids = temp} + } + } + const submitForm = async (formEl: FormInstance | undefined) => { - console.log(state.form.involveOtherWork,555) if (!formEl) return await formEl.validate(async (valid, fields) => { if (valid) { @@ -481,7 +661,15 @@ // if(Array.isArray(state.form.involveOtherWork)){ // state.form.involveOtherWork = state.form.involveOtherWork.join(',') // } - const res = await workApplyApi().submitFireApply(state.form) + const data = state.form + data.operatorUids = transformArr(data.operatorUids) + data.headUids = transformArr(data.headUids) + data.analystUids = transformArr(data.analystUids) + data.guardianUids = transformArr(data.guardianUids) + data.safetyMeasureUids = transformArr(data.safetyMeasureUids) + data.startOrEndUids = transformArr(data.startOrEndUids) + data.acceptUid = transform2Obj(data.acceptUid) + const res = await workApplyApi().submitFireApply(data) if (res.data.code === '200') { ElMessage({ type: 'success', @@ -544,6 +732,7 @@ openWorkSelect, getSelected, workSelectRef, + singleSelect, Search, ruleFormRef, applyRules, -- Gitblit v1.9.2