From 77737f4e73f7267170b9b06fc73d1610c29c0661 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期二, 12 十一月 2024 13:18:35 +0800 Subject: [PATCH] 新增 --- src/views/newSpecialWorkSystem/workTicket/zysq/components/hoist.vue | 401 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 339 insertions(+), 62 deletions(-) diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/hoist.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/hoist.vue index fb355d4..b39b6b4 100644 --- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/hoist.vue +++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/hoist.vue @@ -4,8 +4,8 @@ <div class="homeCard"> <el-row> <el-col :span="12"> - <el-form-item label="作业申请单位" prop="applyDepId"> - <el-cascader style="width: 100%" v-model="form.applyDepId" :options="departList2" :props="props" :show-all-levels="false" placeholder="明确到具体车间" @change="findParent" clearable/> + <el-form-item label="作业申请单位" prop="depIdList"> + <el-cascader style="width: 100%" v-model="form.depIdList" :options="lists.departList2" :props="props1" :show-all-levels="false" placeholder="明确到具体车间" @change="findParent" clearable/> </el-form-item> </el-col> <el-col :span="12"> @@ -51,6 +51,18 @@ /> </el-form-item> </el-col> + <el-col :span="12"> + <el-form-item label="吊装指挥" prop="workDetail.commanderUid"> + <el-select v-model="form.workDetail.commanderUid" filterable clearable @change="getCommand"> + <el-option + v-for="item in lists.workerList" + :key="item.uid" + :label="item.username" + :value="item.uid" + /> + </el-select> + </el-form-item> + </el-col> </el-row> <el-row> <el-col :span="12"> @@ -64,34 +76,36 @@ </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> - </el-col> - </el-row> - <el-row> - <el-col :span="12"> - <el-form-item label="作业单位" prop="workDepId"> - <el-cascader style="width: 100%" v-model="form.workDepId" :props="depProps" :options="departList" :show-all-levels="false"/> - </el-form-item> - </el-col> - <el-col :span="12"> <el-form-item label="作业负责人" prop="headUids"> - <el-select v-model="form.headUids" multiple filterable @change="getStartEndIds" clearable> + <el-select v-model="form.headUids" multiple :multiple-limit="1" filterable @change="getStartEndIds" clearable> <el-option - v-for="item in workerList" + v-for="item in lists.workerList" :key="item.uid" :label="item.username" :value="item.uid" /> </el-select> + <!-- <el-cascader style="width: 100%" v-model="form.headUids" :options="lists.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="workDepIds"> + <el-cascader style="width: 100%" v-model="form.workDepIds" :props="depProps" @change="getWorkerList" :options="lists.departList" :show-all-levels="false"/> + </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 zyList"--> +<!-- :key="item.uid"--> +<!-- :label="item.realName"--> +<!-- :value="item.uid"--> +<!-- />--> +<!-- </el-select>--> + <el-cascader style="width: 100%" v-model="form.operatorUids" :options="zyList?zyList:lists.spList.opList" :props="cas2Props" @change="singleSelect($event,'作业人')" filterable :show-all-levels="false"/> </el-form-item> </el-col> </el-row> @@ -100,7 +114,7 @@ <el-form-item label="司索人" prop="workDetail.solicitorUids"> <el-select v-model="form.workDetail.solicitorUids" filterable multiple clearable> <el-option - v-for="item in workerList" + v-for="item in lists.workerList" :key="item.uid" :label="item.username" :value="item.uid" @@ -119,7 +133,7 @@ <!-- />--> <!-- </el-select>--> <el-select v-model="form.involveOtherWork" multiple clearable :teleported="false" @click="openWorkSelect"> - <el-option v-for="item in otherWorks" :key="item.workApplyId" :label="item.workContent" :value="item.workApplyId"> + <el-option v-for="item in lists.otherWorks" :key="item.workApplyId" :label="item.workContent" :value="item.workApplyId"> </el-option> </el-select> </el-form-item> @@ -128,21 +142,22 @@ <el-row> <el-col :span="12"> <el-form-item label="监护人" prop="guardianUids"> - <el-select v-model="form.guardianUids" filterable multiple @change="getSafetyIds" clearable> + <el-select v-model="form.guardianUids" filterable multiple clearable> <el-option - v-for="item in spList.jhList" + v-for="item in lists.spList.jhList" :key="item.uid" :label="item.realName" :value="item.uid" /> </el-select> +<!-- <el-cascader style="width: 100%" v-model="form.guardianUids" :options="lists.spList.jhList" :props="cas3Props" filterable @change="singleSelect($event,'监护人')" :show-all-levels="false"/>--> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="绑定执法仪" prop="cameraIds"> <el-select v-model="form.cameraIds" multiple clearable> <el-option - v-for="item in deviceList" + v-for="item in lists.deviceList" :key="item.id" :label="item.name" :value="item.id" @@ -191,12 +206,14 @@ <el-row> <el-col :span="12"> <el-form-item label="风险辨识" prop="riskIdentification"> - <el-input - v-model="form.riskIdentification" - :autosize="{ minRows: 1 }" - type="textarea" - placeholder="请输入风险辨识" - /> + <el-select v-model="form.riskIdentification" multiple clearable> + <el-option + v-for="item in lists.riskList" + :key="item.id" + :label="item.content" + :value="item.content" + /> + </el-select> </el-form-item> </el-col> <el-col :span="12"> @@ -211,7 +228,7 @@ </el-col> </el-row> <el-row style="display: flex;justify-content: center"> - <el-table :data="safetyMeasureBasicList" style="width: 90%" border> + <el-table :data="safetyMeasureBasicList" style="width: 90%" border v-loading="tabLoading"> <el-table-column type="index" label="序号" width="100px" align="center"/> <el-table-column prop="measureContent" label="安全措施"/> <!-- <el-table-column prop="address" label="确认人">--> @@ -231,12 +248,13 @@ <el-form-item label="安全措施确认人" prop="safetyMeasureUids"> <el-select v-model="form.safetyMeasureUids" filterable multiple clearable> <el-option - v-for="item in workerList" + v-for="item in lists.workerList" :key="item.uid" :label="item.username" :value="item.uid" /> </el-select> +<!-- <el-cascader style="width: 100%" v-model="form.safetyMeasureUids" :options="lists.workerList" :props="casProps" filterable @change="singleSelect($event,'确认人')" :show-all-levels="false"/>--> </el-form-item> </el-col> </el-row> @@ -261,11 +279,11 @@ <!-- </el-col>--> <!-- </el-row>--> <el-row style="display: flex;justify-content: center"> - <el-table :data="form.approvalDepBasicList" style="width: 90%" border> + <el-table :data="form.approvalDepBasicList" style="width: 90%" border v-loading="tabLoading"> <el-table-column prop="content" label="审批签字项目" align="center"/> <el-table-column prop="approvalType" label="是否必签" align="center"> <template #default="scope"> - <el-form-item label="" prop="acceptUid"> + <el-form-item label="" prop="acceptUid" label-width="0"> <el-radio-group v-model="scope.row.approvalType"> <el-radio :label="0">所有必签</el-radio> <el-radio :label="1">任一</el-radio> @@ -278,7 +296,7 @@ <template #default="scope"> <el-select v-model="scope.row.approvalUids" filterable multiple :disabled="isFirstRow(scope.$index)" clearable> <el-option - v-for="item in workerList" + v-for="item in lists.workerList" :key="item.uid" :label="item.username" :value="item.uid" @@ -290,34 +308,51 @@ </el-row> <el-row> <el-col :span="12"> - <el-form-item label="完工验收" prop="acceptUid"> - <el-select v-model="form.acceptUid" filterable clearable> + <el-form-item label="完工验收" prop="acceptUids"> + <el-select v-model="form.acceptUids" filterable multiple clearable> <el-option - v-for="item in workerList" + v-for="item in lists.workerList" :key="item.uid" :label="item.username" :value="item.uid" /> </el-select> +<!-- <el-cascader style="width: 100%" v-model="form.acceptUid" :options="lists.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" + v-for="item in lists.workerList" :key="item.uid" :label="item.username" :value="item.uid" /> </el-select> +<!-- <el-cascader style="width: 100%" v-model="form.startOrEndUids" :options="lists.workerList" :props="casProps" filterable @change="singleSelect($event,'结束人')" :show-all-levels="false"/>--> </el-form-item> </el-col> </el-row> +<!-- <el-row>--> +<!-- <el-col :span="12">--> +<!-- <el-form-item label="最终审批人" prop="lastApprover">--> +<!-- <el-select v-model="form.lastApprover" filterable clearable>--> +<!-- <el-option--> +<!-- v-for="item in lists.workerList"--> +<!-- :key="item.uid"--> +<!-- :label="item.username"--> +<!-- :value="item.uid"--> +<!-- />--> +<!-- </el-select>--> +<!-- <el-cascader style="width: 100%" v-model="form.lastApprover" :options="lists.workerList" :props="cas4Props" filterable :show-all-levels="false"/>--> +<!-- </el-form-item>--> +<!-- </el-col>--> +<!-- </el-row>--> </div> </el-form> <div class="applyBtn"> - <el-button type="primary" size="large" plain @click="submitForm(ruleFormRef)">提交申报</el-button> + <el-button type="primary" size="large" v-throttle plain @click="submitForm(ruleFormRef)">提交申报</el-button> </div> <work-select ref="workSelectRef" @refreshWorks="getSelected()"></work-select> </div> @@ -334,27 +369,37 @@ 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:{}, + zyList: [] + props1:{}, depProps:{}, + casProps:{} + cas2Props: {} + cas3Props: {} + cas4Props: {} safetyMeasureBasicList: [] + tabLoading: boolean } export default defineComponent({ name: 'hoistForm', components: {workSelect}, - props:['departList','departList2','workerList','deviceList','otherWorks','spList'], + props:['lists'], setup(props: any, context: any) { const userInfo = useUserInfo() const { userInfos } = storeToRefs(userInfo); const state = reactive<stateType>({ + tabLoading: false, equipmentDialog: false, safetyMeasureBasicList: [], + zyList: [], form: { workType: 3, workLevel: null, + depIdList: [], applyDepId: null, seDepId: null, expStartTime: '', @@ -363,18 +408,20 @@ headUids: [], analystUids: [], guardianUids: [], - workDepId: null, + workDepIds: [], workContent: '', workLocation: '', - riskIdentification: '', + riskIdentification: [], involveOtherWork: [], safetyMeasureUids: [], approvalDepBasicList: [], - acceptUid: null, + acceptUids: [], + lastApprover: null, startOrEndUids: [], cameraIds: [], workDetail: { hoistingToolName: '', + commanderUid: null, weightMass: '', solicitorUids: [] } @@ -393,28 +440,124 @@ value: 10 } ], - props:{ + props1:{ expandTrigger: 'hover', label: 'depName', - value: 'depId', - emitPath: false + value: 'depId' }, depProps:{ expandTrigger: 'hover', label: 'depName', value: 'depId', + multiple: true, checkStrictly: true, emitPath: false - } + }, + casProps: { + expandTrigger: 'hover', + value: 'uid', + label: 'username', + multiple: true, + lazy: true, + async lazyLoad(node, resolve){ + const { value, level } = node + let nodes = [] + if(level == 0){ + nodes = props.lists.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: true, + children: 'certList' + }, + cas3Props: { + expandTrigger: 'hover', + value: 'uid', + label: 'realName', + multiple: true, + lazy: true, + async lazyLoad(node, resolve){ + const { value, level } = node + let nodes = [] + if(level == 0){ + nodes = props.lists.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: { + expandTrigger: 'hover', + value: 'uid', + label: 'username', + lazy: true, + async lazyLoad(node, resolve){ + const { value, level } = node + let nodes = [] + if(level == 0){ + nodes = props.lists.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) + } + }, }); const ruleFormRef = ref<FormInstance>() const applyRules = reactive<FormRules>({ - applyDepId: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], + depIdList: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], workLevel: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], workContent: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], workLocation: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], operatorUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], - workDepId: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], + workDepIds: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], headUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], analystUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], guardianUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], @@ -423,7 +566,9 @@ expStartTime: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], expEndTime: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], safetyMeasureUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], - acceptUid: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], + acceptUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], + "workDetail.commanderUid": [{ required: true, message: '该内容不能为空', trigger: 'blur' }], + lastApprover: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], startOrEndUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], "workDetail.hoistingToolName": [{ required: true, message: '该内容不能为空', trigger: 'blur' }], "workDetail.weightMass": [{ required: true, message: '该内容不能为空', trigger: 'blur' }], @@ -432,22 +577,64 @@ const workSelectRef = ref() // 页面载入时执行方法 onMounted(() => { - + state.zyList = props.lists.spList.opList + getBasicData() }); const openWorkSelect = ()=>{ workSelectRef.value.openDialog(state.form.involveOtherWork) + } + + const getWorkerList = ()=>{ + let idList:Array<any> = [] + for(let i of state.form.workDepIds){ + idList = idList.concat(getListFromDep(getIdListsFormDepId(props.lists.departList,i))) + } + const depLists = [...new Set(idList)] + const filteredList = props.lists.spList.opList.filter(i => depLists.includes(i.depId)); + if(filteredList && filteredList.length>0){ + state.zyList = filteredList + }else{ + state.zyList = props.lists.spList.opList + } + } + + const getListFromDep = (dep) =>{ + let depIds = [] + depIds.push(dep.depId) + if (Array.isArray(dep.children)) { + for (let child of dep.children) { + depIds = depIds.concat(getListFromDep(child)); + } + } + return depIds; + } + + const getIdListsFormDepId=(DepList:Array<any>,id:number)=>{ + for(const i of DepList){ + if(i.depId === id){ + return i + } + if(Array.isArray(i.children)){ + const node:any = getIdListsFormDepId(i.children,id) + if(node){ + return node + } + } + } + return null } const getSelected = ()=>{ state.form.involveOtherWork = workSelectRef.value.selected } const findParent = ()=>{ - state.form.seDepId = findNearestDepLevel2DepId(props.departList2,state.form.applyDepId) - console.log(state.form.seDepId,'state.form.seDepId') + state.form.applyDepId = state.form.depIdList[state.form.depIdList.length - 1] + state.form.seDepId = state.form.depIdList[0] } // 获取基础数据 const getBasicData = async ()=>{ + state.tabLoading = true const res = await workApplyApi().getFormData(3) if (res.data.code === '200') { state.safetyMeasureBasicList = JSON.parse(JSON.stringify(res.data.data.safetyMeasureBasicList)) @@ -467,11 +654,31 @@ message: res.data.msg }); } + state.tabLoading = false }; - 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 = [...new Set(state.form.headUids.map((i)=>i[0]))] state.form.startOrEndUids = state.form.headUids - state.form.approvalDepBasicList[0].approvalUids = state.form.headUids + // state.form.approvalDepBasicList[0].approvalUids = state.form.headUids + } + + const getCommand =()=>{ + state.form.approvalDepBasicList[0].approvalUids = [state.form.workDetail.commanderUid] } const getSafetyIds = ()=>{ @@ -480,6 +687,56 @@ const isFirstRow = (index)=> { return index === 0; + } + + const transformArr = (arr: Array<any>)=>{ + return arr.map((i)=>{ + return { + uid: i[0], + certificate: i[1]?i[1].split(',')[0]:'', + certExpiredAt: i[1]?i[1].split(',')[1]:'', + certTypeName: '' + } + }) + } + + const transform2Arr = (arr: Array<any>)=>{ + return arr.map((i)=>{ + return { + uid: i, + certificate: '', + certExpiredAt: '', + certTypeName: '' + } + }) + } + + const transform2Obj = (id:any)=>{ + return { + uid: id, + certificate: '', + certExpiredAt: '', + certTypeName: '' + } + } + + 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.guardianUids = temp} + if(type == '确认人'){state.form.safetyMeasureUids = temp} + if(type == '结束人'){state.form.startOrEndUids = temp} + } } const submitForm = async (formEl: FormInstance | undefined) => { @@ -499,13 +756,25 @@ // state.form.involveOtherWork = state.form.involveOtherWork.join(',') // } state.form.workDetail.solicitorUids = state.form.workDetail.solicitorUids.join(',') - const res = await workApplyApi().submitHoistApply(state.form) + state.form.riskIdentification = state.form.riskIdentification.join(',') + const {depIdList,...data} = state.form + data.operatorUids = transformArr(data.operatorUids) + data.headUids = transform2Arr(data.headUids) + data.guardianUids = transform2Arr(data.guardianUids) + data.safetyMeasureUids = transform2Arr(data.safetyMeasureUids) + data.startOrEndUids = transform2Arr(data.startOrEndUids) + data.acceptUids = transform2Arr(data.acceptUids) + data.lastApprover = transform2Obj(data.lastApprover) + // data.commanderUid = transform2Obj(data.commanderUid) + const res = await workApplyApi().submitHoistApply(data) if (res.data.code === '200') { ElMessage({ type: 'success', message: '提交成功!' }); formEl.resetFields() + state.form.guardianUids = [] + state.form.involveOtherWork = [] getBasicData() } else { ElMessage({ @@ -514,9 +783,14 @@ }); // state.form.involveOtherWork = state.form.involveOtherWork.split(',') state.form.workDetail.solicitorUids = state.form.workDetail.solicitorUids.split(',') + state.form.riskIdentification = state.form.riskIdentification.split(',') } } else { console.log('error submit!', fields) + ElMessage({ + type: 'warning', + message: '有表单内容未完成,请再次检查完善' + }) } }) } @@ -560,13 +834,16 @@ return { renderMenu, getBasicData, + getWorkerList, getStartEndIds, + getCommand, getSafetyIds, isFirstRow, submitForm, findParent, openWorkSelect, getSelected, + singleSelect, workSelectRef, Search, ruleFormRef, -- Gitblit v1.9.2