From eafc031e3e6e48778d22b5455358273714944012 Mon Sep 17 00:00:00 2001 From: Your Name <123456> Date: 星期一, 05 九月 2022 09:53:16 +0800 Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqt --- src/views/specialWorkSystem/workTicket/workApply/components/height.vue | 61 ++++++++++++++++++------------ 1 files changed, 36 insertions(+), 25 deletions(-) diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/height.vue b/src/views/specialWorkSystem/workTicket/workApply/components/height.vue index d0dc61f..dc73325 100644 --- a/src/views/specialWorkSystem/workTicket/workApply/components/height.vue +++ b/src/views/specialWorkSystem/workTicket/workApply/components/height.vue @@ -16,20 +16,6 @@ </el-select> </el-form-item> </el-col> - </el-row> - <el-row> - <el-col :span="12"> - <el-form-item label="作业等级" prop="workLevel"> - <el-select v-model="form.workLevel"> - <el-option - v-for="item in workLevelList" - :key="item.value" - :label="item.label" - :value="item.value" - /> - </el-select> - </el-form-item> - </el-col> <el-col :span="12"> <el-form-item label="作业时间" prop="workTimeLine"> <el-date-picker @@ -46,6 +32,18 @@ </el-row> <el-row> <el-col :span="12"> + <el-form-item label="作业等级" prop="workLevel"> + <el-select v-model="form.workLevel"> + <el-option + v-for="item in workLevelList" + :key="item.value" + :label="item.label" + :value="item.value" + /> + </el-select> + </el-form-item> + </el-col> + <el-col :span="12"> <el-form-item label="作业内容" prop="workContent"> <el-input v-model="form.workContent" @@ -55,6 +53,8 @@ /> </el-form-item> </el-col> + </el-row> + <el-row> <el-col :span="12"> <el-form-item label="作业地址" prop="workLocation"> <el-input @@ -66,17 +66,19 @@ </el-form-item> </el-col> </el-row> + <el-divider border-style="dashed"/> <el-row> <el-col :span="12"> <el-form-item label="作业单位" prop="workDetail.operationDepId"> - <el-select v-model="form.workDetail.operationDepId"> - <el-option - v-for="item in heDepList" - :key="item.value" - :label="item.label" - :value="item.value" - /> - </el-select> + <!-- <el-select v-model="form.workDetail.operationDepId">--> + <!-- <el-option--> + <!-- v-for="item in heDepList"--> + <!-- :key="item.value"--> + <!-- :label="item.label"--> + <!-- :value="item.value"--> + <!-- />--> + <!-- </el-select>--> + <el-cascader v-model="form.workDetail.operationDepId" :options="departList" :props="casProps" :show-all-levels="false" @change="handleChange" /> </el-form-item> </el-col> <el-col :span="12"> @@ -131,12 +133,13 @@ workTypeList: Array<any>, workLevelList: Array<any>, heDepList: Array<any>, - otherWorkList: Array<any> + otherWorkList: Array<any>, + casProps:{} } export default defineComponent({ name: 'heightForm', components: {}, - props:['workerList'], + props:['workerList','departList'], setup() { const userInfo = useUserInfo() const { userInfos } = storeToRefs(userInfo); @@ -182,6 +185,14 @@ value: 6 } ], + casProps: { + emitPath: false, + value: 'depId', + label: 'depName', + multiple: false, + expandTrigger: 'hover', + checkStrictly: true + }, workTypeList: [ { label: "类型一", @@ -339,7 +350,7 @@ .el-select{ width: 100%; } - .el-cascader{ + :deep(.el-cascader){ width: 100% !important; } } -- Gitblit v1.9.2