From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 06 六月 2025 13:47:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1 --- admin/src/views/workorder/components/OperaYwWorkorderWindow.vue | 32 +++++++------------------------- 1 files changed, 7 insertions(+), 25 deletions(-) diff --git a/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue b/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue index f3c7e3a..02f6cad 100644 --- a/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue +++ b/admin/src/views/workorder/components/OperaYwWorkorderWindow.vue @@ -8,7 +8,6 @@ <el-option label="鍏叡缁翠慨" :value="1"></el-option> </el-select> </el-form-item> - <el-form-item label="鎶ヤ慨鍖哄煙" prop="rooms"> <el-cascader v-model="form.rooms" @@ -23,28 +22,6 @@ children: 'projectDataVOList' }" /> </el-form-item> - -<!-- <el-form-item label="閫夋嫨椤圭洰" prop="projectId">--> -<!-- <el-select v-model="form.projectId" clearable filterable @change="getBuild">--> -<!-- <el-option v-for="item in projectList" :label="item.name" :value="item.id" />--> -<!-- </el-select>--> -<!-- </el-form-item>--> -<!-- <el-form-item label="閫夋嫨妤煎畤" prop="buildingId">--> -<!-- <el-select v-model="form.buildingId" clearable filterable @change="changeBuild">--> -<!-- <el-option v-for="item in buildList" :label="item.name" :value="item.id" />--> -<!-- </el-select>--> -<!-- </el-form-item>--> - -<!-- <el-form-item v-if="form.areaType == 1" label="閫夋嫨妤煎眰" prop="floorId">--> -<!-- <el-select v-model="form.floorId">--> -<!-- <el-option v-for="item in levelList" clearable filterable :label="item.name" :value="item.id" />--> -<!-- </el-select>--> -<!-- </el-form-item>--> -<!-- <el-form-item v-if="form.areaType == 0" label="閫夋嫨鎴块棿" prop="roomId">--> -<!-- <el-select v-model="form.roomId" clearable filterable>--> -<!-- <el-option v-for="item in roomList" :label="item.roomNum" :value="item.id" />--> -<!-- </el-select>--> -<!-- </el-form-item>--> <el-form-item label="宸ュ崟鍒嗙被" prop="cateId"> <el-cascader v-model="form.areaIds" @change="changeSel" placeholder="璇烽�夋嫨鍒嗙被" clearable :options="cateList" :props="{ @@ -156,12 +133,13 @@ methods: { open(title, target) { this.title = title + this.fileList = [] this.visible = true - this.getProject() this.getCate() this.getHouseTree() // 鏂板缓 if (target == null) { + this.getProject() this.form = { id: null, editDate: '', @@ -199,8 +177,12 @@ }) return } + getProjectList({}).then(res => { + this.projectList = res || [] + }) // 缂栬緫 this.$nextTick(() => { + // this.$refs.form.resetFields() for (const key in this.form) { this.form[key] = target[key] } @@ -210,7 +192,7 @@ this.form.rooms = [] this.form.projectId = '' this.form.buildingId = '' - this.form.levelList = '' + this.form.floorId = '' this.form.roomId = '' }, getHouseVal(e) { -- Gitblit v1.9.3