From eabbfdfdc018c248ecec095934e1ae2278f02015 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Thu, 9 Nov 2023 11:25:50 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/DictItemList.vue             |  3 ++
 src/views/system/DictList.vue                 | 19 ++++----
 src/views/system/RoleUserList.vue             | 18 ++++----
 src/views/system/UserList.vue                 | 46 +++++++++----------
 .../FriendshipLinkList.vue                    |  3 ++
 .../internalWorkGroup/WorkingGroupList.vue    |  4 ++
 src/views/system/modules/DeptUserInfo.vue     | 14 +++---
 7 files changed, 60 insertions(+), 47 deletions(-)

diff --git a/src/views/system/DictItemList.vue b/src/views/system/DictItemList.vue
index 370b16d7..8c756ec9 100644
--- a/src/views/system/DictItemList.vue
+++ b/src/views/system/DictItemList.vue
@@ -235,5 +235,8 @@ export default {
   background: #f4f4f4;
   color: #bababa;
 }
+/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
+  min-width: 40px;
+}
 //update--begin--autor:wangshuai-----date:20191204------for：系统管理 数据字典禁用和正常区别开，添加背景颜色 teambition JT-22------
 </style>
diff --git a/src/views/system/DictList.vue b/src/views/system/DictList.vue
index e26e5c27..6aa3146f 100644
--- a/src/views/system/DictList.vue
+++ b/src/views/system/DictList.vue
@@ -5,22 +5,20 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="12">
-          <a-col :md="7" :sm="8">
+          <a-col :md="6" :sm="12">
             <a-form-item :label="$t('dict.dictionaryName')" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
               <j-input :placeholder="$t('pleaseEnter')+$t('dict.dictionaryName')" v-model="queryParam.dictName"></j-input>
             </a-form-item>
           </a-col>
-          <a-col :md="7" :sm="8">
+          <a-col :md="6" :sm="12">
             <a-form-item :label="$t('dict.dictionaryNumber')" :labelCol="{span: 6}" :wrapperCol="{span: 14, offset: 1}">
               <j-input :placeholder="$t('pleaseEnter')+$t('dict.dictionaryNumber')" v-model="queryParam.dictCode"></j-input>
             </a-form-item>
           </a-col>
-          <a-col :md="7" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
-            </span>
-          </a-col>
+          <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+            <a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
+          </div>
         </a-row>
       </a-form>
 
@@ -214,5 +212,8 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
+/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
+  min-width: 60px;
+}
 </style>
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index d2cf1fe8..7308d098 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -7,9 +7,9 @@
           <!-- 搜索区域 -->
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
-              <a-col :md="12" :sm="8">
+              <a-col :md="6" :sm="12">
                 <a-form-item :label="$t('roleManage.roleName')" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
-                  <j-input placeholder="" v-model="queryParam.roleName"></j-input>
+                  <j-input :placeholder="$t('pleaseEnter') + $t('roleManage.roleName')" v-model="queryParam.roleName"></j-input>
                 </a-form-item>
               </a-col>
               <!--
@@ -21,12 +21,10 @@
                 </a-form-item>
               </a-col>
               -->
-              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="12" :sm="24">
-               <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 21px">{{ $t('query') }}</a-button>
-              <a-button type="primary" @click="searchReset" 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="searchQuery" icon="search" style="margin-left: 21px">{{ $t('query') }}</a-button>
+                <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
+              </div>
             </a-row>
           </a-form>
         </div>
@@ -533,4 +531,8 @@ export default {
   .ant-btn {
     margin-left: 8px
   }
+
+/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
+  min-width: 60px;
+}
 </style>
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index e1343402..73adaec1 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -12,7 +12,7 @@
             </a-form-item>
           </a-col>
 
-          <a-col :md="6" :sm="8">
+          <a-col :md="6" :sm="12">
             <a-form-item :label="$t('user.gender')">
               <a-select v-model="queryParam.sex" :placeholder="$t('pleaseSelect') + $t('user.gender')">
                 <a-select-option value="">{{ $t('pleaseSelect') }}</a-select-option>
@@ -22,20 +22,19 @@
             </a-form-item>
           </a-col>
 
