Merge branch 'crm_16.7' into debug

src/api/modules/statisticApi.js

@@ -1,395 +1,394 @@
-import http from "@/api/http.js"
-
+import http from "@/api/http.js";
 
 /* 数据报表模块 */
 const dataMainInterface = {
-	/* 工作台 */
-	workdata: params => {
-		return http.get('/statistic_report/home')
-	},
-	/**
-	 * 获取即将过期的客户列表接口
-	 * @param {PageSize } params 
-	 * @param {CurrentIndex } params 
-	 * @param {EndDate } params 结束日期
-	 * @param {CompanyType} params 
-	 * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
-	 * @param {RegionType } params 
-	 * @returns 
-	 */
-	expireList:params => {
-		return http.get('/statistic_report/will_expire_list',params);
-	},
-	/**
-	 * 获取存量客户列表接口
-	 * @param {PageSize } params 
-	 * @param {CurrentIndex } params 
-	 * @param {CompanyType} params 
-	 * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
-	 * @param {RegionType } params 
-	 * @param {Date} params 
-	 * @param {DataType} params 
-	 * @returns 
-	 */
-	stackList:params => {
-		return http.get('/statistic_report/stack_company_list',params);
-	},
-	raiStackList:params => {
-		return http.get('/statistic_report/stack_company_list_rai',params);
-	},
-	/**
-	 * 获取增量客户列表接口
-	 * @param {PageSize} params 
-	 * @param {CurrentIndex} params 
-	 * @param {EndDate} params 结束日期
-	 * @param {CompanyType} params 
-	 * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
-	 * @param {RegionType } params 
-	 * @param {StartDate} params 
-	 * @param {DataType} params 
-	 * @param {IsConfirm} params  是否确认续约: -1-默认全部; 0-待确认; 1-已确认
-	 * @param {CompanyAscribeId} params  归因Id
-	 * @returns  
-	 */
-	incrementalList:params => {
-		return http.get('/statistic_report/incremental_company_list',params);
-	},
-	/**
-	 * 权益客户统计列表接口
-	 * @param {PageSize} params 
-	 * @param {CurrentIndex} params 
-	 * @param {EndDate} params 结束日期
-	 * @param {CompanyType} params 
-	 * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
-	 * @param {RegionType } params 
-	 * @param {StartDate} params 
-	 * @param {DataType} params 
-	 * @param {IsConfirm} params  是否确认续约: -1-默认全部; 0-待确认; 1-已确认
-	 * @param {CompanyAscribeId} params  归因Id
-	 * @returns  
-	 */
-	incrementalEquityList:params => {
-		return http.get('/statistic_report/merge_company_list',params);
-	},
-	/**
- * 获取未续约备注列表
- * @param {CompanyId} params 公司ID
- * @param {ProductId} params 产品ID 1：FICC ，2权益
- * @returns 
- */
-	getNotRenewedRemarkList:params => {
-		return http.get('/custom/company_no_renewed_note/list',params);
-	},
-	/**
- * 添加未续约备注
- * @param {CompanyId} params 公司ID
- * @param {ProductId} params 产品ID 1：FICC ，2权益
- * @param {Content} params 内容
- * @returns 
- */
-	addNotRenewedRemark:params => {
-		return http.post('/custom/company_no_renewed_note/add',params);
-	},
-	/**
- * 获取归因列表
- * @param {KeyWord} params 
- * @returns  
- */
-	getAscribList:params => {
-		return http.get('/custom/company_ascribe/list',params);
-	},
-	/**
-	 * 新增归因
-	 * @param {KeyWord} params 
-	 * @returns  
-	*/
-	addAscrib:params => {
-		return http.post('/custom/company_ascribe/add',params);
-	},
-	/**
-	 * 合同通过归因添加确认不续约接口
-	 * @param {KeyWord} params 
-	 * @returns  
-	*/
-	addAscribContract:params => {
-		return http.post('/custom/company_contract_no_renewed_ascribe/add',params);
-	},
-	/**
-	 * 修改归因标签
-	* @param {CompanyId} params 公司ID
-	* @param {ProductId} params 产品ID 1：FICC ，2权益
-	* @param {Content} params 内容
-	* @param {CompanyAscribeId} params 归因Id
-	 * @returns  
-	*/
-	addNoRenewedAscribe:params => {
-		return http.post('/custom/company_no_renewed_ascribe/add',params);
-	},
-	/**
-	 * 归因标签详情
-	* @param {CompanyId} params 公司ID
-	* @param {ProductId} params 产品ID 1：FICC ，2权益
-	 * @returns  
-	*/
-	infoNoRenewedAscribe:params => {
-		return http.get('/custom/company_no_renewed_ascribe/detail',params);
-	},
-	/**
-	 * 合同确认归因不续约详情接口
-	* @param {CompanyContractId} params 合同ID
-	 * @returns  
-	*/
-	contractInfoNoRenewedAscribe:params => {
-		return http.get('/custom/company_contract_no_renewed_ascribe/detail',params);
-	},
-	/**
-	 * 获取收入统计列表接口
-	 * @param {PageSize} params 
-	 * @param {CurrentIndex} params 
-	 * @param {EndDate} params 结束日期
-	 * @param {CompanyType} params 
-	 * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
-	 * @param {RegionType } params
-	 * @returns 
-	 */
-	incomeList:params => {
-		return http.get('/statistic_report/income_list',params);
-	},
-	/**
-	 * 获取合同数据报表接口
-	 * @param {PageSize} params 
-	 * @param {CurrentIndex} params 
-	 * @param {EndDate} params 结束日期
-	 * @param {CompanyType} params 
-	 * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
-	 * @param {RegionType } params
-	 * @returns 
-	 */
-	contractList:params => {
-		return http.get('/statistic_report/contract_list',params);
-	},
-	/**
-	 * 获取企业客户的合同数据报表接口
-	 * @param {CompanyId  } params
-	 * @returns 
-	 */
-	companyContractList:params => {
-		return http.get('/statistic_report/company_contract_list',params);
-	},
-	// 系统合同类调此接口
-	companyContractDetailList:params => {
-		return http.get('/statistic_report/contract_detail_list',params);
-	},
+  /* 工作台 */
+  workdata: (params) => {
+    return http.get("/statistic_report/home");
+  },
+  /**
+   * 获取即将过期的客户列表接口
+   * @param {PageSize } params
+   * @param {CurrentIndex } params
+   * @param {EndDate } params 结束日期
+   * @param {CompanyType} params
+   * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
+   * @param {RegionType } params
+   * @returns
+   */
+  expireList: (params) => {
+    return http.get("/statistic_report/will_expire_list", params);
+  },
+  /**
+   * 获取存量客户列表接口
+   * @param {PageSize } params
+   * @param {CurrentIndex } params
+   * @param {CompanyType} params
+   * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
+   * @param {RegionType } params
+   * @param {Date} params
+   * @param {DataType} params
+   * @returns
+   */
+  stackList: (params) => {
+    return http.get("/statistic_report/stack_company_list", params);
+  },
+  raiStackList: (params) => {
+    return http.get("/statistic_report/stack_company_list_rai", params);
+  },
+  /**
+   * 获取增量客户列表接口
+   * @param {PageSize} params
+   * @param {CurrentIndex} params
+   * @param {EndDate} params 结束日期
+   * @param {CompanyType} params
+   * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
+   * @param {RegionType } params
+   * @param {StartDate} params
+   * @param {DataType} params
+   * @param {IsConfirm} params  是否确认续约: -1-默认全部; 0-待确认; 1-已确认
+   * @param {CompanyAscribeId} params  归因Id
+   * @returns
+   */
+  incrementalList: (params) => {
+    return http.get("/statistic_report/incremental_company_list", params);
+  },
+  /**
+   * 权益客户统计列表接口
+   * @param {PageSize} params
+   * @param {CurrentIndex} params
+   * @param {EndDate} params 结束日期
+   * @param {CompanyType} params
+   * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
+   * @param {RegionType } params
+   * @param {StartDate} params
+   * @param {DataType} params
+   * @param {IsConfirm} params  是否确认续约: -1-默认全部; 0-待确认; 1-已确认
+   * @param {CompanyAscribeId} params  归因Id
+   * @returns
+   */
+  incrementalEquityList: (params) => {
+    return http.get("/statistic_report/merge_company_list", params);
+  },
+  /**
+   * 获取未续约备注列表
+   * @param {CompanyId} params 公司ID
+   * @param {ProductId} params 产品ID 1：FICC ，2权益
+   * @returns
+   */
+  getNotRenewedRemarkList: (params) => {
+    return http.get("/custom/company_no_renewed_note/list", params);
+  },
+  /**
+   * 添加未续约备注
+   * @param {CompanyId} params 公司ID
+   * @param {ProductId} params 产品ID 1：FICC ，2权益
+   * @param {Content} params 内容
+   * @returns
+   */
+  addNotRenewedRemark: (params) => {
+    return http.post("/custom/company_no_renewed_note/add", params);
+  },
+  /**
+   * 获取归因列表
+   * @param {KeyWord} params
+   * @returns
+   */
+  getAscribList: (params) => {
+    return http.get("/custom/company_ascribe/list", params);
+  },
+  /**
+   * 新增归因
+   * @param {KeyWord} params
+   * @returns
+   */
+  addAscrib: (params) => {
+    return http.post("/custom/company_ascribe/add", params);
+  },
+  /**
+   * 合同通过归因添加确认不续约接口
+   * @param {KeyWord} params
+   * @returns
+   */
+  addAscribContract: (params) => {
+    return http.post("/custom/company_contract_no_renewed_ascribe/add", params);
+  },
+  /**
+   * 修改归因标签
+   * @param {CompanyId} params 公司ID
+   * @param {ProductId} params 产品ID 1：FICC ，2权益
+   * @param {Content} params 内容
+   * @param {CompanyAscribeId} params 归因Id
+   * @returns
+   */
+  addNoRenewedAscribe: (params) => {
+    return http.post("/custom/company_no_renewed_ascribe/add", params);
+  },
+  /**
+   * 归因标签详情
+   * @param {CompanyId} params 公司ID
+   * @param {ProductId} params 产品ID 1：FICC ，2权益
+   * @returns
+   */
+  infoNoRenewedAscribe: (params) => {
+    return http.get("/custom/company_no_renewed_ascribe/detail", params);
+  },
+  /**
+   * 合同确认归因不续约详情接口
+   * @param {CompanyContractId} params 合同ID
+   * @returns
+   */
+  contractInfoNoRenewedAscribe: (params) => {
+    return http.get("/custom/company_contract_no_renewed_ascribe/detail", params);
+  },
+  /**
+   * 获取收入统计列表接口
+   * @param {PageSize} params
+   * @param {CurrentIndex} params
+   * @param {EndDate} params 结束日期
+   * @param {CompanyType} params
+   * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
+   * @param {RegionType } params
+   * @returns
+   */
+  incomeList: (params) => {
+    return http.get("/statistic_report/income_list", params);
+  },
+  /**
+   * 获取合同数据报表接口
+   * @param {PageSize} params
+   * @param {CurrentIndex} params
+   * @param {EndDate} params 结束日期
+   * @param {CompanyType} params
+   * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
+   * @param {RegionType } params
+   * @returns
+   */
+  contractList: (params) => {
+    return http.get("/statistic_report/contract_list", params);
+  },
+  /**
+   * 获取企业客户的合同数据报表接口
+   * @param {CompanyId  } params
+   * @returns
+   */
+  companyContractList: (params) => {
+    return http.get("/statistic_report/company_contract_list", params);
+  },
+  // 系统合同类调此接口
+  companyContractDetailList: (params) => {
+    return http.get("/statistic_report/contract_detail_list", params);
+  },
 
-	// 客户数据未续约说明更多
-	moreRenewReason:params => {
-		return http.get('/statistic_report/more_renew_reason',params);
-	},
-	// 客户数据未续约说明更多
-	mergeCompanyPreviousDetail:params => {
-		return http.get('/statistic_report/merge_company_previous/detail',params);
-	},
-	// 客户数据未续约说明更多上一年
-	mergeCompanyPreviousDetailYear:params => {
-		return http.get('/statistic_report/merge_company_previous/last_year',params);
-	},
-	/**
-	 * 	// 获取图表阅读统计列表
-	 * @param {PageSize} params 
-	 * @param {CurrentIndex} params 
-	 * @param {ClassifyId} params 分类ID
-	 * @param {Order} params 排序
-	 * @returns 
-	 */
-	getchartCensusList:params => {
-		return http.get('/yb/chartCensus/getVisitList',params);
-	},
-	/**
-	 * 	// 图表阅读统计详情列表
-	 * @param {PageSize} params 
-	 * @param {CurrentIndex} params 
-	 * @param {ClassifyId} params 分类ID
-	 * @param {Order} params 排序
-	 * @returns 
-	 */
-	 getchartgetVisitDetailList:params => {
-	   return http.get('yb/chartCensus/getVisitDetailList',params);
-	 },
-	 /**
-	 * 	// 用户图表访问明细
-	 * @returns 
-	 */
-	  getCompanyChartVisitDetail:params => {
-		return http.get('yb/chartCensus/getCompanyChartVisitDetail',params);
-	  },
-	 /**
-	 * 	// 图库权限开通客户统计列表
-	 * @returns 
-	 */
-	 getCompanyAuthCensusList:params => {
-		return http.get('yb/chartCensus/getCompanyAuthCensusList',params);
-	  },
-	  
-	/**新增客户统计 
-	 * StartDate EndDate DataType
-	 * @return 
-	 */
-	newcustomStatistic: params => {
-		return http.get('/statistic_report/report/incremental_company',params)
-	},
-	/**
-	 * 存量客户统计
-	 * Date
-	 * @return
-	 */
-	stockcustomStatistic: params => {
-		return http.get('/statistic_report/report/stack_company',params)
-	},
-	/**续约客户统计 
-	 * StartDate 统计开始时间
-	 * EndDate 统计结束时间
-	 * DataType 统计范围类型
-	 * ProductId 项目类型 1 ficc  2 权益
-	 * @return 
-	 */
-	 renewalCustomStatistic: params => {
-		return http.get('/statistic_report/report/renew_company',params)
-	},
+  // 客户数据未续约说明更多
+  moreRenewReason: (params) => {
+    return http.get("/statistic_report/more_renew_reason", params);
+  },
+  // 客户数据未续约说明更多
+  mergeCompanyPreviousDetail: (params) => {
+    return http.get("/statistic_report/merge_company_previous/detail", params);
+  },
+  // 客户数据未续约说明更多上一年
+  mergeCompanyPreviousDetailYear: (params) => {
+    return http.get("/statistic_report/merge_company_previous/last_year", params);
+  },
+  /**
+   * 	// 获取图表阅读统计列表
+   * @param {PageSize} params
+   * @param {CurrentIndex} params
+   * @param {ClassifyId} params 分类ID
+   * @param {Order} params 排序
+   * @returns
+   */
+  getchartCensusList: (params) => {
+    return http.get("/yb/chartCensus/getVisitList", params);
+  },
+  /**
+   * 	// 图表阅读统计详情列表
+   * @param {PageSize} params
+   * @param {CurrentIndex} params
+   * @param {ClassifyId} params 分类ID
+   * @param {Order} params 排序
+   * @returns
+   */
+  getchartgetVisitDetailList: (params) => {
+    return http.get("yb/chartCensus/getVisitDetailList", params);
+  },
+  /**
+   * 	// 用户图表访问明细
+   * @returns
+   */
+  getCompanyChartVisitDetail: (params) => {
+    return http.get("yb/chartCensus/getCompanyChartVisitDetail", params);
+  },
+  /**
+   * 	// 图库权限开通客户统计列表
+   * @returns
+   */
+  getCompanyAuthCensusList: (params) => {
+    return http.get("yb/chartCensus/getCompanyAuthCensusList", params);
+  },
+
+  /**新增客户统计
+   * StartDate EndDate DataType
+   * @return
+   */
+  newcustomStatistic: (params) => {
+    return http.get("/statistic_report/report/incremental_company", params);
+  },
+  /**
+   * 存量客户统计
+   * Date
+   * @return
+   */
+  stockcustomStatistic: (params) => {
+    return http.get("/statistic_report/report/stack_company", params);
+  },
+  /**续约客户统计
+   * StartDate 统计开始时间
+   * EndDate 统计结束时间
+   * DataType 统计范围类型
+   * ProductId 项目类型 1 ficc  2 权益
+   * @return
+   */
+  renewalCustomStatistic: (params) => {
+    return http.get("/statistic_report/report/renew_company", params);
+  },
 
-	// 续约异常客户统计
-	unusualRenewalCustomStatistic: params => {
-		return http.get('/statistic_report/report/unusual_renew_company',params)
-	},
-	//续约异常客户统计图表数据
-	unusualRenewalCustomStatisticChartData:params=>{
-		return http.get('/statistic_report/report/unusual_renew_company/chart',params)
-	},
+  // 续约异常客户统计
+  unusualRenewalCustomStatistic: (params) => {
+    return http.get("/statistic_report/report/unusual_renew_company", params);
+  },
+  //续约异常客户统计图表数据
+  unusualRenewalCustomStatisticChartData: (params) => {
+    return http.get("/statistic_report/report/unusual_renew_company/chart", params);
+  },
 
-	/**
-	 * 新增客户列表
-	 * @param {} params PageSize CurrentIndex SortParam SortType 	CompanyIds
-	 * @return
-	 */
-	newcustomList: params => {
-		return http.post('/statistic_report/report/company_list',params)
-	},
-	/**
-	 * 销售To do统计
-	 * DataType ProductId StartDate EndDate
-	 * @return
-	 */
-	 todoStatistic: params => {
-		return http.get('/statistic_report/report/seller_company_todo',params)
-	},
+  /**
+   * 新增客户列表
+   * @param {} params PageSize CurrentIndex SortParam SortType 	CompanyIds
+   * @return
+   */
+  newcustomList: (params) => {
+    return http.post("/statistic_report/report/company_list", params);
+  },
+  /**
+   * 销售To do统计
+   * DataType ProductId StartDate EndDate
+   * @return
+   */
+  todoStatistic: (params) => {
+    return http.get("/statistic_report/report/seller_company_todo", params);
+  },
 
-	/**
-	 * 语音播报统计
-	 * @param SectionId	板块id
-	 * @param VarietyId 品种id
-	 * @param AdminId  语音管理员id
-	 * @param ClickSort 排序 1升序 2降序
-	 * @param Title 搜索关键词
-	 */
-	voicePlayStatistic:params=>{
-		return http.get('/yb/voice/broadcast/list',params)
-	},
+  /**
+   * 语音播报统计
+   * @param SectionId	板块id
+   * @param VarietyId 品种id
+   * @param AdminId  语音管理员id
+   * @param ClickSort 排序 1升序 2降序
+   * @param Title 搜索关键词
+   */
+  voicePlayStatistic: (params) => {
+    return http.get("/yb/voice/broadcast/list", params);
+  },
 
-	/**
-	 * 语音播报详情
-	 * @param BroadcastId
-	 */
-	voicePlayDetailSta:params=>{
-		return http.get('/yb/voice/broadcast/deatil',params)
-	},
+  /**
+   * 语音播报详情
+   * @param BroadcastId
+   */
+  voicePlayDetailSta: (params) => {
+    return http.get("/yb/voice/broadcast/deatil", params);
+  },
 
-	/**
-	 * 价格驱动点击量-列表
-	 */
-	priceDrivenStatisticsList:params=>{
-		return http.get('/yb/price_driven/click_census_list',params)
-	},
-	/**
-	 * 价格驱动点击量-详情
-	 */
-	 priceDrivenStatisticsDetail:params=>{
-		return http.get('/yb/price_driven/click_census_detail',params)
-	},
+  /**
+   * 价格驱动点击量-列表
+   */
+  priceDrivenStatisticsList: (params) => {
+    return http.get("/yb/price_driven/click_census_list", params);
+  },
+  /**
+   * 价格驱动点击量-详情
+   */
+  priceDrivenStatisticsDetail: (params) => {
+    return http.get("/yb/price_driven/click_census_detail", params);
+  },
 
-	//ficc产品阅读统计
-	ficcProductStatistic:params=>{
-		return http.get('/statistic_report/report/seller_yb_log',params)
-	},
+  //ficc产品阅读统计
+  ficcProductStatistic: (params) => {
+    return http.get("/statistic_report/report/seller_yb_log", params);
+  },
 
-	/**
-	 * 分产品阅读客户统计-- 新增客户列表
-	 * @param {} params PageSize CurrentIndex SortParam SortType SellerIds ProductId ProductType StartDate EndDate CompanyStatus
-	 * @return
-	*/
-		newCustomProductionList: params => {
-		return http.post('/statistic_report/report/seller_yb_log/user',params)
-	},
+  /**
+   * 分产品阅读客户统计-- 新增客户列表
+   * @param {} params PageSize CurrentIndex SortParam SortType SellerIds ProductId ProductType StartDate EndDate CompanyStatus
+   * @return
+   */
+  newCustomProductionList: (params) => {
+    return http.post("/statistic_report/report/seller_yb_log/user", params);
+  },
 
   /**
    * 分产品阅读统计 -- 收藏统计
    * @param Datatype
    */
-  collectStatistic:params=>{
-    return http.get('/statistic_report/report/seller_collect_log',params)
+  collectStatistic: (params) => {
+    return http.get("/statistic_report/report/seller_collect_log", params);
   },
 
   /**
    * 分产品阅读统计 -- 收藏统计用户详情
    * @param Datatype
    */
-   collectStatisticList:params=>{
-    return http.post('/statistic_report/report/seller_collect_log/user',params)
+  collectStatisticList: (params) => {
+    return http.post("/statistic_report/report/seller_collect_log/user", params);
   },
 
   /**
    * 分产品阅读统计 -- 收藏详情详情
    * @param CollectionType
    */
-   collectDetailList:params=>{
-    return http.post('/statistic_report/report/seller_collect_log/detail',params)
+  collectDetailList: (params) => {
+    return http.post("/statistic_report/report/seller_collect_log/detail", params);
   },
-   /**
+  /**
    * 分产品阅读统计 -- 图收藏统计
    * @param Datatype
    */
-    chartStatistic:params=>{
-      return http.get('/statistic_report/report/seller_chart_collect_log',params)
-    },
+  chartStatistic: (params) => {
+    return http.get("/statistic_report/report/seller_chart_collect_log", params);
+  },
   /**
    * 分产品阅读统计 -- 图收藏统计用户详情
    * @param Datatype
    */
-  chartStatisticList:params=>{
-    return http.post('/statistic_report/report/seller_chart_collect_log/user',params)
+  chartStatisticList: (params) => {
+    return http.post("/statistic_report/report/seller_chart_collect_log/user", params);
   },
   /**
    * 分产品阅读统计 -- 图收藏详情列表
    * @param CollectionType
    */
-   chartDetailList:params=>{
-    return http.post('/statistic_report/report/seller_chart_collect_log/detail',params)
+  chartDetailList: (params) => {
+    return http.post("/statistic_report/report/seller_chart_collect_log/detail", params);
+  },
+  /**
+   * 权益客户统计列表接口
+   * @param {PageSize} params
+   * @param {CurrentIndex} params
+   * @param {EndDate} params 结束日期
+   * @param {CompanyType} params
+   * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
+   * @param {RegionType } params
+   * @param {StartDate} params
+   * @param {DataType} params
+   * @param {IsConfirm} params  是否确认续约: -1-默认全部; 0-待确认; 1-已确认
+   * @param {CompanyAscribeId} params  归因Id
+   * @returns
+   */
+  incrementalCompanyContractPermissionList: (params) => {
+    return http.get("/statistic_report/merge_company/company_contract_permission/list", params);
   },
- /**
-  * 权益客户统计列表接口
-  * @param {PageSize} params 
-  * @param {CurrentIndex} params 
-  * @param {EndDate} params 结束日期
-  * @param {CompanyType} params 
-  * @param {AdminId } params 销售id，多个用英文逗号隔开，空字符串为全部
-  * @param {RegionType } params 
-  * @param {StartDate} params 
-  * @param {DataType} params 
-  * @param {IsConfirm} params  是否确认续约: -1-默认全部; 0-待确认; 1-已确认
-  * @param {CompanyAscribeId} params  归因Id
-  * @returns  
-  */
- incrementalCompanyContractPermissionList:params => {
- 	return http.get('/statistic_report/merge_company/company_contract_permission/list',params);
- },
   /**
   * 权益客户续约率统计
   * @param {PageSize} params 
@@ -401,85 +400,96 @@ const dataMainInterface = {
 
   * @returns  
   */
-  incrementalCompanyContractPercentageList:params => {
-	return http.get('/statistic_report/merge_company/company_contract_percentage/list',params);
+  incrementalCompanyContractPercentageList: (params) => {
+    return http.get("/statistic_report/merge_company/company_contract_percentage/list", params);
   },
-  incrementalCompanyContractPercentageListV2:params => {
-	return http.get('/statistic_report/merge_company/company_contract_percentage/listV2',params);
+  incrementalCompanyContractPercentageListV2: (params) => {
+    return http.get("/statistic_report/merge_company/company_contract_percentage/listV2", params);
   },
   /**
-  * 权益客户续约率统计所能查询的年份
-  * @returns  
-  */
-  incrementalCompanyContractGetYearList:params => {
-	return http.get('/statistic_report/merge_company/get_year_list',params);
+   * 权益客户续约率统计所能查询的年份
+   * @returns
+   */
+  incrementalCompanyContractGetYearList: (params) => {
+    return http.get("/statistic_report/merge_company/get_year_list", params);
   },
   /**
-  * 权益服务统计列表接口
-  * @returns  
-  */
-  getRaiServeList:params => {
-	return http.get('/cygx/rai_serve/list',params);
+   * 权益服务统计列表接口
+   * @returns
+   */
+  getRaiServeList: (params) => {
+    return http.get("/cygx/rai_serve/list", params);
   },
   /**
-  * 标签搜索接口
-  * @returns  
-  */
-  getRaiServeSearchTag:params => {
-	return http.get('/cygx/rai_serve/search_tag',params);
+   * 标签搜索接口
+   * @returns
+   */
+  getRaiServeSearchTag: (params) => {
+    return http.get("/cygx/rai_serve/search_tag", params);
   },
   /**
-  * 近四周覆盖率
-  * @returns  
-  */
-  getRaiServeCoverageRate:params => {
-	return http.get('/cygx/rai_serve/coverage_rate',params);
+   * 近四周覆盖率
+   * @returns
+   */
+  getRaiServeCoverageRate: (params) => {
+    return http.get("/cygx/rai_serve/coverage_rate", params);
   },
   /**
-  * 明细列表接口
-  * @returns  
-  */
-  getRaiServeBillList:params => {
-	return http.get('/cygx/rai_serve/bill_list',params);
+   * 明细列表接口
+   * @returns
+   */
+  getRaiServeBillList: (params) => {
+    return http.get("/cygx/rai_serve/bill_list", params);
   },
   /**
-  * 服务类型列表接口
-  * @returns  
-  */
-  getRaiServeTypeList:params => {
-	return http.get('/cygx/rai_serve/type_list',params);
+   * 服务类型列表接口
+   * @returns
+   */
+  getRaiServeTypeList: (params) => {
+    return http.get("/cygx/rai_serve/type_list", params);
   },
   /**
-  * 获取权益服务组销售列表
-  * @returns  
-  */
-  getRaiServeCustomSellerList:params => {
-	return http.get('/custom/seller/rai_serve/list',params);
+   * 获取权益服务组销售列表
+   * @returns
+   */
+  getRaiServeCustomSellerList: (params) => {
+    return http.get("/custom/seller/rai_serve/list", params);
   },
   /**
-  * 历史备注列表
-  * @returns  
-  */
-  getRaiServeRemarkList:params => {
-	return http.get('/cygx/rai_serve/remark/list',params);
+   * 历史备注列表
+   * @returns
+   */
+  getRaiServeRemarkList: (params) => {
+    return http.get("/cygx/rai_serve/remark/list", params);
   },
   /**
-  * 新增历史备注
-  * @returns  
-  */
-  getRaiServeRemarkAdd:params => {
-	return http.post('/cygx/rai_serve/remark/add',params);
+   * 新增历史备注
+   * @returns
+   */
+  getRaiServeRemarkAdd: (params) => {
+    return http.post("/cygx/rai_serve/remark/add", params);
   },
   /**
-  * 权益数据汇总列表接口
-  * @returns  
-  */
-  getRaiDataSummary:params => {
-	return http.get('/statistic_report/rai_data_summary/list',params);
+   * 权益数据汇总列表接口
+   * @returns
+   */
+  getRaiDataSummary: (params) => {
+    return http.get("/statistic_report/rai_data_summary/list", params);
+  },
+  /**
+   * 获取权益开拓组或者服务组下面的销售接口
+   * @returns
+   */
+  getListRaiSellerServer: (params) => {
+    return http.get("/custom/seller/check/list_rai/server_type", params);
+  },
+  /**
+   * 获取权益弹窗详情接口
+   * @returns
+   */
+  getRaiDataSummaryList: (params) => {
+    return http.get("/statistic_report/rai_data_summary/detail", params);
   },
-  
-}
+};
 
-export {
-	dataMainInterface
-}
+export { dataMainInterface };

src/views/dataReport_manage/components/DataSummary.vue

@@ -1,17 +1,31 @@
 <template>
   <div>
     <el-dialog v-dialogDrag :title="title" :visible.sync="visible" :close-on-click-modal="false" :modal-append-to-body="false" width="60%" @close="closeDialog">
-      <el-table :data="tableData" border style="margin:20px 0">
-        <el-table-column v-for="(col, index) in columns" :key="index" :prop="col.prop" :label="col.label" align="center" />
+      <p v-if="isShowText">共xxx家客户，其中x家客户有多份合同</p>
+      <el-table :data="tableData" border style="margin: 20px 0; height: 400px">
+        <el-table-column v-for="(col, index) in columns" :key="index" :prop="col.prop" :label="col.label" align="center">
+          <template slot-scope="{ row }">
+            <span v-if="col.label === '操作'" style="color: #409eff; cursor: pointer; font-size: 14px; margin-right: 20px" @click="historicalNotesClickHandler(row)">历史备注</span>
+            <span v-else>{{ row[col.prop] }}</span>
+          </template>
+        </el-table-column>
       </el-table>
+      <el-col :span="24" class="toolbar" v-if="total">
+        <m-page :total="total" :page_no="page_no" @handleCurrentChange="handleCurrentChange" />
+      </el-col>
     </el-dialog>
+    <HistoricalNotesDlg :historicalNotesDlgVisible.sync="historicalNotesDlgVisible" :CompanyId.sync="historicalNotesId" />
   </div>
 </template>
 
 <script>
+import HistoricalNotesDlg from "@/components/historicalNotesDlg.vue";
+import { dataMainInterface } from "@/api/api.js";
+import mPage from "@/components/mPage.vue";
+
 export default {
   name: "",
-  components: {},
+  components: { HistoricalNotesDlg, mPage },
   props: {
     visible: {
       type: Boolean,
@@ -25,18 +39,66 @@ export default {
       type: Array,
       default: [],
     },
+    dataItem: {
+      type: Object,
+      default: {},
+    },
   },
   data() {
     return {
       tableData: [],
+      historicalNotesDlgVisible: false, //历史备注的弹框
+      historicalNotesId: 0,
+      total: 0,
+      pageSize: 10,
+      page_no: 1,
     };
   },
-  computed: {},
-  watch: {},
+  computed: {
+    isShowText() {
+      return ["新签合同", "到期合同", "续约合同", "确认不续约合同"].includes(this.title);
+    },
+  },
+  watch: {
+    visible(val) {
+      if (val) {
+        this.getData();
+      }
+    },
+  },
   created() {},
   mounted() {},
   methods: {
-    closeDialog() {},
+    closeDialog() {
+      this.$emit("update:visible", false);
+    },
+    // 点击了历史留言
+    historicalNotesClickHandler(row) {
+      this.historicalNotesDlgVisible = true;
+      this.historicalNotesId = Number(this.companyId);
+    },
+    handleCurrentChange(val) {
+      this.page_no = val;
+      this.getData();
+    },
+    // 获取数据
+    async getData() {
+      console.log(this.columns);
+
+      const res = await dataMainInterface.getRaiDataSummaryList({
+        DataType: this.dataItem.DataType,
+        SellerId: this.dataItem.SellerId,
+        CurrentIndex: this.page_no,
+        PageSize: this.pageSize,
+        PopupType: this.title,
+      });
+      if (res.Ret === 200) {
+        this.tableData = res.Data.List;
+        console.log(this.tableData);
+
+        this.total = res.Data.Paging.Totals;
+      }
+    },
   },
 };
 </script>

src/views/dataReport_manage/configdata.js

@@ -481,7 +481,7 @@ export const tableConfigs = {
   AddTrialCount: [
     { label: "客户名称", prop: "CompanyName" },
     { label: "所属销售", prop: "SellerName" },
-    { label: "新增类型", prop: "Operation" },
+    { label: "新增类型", prop: "AddType" },
     { label: "新增时间", prop: "CreateTime" },
   ],
   // 新签合同
@@ -578,6 +578,12 @@ export const tableConfigs = {
     { label: "到款金额", prop: "paymentAmount" },
     { label: "到款日期", prop: "paymentDate" },
   ],
+  // 未到款比例
+  UnpaidRatioCount: [
+    { label: "开票日期", prop: "invoiceDate" },
+    { label: "到款金额", prop: "invoiceDate" },
+    { label: "未到款金额", prop: "invoiceDate" },
+  ],
 };
 export const tableDlgTitle = {
   AddTrialCount: "新增试用", //新增试用

src/views/dataReport_manage/equityDataSummary.vue

@@ -1,19 +1,49 @@
 <template>
-  <div class="dataReport-container">
-    <div class="dataReport-top">
-      <button :class="['button-sty', { act: month === item.label }]" v-for="item in monthLabel" @click="toggleMonth(item.label)" :key="item.label">
-        {{ item.label }}
-      </button>
-      <date-picker v-model="timeRange" type="year" range value-type="format" placeholder="自定义时间段" :editable="false" @change="dateChange" :disabled-date="disabledDate" @pick="onPick" clearable />
-    </div>
+  <div class="data-summary-container">
+    <el-card>
+      <div style="display: flex">
+        <div class="data-summary-top">
+          <span :class="['button-sty', { act: monthType === item.label }]" v-for="item in monthLabel" @click="toggleMonth(item.label)" :key="item.label">
+            {{ item.label }}
+          </span>
+        </div>
+        <date-picker v-model="timeRange" type="year" range value-type="format" placeholder="开始至结束" :editable="false" @change="dateChange" :disabled-date="disabledDate" @pick="onPick" clearable />
+      </div>
+    </el-card>
     <div class="dataReport-main">
-      <!-- 筛选项 -->
-      <el-checkbox-group v-model="selectedFilters">
-        <el-checkbox v-for="(fields, key) in filterOptions" :key="key" :label="key">
-          {{ key }}
-        </el-checkbox>
-      </el-checkbox-group>
-
+      <!-- 合同类型帅选项 -->
+      <div style="display: flex; flex-wrap: wrap">
+        <div class="data-summary-top">
+          <span :class="['button-sty btn-filter', { act: selectedFilters.includes(item) }]" v-for="(fields, item) in filterOptions" @click="toggleFilter(item)" :key="item">
+            {{ item }}
+          </span>
+        </div>
+        <el-cascader
+          v-model="pathfinderSales"
+          :options="salesArrRai"
+          :props="salesArrProps"
+          clearable
+          @change="salesChangeHandedl"
+          placeholder="选择开拓组销售"
+          :disabled="serviceGroupSalesAct.length"
+          style="margin-right: 20px"
+        ></el-cascader>
+        <el-cascader
+          v-model="serviceGroupSalesAct"
+          :options="salesArrRai"
+          :props="salesArrProps"
+          clearable
+          @change="salesChangeHandedl"
+          placeholder="选择服务组销售"
+          :disabled="pathfinderSales.length"
+        ></el-cascader>
+        <div class="switch-box">
+          <span>开拓组</span>
+          <el-switch v-model="pathfinderSwitch" :disabled="isSwitchDisabled" @change="salesChangeHandedl"></el-switch>
+          <span>服务组</span>
+          <el-switch v-model="serviceGroupSwitch" :disabled="isSwitchDisabled" @change="salesChangeHandedl"></el-switch>
+        </div>
+      </div>
       <!-- 数据表格 -->
       <el-table :data="flattenedData" border style="width: 100%; margin-top: 20px" :span-method="mergeRows">
         <!-- DataType 作为合并行 -->
@@ -37,7 +67,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <DataSummary :visible="showDlg" :title="titleDlg" :columns="columnsDlg" />
+    <DataSummary :visible.sync="showDlg" :title="titleDlg" :columns="columnsDlg" :dataItem="dataItem" />
   </div>
 </template>
 
@@ -52,7 +82,7 @@ export default {
     return {
       timeRange: [currentYear, currentYear],
       timePick: "",
-      month: "季度",
+      monthType: "季度",
       monthLabel: [
         {
           label: "季度",
@@ -95,6 +125,19 @@ export default {
       showDlg: false,
       titleDlg: "",
       columnsDlg: [],
+      salesArrRai: [], //开拓者销售
+      pathfinderSales: [], //选中的开拓者销售
+      salesArrProps: {
+        multiple: true,
+        value: "AdminId",
+        label: "RealName",
+        children: "ChildrenList",
+      },
+      serviceGroupSales: [], //服务组销售
+      serviceGroupSalesAct: [], //选中的服务组销售
+      pathfinderSwitch: false, //开拓者开关
+      serviceGroupSwitch: false, //服务组开关
+      dataItem: {}, //数据项
     };
   },
   methods: {
@@ -102,6 +145,7 @@ export default {
     dateChange() {
       this.$nextTick(() => {
         if (this.timeRange.length) this.timePick = this.timeRange[0];
+        this.getDataList();
       });
     },
     // 处理结束年份变化的逻辑
@@ -118,10 +162,16 @@ export default {
     },
     // 获取表格数据
     async getDataList() {
+      let AdminId = this.pathfinderSales.map((item) => item[item.length - 1]).join(",");
+      let ServiceAdminId = this.serviceGroupSalesAct.map((item) => item[item.length - 1]).join(",");
       let params = {
-        StartYear: "2025",
-        EndYear: "2025",
-        DataType: "年度",
+        StartYear: this.timeRange[0],
+        EndYear: this.timeRange[1],
+        DataType: this.monthType,
+        AdminId,
+        ServiceAdminId,
+        DevelopButton: this.pathfinderSwitch,
+        ServerButton: this.serviceGroupSwitch,
       };
       const res = await dataMainInterface.getRaiDataSummary(params);
       this.tableData = res.Data.List;
@@ -145,12 +195,42 @@ export default {
     },
     // 点击表格
     handlerRowClick(row, key) {
-      console.log(row, key);
-      console.log(tableDlgTitle[key]);
+      console.log(row);
+      
       this.showDlg = true;
+      this.dataItem = row;
       this.titleDlg = tableDlgTitle[key];
       this.columnsDlg = tableConfigs[key];
     },
+    // 点击头部筛选项
+    toggleMonth(key) {
+      if (this.monthType !== key) {
+        this.monthType = key;
+        this.getDataList();
+      }
+    },
+    // 点击了标签
+    toggleFilter(item) {
+      if (this.selectedFilters.includes(item)) {
+        let index = this.selectedFilters.findIndex((key) => key === item);
+        this.selectedFilters.splice(index, 1);
+      } else {
+        this.selectedFilters.push(item);
+      }
+      this.getDataList();
+    },
+    /* 获取权益销售 */
+    getSaleRai() {
+      dataMainInterface.getListRaiSellerServer().then((res) => {
+        if (res.Ret === 200) {
+          this.salesArrRai = res.Data.List;
+          this.serviceGroupSales = res.Data.List;
+        }
+      });
+    },
+    salesChangeHandedl() {
+      this.getDataList();
+    },
   },
   computed: {
     // 计算动态表头
@@ -165,15 +245,66 @@ export default {
       });
       return columns;
     },
+    // 开关选择是否禁用
+    isSwitchDisabled() {
+      return this.pathfinderSales.length || this.serviceGroupSalesAct.length;
+    },
   },
   mounted() {
     this.getDataList();
+    this.getSaleRai();
   },
 };
 </script>
 
 <style scoped lang="scss">
-@import "./index.scss";
+.data-summary-container {
+  .data-summary-top {
+    box-sizing: border-box;
+    height: 40px;
+    border: #dcdfe6 1px solid;
+    border-radius: 4px;
+    margin-right: 20px;
+    overflow: hidden;
+  }
+  .button-sty {
+    display: inline-block;
+    text-align: center;
+    line-height: 40px;
+    width: 120px;
+    height: 40px;
+    cursor: pointer;
+    &:nth-child(2) {
+      border-left: 1px solid #dcdfe6;
+      border-right: 1px solid #dcdfe6;
+    }
+  }
+  .act {
+    background-color: #409eff !important;
+    color: #fff !important;
+  }
+  .dataReport-main {
+    padding: 20px 20px 80px;
+    background: #fff;
+    margin-top: 20px;
+    border: 1px solid #ececec;
+    border-radius: 4px;
+    box-shadow: 0 3px 6px rgba(0, 0, 0, 0.05);
+    .btn-filter {
+      background-color: #eaf3fe;
+      color: #333;
+    }
+    .switch-box {
+      display: flex;
+      align-items: center;
+      span {
+        flex-shrink: 0;
+        display: inline-block;
+        margin: 0 10px 0 20px;
+      }
+    }
+  }
+}
 .dete-partition {
   display: inline-block;
   margin: 0 10px;