diff --git a/pages/oaHome/oaHome.vue b/pages/oaHome/oaHome.vue index 672d6f7..f28f2df 100644 --- a/pages/oaHome/oaHome.vue +++ b/pages/oaHome/oaHome.vue @@ -9,7 +9,7 @@ - + @@ -25,20 +25,25 @@ - - 电话:{{myOaInfo.account}} + 电话:{{myOaInfo.account}}
+ 公司:{{ myOaInfo.admin.company.company_name }}
- + + + + + + 公告列表 @@ -205,8 +210,9 @@ let arr = oaHomeData.filter(item=>!item.admin);//过滤掉管理员专属页面 this.oaHomeData = arr; }else { - let arr = oaHomeData.filter(item=>!item.personnel);//过滤掉普通用户专属页面 - this.oaHomeData = arr; + this.oaHomeData = oaHomeData; + // let arr = oaHomeData.filter(item=>!item.personnel);//过滤掉普通用户专属页面 + // this.oaHomeData = arr; } }, async getApproveList() { diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue index a8081bc..ff4ae0d 100644 --- a/pages/oaMy/oaMy.vue +++ b/pages/oaMy/oaMy.vue @@ -16,7 +16,7 @@ + width="130.28rpx" height="130.28rpx" shape="circle"> @@ -32,9 +32,8 @@ - 电话:{{oaUserInfo.account}} - - + 电话:{{oaUserInfo.account}}
+ 公司:{{ oaUserInfo.admin.company.company_name }}