From 7b51c9e1abc198a501f7858599da9c116130fd6f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 三月 2025 16:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/internalMember.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index cdd8f28..e2f2ba6 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -72,7 +72,7 @@
@change="search">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
</li>
</ul>
- <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <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">
<template slot-scope="{row}">
@@ -162,20 +162,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>
@@ -256,9 +256,9 @@
this.getPositionList()
},
mounted() {
- this.$nextTick(() => {
- this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 276
- })
+ // this.$nextTick(() => {
+ // this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 276
+ // })
},
methods: {
startEmpowerBatch() {
--
Gitblit v1.9.3