森语-用户档案

src/views/system/UserList.vue

@@ -5,22 +5,7 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
-
-          <a-col :md="6" :sm="12">
-            <a-form-item label="账号">
-              <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
-              <j-input placeholder="输入账号模糊查询" v-model="queryParam.username"></j-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="12">
-          <a-form-item label="真实名字">
-               <j-input placeholder="请输入" v-model="queryParam.pkOrgName"></j-input>
-          </a-form-item>
-          </a-col>
-
-
-          <template v-if="toggleSearchStatus">
-            <a-col :md="6" :sm="8">
+          <a-col :md="6" :sm="8">
               <a-form-item label="所属公司">
                 <j-dict-select-tag  v-model="queryParam.belongingCompany" placeholder="请输入用户性别"
                   dictCode="affiliated-company"/>
@@ -34,7 +19,22 @@
               </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="真实名字">
+               <j-input placeholder="请输入" v-model="queryParam.pkOrgName"></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="12">
+            <a-form-item label="账号">
+              <!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>-->
+              <j-input placeholder="输入账号模糊查询" v-model="queryParam.username"></j-input>
+            </a-form-item>
+          </a-col>
+
+            <!-- <a-col :md="6" :sm="8">
               <a-form-item label="用户状态">
                 <a-select v-model="queryParam.status" placeholder="请选择">
                   <a-select-option value="">请选择</a-select-option>
@@ -42,7 +42,7 @@
                   <a-select-option value="2">冻结</a-select-option>
                 </a-select>
               </a-form-item>
-            </a-col>
+            </a-col> -->
           </template>
 
           <a-col :md="6" :sm="8">
@@ -267,10 +267,10 @@
             dataIndex: 'phone'
           },
           {
-            title: '公司',
+            title: '所属公司',
             align: "center",
             width: 180,
-            dataIndex: 'pkOrgName'
+            dataIndex: 'belongingCompany'
           },
           {
             title: '生日',