Skip to content

C
clique-web
Commit 6104d836 by huaying
Options

fix: 集团后台的升降级规则填写框改成和单商户一样，去掉储值相关的

parent 1f2c61c6
Showing with 115 additions and 118 deletions
src/view/companyGroup/membershipSystem/addGroupGrade.vue
...@@ -146,11 +146,11 @@ ...@@ -146,11 +146,11 @@
<el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelDaystoredSelect">当天储值满</el-checkbox> <el-checkbox v-model="ruleForm.upLevelDaystoredSelect">当天储值满</el-checkbox>
<el-input v-model="ruleForm.upLevelDaystored" @focus="inputFocus('upLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelDaystored" @focus="inputFocus('upLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumcostSelect"></el-checkbox> <el-checkbox v-model="ruleForm.upLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumcostDays" @focus="inputFocus('upLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumcostDays" @focus="inputFocus('upLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
...@@ -165,13 +165,13 @@ ...@@ -165,13 +165,13 @@
<el-input v-model="ruleForm.upLevelCosttimes" @focus="inputFocus('upLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelCosttimes" @focus="inputFocus('upLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label> <label> 次 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumstoredSelect"></el-checkbox> <el-checkbox v-model="ruleForm.upLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumstoredDays" @focus="inputFocus('upLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumstoredDays" @focus="inputFocus('upLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label> <label>天内储值满</label>
<el-input v-model="ruleForm.upLevelSumstored" @focus="inputFocus('upLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumstored" @focus="inputFocus('upLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumintegralSelect"></el-checkbox> <el-checkbox v-model="ruleForm.upLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumintegralDays" @focus="inputFocus('upLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumintegralDays" @focus="inputFocus('upLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
...@@ -205,13 +205,13 @@ ...@@ -205,13 +205,13 @@
<el-input v-model="ruleForm.lowLevelHighcost" @focus="inputFocus('lowLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelHighcost" @focus="inputFocus('lowLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelDaystoredSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelDaystoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelDaystoredDays" @focus="inputFocus('lowLevelDaystoredDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelDaystoredDays" @focus="inputFocus('lowLevelDaystoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内单天储值满</label> <label>天内单天储值满</label>
<el-input v-model="ruleForm.lowLevelDaystored" @focus="inputFocus('lowLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelDaystored" @focus="inputFocus('lowLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumcostSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumcostDays" @focus="inputFocus('lowLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumcostDays" @focus="inputFocus('lowLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
...@@ -226,13 +226,13 @@ ...@@ -226,13 +226,13 @@
<el-input v-model="ruleForm.lowLevelCosttimes" @focus="inputFocus('lowLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelCosttimes" @focus="inputFocus('lowLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label> <label> 次 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumstoredSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumstoredDays" @focus="inputFocus('lowLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumstoredDays" @focus="inputFocus('lowLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label> <label>天内储值满</label>
<el-input v-model="ruleForm.lowLevelSumstored" @focus="inputFocus('lowLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumstored" @focus="inputFocus('lowLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumintegralSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumintegralDays" @focus="inputFocus('lowLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumintegralDays" @focus="inputFocus('lowLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......
src/view/companyGroup/membershipSystem/addMemberGrade.vue
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
<el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelDaystoredSelect">当天储值满</el-checkbox> <el-checkbox v-model="ruleForm.upLevelDaystoredSelect">当天储值满</el-checkbox>
<el-input v-model="ruleForm.upLevelDaystored" @focus="inputFocus('upLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelDaystored" @focus="inputFocus('upLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumcostSelect"></el-checkbox> <el-checkbox v-model="ruleForm.upLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumcostDays" @focus="inputFocus('upLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumcostDays" @focus="inputFocus('upLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
...@@ -56,13 +56,13 @@ ...@@ -56,13 +56,13 @@
<el-input v-model="ruleForm.upLevelCosttimes" @focus="inputFocus('upLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelCosttimes" @focus="inputFocus('upLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label> <label> 次 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumstoredSelect"></el-checkbox> <el-checkbox v-model="ruleForm.upLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumstoredDays" @focus="inputFocus('upLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumstoredDays" @focus="inputFocus('upLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label> <label>天内储值满</label>
<el-input v-model="ruleForm.upLevelSumstored" @focus="inputFocus('upLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumstored" @focus="inputFocus('upLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumintegralSelect"></el-checkbox> <el-checkbox v-model="ruleForm.upLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumintegralDays" @focus="inputFocus('upLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumintegralDays" @focus="inputFocus('upLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
...@@ -96,13 +96,13 @@ ...@@ -96,13 +96,13 @@
<el-input v-model="ruleForm.lowLevelHighcost" @focus="inputFocus('lowLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelHighcost" @focus="inputFocus('lowLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelDaystoredSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelDaystoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelDaystoredDays" @focus="inputFocus('lowLevelDaystoredDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelDaystoredDays" @focus="inputFocus('lowLevelDaystoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内单天储值满</label> <label>天内单天储值满</label>
<el-input v-model="ruleForm.lowLevelDaystored" @focus="inputFocus('lowLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelDaystored" @focus="inputFocus('lowLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumcostSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumcostDays" @focus="inputFocus('lowLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumcostDays" @focus="inputFocus('lowLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
...@@ -117,13 +117,13 @@ ...@@ -117,13 +117,13 @@
<el-input v-model="ruleForm.lowLevelCosttimes" @focus="inputFocus('lowLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelCosttimes" @focus="inputFocus('lowLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label> <label> 次 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumstoredSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumstoredDays" @focus="inputFocus('lowLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumstoredDays" @focus="inputFocus('lowLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label> <label>天内储值满</label>
<el-input v-model="ruleForm.lowLevelSumstored" @focus="inputFocus('lowLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumstored" @focus="inputFocus('lowLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumintegralSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumintegralDays" @focus="inputFocus('lowLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumintegralDays" @focus="inputFocus('lowLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......
src/view/companyGroup/membershipSystem/addPointSystem.vue
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</el-form-item> </el-form-item>
<el-form-item label="折扣控制：" prop="region" label-width="85px"> <el-form-item label="折扣控制：" prop="region" label-width="85px">
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent0">所有折扣商品都适用</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventN(0)">所有折扣商品都适用</el-radio>
</div> </div>
<div class="radio-cell margin-20"> <div class="radio-cell margin-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</el-form-item> </el-form-item>
<el-form-item label="折扣控制：" prop="region" label-width="85px" style="margin-bottom: 20px"> <el-form-item label="折扣控制：" prop="region" label-width="85px" style="margin-bottom: 20px">
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent1">所有折扣商品都适用</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventN(1)">所有折扣商品都适用</el-radio>
</div> </div>
<div class="radio-cell margin-20"> <div class="radio-cell margin-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</el-form-item> </el-form-item>
<el-form-item label="折扣控制：" prop="region" class="input-margin-b" label-width="85px"> <el-form-item label="折扣控制：" prop="region" class="input-margin-b" label-width="85px">
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent2">所有折扣商品都适用</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventN(2)">所有折扣商品都适用</el-radio>
</div> </div>
<div class="radio-cell margin-20"> <div class="radio-cell margin-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</el-form-item> </el-form-item>
<el-form-item label="折扣控制：" prop="region" label-width="85px" style="margin-bottom: 20px"> <el-form-item label="折扣控制：" prop="region" label-width="85px" style="margin-bottom: 20px">
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent3">所有折扣商品都适用</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventN(3)">所有折扣商品都适用</el-radio>
</div> </div>
<div class="radio-cell margin-20"> <div class="radio-cell margin-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
</el-form-item> </el-form-item>
<el-form-item label="折扣控制：" prop="region" label-width="85px" style="margin-bottom: 20px"> <el-form-item label="折扣控制：" prop="region" label-width="85px" style="margin-bottom: 20px">
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent4">所有折扣商品都适用</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventN(4)">所有折扣商品都适用</el-radio>
</div> </div>
<div class="radio-cell margin-20"> <div class="radio-cell margin-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
</el-form-item> </el-form-item>
<el-form-item label="折扣控制：" prop="region" label-width="85px" style="margin-bottom: 20px"> <el-form-item label="折扣控制：" prop="region" label-width="85px" style="margin-bottom: 20px">
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent5">所有折扣商品都适用</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventN(5)">所有折扣商品都适用</el-radio>
</div> </div>
<div class="radio-cell margin-20"> <div class="radio-cell margin-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
<el-input v-model="ruleForm.integralGetFreezeDays" @keyup.native="formatInputNum($event)" style="width: 115px"></el-input><label>天</label> <el-input v-model="ruleForm.integralGetFreezeDays" @keyup.native="formatInputNum($event)" style="width: 115px"></el-input><label>天</label>
<span class="setting-tips">仅对通过订单获取的积分生效，活动类获取的积分没有冻结期</span> <span class="setting-tips">仅对通过订单获取的积分生效，活动类获取的积分没有冻结期</span>
</el-form-item> </el-form-item>
<el-form-item label="积分有效期：" v-if="ruleForm.integralGetStatus == 1" prop=""> <el-form-item label="积分有效期：" prop="" required>
<el-radio v-model="ruleForm.userGeneralIntegralExpireRule" :label="1">通用积分策略有效期</el-radio> <el-radio v-model="ruleForm.userGeneralIntegralExpireRule" :label="1">通用积分策略有效期</el-radio>
<el-radio v-model="ruleForm.userGeneralIntegralExpireRule" :label="0">自定义有效期 <el-radio v-model="ruleForm.userGeneralIntegralExpireRule" :label="0">自定义有效期
<el-tooltip placement="right" effect="light"> <el-tooltip placement="right" effect="light">
...@@ -310,36 +310,36 @@ ...@@ -310,36 +310,36 @@
<!-- 自定义有效期 --> <!-- 自定义有效期 -->
<div class="form-child p20" v-if="ruleForm.userGeneralIntegralExpireRule == 0"> <div class="form-child p20" v-if="ruleForm.userGeneralIntegralExpireRule == 0">
<div class="radio-cell mb20"> <div class="radio-cell mb20">
<el-radio v-model="ruleForm.integralExpireType" label="2" @change="radioExpireType1"><label>按年失效：</label></el-radio> <el-radio v-model="ruleForm.integralExpireType" :label="2" @change="radioExpireType1">按年失效：</el-radio>
<label>每年获取的所有积分，在</label> <label>每年获取的所有积分，在</label>
<el-select v-model="yearY" placeholder="请选择" style="width:120px;margin-right:20px"> <el-select v-model="yearY" placeholder="请选择" class="selectwm">
<el-option v-for="n in yearList" :key="n.key" :label="n.value" :value="n.key"></el-option> <el-option v-for="n in yearList" :key="n.key" :label="n.value" :value="n.key"></el-option>
</el-select> </el-select>
<label>的</label> <label>的</label>
<el-select v-model="yearM" placeholder="请选择" style="width:120px;margin-right:20px"> <el-select v-model="yearM" placeholder="请选择" class="selectwm">
<el-option v-for="n in 12" :key="n" :label="n" :value="n"></el-option> <el-option v-for="n in 12" :key="n" :label="n" :value="n"></el-option>
</el-select> </el-select>
<label>月</label> <label>月</label>
<el-select v-model="yearD" placeholder="请选择" style="width:120px;margin-right:20px"> <el-select v-model="yearD" placeholder="请选择" class="selectwm">
<el-option v-for="n in dayList" :key="n.key" :label="n.value" :value="n.key"></el-option> <el-option v-for="n in dayList" :key="n.key" :label="n.value" :value="n.key"></el-option>
</el-select> </el-select>
<label>日失效</label> <label>日失效</label>
</div> </div>
<div class="radio-cell mb20"> <div class="radio-cell mb20">
<el-radio v-model="ruleForm.integralExpireType" label="3" @change="radioExpireType1"><label>按月失效：</label></el-radio> <el-radio v-model="ruleForm.integralExpireType" :label="3" @change="radioExpireType1">按月失效：</el-radio>
<label>每月获取的所有积分，在</label> <label>每月获取的所有积分，在</label>
<el-select v-model="mouthM" placeholder="请选择" style="width:120px;margin-right:20px"> <el-select v-model="mouthM" placeholder="请选择" class="selectwm">
<el-option v-for="n in mouthList" :key="n.key" :label="n.value" :value="n.key"></el-option> <el-option v-for="n in mouthList" :key="n.key" :label="n.value" :value="n.key"></el-option>
</el-select> </el-select>
<label>的</label> <label>的</label>
<el-select v-model="mouthD" placeholder="请选择" style="width:120px; margin-right:20px"> <el-select v-model="mouthD" placeholder="请选择" class="selectwm">
<el-option v-for="n in dayList" :key="n.key" :label="n.value" :value="n.key"></el-option> <el-option v-for="n in dayList" :key="n.key" :label="n.value" :value="n.key"></el-option>
</el-select> </el-select>
<label>日失效</label> <label>日失效</label>
</div> </div>
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="ruleForm.integralExpireType" label="0" @change="radioExpireType1"> <el-radio v-model="ruleForm.integralExpireType" :label="0" @change="radioExpireType1">按天失效：</el-radio>
<label>每天获取的所有积分，在获取之日起</label></el-radio> <label>每天获取的所有积分，在获取之日起</label>
<el-input placeholder="请输入" style="width:115px" v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInput($event)"></el-input> <el-input placeholder="请输入" style="width:115px" v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInput($event)"></el-input>
<label>天后失效</label> <label>天后失效</label>
<span style="font-size: 12px;color: #909399;line-height: 1;padding-left: 10px;">建议不超过3年(1095天)</span> <span style="font-size: 12px;color: #909399;line-height: 1;padding-left: 10px;">建议不超过3年(1095天)</span>
...@@ -614,7 +614,7 @@ export default { ...@@ -614,7 +614,7 @@ export default {
ruleForm: { ruleForm: {
userGeneralIntegralExpireRule: 1, userGeneralIntegralExpireRule: 1,
integralExpireType: '1', //积分有效期类型 0 未默认滚动到期 1永久 2 按年失效 3按月失效 integralExpireType: '0', //积分有效期类型 0 未默认滚动到期 1永久 2 按年失效 3按月失效
integralExpireRule: '', //积分有效期规则 年 x(年),x(月),x(日，为0标识月末) 月,x(月),x(日，为0标识月末) integralExpireRule: '', //积分有效期规则 年 x(年),x(月),x(日，为0标识月末) 月,x(月),x(日，为0标识月末)
// 积分获取规则 // 积分获取规则
integralStrategyId: '', //策略id integralStrategyId: '', //策略id
...@@ -752,7 +752,7 @@ export default { ...@@ -752,7 +752,7 @@ export default {
useCrowd: { required: true, message: '请选择适用对象', trigger: 'blur' }, useCrowd: { required: true, message: '请选择适用对象', trigger: 'blur' },
integralGetStatus: { required: true, message: '请选择获取规则', trigger: 'blur' }, integralGetStatus: { required: true, message: '请选择获取规则', trigger: 'blur' },
integralGetFreezeDays: { required: true, message: '请输入积分冻结期', trigger: 'blur' }, integralGetFreezeDays: { required: true, message: '请输入积分冻结期', trigger: 'blur' },
integralGetEffectiveDays: { required: true, message: '请输入积分有效期', trigger: 'blur' }, userGeneralIntegralExpireRule: { required: true, message: '请输入有效期类型', trigger: 'blur' },
perpetualFlag: { required: true, message: '请选择策略有效期', trigger: 'blur' } perpetualFlag: { required: true, message: '请选择策略有效期', trigger: 'blur' }
}, },
cateOptions: [ cateOptions: [
...@@ -813,29 +813,9 @@ export default { ...@@ -813,29 +813,9 @@ export default {
} }
}) })
}, },
radioEvent0() { radioEventN(n) {
this.ruleForm.channelList[0].integralUseDiscountControlLower = undefined; this.ruleForm.channelList[n].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[0].integralUseDiscountControlUpper = undefined; this.ruleForm.channelList[n].integralUseDiscountControlUpper = undefined;
},
radioEvent1() {
this.ruleForm.channelList[1].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[1].integralUseDiscountControlUpper = undefined;
},
radioEvent2() {
this.ruleForm.channelList[2].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[2].integralUseDiscountControlUpper = undefined;
},
radioEvent3() {
this.ruleForm.channelList[3].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[3].integralUseDiscountControlUpper = undefined;
},
radioEvent4() {
this.ruleForm.channelList[4].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[4].integralUseDiscountControlUpper = undefined;
},
radioEvent5() {
this.ruleForm.channelList[5].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[5].integralUseDiscountControlUpper = undefined;
}, },
radioEvent() { radioEvent() {
this.ruleForm.integralGet.fee = undefined; this.ruleForm.integralGet.fee = undefined;
...@@ -1075,7 +1055,9 @@ export default { ...@@ -1075,7 +1055,9 @@ export default {
data.integralExpireRule = this.timeRuleType data.integralExpireRule = this.timeRuleType
} }
}else if (data.userGeneralIntegralExpireRule == 0) { }else if (data.userGeneralIntegralExpireRule == 0) {
if(data.integralExpireType == 1 || data.integralExpireType == 0) { if(data.integralExpireType == 0) {
data.integralExpireRule = ''
}else if(data.integralExpireType == 1) {
data.integralExpireRule = '' data.integralExpireRule = ''
data.integralGetEffectiveDays = '' data.integralGetEffectiveDays = ''
} else if(data.integralExpireType == 2) { } else if(data.integralExpireType == 2) {
...@@ -1501,6 +1483,7 @@ export default { ...@@ -1501,6 +1483,7 @@ export default {
created() { created() {
// this.selectReplayStyle() // this.selectReplayStyle()
log('create'); log('create');
this.getPointInfo();
}, },
beforeMount() { beforeMount() {
log('beforeMount'); log('beforeMount');
...@@ -1517,6 +1500,10 @@ export default { ...@@ -1517,6 +1500,10 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.selectwm {
width:120px;
margin:0 10px;
}
.mb20 { .mb20 {
margin-bottom: 20px; margin-bottom: 20px;
} }
......
src/view/companyGroup/membershipSystem/editGroupGrade.vue
...@@ -139,11 +139,11 @@ ...@@ -139,11 +139,11 @@
<el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelDaystoredSelect">当天储值满</el-checkbox> <el-checkbox v-model="ruleForm.upLevelDaystoredSelect">当天储值满</el-checkbox>
<el-input v-model="ruleForm.upLevelDaystored" @focus="inputFocus('upLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelDaystored" @focus="inputFocus('upLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumcostSelect"></el-checkbox> <el-checkbox v-model="ruleForm.upLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumcostDays" @focus="inputFocus('upLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumcostDays" @focus="inputFocus('upLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
...@@ -158,13 +158,13 @@ ...@@ -158,13 +158,13 @@
<el-input v-model="ruleForm.upLevelCosttimes" @focus="inputFocus('upLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelCosttimes" @focus="inputFocus('upLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label> <label> 次 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumstoredSelect"></el-checkbox> <el-checkbox v-model="ruleForm.upLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumstoredDays" @focus="inputFocus('upLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumstoredDays" @focus="inputFocus('upLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label> <label>天内储值满</label>
<el-input v-model="ruleForm.upLevelSumstored" @focus="inputFocus('upLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumstored" @focus="inputFocus('upLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumintegralSelect"></el-checkbox> <el-checkbox v-model="ruleForm.upLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumintegralDays" @focus="inputFocus('upLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumintegralDays" @focus="inputFocus('upLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
...@@ -198,13 +198,13 @@ ...@@ -198,13 +198,13 @@
<el-input v-model="ruleForm.lowLevelHighcost" @focus="inputFocus('lowLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelHighcost" @focus="inputFocus('lowLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelDaystoredSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelDaystoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelDaystoredDays" @focus="inputFocus('lowLevelDaystoredDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelDaystoredDays" @focus="inputFocus('lowLevelDaystoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内单天储值满</label> <label>天内单天储值满</label>
<el-input v-model="ruleForm.lowLevelDaystored" @focus="inputFocus('lowLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelDaystored" @focus="inputFocus('lowLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumcostSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumcostDays" @focus="inputFocus('lowLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumcostDays" @focus="inputFocus('lowLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
...@@ -219,13 +219,13 @@ ...@@ -219,13 +219,13 @@
<el-input v-model="ruleForm.lowLevelCosttimes" @focus="inputFocus('lowLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelCosttimes" @focus="inputFocus('lowLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label> <label> 次 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumstoredSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumstoredDays" @focus="inputFocus('lowLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumstoredDays" @focus="inputFocus('lowLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label> <label>天内储值满</label>
<el-input v-model="ruleForm.lowLevelSumstored" @focus="inputFocus('lowLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumstored" @focus="inputFocus('lowLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumintegralSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumintegralDays" @focus="inputFocus('lowLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumintegralDays" @focus="inputFocus('lowLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......
src/view/companyGroup/membershipSystem/editMemberGrade.vue
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
<el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelDaystoredSelect">当天储值满</el-checkbox> <el-checkbox v-model="ruleForm.upLevelDaystoredSelect">当天储值满</el-checkbox>
<el-input v-model="ruleForm.upLevelDaystored" @focus="inputFocus('upLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelDaystored" @focus="inputFocus('upLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumcostSelect"></el-checkbox> <el-checkbox v-model="ruleForm.upLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumcostDays" @focus="inputFocus('upLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumcostDays" @focus="inputFocus('upLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
...@@ -56,13 +56,13 @@ ...@@ -56,13 +56,13 @@
<el-input v-model="ruleForm.upLevelCosttimes" @focus="inputFocus('upLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelCosttimes" @focus="inputFocus('upLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label> <label> 次 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumstoredSelect"></el-checkbox> <el-checkbox v-model="ruleForm.upLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumstoredDays" @focus="inputFocus('upLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumstoredDays" @focus="inputFocus('upLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label> <label>天内储值满</label>
<el-input v-model="ruleForm.upLevelSumstored" @focus="inputFocus('upLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumstored" @focus="inputFocus('upLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelSumintegralSelect"></el-checkbox> <el-checkbox v-model="ruleForm.upLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.upLevelSumintegralDays" @focus="inputFocus('upLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.upLevelSumintegralDays" @focus="inputFocus('upLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
...@@ -96,13 +96,13 @@ ...@@ -96,13 +96,13 @@
<el-input v-model="ruleForm.lowLevelHighcost" @focus="inputFocus('lowLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelHighcost" @focus="inputFocus('lowLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelDaystoredSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelDaystoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelDaystoredDays" @focus="inputFocus('lowLevelDaystoredDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelDaystoredDays" @focus="inputFocus('lowLevelDaystoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内单天储值满</label> <label>天内单天储值满</label>
<el-input v-model="ruleForm.lowLevelDaystored" @focus="inputFocus('lowLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelDaystored" @focus="inputFocus('lowLevelDaystored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumcostSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelSumcostSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumcostDays" @focus="inputFocus('lowLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumcostDays" @focus="inputFocus('lowLevelSumcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
...@@ -117,13 +117,13 @@ ...@@ -117,13 +117,13 @@
<el-input v-model="ruleForm.lowLevelCosttimes" @focus="inputFocus('lowLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelCosttimes" @focus="inputFocus('lowLevelCosttimes', 'day')" @keyup.native="formatInput($event)"></el-input>
<label> 次 </label> <label> 次 </label>
</div> </div>
<div class="check-cell"> <!-- <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumstoredSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelSumstoredSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumstoredDays" @focus="inputFocus('lowLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumstoredDays" @focus="inputFocus('lowLevelSumstoredDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内储值满</label> <label>天内储值满</label>
<el-input v-model="ruleForm.lowLevelSumstored" @focus="inputFocus('lowLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumstored" @focus="inputFocus('lowLevelSumstored', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label> <label> 元 </label>
</div> </div> -->
<div class="check-cell"> <div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelSumintegralSelect"></el-checkbox> <el-checkbox v-model="ruleForm.lowLevelSumintegralSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelSumintegralDays" @focus="inputFocus('lowLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input> <el-input v-model="ruleForm.lowLevelSumintegralDays" @focus="inputFocus('lowLevelSumintegralDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......
src/view/companyGroup/membershipSystem/editPointSystem.vue
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</el-form-item> </el-form-item>
<el-form-item label="折扣控制:" prop="region" class="margin-20 padding-bottom-20"> <el-form-item label="折扣控制:" prop="region" class="margin-20 padding-bottom-20">
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent0">所有折扣商品都适用</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventN(0)">所有折扣商品都适用</el-radio>
</div> </div>
<div class="radio-cell margin-20"> <div class="radio-cell margin-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
</el-form-item> </el-form-item>
<el-form-item label="折扣控制:" prop="region" class="margin-20 padding-bottom-20"> <el-form-item label="折扣控制:" prop="region" class="margin-20 padding-bottom-20">
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent1">所有折扣商品都适用</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventN(1)">所有折扣商品都适用</el-radio>
</div> </div>
<div class="radio-cell margin-20"> <div class="radio-cell margin-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
</el-form-item> </el-form-item>
<el-form-item label="折扣控制:" prop="region" class="input-margin-b margin-20 padding-bottom-20"> <el-form-item label="折扣控制:" prop="region" class="input-margin-b margin-20 padding-bottom-20">
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent2">所有折扣商品都适用</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventN(2)">所有折扣商品都适用</el-radio>
</div> </div>
<div class="radio-cell margin-20"> <div class="radio-cell margin-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
</el-form-item> </el-form-item>
<el-form-item label="折扣控制:" prop="region" class="input-margin-b margin-20 padding-bottom-20"> <el-form-item label="折扣控制:" prop="region" class="input-margin-b margin-20 padding-bottom-20">
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent3">所有折扣商品都适用</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventN(3)">所有折扣商品都适用</el-radio>
</div> </div>
<div class="radio-cell margin-20"> <div class="radio-cell margin-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
...@@ -348,7 +348,7 @@ ...@@ -348,7 +348,7 @@
</el-form-item> </el-form-item>
<el-form-item label="折扣控制:" prop="region" class="input-margin-b margin-20 padding-bottom-20"> <el-form-item label="折扣控制:" prop="region" class="input-margin-b margin-20 padding-bottom-20">
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent4">所有折扣商品都适用</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventN(4)">所有折扣商品都适用</el-radio>
</div> </div>
<div class="radio-cell margin-20"> <div class="radio-cell margin-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
</el-form-item> </el-form-item>
<el-form-item label="折扣控制:" prop="region" class="input-margin-b margin-20 padding-bottom-20"> <el-form-item label="折扣控制:" prop="region" class="input-margin-b margin-20 padding-bottom-20">
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEvent5">所有折扣商品都适用</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="1" @change="radioEventN(5)">所有折扣商品都适用</el-radio>
</div> </div>
<div class="radio-cell margin-20"> <div class="radio-cell margin-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio> <el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
...@@ -421,7 +421,7 @@ ...@@ -421,7 +421,7 @@
<label>自获取之日起</label><el-input v-model="ruleForm.integralGetFreezeDays" @keyup.native="formatInputNum($event)"></el-input><label>天</label> <label>自获取之日起</label><el-input v-model="ruleForm.integralGetFreezeDays" @keyup.native="formatInputNum($event)"></el-input><label>天</label>
<span style="font-size: 12px;color: #828282;line-height: 1;padding-left: 10px;">仅对通过订单获取的积分生效，活动类获取的积分没有冻结期</span> <span style="font-size: 12px;color: #828282;line-height: 1;padding-left: 10px;">仅对通过订单获取的积分生效，活动类获取的积分没有冻结期</span>
</el-form-item> </el-form-item>
<el-form-item label="积分有效期:" v-if="ruleForm.integralGetStatus == 1" prop=""> <el-form-item label="积分有效期:" prop="">
<el-radio v-model="ruleForm.userGeneralIntegralExpireRule" :label="1">通用积分策略有效期</el-radio> <el-radio v-model="ruleForm.userGeneralIntegralExpireRule" :label="1">通用积分策略有效期</el-radio>
<el-radio v-model="ruleForm.userGeneralIntegralExpireRule" :label="0">自定义有效期 <el-radio v-model="ruleForm.userGeneralIntegralExpireRule" :label="0">自定义有效期
<el-tooltip placement="right" effect="light"> <el-tooltip placement="right" effect="light">
...@@ -489,36 +489,36 @@ ...@@ -489,36 +489,36 @@
<!-- 自定义有效期 --> <!-- 自定义有效期 -->
<div class="form-child" style="padding:20px" v-if="ruleForm.userGeneralIntegralExpireRule == 0"> <div class="form-child" style="padding:20px" v-if="ruleForm.userGeneralIntegralExpireRule == 0">
<div class="radio-cell mb20"> <div class="radio-cell mb20">
<el-radio v-model="ruleForm.integralExpireType" label="2" @change="radioExpireType1"><label>按年失效：</label></el-radio> <el-radio v-model="ruleForm.integralExpireType" :label="2" @change="radioExpireType1">按年失效：</el-radio>
<label>每年获取的所有积分，在</label> <label>每年获取的所有积分，在</label>
<el-select v-model="yearY" placeholder="请选择" style="width:120px;margin-right:20px"> <el-select v-model="yearY" placeholder="请选择" class="selectwm">
<el-option v-for="n in yearList" :key="n.key" :label="n.value" :value="n.key"></el-option> <el-option v-for="n in yearList" :key="n.key" :label="n.value" :value="n.key"></el-option>
</el-select> </el-select>
<label>的</label> <label>的</label>
<el-select v-model="yearM" placeholder="请选择" style="width:120px;margin-right:20px"> <el-select v-model="yearM" placeholder="请选择" class="selectwm">
<el-option v-for="n in 12" :key="n" :label="n" :value="n"></el-option> <el-option v-for="n in 12" :key="n" :label="n" :value="n"></el-option>
</el-select> </el-select>
<label>月</label> <label>月</label>
<el-select v-model="yearD" placeholder="请选择" style="width:120px;margin-right:20px"> <el-select v-model="yearD" placeholder="请选择" class="selectwm">
<el-option v-for="n in dayList" :key="n.key" :label="n.value" :value="n.key"></el-option> <el-option v-for="n in dayList" :key="n.key" :label="n.value" :value="n.key"></el-option>
</el-select> </el-select>
<label>日失效</label> <label>日失效</label>
</div> </div>
<div class="radio-cell mb20"> <div class="radio-cell mb20">
<el-radio v-model="ruleForm.integralExpireType" label="3" @change="radioExpireType1"><label>按月失效：</label></el-radio> <el-radio v-model="ruleForm.integralExpireType" :label="3" @change="radioExpireType1">按月失效：</el-radio>
<label>每月获取的所有积分，在</label> <label>每月获取的所有积分，在</label>
<el-select v-model="mouthM" placeholder="请选择" style="width:120px;margin-right:20px"> <el-select v-model="mouthM" placeholder="请选择" class="selectwm">
<el-option v-for="n in mouthList" :key="n.key" :label="n.value" :value="n.key"></el-option> <el-option v-for="n in mouthList" :key="n.key" :label="n.value" :value="n.key"></el-option>
</el-select> </el-select>
<label>的</label> <label>的</label>
<el-select v-model="mouthD" placeholder="请选择" style="width:120px; margin-right:20px"> <el-select v-model="mouthD" placeholder="请选择" class="selectwm">
<el-option v-for="n in dayList" :key="n.key" :label="n.value" :value="n.key"></el-option> <el-option v-for="n in dayList" :key="n.key" :label="n.value" :value="n.key"></el-option>
</el-select> </el-select>
<label>日失效</label> <label>日失效</label>
</div> </div>
<div class="radio-cell"> <div class="radio-cell">
<el-radio v-model="ruleForm.integralExpireType" label="0" @change="radioExpireType1"> <el-radio v-model="ruleForm.integralExpireType" :label="0" @change="radioExpireType1">按天失效：</el-radio>
<label>每天获取的所有积分，在获取之日起</label></el-radio> <label>每天获取的所有积分，在获取之日起</label>
<el-input placeholder="请输入" style="width:115px" v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInput($event)"></el-input> <el-input placeholder="请输入" style="width:115px" v-model="ruleForm.integralGetEffectiveDays" @keyup.native="formatInput($event)"></el-input>
<label>天后失效</label> <label>天后失效</label>
<span style="font-size: 12px;color: #909399;line-height: 1;padding-left: 10px;">建议不超过3年(1095天)</span> <span style="font-size: 12px;color: #909399;line-height: 1;padding-left: 10px;">建议不超过3年(1095天)</span>
...@@ -802,7 +802,7 @@ export default { ...@@ -802,7 +802,7 @@ export default {
useCrowd: { required: true, message: '请选择适用对象', trigger: 'blur' }, useCrowd: { required: true, message: '请选择适用对象', trigger: 'blur' },
integralGetStatus: { required: true, message: '请选择获取规则', trigger: 'blur' }, integralGetStatus: { required: true, message: '请选择获取规则', trigger: 'blur' },
integralGetFreezeDays: { required: true, message: '请输入积分冻结期', trigger: 'blur' }, integralGetFreezeDays: { required: true, message: '请输入积分冻结期', trigger: 'blur' },
integralGetEffectiveDays: { required: true, message: '请输入积分有效期', trigger: 'blur' }, userGeneralIntegralExpireRule: { required: true, message: '请输入有效期类型', trigger: 'blur' },
perpetualFlag: { required: true, message: '请选择策略有效期', trigger: 'blur' } perpetualFlag: { required: true, message: '请选择策略有效期', trigger: 'blur' }
}, },
...@@ -889,29 +889,9 @@ export default { ...@@ -889,29 +889,9 @@ export default {
} }
}) })
}, },
radioEvent0() { radioEventN(n) {
this.ruleForm.channelList[0].integralUseDiscountControlLower = undefined; this.ruleForm.channelList[n].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[0].integralUseDiscountControlUpper = undefined; this.ruleForm.channelList[n].integralUseDiscountControlUpper = undefined;
},
radioEvent1() {
this.ruleForm.channelList[1].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[1].integralUseDiscountControlUpper = undefined;
},
radioEvent2() {
this.ruleForm.channelList[2].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[2].integralUseDiscountControlUpper = undefined;
},
radioEvent3() {
this.ruleForm.channelList[3].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[3].integralUseDiscountControlUpper = undefined;
},
radioEvent4() {
this.ruleForm.channelList[4].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[4].integralUseDiscountControlUpper = undefined;
},
radioEvent5() {
this.ruleForm.channelList[5].integralUseDiscountControlLower = undefined;
this.ruleForm.channelList[5].integralUseDiscountControlUpper = undefined;
}, },
radioEvent() { radioEvent() {
this.ruleForm.integralGet.fee = undefined; this.ruleForm.integralGet.fee = undefined;
...@@ -1135,7 +1115,9 @@ export default { ...@@ -1135,7 +1115,9 @@ export default {
data.integralExpireRule = this.timeRuleType data.integralExpireRule = this.timeRuleType
} }
}else if (data.userGeneralIntegralExpireRule == 0) { }else if (data.userGeneralIntegralExpireRule == 0) {
if(data.integralExpireType == 1 || data.integralExpireType == 0) { if(data.integralExpireType == 0) {
data.integralExpireRule = ''
}else if(data.integralExpireType == 1) {
data.integralExpireRule = '' data.integralExpireRule = ''
data.integralGetEffectiveDays = '' data.integralGetEffectiveDays = ''
} else if(data.integralExpireType == 2) { } else if(data.integralExpireType == 2) {
...@@ -1406,6 +1388,33 @@ export default { ...@@ -1406,6 +1388,33 @@ export default {
let resData = res.data; let resData = res.data;
if (resData.errorCode == 0) { if (resData.errorCode == 0) {
let item = res.data.result.strategy; let item = res.data.result.strategy;
// 积分有效期
if(item.userGeneralIntegralExpireRule==0){
this.ruleForm.userGeneralIntegralExpireRule = 0;
this.ruleForm.integralExpireType = item.integralExpireType;
if(item.integralExpireType==2){
this.yearY = Number(item.integralExpireRule[0]);
this.yearM = Number(item.integralExpireRule[2]);
this.yearD = Number(item.integralExpireRule[4]);
this.ruleForm.integralGetEffectiveDays = '';
}else if(item.integralExpireType==3){
this.mouthM = Number(item.integralExpireRule[0]);
this.mouthD = Number(item.integralExpireRule[2]);
this.ruleForm.integralGetEffectiveDays = '';
}else if(item.integralExpireType==0){
this.ruleForm.integralGetEffectiveDays = item.integralGetEffectiveDays;
} else if(item.integralExpireType == null) {
if(item.integralGetEffectiveDays!=null){
this.ruleForm.integralExpireType = 0;
this.ruleForm.integralGetEffectiveDays = item.integralGetEffectiveDays;
}else {
this.ruleForm.integralExpireType = -1;
}
}
}else if(item.userGeneralIntegralExpireRule==1){
this.ruleForm.userGeneralIntegralExpireRule = 1;
this.getPointInfo();
}
// 商户列表 // 商户列表
let prise = res.data.result.enterpriseList; let prise = res.data.result.enterpriseList;
prise.forEach(function(ele, index) { prise.forEach(function(ele, index) {
...@@ -1784,9 +1793,6 @@ export default { ...@@ -1784,9 +1793,6 @@ export default {
}, },
created() { created() {
// this.selectReplayStyle() // this.selectReplayStyle()
console.log(1);
this.getPointInfo()
console.log(2);
}, },
mounted() { mounted() {
let that = this; let that = this;
...@@ -1803,6 +1809,10 @@ export default { ...@@ -1803,6 +1809,10 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.selectwm {
width:120px;
margin:0 10px;
}
.mb20 { .mb20 {
margin-bottom: 20px; margin-bottom: 20px;
} }
......
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