diff --git a/pages-order/choosePeople/choosePeople.vue b/pages-order/choosePeople/choosePeople.vue index 0e3f6ea..68d1f38 100644 --- a/pages-order/choosePeople/choosePeople.vue +++ b/pages-order/choosePeople/choosePeople.vue @@ -176,16 +176,7 @@ export default { method: 'get', params: {ticketId: this.ticketId} }).then((res) => { - let thisList = res.data - thisList.map((item) => { - getDictTextByCodeAndValue("repair_work_type", item.workType).then(value => { - item.workTypeText = value - }).catch(error => { - item.workTypeText = "未知" - console.error(error); - }); - }) - this.list = thisList + this.list = res.data if (this.list.length > 0) { console.log(this.list[0].userId) this.checkedUserId = this.list[0].userId diff --git a/pages-warehouse/home/home.vue b/pages-warehouse/home/home.vue index fa18cb4..01833b5 100644 --- a/pages-warehouse/home/home.vue +++ b/pages-warehouse/home/home.vue @@ -155,11 +155,12 @@ export default { url: '/pages/login/login' }) } else { + //直接取缓存中的用户信息 + this.userInfo = getUserInfo() if (!this.$msgSocket) { this.$startMsgSocket(getTenantId(), getStrData("userId")) } } - this.onRefresherrefresh() }, onShow() { if (!getToken()) { @@ -167,8 +168,6 @@ export default { url: '/pages/login/login' }) } else { - //直接取缓存中的用户信息 - this.userInfo = getUserInfo() this.onRefresherrefresh() this.getNoReadNum() this.getNoticeList()