From 908ce43ff21c2068ef5148b0a417423c8ed9eae5 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 12 三月 2025 16:37:32 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- admin/src/components/business/OperaHiddenDangerParamWindow.vue | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/admin/src/components/business/OperaHiddenDangerParamWindow.vue b/admin/src/components/business/OperaHiddenDangerParamWindow.vue index 4e351b2..f373969 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-form-item label="璐d换閮ㄩ棬" prop="companyId" v-if="form.type == 0"> <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"> @@ -70,7 +70,6 @@ this.form.memberIdList = null this.form.type = type this.getfindCompanyTreePage() - this.loadMember() // 鏂板缓缁勭粐 if (target == null) { this.$nextTick(() => { @@ -85,6 +84,9 @@ for (const key in this.form) { this.form[key] = target[key] this.form.type = type + if(type == 0){ + this.loadMember(1) + } if (this.form.type == 0 && target.memberIds != null && target.memberIds != '') { const t = target.memberIds.split(',') this.form.memberIdList = [] @@ -93,6 +95,7 @@ }) } } + this.loadMember() }) }, getfindCompanyTreePage() { @@ -106,7 +109,7 @@ loadMember(flag) { if(flag && flag == 1){ this.$set(this.form, 'memberIdList', null) - } + } allList({ type: 2, companyType: 1, -- Gitblit v1.9.3