Merge branch 'bugfix/智能营销'

src/views/ecm/form.js

@@ -834,8 +834,8 @@ export default {
             templateEcmPlanId: this.isAdd ? this.ecmPlanId : '',
             ecmPlanName: this.form.ecmPlanName, //	是	int	计划名称不能为空,且最多9个汉字
             effectType: this.form.effectType, //是	int	时效: 实时: 0; 每天: 1
-            effectTime: this.form.effectTime, //否	int	effectType = 1每天时必填, 时效为时间为0-23
-            effectAction: this.form.effectAction, //	否	string	effectType = 0实时时必填, 关注触发: ‘subscribe’; 认证触发: ‘authentication’
+            effectTime: this.form.effectType == 1 ? this.form.effectTime : undefined, //否	int	effectType = 1每天时必填, 时效为时间为0-23
+            effectAction: this.form.effectType == 0 ? this.form.effectAction : undefined, //	否	string	effectType = 0实时时必填, 关注触发: ‘subscribe’; 认证触发: ‘authentication’
             marketingType: this.form.marketingType, //是	String	营销方式: 卡券营销: ‘card’; 短信营销 : ‘message’; 图文营销: ‘teletext’; 文本营销: ‘text’; 话务: ‘teltask’; 微信图片: ‘image’
             memberType: this.form.memberType,
             memberSearchDTO: this.form.memberType ? this.form.memberGroupIds : this.form.memberSearchDTO,
@@ -843,19 +843,19 @@ export default {
             expireType: this.form.expireType,
             beginDate: this.form.expireType ? formatDateTimeByType(this.form.beginDate, 'yyyy-MM-dd-HH-mm-ss') : '',
             endDate: this.form.expireType ? formatDateTimeByType(this.form.endDate, 'yyyy-MM-dd-HH-mm-ss') : '',
-            brithday_day: this.form.brithday_day,
-            brithday_type: this.form.brithday_type,
-            attention_day: this.form.attention_day,
-            lastCost_day: this.form.lastCost_day,
+            brithday_day: this.form.effectType == 1 ? this.form.brithday_day : undefined,
+            brithday_type: this.form.effectType == 1 ? this.form.brithday_type : undefined,
+            attention_day: this.form.effectType == 1 ? this.form.attention_day : undefined,
+            lastCost_day: this.form.effectType == 1 ? this.form.lastCost_day : undefined,
             cardNoticeType: this.form.cardNoticeType,
             templateNoticeFlag: this.form.templateNoticeFlag,
             gradeIds: this.form.gradeIds.join(',') || '',
             marketingTimesType: this.form.marketingTimesType,
             marketingTimes: this.form.marketingTimes,
-            execType: this.form.execType, // 单次执行类型(1:立即执行; 0:定时执行)
-            execTime: this.form.execTime, // 单次定时执行时间
-            execDateType: this.form.execDateType, // 重复执行频率(1:天; 2:周 3:月)
-            execDate: this.form.execDate ? this.form.execDate.join() : '' // '周/月(1,2,3,4,5,6,7,)'
+            execType: this.form.effectType == 2 ? this.form.execType : undefined, // 单次执行类型(1:立即执行; 0:定时执行)
+            execTime: this.form.effectType == 2 ? this.form.execTime : undefined, // 单次定时执行时间
+            execDateType: this.form.effectType == 1 ? this.form.execDateType : undefined, // 重复执行频率(1:天; 2:周 3:月)
+            execDate: this.form.effectType == 1 ? (this.form.execDate ? this.form.execDate.join() : '') : undefined // '周/月(1,2,3,4,5,6,7,)'
           };
 
           if (this.form.effectType == 1) {