[update] 用户管理查询条件的顺序调整

src/views/system/UserList.vue

@@ -6,34 +6,56 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
 
-          <a-col :md="6" :sm="12">
+          <!--   用户姓名  -->
-            <a-form-item :label="$t('user.userAccount')">
-              <j-input :placeholder="$t('pleaseEnter') + $t('user.userAccount')" v-model="queryParam.username"></j-input>
-            </a-form-item>
-          </a-col>
-
-          <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>
-                <a-select-option value="1">{{ $t('user.male') }}</a-select-option>
-                <a-select-option value="2">{{ $t('user.female') }}</a-select-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-
           <a-col :md="6" :sm="12">
             <a-form-item :label="$t('user.userName')">
               <j-input :placeholder="$t('pleaseEnter') + $t('user.userName')" v-model="queryParam.realname"></j-input>
             </a-form-item>
           </a-col>
 
+          <!--  组织机构  -->
+          <a-col :md="6" :sm="12">
+            <a-form-item :label="$t('organization')">
+              <a-tree-select
+                tree-node-filter-prop="title"
+                v-model="queryParam.departId"
+                :maxTagCount="1"
+                :show-search="true"
+                :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                class="box-input"
+                allow-clear
+                style="width: 100%"
+                :tree-data="categoryTreeList"
+                :placeholder="$t('pleaseSelect') + $t('organization')"
+              />
+            </a-form-item>
+          </a-col>
+
+          <!--  角色  -->
+          <a-col :md="6" :sm="12">
+            <a-form-item :label="$t('role')">
+              <j-search-select-tag
+                :placeholder="$t('pleaseSelect') + $t('role')"
+                v-model="queryParam.roleId"
+                :dictOptions="rolesList">
+              </j-search-select-tag>
+            </a-form-item>
+          </a-col>
+
           <template v-if="toggleSearchStatus">
             <!--<a-col :md="6" :sm="12">-->
             <!--  <a-form-item :label="$t('phoneNumber')">-->
             <!--    <a-input :placeholder="$t('pleaseEnter') + $t('phoneNumber')" v-model="queryParam.phone"></a-input>-->
             <!--  </a-form-item>-->
             <!--</a-col>-->
+            <!--   用户账号  -->
+            <a-col :md="6" :sm="12">
+              <a-form-item :label="$t('user.userAccount')">
+                <j-input :placeholder="$t('pleaseEnter') + $t('user.userAccount')" v-model="queryParam.username"></j-input>
+              </a-form-item>
+            </a-col>
+
+            <!--   状态   -->
             <a-col :md="6" :sm="12">
               <a-form-item :label="$t('status')">
                 <a-select v-model="queryParam.status" :placeholder="$t('pleaseSelect') + $t('status')">
@@ -44,30 +66,14 @@
               </a-form-item>
             </a-col>
 
+            <!--  性别  -->
             <a-col :md="6" :sm="12">
-              <a-form-item :label="$t('organization')">
+              <a-form-item :label="$t('user.gender')">
-                <a-tree-select
+                <a-select v-model="queryParam.sex" :placeholder="$t('pleaseSelect') + $t('user.gender')">
-                  tree-node-filter-prop="title"
+                  <a-select-option value="">{{ $t('pleaseSelect') }}</a-select-option>
-                  v-model="queryParam.departId"
+                  <a-select-option value="1">{{ $t('user.male') }}</a-select-option>
-                  :maxTagCount="1"
+                  <a-select-option value="2">{{ $t('user.female') }}</a-select-option>
-                  :show-search="true"
+                </a-select>
-                  :getPopupContainer="triggerNode=> triggerNode.parentNode"
-                  class="box-input"
-                  allow-clear
-                  style="width: 100%"
-                  :tree-data="categoryTreeList"
-                  :placeholder="$t('pleaseSelect') + $t('organization')"
-                />
-              </a-form-item>
-            </a-col>
-
-            <a-col :md="6" :sm="12">
-              <a-form-item :label="$t('role')">
-                <j-search-select-tag
-                  :placeholder="$t('pleaseSelect') + $t('role')"
-                  v-model="queryParam.roleId"
-                  :dictOptions="rolesList">
-                </j-search-select-tag>
               </a-form-item>
             </a-col>
           </template>