From 9f7777c83f2d07c8d83c506ab2a13bc543f47de9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 10 四月 2025 11:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/companyMember.vue | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/companyMember.vue b/admin/src/views/business/companyMember.vue
index 3b135f6..f189d83 100644
--- a/admin/src/views/business/companyMember.vue
+++ b/admin/src/views/business/companyMember.vue
@@ -16,8 +16,8 @@
<div
style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
浼佷笟缁勭粐</div>
- <div style="width: 100%; height: calc(100vh - 170px); overflow-y: scroll;">
- <Tree :list="companyTree" :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
+ <div style="width: 100%; height: calc(100vh - 130px); overflow-y: scroll;">
+ <Tree :list="companyTree" :alllist="companyTree" :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
@callback="callback" />
</div>
</template>
@@ -30,7 +30,7 @@
@change="search">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
</li>
</ul>
- <el-table 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}">
@@ -93,7 +93,6 @@
})
// this.search()
this.getfindCompanyTreePage()
- this.getPositionList()
},
methods: {
// 鑾峰彇缁勭粐鏍�
--
Gitblit v1.9.3