渠道人员家庭成员管理bug

src/components/p-header.vue

@@ -111,7 +111,7 @@ export default {
               window.sessionStorage.userInfo = undefined;
               window.sessionStorage.childrenMenus = undefined;
               window.opener=null;
-              window.open('','_self');
+              window.open(' ','_self');
               window.close();
               // window.parent.close();
             //返回到登录页面

src/pages/main/memberFamily/dataStatistics.vue

@@ -76,17 +76,21 @@
 				lastUpdateTime: '',
                 sts:1,
                 companyFlag:'',
+				// excelCityparam: ""
+				memberFamilyBtnShow: "-1"
 			}
 		},
 		methods: {
             outexl(){
                 let url = '';
                 let paramsf = {};
+				if(window.sessionStorage.excelCityparam){
+					paramsf.regionName = window.sessionStorage.excelCityparam
+				}
                 if(this.sts == 1){
                     url = '/market/cMemberWo/excelExportSummaryByProv';
                 }else{
                     url = '/market/cMemberWo/excelExportSummaryByArea';
-                    // paramsf.regionName =
                 }
                 this.$http({
                     url: url,
@@ -118,8 +122,30 @@
                 });
             },
 			choseperson(v){
-                console.log(v)
+				if(v.showButton){
+					window.sessionStorage.memberFamilyBtnShow = v.showButton;
+				}
                 if(this.companyFlag == 0){
+					if(v.regionName == "省公司"){
+						 this.$router.push({
+                        	path: "/employeeInfo",
+                            query:{
+                                regionName:v.regionName
+                            }
+                        });
+                        this.setabList("员工信息", "/employeeInfo?regionName="+v.regionName);
+						return
+					}
+					// if(v.areaName == "省公司"){
+					// 	this.$router.push({
+                    //     	path: "/employeeInfo",
+                    //         query:{
+                    //             regionName:v.areaName
+                    //         }
+                    //     });
+                    //     this.setabList("员工信息", "/employeeInfo?regionName="+v.areaName);
+					// 	return
+					// }
                     if(this.sts == 2){
                         this.$router.push({
                         	path: "/employeeInfo",
@@ -130,6 +156,7 @@
                         this.setabList("员工信息", "/employeeInfo?regionName="+v.areaName);
                         return
                     }
+					window.sessionStorage.excelCityparam = v.regionName;
                     this.$http({
                     	url: "/market/cMemberWo/querySummaryByAreaPage",
                     	method: "post",
@@ -144,14 +171,16 @@
                     	this.loading = false;
                         this.sts = 2;
                     });
+					
                 }else{
                     this.$router.push({
-                    	path: "/employeeInfo?regionName="+v.regionName,
+                    	path: "/employeeInfo?regionName="+v.areaName,
                         query:{
-                            regionName:v.regionName
+                            regionName:v.areaName
                         }
                     });
-                    this.setabList("员工信息", "/employeeInfo?regionName="+v.regionName);
+					
+                    this.setabList("员工信息", "/employeeInfo?regionName="+v.areaName);
                 }
 			},
 			setabList(n, p) {
@@ -172,7 +201,7 @@
 				this.$store.commit("setTabList", Array.from(set));
 			},
 			handleSelectionChange(val) {
-				console.log(val)
+				console.log(val) 
 			},
 			//搜索数据
 			searchInfo(v) {
@@ -192,6 +221,8 @@
                 }else if(this.companyFlag == 1){
                     url="/market/cMemberWo/querySummaryByAreaPage"
                     v.regionName = this.userInfo.cityName
+					window.sessionStorage.excelCityparam = this.userInfo.cityName;
+					this.sts = 2
                 }
 				this.$http({
 					url: url,
@@ -205,6 +236,7 @@
 					this.tableData = res.data.data;
 					this.total = res.data.totalRecord;
 					this.loading = false;
+					
 				});
 			},
 			// 分页
@@ -268,6 +300,7 @@
 		},
 		mounted() {
 			this.getUser();
+			window.sessionStorage.memberFamilyBtnShow = this.memberFamilyBtnShow
 		},
 		created() {
 

src/pages/main/memberFamily/employeeInfo.vue

@@ -100,7 +100,7 @@
                 searchList: [
                     {
                         type: 'input',
-                        tit: '供应商名称',
+                        tit: '人员名称',
                         value: '',
                         width: '98%',
                     }
@@ -121,12 +121,19 @@
                 delid: '',
                 loading:false,
                 loadinged:false,
+                memberFamilyBtnShow: "",
             }
         },
         methods: {
             outexl(){
                 let url = '/market/cMemberWo/excelExportDetailSummary';
-                let paramsf = {areaName:this.$route.query.regionName};
+                let paramsf = {};
+                
+                if(this.memberFamilyBtnShow && (this.memberFamilyBtnShow == "1")){
+                    paramsf.areaName = this.$route.query.regionName
+                }else{
+                    paramsf.regionName = this.$route.query.regionName
+                }
                 this.$http({
                     url: url,
                     method: "post",
@@ -198,8 +205,10 @@
                 let _this = this;
                 this.loading = true;
                 this.tableData = [];
-                v.areaName = this.$route.query.regionName
-                v.isShow = 0
+                v.areaName = this.$route.query.regionName;
+                v.isShow = 0;
+                var memberFamilyBtnShow = JSON.parse(window.sessionStorage.memberFamilyBtnShow)
+                v.showButton = memberFamilyBtnShow
                 this.$http({
                     url: "/market/cMemberWo/queryMkMemberFillDetailSummaryPage",
                     method: "post",
@@ -342,6 +351,7 @@
         mounted() {
             this.getList({}, 1);
             this.getUser();
+            this.memberFamilyBtnShow = JSON.parse(window.sessionStorage.memberFamilyBtnShow)
         },
         created() {