From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007

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

diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 45e0aa9..83a2d66 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -6,7 +6,6 @@
         <el-form-item label="" prop="keyword">
           <el-input v-model="searchForm.keyword" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�/宸ュ彿" @keypress.enter.native="search"></el-input>
         </el-form-item>
-
         <el-form-item label="" prop="positionId">
           <el-select v-model="searchForm.positionId" clearable filterable placeholder="宀椾綅">
             <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
@@ -17,6 +16,12 @@
           <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" 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="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">
@@ -37,6 +42,9 @@
             <el-option label="鍚屾鎴愬姛" value="1"></el-option>
             <el-option label="鍚屾澶辫触" value="2"></el-option>
           </el-select>
+          <el-form-item label="" prop="idcardNo">
+            <el-input v-model="searchForm.idcardNo" placeholder="韬唤璇佸彿" @keypress.enter.native="search"></el-input>
+          </el-form-item>
         </el-form-item>
         <!--      <el-form-item label="">
         <el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
@@ -61,10 +69,10 @@
       <ul class="toolbar"
         v-permissions="['business:member:delete', 'business:member:create,business:empower:create', 'business:traintime:create']">
         <!--
-                <li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
--->
+           <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>
@@ -189,7 +197,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>
@@ -249,7 +257,8 @@
         workStatus: '',
         positionId: '',
         companyId: '',
-        hasFace: ''
+        hasFace: '',
+        idcardNo:''
       },
       loading: false,
       heading: false,
@@ -272,11 +281,19 @@
     this.getPositionList()
   },
   mounted() {
-    this.$nextTick(() => {
+ /*   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('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
@@ -314,7 +331,7 @@
     },
     // 鑾峰彇缁勭粐鏍�
     getfindCompanyTreePage() {
-      fetchList()
+      fetchList(0)
         .then(res => {
           if (res && res.length > 0) {
             res[0].fsStatus = 1

--
Gitblit v1.9.3