From b1740c80205d9584738b1150f4122784c70bbe57 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 08 四月 2025 14:55:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/relativeMember.vue | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index a773a79..15bfb90 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.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" @keypress.enter.native="search" placeholder="鍙嫓璁�">
<el-option label="鏄�" value="1"></el-option>
@@ -63,7 +69,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>
@@ -188,7 +194,7 @@
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)"
+ <el-button type="text" icon="el-icon-edit" @click="edit(row)"
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>
@@ -276,6 +282,14 @@
})*/
},
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('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
@@ -313,7 +327,7 @@
},
// 鑾峰彇缁勭粐鏍�
getfindCompanyTreePage() {
- fetchList()
+ fetchList(0)
.then(res => {
if (res && res.length > 0) {
res[0].fsStatus = 1
--
Gitblit v1.9.3