修改了弹框的传参

src/views/roadshow_manage/compononts/activityDetailDia.vue

@@ -40,14 +40,14 @@
 					</span>
 
 					<span v-else-if="item.key === 'company'">
-						{{ row.CooperationName || row.CompanyName }} <span v-if="fromType == 'seller' || fromType == 'special'">{{`(${row.CompanyStatus})`}} </span>
+						{{ row.CooperationName || row.CompanyName }} <span v-if="(fromType == 'seller' || fromType == 'special') && row.CompanyStatus">{{`(${row.CompanyStatus})`}} </span>
 
 						<el-tooltip effect="dark" placement="top-start" v-if="row.CompanyId"  @mouseenter.native="getCompanyInfo(row.CompanyId)" popper-class="company-tip-poper">
 							<i class="el-icon-info"/>
 							<div slot="content" v-if="companyInfo">
 								<p style="margin: 6px 0;">客户状态：{{companyInfo.Status}}</p>
 								<p style="margin: 6px 0;">所属行业：{{companyInfo.IndustryName}}</p>
-								<p style="margin: 6px 0;text-indent: -70px;margin-left: 70px;">开通品种：{{companyInfo.PermissionName}}</p>
+								<p style="margin: 6px 0;text-indent: -70px;margin-left: 70px;">开通{{form.departmentType == '权益'  ? '行业：':'品种：'}}{{companyInfo.PermissionName}}</p>
 								<p style="margin: 6px 0;">累计报告阅读次数：{{companyInfo.ReportReadTotal}}</p>
 							</div>
 						</el-tooltip>
@@ -133,7 +133,6 @@ export default {
 					路演: 'road_show',
 					沙龙: 'salon',
 				}
-				console.log(key,'---===');
 				
 				roadshowInterence.statisticDetailList({
 					DataType: typeMapObj[key] && typeMapObj[key],
@@ -160,7 +159,7 @@ export default {
 
 		/* 获取客户信息 */
     async getCompanyInfo(CompanyId) {
-      const { Data }  = await roadshowInterence.componyDetail({ CompanyId });
+      const { Data }  = await roadshowInterence.componyDetail({ CompanyId,CompanyType:this.form.departmentType });
       this.companyInfo = Data;
     },
 

src/views/roadshow_manage/statistics/seller.vue

@@ -52,17 +52,17 @@
 							</tr>
 							<template v-if="item.Item.length">
 								<tr v-show="item.showDetail">
-								<td :rowspan="item.Item.length+1" class="thead-rs">{{item.Name}}</td>
-							</tr>
+									<td :rowspan="item.Item.length+1" class="thead-rs">{{item.Name}}</td>
+								</tr>
 
-							<tr v-for="rs in item.Item" :key="rs.AdminId" v-show="item.showDetail">
-								<td class="thead-rs">{{rs.Name}}</td>
+								<tr v-for="rs in item.Item" :key="rs.AdminId" v-show="item.showDetail">
+									<td class="thead-rs">{{rs.Name}}</td>
 
-								<td class="data-cell" v-for="(data,data_key) in rs.dataArr" :key="data_key" @click="openDiaHandle(data)">
-									{{ data.value !== 0 ? data.value : '' }}
-								</td>
-								
-							</tr>
+									<td class="data-cell" v-for="(data,data_key) in rs.dataArr" :key="data_key" @click="openDiaHandle(data)">
+										{{ data.value !== 0 ? data.value : '' }}
+									</td>
+									
+								</tr>
 							</template>
 					</tbody>
 					<tfoot>
@@ -111,7 +111,6 @@ export default {
 				StartDate: this.select_date ? this.select_date[0] : '',
 				EndDate: this.select_date ? this.select_date[1] : '',
 				CompanyType: this.departmentAct,
-				DimensionType: 'roadshow_rai'
 			}).then(res => {
 
 				const { Data,Ret } = res;