Merge branch 'crm_16.7' into debug

src/views/dataReport_manage/components/DataSummary.vue

@@ -86,7 +86,7 @@ export default {
     // 点击了历史留言
     historicalNotesClickHandler(row) {
       this.historicalNotesDlgVisible = true;
-      this.historicalNotesId = Number(this.companyId);
+      this.historicalNotesId = row.CompanyId;
     },
     handleCurrentChange(val) {
       this.page_no = val;
@@ -97,6 +97,7 @@ export default {
       const res = await dataMainInterface.getRaiDataSummaryList({
         DataType: this.dataItem.DataType,
         SellerId: this.dataItem.SellerId,
+        IsServerSeller: this.dataItem.IsServerSeller,
         CurrentIndex: this.page_no,
         PageSize: this.pageSize,
         PopupType: this.title,