diff --git a/components/orderCard.vue b/components/orderCard.vue index 5e79c93..ff0389c 100644 --- a/components/orderCard.vue +++ b/components/orderCard.vue @@ -98,6 +98,12 @@ export default { default: () => { return {} } + }, + userInfo: { + type: Object, + default: () => { + return {} + } } }, computed: { @@ -122,14 +128,11 @@ export default { roleCanJd:false, //当前用户是否可以进行施工、施工过程、结束施工操作--- roleCanSg:false, - //当前用户 - userInfo:{}, ifLeader:false, } }, mounted(){ this.ifLeader = getStrData('ifLeader') - this.userInfo = getUserInfo() if(this.userInfo.roleCodes.includes("service_advisor") || this.userInfo.roleCodes.includes("general_inspection") || (this.userInfo.roleCodes.includes("repair_staff") && getStrData("ifLeader"))){ //服务顾问、总检可以派工,维修班组长需要判断是否可以派工 this.roleCanPg = true diff --git a/pages-home/home/home.vue b/pages-home/home/home.vue index 0c7a3e3..6926903 100644 --- a/pages-home/home/home.vue +++ b/pages-home/home/home.vue @@ -3,13 +3,16 @@ + + {{ companyInfo.simpleName || companyInfo.corpName }} + {{ userInfo.nickname }} {{ userInfo.roleNames }} - 班组长 + 班组长 @@ -97,7 +100,7 @@ - + @@ -231,6 +234,8 @@ export default { //告知客户的内容 tellCusText:"", ifLeader:false, + //企业信息 + companyInfo:{}, } }, onLoad(){ @@ -239,6 +244,7 @@ export default { url: '/pages/login/login' }) }else{ + this.companyInfo = getJSONData("companyInfo") if(!this.$msgSocket){ this.$startMsgSocket(getTenantId(),getStrData("userId")) } @@ -751,6 +757,12 @@ export default { overflow: auto; padding-bottom: 30rpx; } + .company-text { + font-size: 30rpx; + font-weight: bold; + display: inline-block; + padding: 8rpx 16rpx; + } .userInfoBox { margin: 0 32rpx 40rpx; diff --git a/pages-warehouse/home/home.vue b/pages-warehouse/home/home.vue index 1268639..ab08c6a 100644 --- a/pages-warehouse/home/home.vue +++ b/pages-warehouse/home/home.vue @@ -85,7 +85,7 @@ - + diff --git a/pages/login/login.vue b/pages/login/login.vue index 874e3e7..74e416f 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -163,6 +163,8 @@ setToken(res.data.loginResult.accessToken) setUserInfo(res.data.userinfo) setStrData("userId",res.data.userinfo.id) + //查租户下维修企业信息 + this.getCompanyInfo() this.getNoReadNum() if(res.data.userinfo.roleCodes.includes("repair_staff")){ //维修工角色,需要再查一下是否是班组长 @@ -320,6 +322,18 @@ } }) }, + async getCompanyInfo(){ + await request({ + url: "/admin-api/base/company/getCompanyByTenantId", + method: "GET", + params:{tenantId:getTenantId(),systemCode:"weixiu"} + }).then((res) => { + if(res.code==200){ + setJSONData("companyInfo",res.data) + console.log(res.data,"企业信息") + } + }) + }, dianyidain() { if(!this.ifPlay){ console.log('执行了,dianyidain');