From c4c382341766272ece291cb6d2a91f2ae1c9692b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Fri, 17 Nov 2023 14:47:51 +0800
Subject: [PATCH] =?UTF-8?q?[bug=20UAT]=20=E8=A7=92=E8=89=B2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=85=8D=E7=BD=AE=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8C=89=E5=90=8D=E5=AD=97=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/modules/SelectUserModal.vue | 60 +++++++++++---------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/views/system/modules/SelectUserModal.vue b/src/views/system/modules/SelectUserModal.vue
index f569c35c..8e3e52ac 100644
--- a/src/views/system/modules/SelectUserModal.vue
+++ b/src/views/system/modules/SelectUserModal.vue
@@ -12,14 +12,19 @@
 
       <!-- 查询区域 -->
       <div class="table-page-search-wrapper">
-        <a-form layout="inline"  @keyup.enter.native="searchQuery">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
           <a-row :gutter="24">
 
-            <a-col :span="10">
+            <a-col :span="8">
               <a-form-item label="用户账号">
                 <j-input placeholder="请输入用户账号" v-model="queryParam.username"></j-input>
               </a-form-item>
             </a-col>
+            <a-col :span="8">
+              <a-form-item label="用户名称">
+                <j-input placeholder="请输入用户名称" v-model="queryParam.realname"></j-input>
+              </a-form-item>
+            </a-col>
             <a-col :span="8">
                     <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                       <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
@@ -187,11 +192,14 @@ export default {
         this.ipagination.current = 1
       }
       const params = this.getQueryParams()// 查询条件
+      this.loading = true
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
           this.dataSource1 = res.result.records
           this.ipagination.total = res.result.total
         }
+      }).finally(() => {
+        this.loading = false
       })
     },
     getQueryParams () {
@@ -253,34 +261,34 @@ export default {
 }
 </script>
 <style lang="less" scoped>
-  .ant-card-body .table-operator {
-    margin-bottom: 18px;
-  }
+.ant-card-body .table-operator {
+  margin-bottom: 18px;
+}
 
-  .ant-table-tbody .ant-table-row td {
-    padding-top: 15px;
-    padding-bottom: 15px;
-  }
+.ant-table-tbody .ant-table-row td {
+  padding-top: 15px;
+  padding-bottom: 15px;
+}
 
-  .anty-row-operator button {
-    margin: 0 5px
-  }
+.anty-row-operator button {
+  margin: 0 5px
+}
 
-  .ant-btn-danger {
-    background-color: #ffffff
-  }
+.ant-btn-danger {
+  background-color: #ffffff
+}
 
-  .ant-modal-cust-warp {
-    height: 100%
-  }
+.ant-modal-cust-warp {
+  height: 100%
+}
 
-  .ant-modal-cust-warp .ant-modal-body {
-    height: calc(100% - 110px) !important;
-    overflow-y: auto
-  }
+.ant-modal-cust-warp .ant-modal-body {
+  height: calc(100% - 110px) !important;
+  overflow-y: auto
+}
 
-  .ant-modal-cust-warp .ant-modal-content {
-    height: 90% !important;
-    overflow-y: hidden
-  }
+.ant-modal-cust-warp .ant-modal-content {
+  height: 90% !important;
+  overflow-y: hidden
+}
 </style>