From 61d03721e35e66214937df9fab548b09fa11170b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 07 五月 2025 14:00:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- admin/src/components/operation/HiddenDangerParam.vue | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/admin/src/components/operation/HiddenDangerParam.vue b/admin/src/components/operation/HiddenDangerParam.vue index 30386b0..bef7aff 100644 --- a/admin/src/components/operation/HiddenDangerParam.vue +++ b/admin/src/components/operation/HiddenDangerParam.vue @@ -4,6 +4,7 @@ width="600px" :visible.sync="isShowModal" :confirm-working="isWorking" + @close="close" @confirm="confirm" > <el-form :model="param" ref="paramRef" :rules="rules"> @@ -38,7 +39,7 @@ </el-select> </el-form-item> <el-form-item label="澶勭悊浜�" prop="checkUserId"> - <el-select v-model="param.checkUserId" placeholder="璇烽�夋嫨"> + <el-select v-model="param.checkUserId" filterable placeholder="璇烽�夋嫨"> <el-option v-for="item in memberList" :key="item.id" @@ -150,7 +151,7 @@ this.initData() }, methods: { - + initData () { allList({ type: 1 }).then(res => { // 绫诲瀷 this.typeList = res || [] @@ -161,7 +162,7 @@ this.getfindCompanyTreePage() }, getfindCompanyTreePage() { - companyGetListPost({}) + companyGetListPost({queryHiddenDanger: 1}) .then(res => { if (res && res.length > 0) { this.department = res @@ -170,9 +171,14 @@ }, getAddrList() { const { companyId } = this.param - allList({ type: 0,companyId }).then(res => { // 浣嶇疆 - this.addrList = res || [] - }) + this.$set(this.param, 'areaId', '') + this.$set(this.param, 'checkUserId', '') + this.addrList = [] + if(companyId){ + allList({ type: 0,companyId }).then(res => { // 浣嶇疆 + this.addrList = res || [] + }) + } }, changeArea (e) { const item = this.addrList.find(i => i.id === e) @@ -239,6 +245,10 @@ handleDelImg (i) { this.fileList.splice(i, 1) }, + close(){ + this.isShowModal = false + this.$emit('close') + }, // 鍚屾淇℃伅 confirm () { this.$refs.paramRef.validate((valid) => { -- Gitblit v1.9.3