coys

.env.development

@@ -17,8 +17,8 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://10.87.11.173:8080'
 # VUE_APP_BASE_API = 'http://localhost:8080'
 # 55环境
-# VUE_APP_BASE_API = 'http://10.87.21.107:8080'
-VUE_APP_BASE_API = 'http://localhost:8080'
+VUE_APP_BASE_API = 'http://10.87.23.62:8080'
+# VUE_APP_BASE_API = 'http://localhost:8080'
 # 开发环境
 # VUE_APP_BASE_API = 'http://10.87.21.103:8080'
 # 路由懒加载

src/api/system/user.js

@@ -9,6 +9,14 @@ export function listUser(query) {
     params: query
   })
 }
+//查询用户系统参数显示隐藏个人资料和修改密码
+export function getUserPasswordAndInfo(query) {
+  return request({
+    url: '/system/config/getIsDisplayPassword',
+    method: 'get',
+    params: query
+  })
+}
 export function listAllUser(query) {
   return request({
     url: '/system/user/selectAllUser',

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

@@ -4,12 +4,12 @@
       <el-col :span="6" :xs="24">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
-            <span>个人信息</span>
+            <span>个人信息 </span>
           </div>
           <div>
-<!--            <div class="text-center">-->
-<!--              <userAvatar :user="user" />-->
-<!--            </div>-->
+            <!--            <div class="text-center">-->
+            <!--              <userAvatar :user="user" />-->
+            <!--            </div>-->
             <ul class="list-group list-group-striped">
               <li class="list-group-item">
                 <svg-icon icon-class="user" />用户名称
@@ -25,11 +25,13 @@
               </li> -->
               <li class="list-group-item">
                 <svg-icon icon-class="tree" />所属机构
-                <div class="pull-right" v-if="user.orgName">{{ user.orgName }} </div>
+                <div class="pull-right" v-if="user.orgName">
+                  {{ user.orgName }}
+                </div>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="peoples" />所属角色
-                <div class="pull-right">{{ roleGroup }} </div>
+                <div class="pull-right">{{ roleGroup }}</div>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="date" />创建日期
@@ -39,7 +41,8 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="18" :xs="24" v-if="user.source==0">
+
+      <el-col :span="18" :xs="24" v-if="configValue == 'N'">
         <el-card>
           <div slot="header" class="clearfix">
             <span>基本资料</span>
@@ -49,7 +52,7 @@
               <userInfo :user="user" />
             </el-tab-pane>
             <el-tab-pane label="修改密码" name="resetPwd">
-              <resetPwd />
+              <resetPwd :userObj="user" />
             </el-tab-pane>
           </el-tabs>
         </el-card>
@@ -62,7 +65,7 @@
 import userAvatar from "./userAvatar";
 import userInfo from "./userInfo";
 import resetPwd from "./resetPwd";
-import { getUserProfile } from "@/api/system/user";
+import { getUserProfile, getUserPasswordAndInfo } from "@/api/system/user";
 
 export default {
   name: "Profile",
@@ -70,32 +73,38 @@ export default {
   data() {
     return {
       user: {},
+      configValue: "",
       roleGroup: null,
       postGroup: null,
-      activeTab: "userinfo"
+      activeTab: "userinfo",
     };
   },
   mounted() {
     this.getUser();
+    this.getUserInfo();
   },
   methods: {
     getUser() {
-      getUserProfile().then(res => {
-        console.log(res)
-        if(!res.user) return;
+      getUserProfile().then((res) => {
+        if (!res.user) return;
         this.user = res.data;
         this.roleGroup = res.roleGroup;
         this.postGroup = res.postGroup;
       });
-    }
-  }
+    },
+    getUserInfo() {
+      getUserPasswordAndInfo().then((res) => {
+        this.configValue = res.data.configValue;
+      });
+    },
+  },
 };
 </script>
 <style lang="scss">
-.list-group-item{
+.list-group-item {
   border-top: 0;
   align-items: center;
-  >svg{
+  > svg {
     margin-right: 5px;
   }
 }

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

@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+  <el-form ref="form" :model="user" :disabled="userObj.source==1" :rules="rules" label-width="100px">
     <el-form-item label="旧密码" prop="oldPassword">
       <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
     </el-form-item>
@@ -20,7 +20,16 @@
 import { updateUserPwd } from "@/api/system/user";
 
 export default {
+  props: {
+    userObj: {
+      type: Object,
+      default:{
+        
+      }
+    }
+  },
   data() {
+    
     const equalToPassword = (rule, value, callback) => {
       if (this.user.newPassword !== value) {
         callback(new Error("两次输入的密码不一致"));

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

@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
+  <el-form ref="form" :disabled="user.source==1" :model="user" :rules="rules" label-width="100px">
     <el-form-item label="用户昵称" prop="name">
       <el-input v-model="user.name" maxlength="30" />
     </el-form-item>