From fd4b065fc5a3f73dbe6ceb8f2ed66612b10a3c00 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 11 十二月 2024 17:15:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- admin/src/components/business/OperaHiddenDangerParamWindow.vue | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/admin/src/components/business/OperaHiddenDangerParamWindow.vue b/admin/src/components/business/OperaHiddenDangerParamWindow.vue index ffe844c..4e351b2 100644 --- a/admin/src/components/business/OperaHiddenDangerParamWindow.vue +++ b/admin/src/components/business/OperaHiddenDangerParamWindow.vue @@ -4,11 +4,11 @@ <el-form-item label="鍚嶇О" prop="name"> <el-input v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�" v-trim /> </el-form-item> - <el-form-item label="璐d换閮ㄩ棬" prop="companyId"> - <el-select @change="loadMember" v-model="form.companyId"> + <!-- <el-form-item label="璐d换閮ㄩ棬" prop="companyId"> + <el-select filterable clearable @change="() => loadMember(1)" v-model="form.companyId"> <el-option v-for="op in department" :key="op.id" :label="op.name" :value="op.id"></el-option> </el-select> - </el-form-item> + </el-form-item> --> <el-form-item v-if="form.type == 0" label="閫夋嫨瀹夊叏鍛�" prop="memberIdList"> <el-select v-model="form.memberIdList" filterable multiple clearable placeholder="璇烽�夋嫨"> <el-option v-for="item in memberList" :key="item.id" :label="item.name" :value="item.id"> @@ -67,8 +67,10 @@ open(title, target, type) { this.title = title this.visible = true + this.form.memberIdList = null this.form.type = type this.getfindCompanyTreePage() + this.loadMember() // 鏂板缓缁勭粐 if (target == null) { this.$nextTick(() => { @@ -101,7 +103,10 @@ } }) }, - loadMember() { + loadMember(flag) { + if(flag && flag == 1){ + this.$set(this.form, 'memberIdList', null) + } allList({ type: 2, companyType: 1, -- Gitblit v1.9.3