update: 增加单笔消费触发

src/view/companyGroup/membershipSystem/addGroupGrade.vue

@@ -465,7 +465,6 @@ export default {
           flag = false;
         }
         // x天内消费满x元
-        console.log(data.upLevelConsumeSelect, data.upLevelConsumeCost)
         if (!!data.upLevelConsumeSelect && !data.upLevelConsumeCost) {
           flag = false;
         }

src/view/companyGroup/membershipSystem/addMemberGrade.vue

@@ -27,6 +27,11 @@
               <el-switch v-model="ruleForm.autoUpgrade"> </el-switch>
             </el-form-item>
             <el-form-item label="升级条件" prop="" v-if="ruleForm.autoUpgrade">
+              <div class="check-cell" v-if="isNormal">
+                <el-checkbox v-model="ruleForm.upLevelConsumeSelect">单笔消费满</el-checkbox>
+                 <el-input v-model="ruleForm.upLevelConsumeCost" @focus="inputFocus('upLevelConsumeCost', 'money')" @keyup.native="formatInput($event)"/>
+                <label> 元 </label>
+              </div>
               <div class="check-cell">
                 <el-checkbox v-model="ruleForm.upLevelHighcostSelect">当天消费满</el-checkbox>
                 <el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
@@ -77,6 +82,13 @@
                 <label> 天 </label>
               </el-form-item>
               <el-form-item label="保级条件" prop="">
+                <div class="check-cell" v-if="isNormal">
+                  <el-checkbox v-model="ruleForm.lowLevelConsumeSelect"></el-checkbox>
+                  <el-input  v-model="ruleForm.lowLevelConsumeDays" @focus="inputFocus('lowLevelConsumeDays', 'day')" @keyup.native="formatInput($event)" />
+                  <label>天内单笔消费满</label>
+                  <el-input v-model="ruleForm.lowLevelConsumeCost"  @focus="inputFocus('lowLevelConsumeCost', 'money')" @keyup.native="formatInput($event)"/>
+                  <label> 元 </label>
+                </div>
                 <div class="check-cell">
                   <el-checkbox v-model="ruleForm.lowLevelHighcostSelect"></el-checkbox>
                   <el-input v-model="ruleForm.lowLevelHighcostDays" @focus="inputFocus('lowLevelHighcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
@@ -210,6 +222,8 @@ export default {
         upLevelSumintegralSelect: false, //x天内获得x积分
         upLevelSumintegral: '',
         upLevelSumintegralDays: '',
+        upLevelConsumeSelect: false, // x天内消费满x元-开关
+        upLevelConsumeCost: '', // x天内消费满x元
         autoDowngrade: true, //自动降级 1启用 2停用
         gradeEffectDay: '', //自升级之日起算X天
         lowLevelHighcostDays: '', //x天内单天消费满x元
@@ -230,6 +244,9 @@ export default {
         lowLevelSumintegralSelect: false, //x天内获得x积分
         lowLevelSumintegral: '',
         lowLevelSumintegralDays: '',
+        lowLevelConsumeSelect: false, // x天内单笔消费-开关
+        lowLevelConsumeDays: '', // x天内单笔消费
+        lowLevelConsumeCost: '', // x天内单笔消费x元
         gradeDescribe: '', //会员等级说明
         upCliqueEnterpriseRelation: null
       },
@@ -313,6 +330,11 @@ export default {
         if (!!data.upLevelSumintegralSelect && (!data.upLevelSumintegralDays || !data.upLevelSumintegral)) {
           flag = false;
         }
+
+        // x天内消费满x元
+        if (this.isNormal && !!data.upLevelConsumeSelect && !data.upLevelConsumeCost) {
+          flag = false;
+        }
       }
       return flag;
     },
@@ -345,6 +367,11 @@ export default {
         if (!!data.lowLevelSumintegralSelect && (!data.lowLevelSumintegralDays || !data.lowLevelSumintegral)) {
           flag = false;
         }
+
+        // x天内消费满x元
+        if (this.isNormal && !!data.lowLevelConsumeSelect && (!data.lowLevelConsumeDays || !data.lowLevelConsumeCost)) {
+          flag = false;
+        }
       }
       return flag;
     },
