From 7e90b706ce34a759ea20de5e00896e66a8fca0aa Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 12 七月 2024 17:46:06 +0800
Subject: [PATCH] 提交

---
 admin/src/views/business/shopUsers.vue |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/admin/src/views/business/shopUsers.vue b/admin/src/views/business/shopUsers.vue
index 818c8a6..4e23bf9 100644
--- a/admin/src/views/business/shopUsers.vue
+++ b/admin/src/views/business/shopUsers.vue
@@ -54,10 +54,11 @@
     <!-- 琛ㄦ牸鍜屽垎椤� -->
     <template v-slot:table-wrap>
       <ul class="toolbar"  style="height: 26px">
-<!--        <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="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
-     -->
+        <li><el-button type="primary" @click="$refs.OperaUserImportWindow.open('鍒濆鍖栧鍏�')"  icon="el-icon-plus" v-permissions="['business:member:create']">鍒濆鍖栧鍏�</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="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
+             -->
         <li style="float: right;">
          <el-checkbox style="font-size: 12px"  label="1" v-model="searchForm.includeChild" key="1"  @change="search" >鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
         </li>
@@ -69,23 +70,23 @@
           @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
-        <el-table-column prop="iamUsername" label="鐧诲綍璐﹀彿" min-width="100px"></el-table-column>
-        <el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+        <el-table-column prop="name" label="濮撳悕" fixed min-width="100px"></el-table-column>
+        <el-table-column prop="iamUsername" fixed label="鐧诲綍璐﹀彿" min-width="100px"></el-table-column>
+        <el-table-column prop="phone" label="鎵嬫満鍙�" fixed min-width="100px"></el-table-column>
         <el-table-column label="鎬у埆" min-width="100px">
           <template slot-scope="{row}">
             <span v-if="row.sex == 0">鐢�</span>
             <span v-if="row.sex == 1">濂�</span>
           </template>
         </el-table-column>
-        <el-table-column prop="shopName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
+        <el-table-column prop="shopName" label="鎵�灞為儴闂�" min-width="150px"></el-table-column>
         <el-table-column prop="status" label="鐘舵��" min-width="100px">
           <template slot-scope="{row}">
             <span v-if="row.status == 0" style="color: red">鍋滅敤</span>
             <span v-if="row.status == 1" style="color:green">鍚敤</span>
           </template>
         </el-table-column>
-        <el-table-column prop="shopType" label="缁勭粐绫诲瀷" min-width="80px">
+        <el-table-column prop="shopType" label="缁勭粐绫诲瀷" min-width="110px">
           <template scope="{row}">
             <span v-if="row.shopType == 1">HR</span>
             <span v-if="row.shopType == 2">鍔犵洘鍟�</span>
@@ -130,8 +131,7 @@
       >
       </pagination>
       <!--    鏌ョ湅浜哄憳寮�鍗¤褰�    -->
-      <OperaMemberWindow ref="OperaMemberWindow" @success="handlePageChange" />
-      <OperaMemberImportWindow ref="OperaMemberImportWindow" @success="handlePageChange" />
+      <OperaUserImportWindow ref="OperaUserImportWindow" @success="handlePageChange" />
     </template>
   </TableLayout1>
 </template>
@@ -140,13 +140,12 @@
 import BaseTable from '@/components/base/BaseTable'
 import TableLayout1 from '@/layouts/TableLayout1'
 import Pagination from '@/components/common/Pagination'
-import OperaMemberWindow from '@/components/business/OperaMemberWindow'
-import OperaMemberImportWindow from '@/components/business/OperaMemberImportWindow'
+import OperaUserImportWindow from '@/components/business/OperaUserImportWindow'
 import { fetchListByParent } from '@/api/business/shop'
 export default {
   name: 'internalMember',
   extends: BaseTable,
-  components: { TableLayout1, Pagination,  OperaMemberWindow, OperaMemberImportWindow },
+  components: { TableLayout1, Pagination, OperaUserImportWindow },
   data () {
     return {
       TreeList: [],

--
Gitblit v1.9.3