|
@@ -163,9 +163,11 @@
|
|
label="周期类型"
|
|
label="周期类型"
|
|
prop="datePicker"
|
|
prop="datePicker"
|
|
:required="form.integralActivity == 1"
|
|
:required="form.integralActivity == 1"
|
|
- v-show="form.integralActivity == 1"
|
|
|
|
|
|
+ v-show="form.integralActivity == 1"
|
|
>
|
|
>
|
|
- <el-select v-model="form.datePicker" clearable size="small">
|
|
|
|
|
|
+ <el-select v-model="form.datePicker" clearable size="small"
|
|
|
|
+ @change="timeClear"
|
|
|
|
+ >
|
|
<el-option label="每周指定日" value="1"></el-option>
|
|
<el-option label="每周指定日" value="1"></el-option>
|
|
<el-option label="每月指定日" value="2"></el-option>
|
|
<el-option label="每月指定日" value="2"></el-option>
|
|
<el-option label="固定活动日" value="3"></el-option>
|
|
<el-option label="固定活动日" value="3"></el-option>
|
|
@@ -304,8 +306,6 @@ export default {
|
|
}
|
|
}
|
|
if (ele.oilType != 3) {
|
|
if (ele.oilType != 3) {
|
|
if (!ele.ruleType || ele.grade === undefined || ele.grade === "") {
|
|
if (!ele.ruleType || ele.grade === undefined || ele.grade === "") {
|
|
- console.log("2");
|
|
|
|
- console.log('grade',ele.grade)
|
|
|
|
callback(new Error("请检查规则完整性"));
|
|
callback(new Error("请检查规则完整性"));
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -355,7 +355,7 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if(this.form.datePicker == 3){
|
|
if(this.form.datePicker == 3){
|
|
- if(!this.form.collectClickDay.length<= 0){
|
|
|
|
|
|
+ if(this.form.collectClickDay==null || this.form.collectClickDay.length<= 0){
|
|
callback(new Error("请填写指定的多倍积分日"));
|
|
callback(new Error("请填写指定的多倍积分日"));
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -441,7 +441,6 @@ export default {
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
pageSize: 100,
|
|
pageSize: 100,
|
|
}).then((response) => {
|
|
}).then((response) => {
|
|
- console.log("拉取", response.data);
|
|
|
|
this.form = response.data;
|
|
this.form = response.data;
|
|
this.form.collectClickCalendar = [];
|
|
this.form.collectClickCalendar = [];
|
|
this.form.collectClickDay = "";
|
|
this.form.collectClickDay = "";
|
|
@@ -508,7 +507,6 @@ export default {
|
|
this.form = {
|
|
this.form = {
|
|
...this.form,
|
|
...this.form,
|
|
};
|
|
};
|
|
- console.log(item);
|
|
|
|
});
|
|
});
|
|
queryOilType(item.oilName).then((res) => {
|
|
queryOilType(item.oilName).then((res) => {
|
|
item.oilType = res;
|
|
item.oilType = res;
|
|
@@ -554,9 +552,7 @@ export default {
|
|
},
|
|
},
|
|
/** 提交按钮 */
|
|
/** 提交按钮 */
|
|
submitForm() {
|
|
submitForm() {
|
|
- console.log("提交");
|
|
|
|
this.$refs["form"].validate((valid) => {
|
|
this.$refs["form"].validate((valid) => {
|
|
- console.log(valid);
|
|
|
|
if (valid) {
|
|
if (valid) {
|
|
if (this.form.datePicker == "1" || this.form.datePicker == "2") {
|
|
if (this.form.datePicker == "1" || this.form.datePicker == "2") {
|
|
this.form.datePickerTime = this.form.collectClickCalendar.toString();
|
|
this.form.datePickerTime = this.form.collectClickCalendar.toString();
|