Commit 64e9731f by crushh

update: dist

parent e9c6f34c
......@@ -16,11 +16,11 @@
</el-form-item>
</div>
</el-form-item>
<el-form-item label="节日日期" prop="holiday_date1" required v-show="form.holiday_type == 1">
<el-form-item label="节日日期" prop="holiday_date1" v-show="form.holiday_type == 1">
<span class="tips fz14" v-if="!form.holiday_date1">未选择节日</span>
<span v-else>{{ form.holiday_date1 }}</span>
</el-form-item>
<el-form-item label="节日日期" required prop="holiday_date2" v-show="form.holiday_type == 2">
<el-form-item label="节日日期" prop="holiday_date2" v-show="form.holiday_type == 2">
<el-date-picker v-model="form.holiday_date2" value-format="yyyy-MM-dd" :picker-options="pickerOptions" @change="handleDateChange" type="date" placeholder="选择日期"> </el-date-picker>
</el-form-item>
<el-form-item label="外呼时间" prop="holiday_day" :rules="[{ required: true, message: '请输入外呼时间' }]">
......@@ -73,7 +73,7 @@ export default {
}
if (this.form.holiday_type == 2 && value) {
if (this.currentTime + this.form.holiday_day * 24 * 60 * 60 * 1000 > value) {
return callback(new Error('节日日期 - 节日前X天不能早于当前日期'));
return callback(new Error(`节日日期减去节日前${this.form.holiday_day}天不能早于当前日期`));
}
}
callback();
......@@ -173,12 +173,12 @@ export default {
// 回显时 根据外呼周期和节日日期 算出外呼时间
this.form.holiday_day = (getTimesByReq(this.form.holiday_date) - this.form.startDate) / (24 * 60 * 60 * 1000);
},
hanldeHolidayDay(val) {
const { holiday_type, holiday_date1, holiday_date2 } = this.form;
hanldeHolidayDay() {
const { holiday_type, holiday_date1, holiday_date2, holiday_day } = this.form;
if ((holiday_type == 1 && holiday_date1) || (holiday_type == 2 && holiday_date2)) {
if (this.currentTime + val * 24 * 60 * 60 * 1000 > getTimesByReq(this.form[`holiday_date${holiday_type}`])) {
if (this.currentTime + holiday_day * 24 * 60 * 60 * 1000 > getTimesByReq(this.form[`holiday_date${holiday_type}`])) {
this.$message.warning(`节日日期减去节日前${holiday_day}天不能早于当前日期`);
this.form.holiday_day = ' ';
this.$message.warning('节日日期 - 节日前X天不能早于当前日期');
}
}
this.form = Object.assign({}, this.form);
......@@ -224,7 +224,6 @@ export default {
let currentdate = date + ' ' + time;
return new Date(currentdate).getTime();
},
submit() {
return new Promise(async resolve => {
let arr = [];
......@@ -237,6 +236,13 @@ export default {
}
});
}
const { holiday_type, holiday_date1, holiday_date2, holiday_day } = this.form;
if ((holiday_type == 1 && holiday_date1) || (holiday_type == 2 && holiday_date2)) {
if (this.currentTime + holiday_day * 24 * 60 * 60 * 1000 > getTimesByReq(this.form[`holiday_date${holiday_type}`])) {
this.$message.warning(`节日日期减去节日前${holiday_day}天不能早于当前日期`);
this.form.holiday_day = ' ';
}
}
this.$refs.form.validate(val => {
if (val) {
const { callFlag, callTime, holiday_date1, holiday_type, holiday_name1, holiday_day, holiday_name2, holiday_date2 } = this.form;
......
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