From 20b0ce2db27b64a60de60aee05dedd448099e330 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期一, 08 七月 2024 10:12:16 +0800 Subject: [PATCH] xiugai --- src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue | 60 +++++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 23 deletions(-) diff --git a/src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue b/src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue index 8ae195e..0f5a025 100644 --- a/src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue +++ b/src/views/newSpecialWorkSystem/workTicket/zysq/components/ground.vue @@ -21,26 +21,6 @@ </el-form-item> </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 lists.spList.opList" - :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-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="lists.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-option @@ -50,7 +30,27 @@ :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-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" 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-form-item> </el-col> </el-row> @@ -354,6 +354,7 @@ interface stateType { form: Object, equipmentDialog: boolean, + zyList: [] props1:{}, depProps:{}, casProps:{} @@ -382,6 +383,7 @@ tabLoading: false, equipmentDialog: false, safetyMeasureBasicList: [], + zyList: [], form: { workType: 4, workLevel: 0, @@ -393,7 +395,7 @@ operatorUids: [], headUids: [], guardianUids: [], - workDepId: null, + workDepIds: [], workContent: '', workLocation: '', riskIdentification: [], @@ -419,6 +421,7 @@ expandTrigger: 'hover', label: 'depName', value: 'depId', + multiple: true, checkStrictly: true, emitPath: false }, @@ -555,7 +558,7 @@ 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' }], guardianUids: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], riskIdentification: [{ required: true, message: '该内容不能为空', trigger: 'blur' }], @@ -573,10 +576,20 @@ const workSelectRef = ref() // 页面载入时执行方法 onMounted(() => { + state.zyList = props.lists.spList.opList getBasicData() }); const openWorkSelect = ()=>{ workSelectRef.value.openDialog(state.form.involveOtherWork) + } + + const getWorkerList = (val)=>{ + const filteredList = props.lists.spList.opList.filter(i => state.form.workDepIds.includes(i.depId)); + if(filteredList && filteredList.length>0){ + state.zyList = filteredList + }else{ + state.zyList = props.lists.spList.opList + } } const getSelected = ()=>{ @@ -877,6 +890,7 @@ return { renderMenu, getBasicData, + getWorkerList, getStartEndIds, getSafetyIds, isFirstRow, -- Gitblit v1.9.2