jbb 2 лет назад
Родитель
Сommit
c22b6ce58b
1 измененных файлов с 12 добавлено и 13 удалено
  1. 12 13
      src/views/system/UserList.vue

+ 12 - 13
src/views/system/UserList.vue

@@ -12,28 +12,25 @@
               <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.sex" placeholder="请选择性别">
-                <a-select-option value="">请选择</a-select-option>
-                <a-select-option value="1">男性</a-select-option>
-                <a-select-option value="2">女性</a-select-option>
-              </a-select>
-            </a-form-item>
+          <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-form-item label="公司">
-                <j-input placeholder="请输入公司" v-model="queryParam.pkOrgName"></j-input>
+              <a-form-item label="所属公司">
+                <j-dict-select-tag  v-model="queryParam.sex" placeholder="请输入用户性别"
+                  dictCode="affiliated-company"/>
               </a-form-item>
             </a-col>
 
             <a-col :md="6" :sm="8">
               <a-form-item label="部门">
-                <j-input placeholder="请输入部门" v-model="queryParam.orgCode"></j-input>
+                <j-search-select-tag v-model="queryParam.deptName" placeholder="请选择部门" 
+                     dict="sys_depart,depart_name,depart_name,org_type='3' or org_code='TBD' order by org_code"/>
               </a-form-item>
             </a-col>
 
@@ -200,6 +197,7 @@
   import SysUserAgentModal from "./modules/SysUserAgentModal";
   import JInput from '@/components/jeecg/JInput'
   import UserRecycleBinModal from './modules/UserRecycleBinModal'
+  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
 
   export default {
     name: "UserList",
@@ -209,7 +207,8 @@
       UserModal,
       PasswordModal,
       JInput,
-      UserRecycleBinModal
+      UserRecycleBinModal,
+      JSearchSelectTag
     },
     data() {
       return {