Joe vor 4 Jahren
Ursprung
Commit
bd8598c9a8

+ 3 - 1
src/views/customer/Customer_Info.vue

@@ -53,7 +53,9 @@
             type="text"
             icon="el-icon-search"
             @click="detail(scope.row)"
-          >订单查询</el-button>
+          >
+            订单查询
+          </el-button>
         </template>
       </af-table-column>
     </el-table>

+ 5 - 1
src/views/dzk/Dzk_Rule.vue

@@ -371,7 +371,7 @@ export default {
         }
       }
       if (this.settingForm.discountTimeType == 3) {
-        if (this.settingForm.collectClickDay.length <= 0) {
+        if (this.settingForm.collectClickDay==null || this.settingForm.collectClickDay.length <= 0) {
           callback(new Error("请填写活动时间"));
           return;
         }
@@ -465,8 +465,12 @@ export default {
     init() {
       selectCustomerCardSetting().then((response) => {
         this.settingForm = response.data;
+        console.log('你好',this.settingForm);
         this.settingForm.collectClickCalendar = [];
         this.settingForm.collectClickDay = "";
+        if(this.settingForm.cardOilsType == null){
+          this.settingForm.cardOilsType = ''
+        }
         const cardOilsType = this.settingForm.cardOilsType.split(',').filter((ele)=>{
           return ele != ''
         })

+ 5 - 9
src/views/point/Point_Rule.vue

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

+ 1 - 1
src/views/station/Station_Group.vue

@@ -26,7 +26,7 @@
         </div>
       </el-form-item>
       <el-form-item label="集团内共享优惠劵" prop="couponFlag">
-        <el-radio-group v-model="form.couponFlag" disabled="true">
+        <el-radio-group v-model="form.couponFlag" :disabled="true">
           <el-radio label="0">不共享</el-radio>
           <el-radio label="1">共享</el-radio>
         </el-radio-group>