From 94fdc01dacf7a3bc185ca99e98d0864594d34ef1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 07 五月 2025 10:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/internalMember.vue | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index f7c1963..19165d3 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -18,6 +18,12 @@
<el-option label="鏈�" value="1"></el-option>
</el-select>
</el-form-item>
+ <el-form-item label="" prop="authStatus">
+ <el-select v-model="searchForm.authStatus" @keypress.enter.native="search" clearable placeholder="鏄惁鎺堟潈">
+ <el-option label="鍚�" value="0"></el-option>
+ <el-option label="鏄�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="" prop="canVisit">
<el-select v-model="searchForm.canVisit" clearable @keypress.enter.native="search" placeholder="鍙嫓璁�">
<el-option label="鏄�" value="1"></el-option>
@@ -59,7 +65,7 @@
<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"
+ @click="add" icon="el-icon-plus"
v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
<li><el-button type="primary" @click="$refs.OperaMemberImportWindow.open('浜哄憳瀵煎叆', searchForm.companyType)"
icon="el-icon-plus" v-permissions="['business:member:create']">浜哄憳瀵煎叆</el-button></li>
@@ -72,7 +78,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}">
@@ -175,8 +181,8 @@
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,searchForm.companyType)"
- v-permissions="['business:empower:update']">缂栬緫</el-button>
+ <el-button type="text" icon="el-icon-edit" @click="edit(row)"
+ v-permissions="['business:member:update']">缂栬緫</el-button>
<el-button type="text" icon="el-icon-plus" @click="empower(row.id)"
v-permissions="['business:empower:create']">閲嶆柊鎺堟潈</el-button>
<el-button type="text" :loading="heading" style="color: red" icon="el-icon-delete"
@@ -233,7 +239,8 @@
workStatus: '',
positionId: '',
companyId: '',
- hasFace: ''
+ hasFace: '',
+ authStatus: ''
},
loading: false,
heading: false,
@@ -256,11 +263,19 @@
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: {
+ edit(row) {
+ this.$refs.OperaMemberWindow.treeData = this.companyTree
+ this.$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row, this.department, this.searchForm.companyType)
+ },
+ add() {
+ this.$refs.OperaMemberWindow.treeData = this.companyTree
+ this.$refs.OperaMemberWindow.open('鏂板缓鍛樺伐', null, this.department, this.searchForm.companyType)
+ },
startEmpowerBatch() {
if (this.tableData.selectedRows.length === 0) {
this.$tip.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
@@ -298,7 +313,7 @@
},
// 鑾峰彇缁勭粐鏍�
getfindCompanyTreePage() {
- fetchList()
+ fetchList(1)
.then(res => {
if (res && res.length > 0) {
res[0].fsStatus = 1
--
Gitblit v1.9.3