Merge branch 'feature/6/31' into dev

src/service/api/ecmApi.js

@@ -23,7 +23,7 @@ export const gicPaymentList = params => requests(PREFIX + 'query-gic-payment-lis
 export const getEcmInfo = params => requests(PREFIX + 'get-ecm-info', params);
 
 // 智能营销--ECM营销引擎-- 新建/修改 [保存]计划信息
-export const saveEcmInfo = params => requests(PREFIX + 'save-update-ecm', params);
+export const saveEcmInfo = params => requests(PREFIX + 'check-ecm-send-count', params);
 
 // 智能营销--下线
 export const offlineEcmPlan = params => requests(PREFIX + 'ecm-plan-offline', params);

src/service/api/messageApi.js

@@ -72,3 +72,6 @@ export const downloadOImportSmsTemp = config.api + PREFIX + 'download-import-sms
 
 // 卡券营销--导入短信群发--导出发送人群
 export const exportSmsImportPlanLog = config.api + PREFIX + 'export-sms-import-plan-log';
+
+//ecm查看筛选人数
+export const checkEcmSendCount = params => requests(PREFIX + 'check-ecm-send-count', params);

src/views/ecm/form.js

 import { _debounce } from '@/utils/index';
-import { checkMessageSendCount } from '@/service/api/messageApi.js';
+import { checkEcmSendCount } from '@/service/api/messageApi.js';
 import { getEcmInfo, saveEcmInfo, getUseStoredFalg, getXsxsFalg, gicPaymentList } from '@/service/api/ecmApi.js';
 import { getCardManualSetting } from '@/service/api/cardApi.js';
 import { listTemplateVariables } from '@/service/api/msgApi.js';
@@ -345,18 +345,12 @@ export default {
     filterWord(prop) {
       this.copyTemplate[prop] = this.copyTemplate[prop].replace(/[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF][\u200D|\uFE0F]|[\uD83C|\uD83D|\uD83E][\uDC00-\uDFFF]|[0-9|*|#]\uFE0F\u20E3|[0-9|#]\u20E3|[\u203C-\u3299]\uFE0F\u200D|[\u203C-\u3299]\uFE0F|[\u2122-\u2B55]|\u303D|[\A9|\AE]\u3030|\uA9|\uAE|\u3030/g, '');
     },
-    checkMessageSendCount() {
+    checkEcmSendCount(params) {
       return new Promise(async (resolve, reject) => {
         let events = this.$refs.marketingEvent.list.map(el => el.name);
         events = Array.from(new Set(events));
-        const params = {
-          memberSearchDTO: this.form.memberType ? this.form.memberGroupIds : this.form.memberSearchDTO,
-          marketingType: 0,
-          // 区分人员筛选和会员分组，需要传这个flag
-          groupType: this.form.memberType
-        };
         this.loading = true;
-        const res = await checkMessageSendCount(params).finally(() => (this.loading = false));
+        const res = await checkEcmSendCount(params).finally(() => (this.loading = false));
         if (res && res.errorCode === 0) {
           this.$confirm(
             `<div>
@@ -1101,7 +1095,7 @@ export default {
         return false;
       }
       if (this.form.effectType != 0) {
-        let count = await this.checkMessageSendCount();
+        let count = await this.checkEcmSendCount(params);
         params.forecastMemberCount = count;
       }
       this.loading = true;

src/views/sign/list.vue

@@ -94,8 +94,8 @@ export default {
     exportExcel() {
       const params = { storeName: this.pageParams.storeName, memberInfo: this.pageParams.memberInfo };
       if (this.pageParams.time) {
-        params.startTime = formatDateTimeByType(params.time[0], 'yyyy-MM-dd');
-        params.endTime = formatDateTimeByType(params.time[1], 'yyyy-MM-dd');
+        params.startTime = formatDateTimeByType(this.pageParams.time[0], 'yyyy-MM-dd');
+        params.endTime = formatDateTimeByType(this.pageParams.time[1], 'yyyy-MM-dd');
         delete params.time;
       }
       this.params = params;