fix: 用户新增和修改

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

@@ -14,7 +14,7 @@
         <el-input v-model="dataForm.password" type="password" placeholder="密码"></el-input>
       </el-form-item>
       <el-form-item label="确认密码" prop="comfirmPassword" :class="{ 'is-required': !dataForm.id }">
-        <el-input v-model="dataForm.comfirmPassword" type="password" placeholder="确认密码"></el-input>
+        <el-input v-model="dataForm.confirmPassword" type="password" placeholder="确认密码"></el-input>
       </el-form-item>
       <el-form-item label="邮箱" prop="email">
         <el-input v-model="dataForm.email" placeholder="邮箱"></el-input>
@@ -45,14 +45,14 @@
   import { isEmail, isMobile } from '@/utils/validate'
   export default {
     data () {
-      var validatePassword = (rule, value, callback) => {
+      let validatePassword = (rule, value, callback) => {
         if (!this.dataForm.id && !/\S/.test(value)) {
           callback(new Error('密码不能为空'))
         } else {
           callback()
         }
       }
-      var validateComfirmPassword = (rule, value, callback) => {
+      let validateConfirmPassword = (rule, value, callback) => {
         if (!this.dataForm.id && !/\S/.test(value)) {
           callback(new Error('确认密码不能为空'))
         } else if (this.dataForm.password !== value) {
@@ -61,14 +61,14 @@
           callback()
         }
       }
-      var validateEmail = (rule, value, callback) => {
-        if (!isEmail(value)) {
+      let validateEmail = (rule, value, callback) => {
+        if (value !== '' && !isEmail(value)) {
           callback(new Error('邮箱格式错误'))
         } else {
           callback()
         }
       }
-      var validateMobile = (rule, value, callback) => {
+      let validateMobile = (rule, value, callback) => {
         if (!isMobile(value)) {
           callback(new Error('手机号格式错误'))
         } else {
@@ -78,12 +78,13 @@
       return {
         visible: false,
         roleList: [],
+        orgList: [],
         dataForm: {
           id: 0,
           userName: '',
           name: '',
           password: '',
-          comfirmPassword: '',
+          confirmPassword: '',
           salt: '',
           email: '',
           mobile: '',
@@ -97,8 +98,8 @@
           password: [
             { validator: validatePassword, trigger: 'blur' }
           ],
-          comfirmPassword: [
-            { validator: validateComfirmPassword, trigger: 'blur' }
+          confirmPassword: [
+            { validator: validateConfirmPassword, trigger: 'blur' }
           ],
           email: [
             { validator: validateEmail, trigger: 'blur' }
@@ -158,11 +159,20 @@
             this.$http({
               url: this.$http.adornUrl(`/user-service/user/${!this.dataForm.id ? 'save' : 'update'}`),
               method: !this.dataForm.id ? 'post' : 'put',
-              data: this.$http.adornData({
-                'userId': this.dataForm.id || undefined,
+              data: this.$http.adornData(!this.dataForm.id ? {
+                'userId': undefined,
                 'username': this.dataForm.userName,
                 'password': this.dataForm.password,
-                'salt': this.dataForm.salt,
+                // 'salt': this.dataForm.salt,
+                'email': this.dataForm.email,
+                'mobile': this.dataForm.mobile,
+                'status': this.dataForm.status,
+                'roleIdList': this.dataForm.roleIdList,
+                'name': this.dataForm.name,
+                'orgId': '1236014628821554950' // 硬编码，测试用
+              } : {
+                'userId': this.dataForm.id,
+                'password': this.dataForm.password,
                 'email': this.dataForm.email,
                 'mobile': this.dataForm.mobile,
                 'status': this.dataForm.status,