···

src/option/user/info.js

@@ -28,23 +28,32 @@ export default {
         row: true,
         prop: 'name'
       }, {
-        label: '用户名',
+        label: 'Mo碼',
         span: 12,
         row: true,
-        prop: 'realName'
+        prop: 'code',
+        disabled: true,
       }, {
-        label: '手机号',
+        label: 'EHR號',
         span: 12,
         row: true,
-        prop: 'phone'
+        prop: 'ehr',
+        disabled: true,
       }, {
-        label: '邮箱',
-        prop: 'email',
+        label: '所屬機構',
+        prop: 'deptName',
         span: 12,
         row: true,
+        disabled: true,
+      }, {
+        label: '所屬角色',
+        prop: 'roleName',
+        span: 12,
+        row: true,
+        disabled: true,
       }]
     },
-    {
+    /*{
       label: '修改密码',
       prop: 'password',
       column: [{
@@ -66,6 +75,6 @@ export default {
         type: 'password',
         prop: 'newPassword1'
       }]
-    }
+    }*/
   ],
 }

src/page/index/top/index.vue

@@ -19,6 +19,12 @@
       </span>
     </div>
     <div class="top-bar__right">
+      <div style="font-size: small;font-weight: bold;">所属机构：</div>
+      <div style="font-size: small;margin-right: 10px;">{{form.deptName}}</div>
+      <div style="font-size: small;font-weight: bold;">角色：</div>
+      <div style="font-size: small;margin-right: 10px;">{{form.roleName}}</div>
+      <div style="font-size: small;font-weight: bold;">账号：</div>
+      <div style="font-size: small;margin-right: 10px;">{{form.name}}</div>
       <el-tooltip v-if="showColor"
                   effect="dark"
                   :content="$t('navbar.color')"
@@ -108,6 +114,7 @@
   import topColor from "./top-color";
   import topNotice from './top-notice'
   import topLang from "./top-lang";
+  import {getUserInfo} from "@/api/system/user";
 
   export default {
     components: {
@@ -122,13 +129,28 @@
     },
     name: "top",
     data() {
-      return {};
+      return {
+        form: {},
+      };
     },
     filters: {},
     created() {
+      getUserInfo().then(res => {
+        const user = res.data.data;
+        this.form = {
+          id: user.id,
+          avatar: user.avatar,
+          name: user.name,
+          deptName: user.deptName,
+          roleName: user.roleName,
+          code: user.code,
+          ehr: user.ehr,
+        }
+      });
     },
     mounted() {
       listenfullscreen(this.setScreen);
+
     },
     computed: {
       ...mapState({

src/views/system/user.vue

@@ -45,20 +45,20 @@
                        icon="el-icon-user"
                        @click="handleGrant">角色配置
             </el-button>
-            <el-button type="info"
+            <!--<el-button type="info"
                        size="small"
                        plain
                        v-if="permission.user_reset"
                        icon="el-icon-refresh"
                        @click="handleReset">密码重置
-            </el-button>
-            <el-button type="info"
+            </el-button>-->
+           <!-- <el-button type="info"
                        size="small"
                        plain
                        v-if="userInfo.role_name.includes('admin')"
                        icon="el-icon-setting"
                        @click="handlePlatform">平台配置
-            </el-button>
+            </el-button>-->
             <el-button type="success"
                        size="small"
                        plain
@@ -170,7 +170,7 @@
     grant,
     resetPassword
   } from "@/api/system/user";
-  import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
+  import {getDeptTree, getDeptLazyTree, getTree} from "@/api/system/dept";
   import {getRoleTree} from "@/api/system/role";
   import {getPostList} from "@/api/system/post";
   import {mapGetters} from "vuex";
@@ -230,9 +230,9 @@
         treeData: [],
         treeOption: {
           nodeKey: 'id',
-          lazy: true,
+          lazy: false,
           treeLoad: function (node, resolve) {
-            const parentId = (node.level === 0) ? 0 : node.data.id;
+            /*const parentId = (node.level === 0) ? 0 : node.data.id;
             getDeptLazyTree(parentId).then(res => {
               resolve(res.data.data.map(item => {
                 return {
@@ -240,7 +240,7 @@
                   leaf: !item.hasChildren
                 }
               }))
-            });
+            });*/
           },
           addBtn: false,
           menu: false,
@@ -323,7 +323,6 @@
                 value: "dictKey"
               },
               dataType: "number",
-              search: true,
               hide: true,
               display: false,
               prop: "userType",
@@ -746,6 +745,8 @@
         getDeptTree(tenantId).then(res => {
           const column = this.findObject(this.option.group, "deptId");
           column.dicData = res.data.data;
+          let treeData = getTree(res.data.data, this.userInfo.dept_id);
+          this.treeData = treeData;
         });
         getPostList(tenantId).then(res => {
           const column = this.findObject(this.option.group, "postId");
@@ -907,7 +908,7 @@
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          window.open(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`);
+          window.open(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&name=${this.search.name}`);
         });
       },
       handleTemplate() {

src/views/system/userinfo.vue

@@ -75,9 +75,10 @@
               id: user.id,
               avatar: user.avatar,
               name: user.name,
-              realName: user.realName,
-              phone: user.phone,
-              email: user.email,
+              deptName: user.deptName,
+              roleName: user.roleName,
+              code: user.code,
+              ehr: user.ehr,
             }
           });
         }