Merge branch 'feature/十月迭代' into dev

src/views/salesleads/groupSend/grStoreDetail.vue

@@ -183,18 +183,16 @@ export default {
       let para = {
         enterpriseId: sessionStorage.getItem('userInfoBrandId'),
         dataType: 1,
-        pageNum: this.pageParams.pageNum,
-        pageSize: this.pageParams.pageSize,
+        ...this.pageParams,
         startTime: this.pageParams.date[0],
         endTime: this.pageParams.date[1],
-        storeId: this.$route.params.id,
-        taskTitle: this.pageParams.taskTitle,
-        finishOverStatus: this.pageParams.finishOverStatus
+        storeId: this.$route.params.id
       };
       let fileName = this.pageParams.date.length ? `群发任务-门店视图-任务详情_${para.startTime}至${para.endTime}.xls` : `群发任务-门店视图-任务详情.xls`;
       if (this.$route.query.hasOwnProperty('ecmPlanName')) {
         para.ecmPlanName = this.$route.query.ecmPlanName;
         url = '/haoban-task-manage-web/market/clue/export/plan-view-task-store-task-detail';
+        para.ecmPlanId = this.$route.query.ecmPlanId;
         fileName = this.pageParams.date.length ? `群发任务-计划视图-任务门店详情-任务详情_${para.startTime}至${para.endTime}.xls` : `群发任务-计划视图-任务门店详情-任务详情.xls`;
       }
       postExcel(url, para)

src/views/salesleads/groupSend/grStoreList.vue

@@ -150,6 +150,7 @@ export default {
       let url = '/haoban-task-manage-web/market/clue/export/store-view';
       let para = {
         ...this.pageParams,
+        taskType: 2,
         enterpriseId: sessionStorage.getItem('userInfoBrandId'),
         qywxEnterpriseId: JSON.parse(localStorage.getItem('userInfos')).wxEnterpriseId,
         startTime: this.pageParams.date[0],