yujinwen 3 周之前
父节点
当前提交
c9db3dabd4

+ 12 - 1
src/views/roadshow_manage/compononts/activityDetailDia.vue

@@ -69,11 +69,21 @@
 
 						<el-tooltip effect="dark" placement="top-start" v-if="row.CompanyId"  @mouseenter.native="getCompanyInfo(row)" popper-class="company-tip-poper">
 							<i class="el-icon-info"/>
+							
 							<div slot="content" v-if="companyInfo">
+								<!-- 国内客户 -->
+								<template v-if="companyInfo.EnglishCompany===0">
 								<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;">开通{{form.departmentType == '权益'  ? '行业:':'品种:'}}{{companyInfo.PermissionName}}</p>
 								<p style="margin: 6px 0;">{{form.departmentType == '权益' ? '累计互动次数':'累计报告阅读次数'}}:{{companyInfo.ReportReadTotal}}</p>
+								</template>
+								<!-- 海外客户 -->
+								<template v-if="companyInfo.EnglishCompany===1">
+								<p style="margin: 6px 0;">客户状态:{{companyInfo.Status}}</p>
+								<p style="margin: 6px 0;">所属国家:{{companyInfo.IndustryName}}</p>
+								<p style="margin: 6px 0;">{{form.departmentType == '权益' ? '累计互动次数':'累计报告阅读次数'}}:{{companyInfo.ReportReadTotal}}</p>
+								</template>
 							</div>
 						</el-tooltip>
 					</span>
@@ -219,7 +229,8 @@ export default {
 		CompanyId:row.CompanyId,
 		RsReportRecordId:row.RsReportRecordId,
 		CompanyType:this.form.departmentType,
-		SellerId:row.SellerId
+		SellerId:row.SellerId,
+		EnglishCompany:row.EnglishCompany
 		});
       this.companyInfo = Data;
     },

+ 2 - 2
src/views/roadshow_manage/myCalendar.vue

@@ -573,8 +573,8 @@ export default {
     },
     
     /* 获取客户信息 */
-    async getCompanyInfo({CompanyId,EnglishCompany,ActivityType,ResearcherId}) {
-      const { Data }  = await roadshowInterence.componyDetail({ CompanyId,EnglishCompany });
+    async getCompanyInfo({CompanyId,EnglishCompany,ActivityType,ResearcherId,SysUserId}) {
+      const { Data }  = await roadshowInterence.componyDetail({ CompanyId,EnglishCompany,SellerId:SysUserId });
       this.companyInfo = Data;
     },
 

+ 3 - 1
src/views/roadshow_manage/roadshowQuestion.vue

@@ -306,9 +306,11 @@ export default {
     },
 
     handleRemoveResearcherTag(e){
-      console.log(e);
       this.filterData.researcher=this.filterData.researcher.filter(i=>i!==e)
       this.cascaderIdx++
+      if(this.filterData.researcher.length===0){
+        this.handleCurrentChange(1)
+      }
     },
 
     /* 获取客户信息 */