Fix: 用户修改问题

src/views/modules/sys/user-add-or-update.vue

@@ -8,7 +8,7 @@
         <el-input v-model="dataForm.userName" :disabled="dataForm.id !== 0" placeholder="登录帐号"></el-input>
       </el-form-item>
       <el-form-item label="姓名" prop="name">
-        <el-input v-model="dataForm.name" :disabled="dataForm.id !== 0" placeholder="姓名"></el-input>
+        <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
       </el-form-item>
       <el-form-item label="密码" prop="password" :class="{ 'is-required': !dataForm.id }">
         <el-input v-model="dataForm.password" type="password" placeholder="密码"></el-input>
@@ -16,7 +16,7 @@
       <el-form-item label="确认密码" prop="confirmPassword" :class="{ 'is-required': !dataForm.id }">
         <el-input v-model="dataForm.confirmPassword" type="password" placeholder="确认密码"></el-input>
       </el-form-item>
-      <el-form-item label="所属机构" prop="orgId">
+      <el-form-item v-if="dataForm.userName !== 'admin'" label="所属机构" prop="orgId">
         <org-component v-model="dataForm.orgId" @orgSelected="validateField('orgId')"/>
       </el-form-item>
       <el-form-item label="邮箱" prop="email">
@@ -25,12 +25,12 @@
       <el-form-item label="手机号" prop="mobile">
         <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
       </el-form-item>
-      <el-form-item label="角色" size="mini" prop="roleIdList">
+      <el-form-item v-if="dataForm.userName !== 'admin'" label="角色" size="mini" prop="roleIdList">
         <el-checkbox-group v-model="dataForm.roleIdList">
           <el-checkbox v-for="role in roleList" :key="role.roleId" :label="role.roleId">{{ role.roleName }}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
-      <el-form-item label="状态" size="mini" prop="status">
+      <el-form-item v-if="dataForm.userName !== 'admin'" label="状态" size="mini" prop="status">
         <el-radio-group v-model="dataForm.status">
           <el-radio :label="0">禁用</el-radio>
           <el-radio :label="1">正常</el-radio>
@@ -67,7 +67,7 @@
         }
       }
       let validateEmail = (rule, value, callback) => {
-        if (value !== '' && !isEmail(value)) {
+        if (value !== null && value !== '' && !isEmail(value)) {
           callback(new Error('邮箱格式错误'))
         } else {
           callback()
@@ -111,7 +111,7 @@
             { validator: validateEmail, trigger: 'blur' }
           ],
           name: [
-            { required: true, message: '手机号不能为空', trigger: 'blur' }
+            { required: true, message: '姓名不能为空', trigger: 'blur' }
           ],
           mobile: [
             { required: true, message: '手机号不能为空', trigger: 'blur' },

src/views/modules/sys/user.vue

@@ -36,10 +36,16 @@
         label="用户名">
       </el-table-column>
       <el-table-column
-        prop="email"
+        prop="name"
         header-align="center"
         align="center"
-        label="邮箱">
+        label="姓名">
+      </el-table-column>
+      <el-table-column
+        prop="orgName"
+        header-align="center"
+        align="center"
+        label="所属机构">
       </el-table-column>
       <el-table-column
         prop="mobile"
@@ -47,6 +53,12 @@
         align="center"
         label="手机号">
       </el-table-column>
+      <el-table-column
+        prop="email"
+        header-align="center"
+        align="center"
+        label="邮箱">
+      </el-table-column>
       <el-table-column
         prop="status"
         header-align="center"