用户中心修改

front-vue/src/views/system/company/certification.vue

@@ -1052,12 +1052,12 @@ export default {
                  this.$set(
               this.form,
               "phone",
-              response.data.user[0].userName
+              response.data.user.userName
             );
                     this.$set(
               this.form,
               "handler",
-              response.data.user[0].nickName
+              response.data.user.nickName
             );
                        this.$set(
               this.form,
@@ -1072,12 +1072,12 @@ export default {
                      this.$set(
               this.form,
               "phone",
-              response.data.user[0].userName
+              response.data.user.userName
             );
                     this.$set(
               this.form,
               "handler",
-              response.data.user[0].nickName
+              response.data.user.nickName
             );
                        this.$set(
               this.form,

front-vue/src/views/system/user/index.vue

@@ -120,11 +120,6 @@
                             <el-input v-model="form.userName" placeholder="请输入登手机号" maxlength="11" :disabled="isUpdate" />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
-                        <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-                            <el-input v-model="form.password" placeholder="请输入用户密码" show-password maxlength="20" />
-                        </el-form-item>
-                    </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="12">
@@ -357,25 +352,6 @@ export default {
                         trigger: "blur",
                     },
                 ],
-                password: [
-                    {
-                        required: true,
-                        message: "用户密码不能为空",
-                        trigger: "blur",
-                    },
-                    {
-                        min: 6,
-                        max: 20,
-                        message: "长度在 6 到 20 个字符",
-                        trigger: "blur",
-                    },
-                    {
-                        // pattern:/^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)]|[\(\)])+$)([^(0-9a-zA-Z)]|[\(\)]|[a-z]|[A-Z]|[0-9]){6,}$/,
-                        pattern: /^[a-zA-Z0-9\x21-\x7e]{6,20}$/,
-                        message: "密码只能包含大小写字母、数字或符号",
-                        trigger: ["blur", "change"],
-                    },
-                ],
                 postIds: [
                     {
                         required: true,

front-vue/src/views/system/user/profile/index.vue

@@ -16,10 +16,6 @@
                 <div class="pull-right">{{ user.userName }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="phone" />手机号码
-                <div class="pull-right">{{ user.phonenumber }}</div>
-              </li>
-              <li class="list-group-item">
                 <svg-icon icon-class="email" />用户邮箱
                 <div class="pull-right">{{ user.email }}</div>
               </li>
@@ -30,11 +26,10 @@
               <li class="list-group-item">
                 <svg-icon icon-class="peoples" />所属角色
                 <!-- <div class="pull-right" :show-overflow-tooltip="true" width="50" ></div> -->
-             <el-tooltip placement="top">
-  <div slot="content">{{ roleGroup }}</div>
-  <div class="pulll-right" >{{ roleGroup }}</div>
-</el-tooltip>
-
+                <el-tooltip placement="top">
+                  <div slot="content">{{ roleGroup }}</div>
+                  <div class="pulll-right" >{{ roleGroup }}</div>
+                </el-tooltip>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="date" />创建日期
@@ -56,9 +51,9 @@
             <el-tab-pane label="修改密码" name="resetPwd">
               <resetPwd :user="user" />
             </el-tab-pane>
-            <el-tab-pane label="解除绑定" name="bindOff">
+            <!-- <el-tab-pane label="解除绑定" name="bindOff">
               <bindOff/>
-            </el-tab-pane>
+            </el-tab-pane> -->
           </el-tabs>
         </el-card>
       </el-col>
@@ -79,8 +74,7 @@ export default {
   data() {
     return {
       user: {},
-      roleGroup: {},
-      // postGroup: {},
+      roleGroup: '',
       activeTab: "userinfo"
     };
   },
@@ -92,8 +86,13 @@ export default {
       var sscDomain = document.location.hostname;
       getUserProfile(sscDomain).then(response => {
         this.user = response.data;
-        this.roleGroup = response.roleGroup;
-        // this.postGroup = response.postGroup;
+        var roles = response.roleGroup.roles;
+        for (var i = 0; i < roles.length; i ++) {
+          this.roleGroup += roles[i];
+          if (i != roles.length - 1) {
+            this.roleGroup += ',';
+          }
+        }
       });
     }
   }

front-vue/src/views/system/user/profile/resetPwd.vue

@@ -66,9 +66,9 @@ export default {
             response => {
               loading.close();
               this.msgSuccess("修改成功");
-                    this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
-        })
+              this.$store.dispatch('LogOut').then(() => {
+                location.href = '/index';
+              })
             }
           ).catch((response)=>{
               loading.close();

front-vue/src/views/system/user/profile/userInfo.vue

@@ -1,14 +1,13 @@
 <template>
-  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+  <el-form ref="form" :model="user" label-width="80px">
     <el-form-item label="用户姓名" prop="nickName">
-      <el-input v-model="user.nickName" maxlength="20" disabled="true"/>
-    </el-form-item> 
+      <el-input v-model="user.nickName" maxlength="20" :disabled="true"/>
+    </el-form-item>
     <el-form-item label="手机号码" prop="phonenumber">
-      <el-input v-model="user.phonenumber" v-bind:disabled="diasabledInput" 
-              onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" maxlength="11" disabled="true" />
+      <el-input v-model="user.userName" :disabled="true" />
     </el-form-item>
     <el-form-item label="邮箱" prop="email">
-      <el-input v-model="user.email" maxlength="50" disabled="true"/>
+      <el-input v-model="user.email" maxlength="50" :disabled="true"/>
     </el-form-item>
     <el-form-item label="性别">
       <el-radio-group v-model="user.sex">
@@ -16,10 +15,6 @@
         <el-radio label="1" disabled>女</el-radio>
       </el-radio-group>
     </el-form-item>
-    <!-- <el-form-item>
-      <el-button type="primary" size="mini" @click="submit">保存</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
-    </el-form-item> -->
   </el-form>
 </template>
 <script>
@@ -34,46 +29,9 @@ export default {
   },
   data() {
     return {
-      // 表单校验
-      rules: {
-        /* nickName: [
-          { required: true, message: "用户姓名不能为空", trigger: "blur" }
-        ],
-        email: [
-          { required: true, message: "邮箱地址不能为空", trigger: "blur" },
-          {
-            // type: "email",
-            pattern:/^([a-z0-9A-Z]+[-|_|\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\.)+[a-zA-Z]{2,}$/,
-            message: "邮箱格式不正确",
-            trigger: "blur",
-          }
-        ],
-        phonenumber: [
-          { required: true, message: "手机号码不能为空", trigger: "blur" },
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ] */
-      }
     };
   },
   methods: {
-    submit() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          updateUserProfile(this.user).then(response => {
-            this.msgSuccess("修改成功");
-          });
-        }
-      });
-    },
-    close() {
-      Global.$emit("removeCache", "closeSelectedTag", this.$route);
-      this.$store.dispatch("tagsView/delView", this.$route);
-      this.$router.push({ path: "/index" });
-    }
   }
 };
 </script>