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 | 92 ++++++++++++++++++++++++++++------------------ 1 files changed, 56 insertions(+), 36 deletions(-) diff --git a/admin/src/components/business/OperaHiddenDangerParamWindow.vue b/admin/src/components/business/OperaHiddenDangerParamWindow.vue index 3e2b4df..f373969 100644 --- a/admin/src/components/business/OperaHiddenDangerParamWindow.vue +++ b/admin/src/components/business/OperaHiddenDangerParamWindow.vue @@ -1,71 +1,75 @@ <template> - <GlobalWindow - :title="title" - width="500px" - :visible.sync="visible" - :confirm-working="isWorking" - @confirm="confirm" - > - <el-form :model="form" ref="form" :rules="rules"> - <el-form-item label="鍚嶇О" prop="name"> - <el-input v-model="form.name" placeholder="璇疯緭鍏ュ悕绉�" v-trim/> - </el-form-item> - <el-form-item label="鎺掑簭鐮�(鍗囧簭)" prop="sortnum"> - <el-input v-model="form.sortnum" type="number" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim/> - </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"> - </el-option> - </el-select> - </el-form-item> - </el-form> - </GlobalWindow> + <GlobalWindow :title="title" width="500px" :visible.sync="visible" :confirm-working="isWorking" @confirm="confirm"> + <el-form :model="form" ref="form" :rules="rules"> + <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" 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 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"> + </el-option> + </el-select> + </el-form-item> + <el-form-item label="鎺掑簭鐮�(鍗囧簭)" prop="sortnum"> + <el-input v-model="form.sortnum" type="number" placeholder="璇疯緭鍏ユ帓搴忕爜" v-trim /> + </el-form-item> + </el-form> + </GlobalWindow> </template> <script> import BaseOpera from '@/components/base/BaseOpera' import GlobalWindow from '@/components/common/GlobalWindow' import { allList } from '@/api/business/member' +import { companyGetListPost } from '@/api/business/company' export default { name: 'OperaHiddenDangerParamWindow', extends: BaseOpera, components: { GlobalWindow }, - data () { + data() { return { // 琛ㄥ崟鏁版嵁 memberList: [], + department: [], + departprops: { + label: 'name', + value: 'id', + checkStrictly: true + }, form: { id: null, name: null, + companyId: null, memberIdList: null, type: null, sortnum: null }, // 楠岃瘉瑙勫垯 rules: { - name: [ - { required: true, message: '璇疯緭鍏ュ悕绉�' } - ] + name: [{ required: true, message: '璇疯緭鍏ュ悕绉�' }], + companyId: [{ required: true, message: '璇烽�夋嫨' }], + memberIdList: [{ required: true, message: '璇烽�夋嫨', type: 'array' }], } } }, - created () { + created() { this.config({ api: '/business/hiddenDangerParam', 'field.id': 'id' }) }, methods: { - open (title, target, type) { + open(title, target, type) { this.title = title this.visible = true + this.form.memberIdList = null this.form.type = type - this.loadMember() + this.getfindCompanyTreePage() // 鏂板缓缁勭粐 if (target == null) { this.$nextTick(() => { @@ -80,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 = [] @@ -88,18 +95,31 @@ }) } } + this.loadMember() }) }, - loadMember () { + getfindCompanyTreePage() { + companyGetListPost({}) + .then(res => { + if (res && res.length > 0) { + this.department = res + } + }) + }, + loadMember(flag) { + if(flag && flag == 1){ + this.$set(this.form, 'memberIdList', null) + } allList({ type: 2, - companyType: 1 + companyType: 1, + companyId: this.form.companyId }) .then(res => { this.memberList = res }) .catch(e => { - this.$tip.apiFailed(e) + // this.$tip.apiFailed(e) }) .finally(() => { this.isWorking = false -- Gitblit v1.9.3