From e23a1db0b60437f17d09d65c65f8fd0c8a5d88c7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 26 八月 2024 18:11:07 +0800
Subject: [PATCH] 最新版本

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

diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 189b1d7..73e45ef 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -47,12 +47,14 @@
         </template>
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
-            <ul class="toolbar" v-permissions="['business:member:delete','business:member:create,business:empower:create']">
+            <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" @click="$refs.OperaMemberWindow.open('鏂板缓鍛樺伐',null,department,0)"  icon="el-icon-plus" v-permissions="['business:member:create']">鏂板缓鍛樺伐</el-button></li>
-                <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
+              <li><el-button type="primary" @click="$refs.OperaMemberWindow.open('鏂板缓鍛樺伐',null,department,searchForm.companyType)"  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>
+              <li><el-button type="primary" @click="$refs.OperaTrainTimeImportWindow.open('鍩硅鏈熷鍏�',department,searchForm.companyType)"  icon="el-icon-plus" v-permissions="['business:traintime:create']">鍩硅鏈熷鍏�</el-button></li>
+              <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
                 <li><el-button type="primary" v-permissions="['business:empower:create']"  @click="startEmpowerBatch()"  icon="el-icon-plus">涓嬪彂鎺堟潈</el-button></li>
             </ul>
             <el-table
@@ -166,10 +168,10 @@
                 >
                     <template slot-scope="{row}">
                         <el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅',row,department)" v-permissions="['business:empower:update']">缂栬緫</el-button>
-                        <el-button type="text" :loading="heading" icon="el-icon-delete" @click="updateHead(row,0)" v-if="row.headStatus ==1 " v-permissions="['business:member:head']">鍙栨秷涓荤</el-button>
-                        <el-button type="text" :loading="heading"  icon="el-icon-edit" @click="updateHead(row,1)"  v-if="row.headStatus  == 0"  v-permissions="['business:member:head']">璁句负涓荤</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"  icon="el-icon-delete" @click="empower(row.id)" v-permissions="['business:empower:delete']">鍒犻櫎</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" @click="updateHead(row,0)" v-if="row.headStatus ==1 " v-permissions="['business:member:head']">鍙栨秷涓荤</el-button>
+                      <el-button type="text" :loading="heading"  icon="el-icon-edit" @click="updateHead(row,1)"  v-if="row.headStatus  == 0"  v-permissions="['business:member:head']">璁句负涓荤</el-button>
+                        <el-button  type="text"  icon="el-icon-delete"   style="color: red" @click="empower(row.id)" v-permissions="['business:empower:delete']">鍒犻櫎</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -182,6 +184,8 @@
             <!--    鏌ョ湅浜哄憳寮�鍗¤褰�    -->
             <cardOpeningRecord ref="cardOpeningRecord" @success="handlePageChange" />
             <OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
+            <OperaMemberImportWindow ref="OperaMemberImportWindow" @success="handlePageChange" />
+            <OperaTrainTimeImportWindow ref="OperaTrainTimeImportWindow" @success="handlePageChange" />
             <OperaMemberRoleWindow ref="OperaMemberRoleWindow" @success="handlePageChange" />
         </template>
     </TableLayout1>
@@ -194,13 +198,15 @@
 import cardOpeningRecord from '@/components/business/cardOpeningRecord'
 import Tree from '@/components/common/Tree'
 import OperaMemberWindow from '@/components/business/OperaMemberWindow'
+import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
+import OperaTrainTimeImportWindow from '@/components/business/OperaTrainTimeImportWindow'
 import OperaMemberRoleWindow from '@/components/business/OperaMemberRoleWindow'
 import { fetchList } from '@/api/business/company'
 import { memberSync, roleAuth, updateCanVisit, updateHead, updateWorkStatus } from '@/api/business/member'
 export default {
   name: 'internalMember',
   extends: BaseTable,
-  components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow, OperaMemberRoleWindow },
+  components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow, OperaMemberRoleWindow ,OperaMemberImportWindow,OperaTrainTimeImportWindow},
   data () {
     return {
       TreeList: [],
@@ -213,7 +219,7 @@
         canVisit: '',
         keyword: '',
         type: 2,
-        companyType:0,
+        companyType: 0,
         erpOrgId: '',
         companyId: '',
         hasFace: ''

--
Gitblit v1.9.3