From de7f9e112657500db93eba72b6956aa74b6b837c Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 10 Nov 2023 14:06:46 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=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   |  4 ++--
 src/views/system/RoleUserList.vue | 17 +++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue
index 0e04ee06..7966bece 100644
--- a/src/views/system/DepartList.vue
+++ b/src/views/system/DepartList.vue
@@ -5,8 +5,8 @@
 
         <!-- 按钮操作区域 -->
         <a-row style="margin-left: 14px" v-if="isDev">
-          <a-button @click="handleAdd(1)" type="primary">{{ $t('depart.addDepartment') }}</a-button>
-          <a-button @click="handleAdd(2)" type="primary">{{ $t('depart.addSubordinate') }}</a-button>
+          <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-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>-->
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index c01c6f18..69ed37de 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -7,7 +7,7 @@
           <!-- 搜索区域 -->
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
-              <a-col :md="6" :sm="12">
+              <a-col :md="this.selectedRowKeys1.length === 0 ? 6: 12" :sm="12">
                 <a-form-item :label="$t('roleManage.roleName')" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                   <j-input :placeholder="$t('pleaseEnter') + $t('roleManage.roleName')" v-model="queryParam.roleName"></j-input>
                 </a-form-item>
@@ -85,7 +85,7 @@
     </a-col>
     <a-col :md="rightColMd" :sm="24" v-if="this.rightcolval === 1">
       <a-card :bordered="false">
-        <div style="text-align: right;">
+        <div style="text-align: right;margin-bottom: 6px">
           <a-icon type="close-circle" @click="hideUserList" />
         </div>
         <!-- 查询区域 -->
@@ -95,16 +95,13 @@
 
               <a-col :md="12" :sm="12">
                 <a-form-item :label="$t('user.userAccount')">
-                  <a-input placeholder="" v-model="queryParam2.username"></a-input>
+                  <a-input :placeholder="$t('pleaseEnter') + $t('user.userAccount')" v-model="queryParam2.username"></a-input>
                 </a-form-item>
               </a-col>
-              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="9" :sm="24">
-             <a-button type="primary" @click="searchQuery2" icon="search" style="margin-left: 21px">{{ $t('query') }}</a-button>
-              <a-button type="primary" @click="searchReset2" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
-
-            </a-col>
-          </span>
+              <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+                <a-button type="primary" @click="searchQuery2" icon="search" style="margin-left: 21px">{{ $t('query') }}</a-button>
+                <a-button type="primary" @click="searchReset2" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
+              </div>
             </a-row>
           </a-form>
         </div>