From cd1eb4f48fbbba55154e9aec80ec93f48e9c075b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 03 七月 2025 11:03:37 +0800
Subject: [PATCH] 代码初始化

---
 admin/src/views/business/companyMember.vue |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/admin/src/views/business/companyMember.vue b/admin/src/views/business/companyMember.vue
index a2ce228..d885ac0 100644
--- a/admin/src/views/business/companyMember.vue
+++ b/admin/src/views/business/companyMember.vue
@@ -17,7 +17,8 @@
         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 - 130px); overflow-y: scroll;">
-        <Tree :list="companyTree" :alllist="companyTree" :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
+       <Tree :list="companyTree" :alllist="companyTree"
+              :defaultProps="{ name: 'name', status: 'fsStatus', children: 'childList', id: 'id' }"
           @callback="callback" />
       </div>
     </template>
@@ -31,7 +32,9 @@
         </li>
       </ul>
       <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 prop="index" label="搴忓彿" width="55" fixed="left">
+          <template slot-scope="scope">{{ scope.$index+1}}</template>
+        </el-table-column>-->
         <el-table-column fixed="left" prop="name" label="濮撳悕" min-width="80px">
           <template slot-scope="{row}">
             <span>{{ row.name }}</span>
@@ -42,7 +45,7 @@
           <template slot-scope="{row}">
             <span v-if="row.sex == '1'">鐢�</span>
             <span v-else-if="row.sex == '2' ">濂�</span>
-            <span v-else>濂�</span>
+            <span v-else>-</span>
           </template>
         </el-table-column>
         <el-table-column prop="email" label="閭" min-width="100px"></el-table-column>
@@ -56,9 +59,15 @@
         </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 fixed="right"   v-if="containPermissions(['business:member:update'])" label="鎿嶄綔" min-width="100">
+          <template slot-scope="{row}">
+            <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row)"  v-permissions="['business:member:update']">缂栬緫</el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
       </pagination>
+      <OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
     </template>
   </TableLayout1>
 </template>
@@ -67,16 +76,18 @@
 import BaseTable from '@/components/base/BaseTable'
 import TableLayout1 from '@/layouts/TableLayout1'
 import Pagination from '@/components/common/Pagination'
-import Tree from '@/components/common/Tree'
-import { treeList } from '@/api/business/company'
+import Tree from '@/components/common/TreeNew'
+import OperaMemberWindow from '@/components/business/OperaMemberWindow'
+import { allList,treeList } from '@/api/business/company'
 import { memberSync} from '@/api/business/member'
 export default {
   name: 'internalMember',
   extends: BaseTable,
-  components: { TableLayout1, Pagination, Tree },
+  components: { TableLayout1, Pagination, Tree, OperaMemberWindow },
   data() {
     return {
       TreeList: [],
+      defaultExpanedKeys:null,
       // 鎼滅储
       searchForm: {
         name: '' ,
@@ -87,6 +98,7 @@
       loading: false,
       heading: false,
       working: false,
+      dataList: [],
       companyTree: [],
       department: []
     }
@@ -104,15 +116,26 @@
   methods: {
     // 鑾峰彇缁勭粐鏍�
     getfindCompanyTreePage() {
-      treeList({})
+      allList({})
         .then(res => {
+          console.log(res)
           if (res && res.length > 0) {
             res[0].fsStatus = 1
+            this.getCompanyList(res[0])
             this.companyTree = res
             this.search()
-            this.department = this.getDepartmentTree(res)
+            // this.department = this.getDepartmentTree(res)
           }
         })
+    },
+    getCompanyList(row){
+      allList({parentId:row.id})
+          .then(res => {
+            console.log(res)
+            if (res && res.length > 0) {
+              row.childList = res
+            }
+          })
     },
     getDepartmentTree(tree) {
       if (tree == null) {
@@ -144,7 +167,7 @@
           this.loading = true
           memberSync({})
             .then(res => {
-              this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
+              this.$tip.apiSuccess(  '鍚屾鎴愬姛')
               this.search()
             })
             .catch(e => {
@@ -161,6 +184,9 @@
       this.searchForm.erpOrgId = row.erpId
       this.searchForm.companyId = row.id
       this.search()
+      if(row.hasChildren && (row.childList == null || row.childList.length == 0)){
+        this.getCompanyList(row)
+      }
     }
   }
 }

--
Gitblit v1.9.3