From c523e2267a47b67930ef6485ccde8489a69df7c9 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期五, 29 一月 2021 00:27:38 +0800
Subject: [PATCH] 员工管理字段调整,用户管理按钮修改,部门管理表单增加字段,岗位管理增加表单

---
 src/views/febs/system/user/Index.vue |   42 ++++++++++++++++++++++++++++++------------
 1 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/views/febs/system/user/Index.vue b/src/views/febs/system/user/Index.vue
index a36a451..5d8f314 100644
--- a/src/views/febs/system/user/Index.vue
+++ b/src/views/febs/system/user/Index.vue
@@ -17,7 +17,20 @@
       <el-button class="filter-item" type="success" @click="reset">
         {{ $t('table.reset') }}
       </el-button>
-      <el-dropdown v-has-any-permission="['user:add','user:delete','user:reset','user:export']" trigger="click" class="filter-item">
+      <el-button v-has-permission="['user:add']" class="filter-item" type="success" @click.native="add">
+        {{ $t('table.add') }}
+      </el-button>
+      <el-button v-has-permission="['user:delete']" class="filter-item" type="success" @click.native="batchDelete">
+        {{ $t('table.delete') }}
+      </el-button>
+      <el-button v-has-permission="['user:reset']" class="filter-item" type="success" @click.native="resetPassword">
+        {{ $t('table.resetPassword') }}
+      </el-button>
+      <el-button v-has-permission="['user:export']" class="filter-item" type="success" @click.native="exportExcel">
+        {{ $t('table.export') }}
+      </el-button>
+
+      <!-- <el-dropdown v-has-any-permission="['user:add','user:delete','user:reset','user:export']" trigger="click" class="filter-item">
         <el-button>
           {{ $t('table.more') }}<i class="el-icon-arrow-down el-icon--right" />
         </el-button>
@@ -27,7 +40,7 @@
           <el-dropdown-item v-has-permission="['user:reset']" @click.native="resetPassword">{{ $t('table.resetPassword') }}</el-dropdown-item>
           <el-dropdown-item v-has-permission="['user:export']" @click.native="exportExcel">{{ $t('table.export') }}</el-dropdown-item>
         </el-dropdown-menu>
-      </el-dropdown>
+      </el-dropdown> -->
     </div>
 
     <el-table
@@ -42,11 +55,23 @@
       @sort-change="sortChange"
     >
       <el-table-column type="selection" align="center" width="40px" />
+      <el-table-column :label="$t('table.operation')" align="center" min-width="150px" class-name="small-padding fixed-width">
+        <template slot-scope="{row}">
+          <i v-hasPermission="['user:view']" class="el-icon-view table-operation" style="color: #87d068;" @click="view(row)" />
+          <i v-hasPermission="['user:update']" class="el-icon-setting table-operation" style="color: #2db7f5;" @click="edit(row)" />
+          <i v-hasPermission="['user:delete']" class="el-icon-delete table-operation" style="color: #f50;" @click="singleDelete(row)" />
+          <el-link v-has-no-permission="['user:view','user:update','user:delete']" class="no-perm">
+            {{ $t('tips.noPermission') }}
+          </el-link>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('table.user.username')" prop="username" :show-overflow-tooltip="true" align="center" min-width="120px">
         <template slot-scope="scope">
           <span>{{ scope.row.username }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="用户头像" :show-overflow-tooltip="true" align="center" min-width="120px" />
+      <el-table-column label="姓名" :show-overflow-tooltip="true" align="center" min-width="120px" />
       <el-table-column
         :label="$t('table.user.sex')"
         :filters="[{ text: $t('common.sex.male'), value: '0' }, { text: $t('common.sex.female'), value: '1' }, { text: $t('common.sex.secret'), value: '2' }]"
@@ -59,11 +84,13 @@
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column label="手机" :show-overflow-tooltip="true" align="center" min-width="120px" />
       <el-table-column :label="$t('table.user.email')" :show-overflow-tooltip="true" align="center" min-width="150px">
         <template slot-scope="scope">
           <span>{{ scope.row.email }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="联系地址" :show-overflow-tooltip="true" align="center" min-width="120px" />
       <el-table-column :label="$t('table.user.dept')" align="center" min-width="100px">
         <template slot-scope="scope">
           <span>{{ scope.row.deptName }}</span>
@@ -86,16 +113,7 @@
           <span>{{ scope.row.createTime }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('table.operation')" align="center" min-width="150px" class-name="small-padding fixed-width">
-        <template slot-scope="{row}">
-          <i v-hasPermission="['user:view']" class="el-icon-view table-operation" style="color: #87d068;" @click="view(row)" />
-          <i v-hasPermission="['user:update']" class="el-icon-setting table-operation" style="color: #2db7f5;" @click="edit(row)" />
-          <i v-hasPermission="['user:delete']" class="el-icon-delete table-operation" style="color: #f50;" @click="singleDelete(row)" />
-          <el-link v-has-no-permission="['user:view','user:update','user:delete']" class="no-perm">
-            {{ $t('tips.noPermission') }}
-          </el-link>
-        </template>
-      </el-table-column>
+
     </el-table>
     <pagination v-show="total>0" :total="total" :page.sync="pagination.num" :limit.sync="pagination.size" @pagination="search" />
     <user-edit

--
Gitblit v1.8.0