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/views/business/relativeMember.vue | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index abecc87..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>
@@ -84,7 +83,7 @@
@click="exportExcel">瀵煎嚭</el-button></li>
</ul>
- <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
+ <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column fixed="left" prop="name" label="濮撳悕" min-width="80px">
@@ -176,20 +175,20 @@
<div v-else>-</div>
</template>
</el-table-column>
- <el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
+<!-- <el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
<el-table-column label="鍗＄墖" min-width="80px">
<template slot-scope="{row}">
<el-button @click="$refs.cardOpeningRecord.open('寮�鍗¤褰�', row.id)" type="text">{{ row.memberCardCount ||
'0' }}</el-button>
</template>
- </el-table-column>
+ </el-table-column>-->
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete', 'business:empower:create'])"
label="鎿嶄綔" min-width="280">
<template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row, department)"
+ <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row, department,searchForm.companyType)"
v-permissions="['business:empower:update']">缂栬緫</el-button>
<el-button type="text" icon="el-icon-plus" @click="empower(row.id)"
v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
@@ -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