Commit 37777e4b by crushh

update: dist

parent 16fb1753
......@@ -110,6 +110,22 @@ export default {
return time.getTime() < Date.now() - 8.64e7;
}
},
endDatePickerOptions2: {
//编辑 消费触发-累计订单实付金额-结束时间
disabledDate: time => {
return time.getTime() < Date.now() - 8.64e7 || time.getTime() > this.endDate;
}
},
endDatePickerOptions3: {
//新增 消费触发-累计订单实付金额-结束时间
disabledDate: time => {
if (this.form.beginDate) {
return time.getTime() < Date.now() - 8.64e7 || time.getTime() > new Date(this.form.beginDate).getTime() + 31 * 24 * 60 * 60 * 1000;
} else {
return time.getTime() < Date.now() - 8.64e7;
}
}
},
pickerOptions: {
disabledDate(val) {
return Date.now() >= val.getTime() + 24 * 60 * 60 * 1000;
......@@ -174,7 +190,8 @@ export default {
gicList: [], // gic支付方式
paymentList: [], //商户支付方式
checkList: [],
paymentFlag: 1
paymentFlag: 1,
endDate: '' //编辑 消费触发-累计订单实付金额-结束时间修改时用到
};
},
components: {
......@@ -425,6 +442,7 @@ export default {
if (this.form.expireType) {
this.form.beginDate = result.beginDate || '';
this.form.endDate = result.endDate || '';
this.endDate = this.form.endDate;
}
if (res.result.searchId) {
this.useId = res.result.searchId || '';
......@@ -1116,6 +1134,8 @@ export default {
this.form.expireType = 1;
this.consumeChecked.cost = true;
}
this.form.beginDate = '';
this.form.endDate = '';
// this.form.lowest_cost = '';
},
// 对比开始时间结束时间
......@@ -1127,6 +1147,11 @@ export default {
// this.form.beginDate = this.form.endDate;
this.showMessage = true;
return true;
} else if (this.form.expireType && this.form.consum_type == 2 && beginDate && endDate && endDate.getTime() - beginDate.getTime() > 31 * 24 * 60 * 60 * 1000) {
this.$tips({ type: 'warning', message: '最长时间跨度为31天' });
this.showMessage = true;
return true;
} else {
this.showMessage = false;
return false;
......@@ -1255,6 +1280,12 @@ export default {
this.analyseConfig.crowd_send = 4;
this.analyseConfig.crowd_no_send = 1;
}
if (this.form.consum_type == 2) {
// 累计消费时 切换时效 重置
this.form.consum_type = 1;
this.form.beginDate = '';
this.form.endDate = '';
}
}
},
filters: {
......
......@@ -360,8 +360,8 @@
<el-date-picker v-if="form.expireType" v-model="form.endDate" :disabled="isEdit && onlineStatus == 2" type="datetime" :picker-options="endDatePickerOptions" placeholder="结束时间" @change="checkBeginEndTime"> </el-date-picker>
</el-form-item>
<el-form-item label="固定期限" prop="endDate" :show-message="showMessage" v-else>
<el-date-picker class="ml10" v-model="form.beginDate" :disabled="isEdit && onlineStatus != 0" type="datetime" placeholder="开始时间" @change="checkBeginEndTime"> </el-date-picker>
<el-date-picker v-model="form.endDate" :disabled="isEdit && onlineStatus == 2" type="datetime" :picker-options="endDatePickerOptions" placeholder="结束时间" @change="checkBeginEndTime"> </el-date-picker>
<el-date-picker class="ml10" v-model="form.beginDate" :disabled="isEdit && onlineStatus != 0" type="datetime" placeholder="开始时间" @change="checkBeginEndTime" :picker-options="endDatePickerOptions"> </el-date-picker>
<el-date-picker v-model="form.endDate" :disabled="isEdit && onlineStatus == 2" type="datetime" :picker-options="isEdit ? endDatePickerOptions2 : endDatePickerOptions3" placeholder="结束时间" @change="checkBeginEndTime"> </el-date-picker>
</el-form-item>
</section>
<!-- 人群筛选器 -->
......@@ -418,7 +418,7 @@
</div>
</h3>
<!-- 只有实时才是单图文 -->
<marketing-event :effectType="form.effectType" :readOnly="isInfo || onlineStatus == 2" :show-delete-tooltip="isEdit && analyseConfig.open_flag == 1" show-out-coupon-icon ref="marketingEvent" @has-card="hasCard" v-if="ecmPlanId" :singleFlag="form.effectType === 0" :integralMultiple="form.effectAction === 'consume'" :ecmPlanId="ecmPlanId" :isSupportVar="form.effectType === 0" :code="code" :enabledMessageState="enabledMessageState" :cardLimitType="-1" :use-stored="useStoredFlag && ['consume', 'stored'].includes(form.effectAction) && form.effectType == 0 && form.consum_type == 1" :use-qfxx="form.effectType !== 0" :consumType="form.consum_type"> </marketing-event>
<marketing-event :effectType="form.effectType" :readOnly="isInfo || onlineStatus == 2 || (form.consum_type == 2 && isEdit)" :show-delete-tooltip="isEdit && analyseConfig.open_flag == 1" show-out-coupon-icon ref="marketingEvent" @has-card="hasCard" v-if="ecmPlanId" :singleFlag="form.effectType === 0" :integralMultiple="form.effectAction === 'consume'" :ecmPlanId="ecmPlanId" :isSupportVar="form.effectType === 0" :code="code" :enabledMessageState="enabledMessageState" :cardLimitType="-1" :use-stored="useStoredFlag && ['consume', 'stored'].includes(form.effectAction) && form.effectType == 0 && form.consum_type == 1" :use-qfxx="form.effectType !== 0" :consumType="form.consum_type"> </marketing-event>
<!-- 只有非实时&&选择卡券了展示提示 -->
<div v-if="currentCard.comName && form.effectType != 0 && couponAutoGetFlag" class="fz13 regular-font-color line-height2" style="margin-left:120px;margin-top:30px;">
* 用户在领取卡券后需要<b class="bold">同步至ERP</b>,如果关闭用户<b class="bold">手动领取</b>,卡券在<b class="bold">批量投放</b>时会需要将卡券信息批量同步至ERP。 <br />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment