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/ground.vue | 131 +++++++++++++++++++++++++------------------ 1 files changed, 76 insertions(+), 55 deletions(-) diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue index bb9c260..d0fec06 100644 --- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue +++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue @@ -42,15 +42,15 @@ </el-col> <el-col :span="12"> <el-form-item label="作业人" prop="operatorUids"> - <el-select v-model="form.operatorUids" 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="lists.spList.opList" :props="cas2Props" @change="singleSelect($event,'作业人')" filterable :show-all-levels="false"/>--> +<!-- <el-select v-model="form.operatorUids" multiple filterable 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> @@ -128,6 +128,20 @@ <div class="el-upload__tip">上传jpg/png图片尺寸小于2M,最多可上传3张</div> </template> </el-upload> + </el-form-item> + </el-col> + </el-row> + <el-row> + <el-col :span="12"> + <el-form-item label="作业内容签字人" prop="workDetail.signUid"> + <el-select v-model="form.workDetail.signUid" filterable clearable> + <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> @@ -299,19 +313,19 @@ </el-form-item> </el-col> </el-row> - <el-row> - <el-col :span="12"> - <el-form-item label="签字人" prop="workDetail.signUid"> - <el-select v-model="form.workDetail.signUid" filterable clearable> - <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-col :span="12">--> +<!-- <el-form-item label="作业内容签字人" prop="workDetail.signUid">--> +<!-- <el-select v-model="form.workDetail.signUid" filterable clearable>--> +<!-- <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-col :span="12">--> <!-- <el-form-item label="最终审批人" prop="lastApprover">--> <!-- <el-select v-model="form.lastApprover" filterable clearable>--> @@ -325,7 +339,7 @@ <!-- <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> +<!-- </el-row>--> </div> </el-form> <div class="applyBtn"> @@ -456,35 +470,11 @@ } }, cas2Props: { - expandTrigger: 'hover', value: 'uid', label: 'realName', multiple: true, - checkStrictly: false, - lazy: true, - async lazyLoad(node, resolve){ - const { value, level } = node - let nodes = [] - if(level == 0){ - nodes = props.lists.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) - } + checkStrictly: true, + children: 'certList' }, cas3Props: { expandTrigger: 'hover', @@ -583,13 +573,44 @@ workSelectRef.value.openDialog(state.form.involveOtherWork) } - const getWorkerList = (val)=>{ - const filteredList = props.lists.spList.opList.filter(i => state.form.workDepIds.includes(i.depId)); + 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 = ()=>{ @@ -657,9 +678,9 @@ return arr.map((i)=>{ return { uid: i[0], - certificate: i[1].split(',')[0], - certExpiredAt: i[1].split(',')[1], - certTypeName: i[1].split(',')[2] + certificate: i[1]?i[1].split(',')[0]:'', + certExpiredAt: i[1]?i[1].split(',')[1]:'', + certTypeName: '' } }) } @@ -722,7 +743,7 @@ state.form.workDetail.gbPath = state.form.workDetail.gbPath.join(',') state.form.riskIdentification = state.form.riskIdentification.join(',') const {depIdList,...data} = state.form - data.operatorUids = transform2Arr(data.operatorUids) + data.operatorUids = transformArr(data.operatorUids) data.headUids = transform2Arr(data.headUids) data.guardianUids = transform2Arr(data.guardianUids) data.safetyMeasureUids = transform2Arr(data.safetyMeasureUids) -- Gitblit v1.9.2