luojun 2 жил өмнө
parent
commit
698cd040ba

+ 40 - 37
src/views/system/user/index.vue

@@ -60,10 +60,10 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="状态" prop="isLock">
+            <el-form-item label="账号状态" prop="isLock">
               <el-select
                 v-model="queryParams.isLock"
-                placeholder="请选择状态"
+                placeholder="请选择账号状态"
                 clearable
                 style="width: 200px"
               >
@@ -358,16 +358,48 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="用户名称" prop="name">
+            <el-form-item v-if="!form.id" label="密码" prop="password">
+              <el-input
+                v-model="form.password"
+                placeholder="请输入密码"
+                autocomplete="off"
+                type="password"
+                maxlength="20"
+                show-password
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="10">
+            <el-form-item label="姓名" prop="name">
               <el-input
                 v-model="form.name"
-                placeholder="请输入用户名称"
+                placeholder="请输入姓名"
                 maxlength="30"
                 :readonly="form.source == 1"
               />
             </el-form-item>
           </el-col>
+          <el-col :span="10">
+            <el-form-item label="性别" prop="gender">
+              <el-select
+                style="width: 100%"
+                v-model="form.gender"
+                placeholder="请选择性别"
+                :disabled="form.source == 1"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_user_sex"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="`${dict.value}`"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
+          
         <el-row>
           <el-col :span="20">
             <el-form-item label="所属机构" prop="orgId">
@@ -410,25 +442,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="用户性别" prop="gender">
-              <el-select
-                style="width: 100%"
-                v-model="form.gender"
-                placeholder="请选择用户性别"
-                :disabled="form.source == 1"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_user_sex"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="`${dict.value}`"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="10">
             <el-form-item label="手机号码" prop="phone">
               <el-input
                 v-model="form.phone"
@@ -439,22 +452,12 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item v-if="!form.id" label="用户密码" prop="password">
-              <el-input
-                v-model="form.password"
-                placeholder="请输入用户密码"
-                autocomplete="off"
-                type="password"
-                maxlength="20"
-                show-password
-              />
-            </el-form-item>
-          </el-col>
+
         </el-row>
+        
         <el-row>
           <el-col :span="10">
-            <el-form-item label="状态">
+            <el-form-item label="账号状态">
               <el-radio-group v-model="form.isLock">
                 <el-radio
                   v-for="dict in dict.type.sys_user_is_lock"
@@ -467,7 +470,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="是否管理人员" label-width="180">
+            <el-form-item label="管理人员" label-width="180">
               <el-radio-group v-model="form.isManage">
                 <el-radio
                   v-for="dict in dict.type.sys_yes_no"