-          <template v-if="toggleSearchStatus">
-            <a-col :md="6" :sm="8">
-              <a-form-item :label="$t('user.realName')">
-                <j-input :placeholder="$t('pleaseEnter') + $t('user.realName')" v-model="queryParam.realname"></j-input>
-              </a-form-item>
-            </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item :label="$t('user.realName')">
+              <j-input :placeholder="$t('pleaseEnter') + $t('user.realName')" v-model="queryParam.realname"></j-input>
+            </a-form-item>
+          </a-col>
 
-            <a-col :md="6" :sm="8">
+          <template v-if="toggleSearchStatus">
+            <a-col :md="6" :sm="12">
               <a-form-item :label="$t('phoneNumber')">
                 <a-input :placeholder="$t('user.pleaseEnterFullPhone')" v-model="queryParam.phone"></a-input>
               </a-form-item>
             </a-col>
-
-            <a-col :md="6" :sm="8">
+            <a-col :md="6" :sm="12">
               <a-form-item :label="$t('user.userStatues')">
                 <a-select v-model="queryParam.status" :placeholder="$t('pleaseSelect')">
                   <a-select-option value="">{{ $t('pleaseSelect') }}</a-select-option>
@@ -45,7 +44,7 @@
               </a-form-item>
             </a-col>
 
-            <a-col :md="6" :sm="8">
+            <a-col :md="6" :sm="12">
               <a-form-item :label="$t('organization')">
                 <a-tree-select
                   tree-node-filter-prop="title"
@@ -61,7 +60,7 @@
               </a-form-item>
             </a-col>
 
-            <a-col :md="6" :sm="8">
+            <a-col :md="6" :sm="12">
               <a-form-item :label="$t('role')">
                 <j-search-select-tag
                   :placeholder="$t('pleaseSelect') + $t('role')"
@@ -72,17 +71,14 @@
             </a-col>
           </template>
 
-          <a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? $t('putAway') : $t('open') }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-
+          <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+            <a @click="handleToggleSearch" style="margin-left: 8px">
+              {{ toggleSearchStatus ? $t('putAway') : $t('open') }}
+              <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+            </a>
+            <a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
+          </div>
         </a-row>
       </a-form>
     </div>
@@ -453,5 +449,7 @@ export default {
 </script>
 <style lang="less" scoped>
 @import '~@assets/less/common.less';
-
+/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
+  min-width: 80px;
+}
 </style>
diff --git a/src/views/system/firendshipLinkManage/FriendshipLinkList.vue b/src/views/system/firendshipLinkManage/FriendshipLinkList.vue
index d508a70b..1c8faa8c 100644
--- a/src/views/system/firendshipLinkManage/FriendshipLinkList.vue
+++ b/src/views/system/firendshipLinkManage/FriendshipLinkList.vue
@@ -180,4 +180,7 @@ export default {
 
 <style scoped lang="less">
 @import '~@assets/less/common.less';
+/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
+  min-width: 80px;
+}
 </style>
diff --git a/src/views/system/internalWorkGroup/WorkingGroupList.vue b/src/views/system/internalWorkGroup/WorkingGroupList.vue
index 45798402..71fd988b 100644
--- a/src/views/system/internalWorkGroup/WorkingGroupList.vue
+++ b/src/views/system/internalWorkGroup/WorkingGroupList.vue
@@ -455,4 +455,8 @@ export default {
   font-size: 16px;
   margin-right: 10px;
 }
+
+/deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
+  min-width: 60px;
+}
 </style>
diff --git a/src/views/system/modules/DeptUserInfo.vue b/src/views/system/modules/DeptUserInfo.vue
index 3102cd1a..d3631f84 100644
--- a/src/views/system/modules/DeptUserInfo.vue
+++ b/src/views/system/modules/DeptUserInfo.vue
@@ -10,12 +10,10 @@
               <a-input placeholder="请输入账号" v-model="queryParam.username"></a-input>
             </a-form-item>
           </a-col>
-          <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-            <a-col :md="6" :sm="24">
-             <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </a-col>
-          </span>
+          <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+            <a-button type="primary" @click="searchQuery" icon="search" style="margin-left: 18px">查询</a-button>
+            <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+          </div>
         </a-row>
       </a-form>
     </div>
@@ -315,4 +313,8 @@ export default {
     margin-top: -16px;
     margin-bottom: 16px;
   }
+
+  /deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
+    min-width: 80px;
+  }
 </style>