From 6cfd5d9a0c8f7bacbe2d3d1b1d84511207789ca6 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期二, 11 三月 2025 19:55:17 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- admin/src/views/business/relativeMember.vue | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue index 45e0aa9..a773a79 100644 --- a/admin/src/views/business/relativeMember.vue +++ b/admin/src/views/business/relativeMember.vue @@ -6,7 +6,6 @@ <el-form-item label="" prop="keyword"> <el-input v-model="searchForm.keyword" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�/宸ュ彿" @keypress.enter.native="search"></el-input> </el-form-item> - <el-form-item label="" prop="positionId"> <el-select v-model="searchForm.positionId" clearable filterable placeholder="宀椾綅"> <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id"> @@ -61,8 +60,8 @@ <ul class="toolbar" v-permissions="['business:member:delete', 'business:member:create,business:empower:create', 'business:traintime:create']"> <!-- - <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li> ---> + <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li> + --> <li><el-button type="primary" @click="$refs.OperaMemberWindow.open('鏂板缓鍛樺伐', null, department, searchForm.companyType)" icon="el-icon-plus" v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li> @@ -272,9 +271,9 @@ this.getPositionList() }, mounted() { - this.$nextTick(() => { + /* this.$nextTick(() => { this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 276 - }) + })*/ }, methods: { startEmpowerBatch() { -- Gitblit v1.9.3