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/broken.vue | 42 +++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 17 deletions(-) diff --git a/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue b/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue index 08eda8b..0187f0a 100644 --- a/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue +++ b/src/views/specialWorkSystem/workTicket/workApply/components/broken.vue @@ -16,8 +16,6 @@ </el-select> </el-form-item> </el-col> - </el-row> - <el-row> <el-col :span="12"> <el-form-item label="作业时间" prop="workTimeLine"> <el-date-picker @@ -54,19 +52,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 csDepList" - :key="item.value" - :label="item.label" - :value="item.value" - /> - </el-select> +<!-- <el-select v-model="form.workDetail.operationDepId">--> +<!-- <el-option--> +<!-- v-for="item in csDepList"--> +<!-- :key="item.value"--> +<!-- :label="item.label"--> +<!-- :value="item.value"--> +<!-- />--> +<!-- </el-select>--> + <el-cascader v-model="form.workDetail.operationDepId" :options="departList" :props="casProps2" :show-all-levels="false" @change="handleChange2" /> </el-form-item> </el-col> <el-col :span="12"> @@ -103,7 +101,7 @@ <el-upload accept="image/*" :on-exceed="showTip" :on-preview="handlePictureCardPreview" :limit='imgLimit' v-model:file-list="fileList" :http-request="upload" :action="uploadUrl" list-type="picture-card" :on-remove="handleRemove" :before-remove="beforeRemove" :before-upload="getUploadUrl"> <el-icon><Plus /></el-icon> <template #tip> - <div class="el-upload__tip">上传jpg/png图片尺寸小于500KB,最多可上传5张</div> + <div class="el-upload__tip">上传jpg/png图片尺寸小于500KB,最多可上传3张</div> </template> </el-upload> </el-form-item> @@ -141,7 +139,8 @@ dialogVisible: Boolean, dialogImageUrl: string | null, imgLimit: number, - casProps: {} + casProps: {}, + casProps2: {} } interface file { url: string; @@ -172,7 +171,7 @@ expEndTime: '' }, fileList: [], - imgLimit: 5, + imgLimit: 3, uploadUrl: '', dialogVisible: false, dialogImageUrl: null, @@ -207,6 +206,14 @@ value: 'depId', label: 'depName', multiple: true + }, + casProps2: { + emitPath: false, + value: 'depId', + label: 'depName', + multiple: false, + expandTrigger: 'hover', + checkStrictly: true } }); const ruleFormRef = ref<FormInstance>() @@ -219,7 +226,8 @@ "workDetail.operationDepId": [{ required: true, message: '该内容不能为空', trigger: 'blur' }], "workDetail.bcReason": [{ required: true, message: '该内容不能为空', trigger: 'blur' }], "workDetail.bcExplain": [{ required: true, message: '该内容不能为空', trigger: 'blur' }], - "workDetail.bcPath": [{ required: true, message: '该内容不能为空', trigger: 'blur' }] + "workDetail.bcPath": [{ required: true, message: '该内容不能为空', trigger: 'blur' }], + "workDetail.involvedDepIds": [{ required: true, message: '该内容不能为空', trigger: 'blur' }] }); const submitForm = async (formEl: FormInstance | undefined) => { if (!formEl) return @@ -399,7 +407,7 @@ .el-select{ width: 100%; } - .el-cascader{ + :deep(.el-cascader){ width: 100% !important; } } -- Gitblit v1.9.2