From 9203a43facf5fd967aaafcfc41541a9f4565869a Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Thu, 07 Jan 2021 11:29:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app

---
 hive-app/pages/manager/employeeReport.vue |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/hive-app/pages/manager/employeeReport.vue b/hive-app/pages/manager/employeeReport.vue
index a7aee95..5610f24 100644
--- a/hive-app/pages/manager/employeeReport.vue
+++ b/hive-app/pages/manager/employeeReport.vue
@@ -143,7 +143,9 @@
 		  }  
 		},
 		onLoad(options) {
+			this.initTitle();
 			this.loadEmloyeeList();
+			this.loadList()
 		},
 		onNavigationBarButtonTap(e){
 			if(e.index==0){
@@ -158,6 +160,15 @@
 			}
 		},
 		methods:{
+			initTitle(){
+				let roleInfo = this.$httpUtils.getRoleInfo();
+				if(roleInfo){
+					this.staffId = roleInfo.id;
+					uni.setNavigationBarTitle({
+						title: roleInfo.name+'的业绩报表'
+					})
+				}
+			},
 			tabChange(index){
 				let val = index + 1;
 				if(val == this.tabIndex){
@@ -177,14 +188,7 @@
 				this.$httpUtils.request('/api/user/findAllUsers', {}, 'POST').then((res) => {
 					if(res.status == 200){
 						let result = res.rows;
-						if(result.length){
-							this.staffId = result[0].id;
-							uni.setNavigationBarTitle({
-								title: result[0].name+'的业绩报表'
-							})
-							this.loadList()
-						}else{
-							this.loadList()
+						if(!result.length){
 							// #ifdef APP-PLUS
 							let webView = this.$mp.page.$getAppWebview();
 							webView.setTitleNViewButtonStyle(1, {

--
Gitblit v1.9.1