@@ -422,6 +449,12 @@ export default {
           data.lowLevelSumintegralDays = data.lowLevelSumintegralDays || 0;
           data.lowLevelSumintegral = data.lowLevelSumintegral || 0;
 
+          // 单笔消费
+          data.upLevelConsumeSelect = data.upLevelConsumeSelect==true? 1:0
+          data.upLevelConsumeCost = data.upLevelConsumeCost || 0;
+          data.lowLevelConsumeSelect = data.lowLevelConsumeSelect==true? 1:0
+          data.lowLevelConsumeDays = data.lowLevelConsumeDays || 0;
+          data.lowLevelConsumeCost = data.lowLevelConsumeCost || 0;
           that.saveInfo(data);
         } else {
           log('error submit!!');
@@ -473,6 +506,12 @@ export default {
   components: {
     topNavNew
   },
+  computed: {
+    // 是否为常规卡类型
+    isNormal() {
+      return this.$route.query.type == 1;
+    }
+  },
   mounted() {
     let that = this;
     that.cliqueId = that.$route.query.enterpriseId;

src/view/companyGroup/membershipSystem/components/MemberCardTable.vue

@@ -55,7 +55,7 @@
       </el-table-column>
       <el-table-column prop="" label="操作">
         <template slot-scope="{$index,row}">
-          <el-button @click="editCliqueLevel($index,row,list)" type="text" :disabled="isEditSort">编辑</el-button>
+          <el-button @click="editCliqueLevel($index, row, list, type)" type="text" :disabled="isEditSort">编辑</el-button>
           <delete-tip @confirm="delCliqueLevel($index,row,list)" tips="确认删除吗?">
             <el-button type="text" :disabled="isEditSort">删除</el-button>
           </delete-tip>
@@ -143,8 +143,8 @@ export default {
   },
   methods: {
     // 编辑集团
-    editCliqueLevel(index, row, obj) {
-      this.$emit('edit', row);
+    editCliqueLevel(index, row, obj, type) {
+      this.$emit('edit', row, type);
     },
     // 删除
     delCliqueLevel(index, row, obj) {

src/view/companyGroup/membershipSystem/editMemberGrade.vue

@@ -27,6 +27,11 @@
               <el-switch v-model="ruleForm.autoUpgrade"> </el-switch>
             </el-form-item>
             <el-form-item label="升级条件" prop="" v-if="ruleForm.autoUpgrade">
+              <div class="check-cell" v-if="isNormal">
+                <el-checkbox v-model="ruleForm.upLevelConsumeSelect">单笔消费满</el-checkbox>
+                 <el-input v-model="ruleForm.upLevelConsumeCost" @focus="inputFocus('upLevelConsumeCost', 'money')" @keyup.native="formatInput($event)"/>
+                <label> 元 </label>
+              </div>
               <div class="check-cell">
                 <el-checkbox v-model="ruleForm.upLevelHighcostSelect">当天消费满</el-checkbox>
                 <el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
@@ -77,6 +82,13 @@
                 <label> 天 </label>
               </el-form-item>
               <el-form-item label="保级条件" prop="">
+                <div class="check-cell" v-if="isNormal">
+                  <el-checkbox v-model="ruleForm.lowLevelConsumeSelect"></el-checkbox>
+                  <el-input  v-model="ruleForm.lowLevelConsumeDays" @focus="inputFocus('lowLevelConsumeDays', 'day')" @keyup.native="formatInput($event)" />
+                  <label>天内单笔消费满</label>
+                  <el-input v-model="ruleForm.lowLevelConsumeCost"  @focus="inputFocus('lowLevelConsumeCost', 'money')" @keyup.native="formatInput($event)"/>
+                  <label> 元 </label>
+                </div>
                 <div class="check-cell">
                   <el-checkbox v-model="ruleForm.lowLevelHighcostSelect"></el-checkbox>
                   <el-input v-model="ruleForm.lowLevelHighcostDays" @focus="inputFocus('lowLevelHighcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
@@ -262,6 +274,11 @@ export default {
         if (!!data.upLevelSumintegralSelect && (!data.upLevelSumintegralDays || !data.upLevelSumintegral)) {
           flag = false;
         }
+
+        // x天内消费满x元
+        if (this.isNormal && !!data.upLevelConsumeSelect && !data.upLevelConsumeCost) {
+          flag = false;
+        }
       }
       return flag;
     },
@@ -294,6 +311,11 @@ export default {
         if (!!data.lowLevelSumintegralSelect && (!data.lowLevelSumintegralDays || !data.lowLevelSumintegral)) {
           flag = false;
         }
+
+        // x天内消费满x元
+        if (this.isNormal && !!data.lowLevelConsumeSelect && (!data.lowLevelConsumeDays || !data.lowLevelConsumeCost)) {
+          flag = false;
+        }
       }
       return flag;
     },
@@ -375,6 +397,14 @@ export default {
           data.lowLevelSumintegralDays = data.lowLevelSumintegralDays || 0;
           data.lowLevelSumintegral = data.lowLevelSumintegral || 0;
 
+          // 单笔消费
+          if(this.isNormal) {
+            data.upLevelConsumeSelect = data.upLevelConsumeSelect==true? 1:0
+            data.upLevelConsumeCost = data.upLevelConsumeCost || 0;
+            data.lowLevelConsumeSelect = data.lowLevelConsumeSelect==true? 1:0
+            data.lowLevelConsumeDays = data.lowLevelConsumeDays || 0;
+            data.lowLevelConsumeCost = data.lowLevelConsumeCost || 0;
+          }
           that.saveInfo(data);
         } else {
           log('error submit!!');
@@ -451,7 +481,11 @@ export default {
             data.lowLevelCosttimesSelect = data.lowLevelCosttimesSelect == 1 ? true : false;
             data.lowLevelSumstoredSelect = data.lowLevelSumstoredSelect == 1 ? true : false;
             data.lowLevelSumintegralSelect = data.lowLevelSumintegralSelect == 1 ? true : false;
-
+            // 单笔消费
+            if(this.isNormal) {
+              data.upLevelConsumeSelect = data.upLevelConsumeSelect==1? true:false;
+              data.lowLevelConsumeSelect = data.lowLevelConsumeSelect==1? true:false;
+            }
             that.ruleForm = data;
 
             that.inputNumObj.gradeName = strLength.getZhLen(that.ruleForm.gradeName);
@@ -471,6 +505,12 @@ export default {
         });
     }
   },
+  computed: {
+    // 是否为常规卡类型
+    isNormal() {
+      return this.$route.query.type == 1;
+    }
+  },
   components: {
     topNavNew
   },

src/view/companyGroup/membershipSystem/memberGrade.vue

@@ -87,13 +87,15 @@ export default {
       })
     },
     // 编辑
-    editGrade(row) {
+    editGrade(row, type) {
+      console.log(type);
       this.$router.push({
         path: '/editMemberGrade',
         query: {
           gradeId: row.gradeId,
           enterpriseId: this.cliqueId,
-          name: this.cliqueName
+          name: this.cliqueName,
+          type
         }
       });
     },