From 816a87981b733280861da4117d88bff4e024693a Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 10 Nov 2023 19:36:46 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=94=A8=E6=88=B7=E3=80=81=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=AE=A1=E7=90=86=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/DepartList.vue |  8 ++++----
 src/views/system/UserList.vue   | 14 ++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 7966bece..de70ca1b 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -4,14 +4,14 @@
       <a-card :bordered="false">
 
         <!-- 按钮操作区域 -->
-        <a-row style="margin-left: 14px" v-if="isDev">
-          <a-button icon="plus" @click="handleAdd(1)" type="primary">{{ $t('depart.addDepartment') }}</a-button>
-          <a-button icon="plus" @click="handleAdd(2)" type="primary">{{ $t('depart.addSubordinate') }}</a-button>
+        <a-row style="margin-left: 14px">
+          <a-button v-if="isDev" icon="plus" @click="handleAdd(1)" type="primary">{{ $t('depart.addDepartment') }}</a-button>
+          <a-button v-if="isDev" icon="plus" @click="handleAdd(2)" type="primary">{{ $t('depart.addSubordinate') }}</a-button>
           <a-button type="primary" ghost icon="download" @click="handleExportXls($t('depart.departmentInformation'), '.xls')">{{ $t('export') }}</a-button>
           <!--<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
           <!--  <a-button type="primary" icon="import">{{ $t('import') }}</a-button>-->
           <!--</a-upload>-->
-          <a-button :title="$t('depart.deleteMultiplePiecesData')" @click="batchDel" type="default">{{ $t('batchDelete') }}</a-button>
+          <a-button v-if="isDev" :title="$t('depart.deleteMultiplePiecesData')" @click="batchDel" type="default">{{ $t('batchDelete') }}</a-button>
           <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
         </a-row>
         <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index 9e7990d2..fa549593 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -84,12 +84,12 @@
     </div>
 
     <!-- 操作按钮区域 -->
-    <div class="table-operator" style="border-top: 5px" v-if="isDev">
-      <a-button @click="handleAdd" type="primary" icon="plus" >{{ $t('user.addUser') }}</a-button>
+    <div class="table-operator" style="border-top: 5px">
+      <a-button v-if="isDev" @click="handleAdd" type="primary" icon="plus" >{{ $t('user.addUser') }}</a-button>
       <a-button type="primary" ghost icon="download" @click="handleExportXls($t('user.userInformation'), '.xls')">{{ $t('export') }}</a-button>
-      <a-button type="primary" ghost icon="hdd" @click="recycleBinVisible=true">{{ $t('recycleBin') }}</a-button>
-      <a-button type="primary" ghost icon="hdd" @click="roleAssignment">{{ $t('user.roleAllocation') }}</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
+      <a-button v-if="isDev" type="primary" ghost icon="hdd" @click="recycleBinVisible=true">{{ $t('recycleBin') }}</a-button>
+      <a-button v-if="isDev" type="primary" ghost icon="hdd" @click="roleAssignment">{{ $t('user.roleAllocation') }}</a-button>
+      <a-dropdown v-if="isDev && selectedRowKeys.length > 0">
         <a-menu slot="overlay" @click="handleMenuClick">
           <a-menu-item key="1">
             <a-icon type="delete" @click="batchDel"/>
@@ -171,7 +171,9 @@
             </a-menu>
           </a-dropdown>
         </template>
-
+        <template v-slot:action="{text, record}" v-else>
+          <a href="javascript:" @click="handleDetail(record)">{{ $t('details') }}</a>
+        </template>
       </j-table>
     </div>
     <!-- table区域-end -->