fix: 积分失效调整

src/view/companyGroup/membershipSystem/addPointSystem.vue

@@ -296,7 +296,8 @@
                     </el-select>
                     <label>日失效</label>
                   </div>
-                  <div class="radio-cell" v-else-if="timeType == 0 || timeType == null">
+                  <!-- <div class="radio-cell" v-else-if="timeType == 0 || timeType == null"> -->
+                  <div class="radio-cell" v-else-if="timeType == 0">
                     <el-radio  v-model="ruleForm.integralExpireType" label="0" disabled="true">
                     <label>每天获取的所有积分，在获取之日起</label></el-radio>
                     <el-input placeholder="请输入" style="width:115px" v-model="effectiveDays" @keyup.native="formatInput($event)" disabled="true"></el-input>
@@ -455,7 +456,7 @@ export default {
       mouthMT: '', //按月失效 月
       mouthDT: '', //按月失效 月
       effectiveDays: undefined,
-      timeType: '',
+      timeType: -1,
       timeRuleType: '',
       dayList: dayList(),
       mouthList: mouthList(),
@@ -627,7 +628,7 @@ export default {
         integralGet: { fee: '1', integral: '1' },
         integralGetStrategy: '1', // 取整策略 1四舍五入 2抹零 3向上取整
         integralGetFreezeDays: 1, // 获取积分冻结天数
-        integralGetEffectiveDays: 1, // 获取积分有效天
+        integralGetEffectiveDays: '', // 获取积分有效天
         integralUseStatus: '0', // 积分抵现开启 1是0否
         // integralUse: { fee: undefined, integral: undefined }, // 积分抵现 {fee:5,integral:5}
         perpetualFlag: 1,
@@ -799,14 +800,14 @@ export default {
           var resData = res.data
           if(resData.errorCode == 0) {
             this.timeType = resData.result.memberIntegral.integralExpireType;
-            this.timeRuleType = resData.result.memberIntegral.integralExpireRule;
+            this.timeRuleType = resData.result.memberIntegral.integralExpireRule.split(',');
             if(this.timeType ==2) {
               this.yearYT = Number(this.timeRuleType[0])
-              this.yearMT = Number(this.timeRuleType[2])
-              this.yearDT = Number(this.timeRuleType[4])
+              this.yearMT = Number(this.timeRuleType[1])
+              this.yearDT = Number(this.timeRuleType[2])
             }else if(this.timeType == 3) {
               this.mouthMT = Number(this.timeRuleType[0])
-              this.mouthDT = Number(this.timeRuleType[2])
+              this.mouthDT = Number(this.timeRuleType[1])
             } else if (this.timeType == 0 || this.timeType == null) {
               this.effectiveDays = resData.result.memberIntegral.effectiveTime;
             }
@@ -985,10 +986,10 @@ export default {
               return;
             }
             if (data.userGeneralIntegralExpireRule == 0) {
-              if(data.integralExpireType ==3 && (this.mouthM == '' || this.mouthD == '')) {
+              if(data.integralExpireType ==3 && (this.mouthM == '' || this.mouthD == -1)) {
                 showMsg.showmsg('请选择按月失效规则','error')
                 return;
-              }else if(data.integralExpireType ==2 && (this.yearY == '' || this.yearM == '' || this.yearD == '' )) {
+              }else if(data.integralExpireType ==2 && (this.yearY == '' || this.yearM == '' || this.yearD == -1 )) {
                 showMsg.showmsg('请选择按年失效规则','error')
                 return;
               } else if (data.integralExpireType ==0  && !Number(data.integralGetEffectiveDays)) {
@@ -1498,11 +1499,11 @@ export default {
   },
   created() {
     // this.selectReplayStyle()
-    log('create');
-    this.getPointInfo();
+    // log('create');
+
   },
   beforeMount() {
-    log('beforeMount');
+    // log('beforeMount');
   },
   mounted() {
     let that = this;
@@ -1512,6 +1513,7 @@ export default {
     // 获取门店分组
     that.getStoreGroup();
     that.getLoginInfo();
+    this.getPointInfo();
   }
 };
 </script>

src/view/companyGroup/membershipSystem/editPointSystem.vue

@@ -422,8 +422,8 @@
                 <span style="font-size: 12px;color: #828282;line-height: 1;padding-left: 10px;">仅对通过订单获取的积分生效，活动类获取的积分没有冻结期</span>
               </el-form-item>
               <el-form-item label="积分有效期:" prop="userGeneralIntegralExpireRule">
-                <el-radio  v-model="ruleForm.userGeneralIntegralExpireRule" :label="1">通用积分策略有效期</el-radio>
-                <el-radio v-model="ruleForm.userGeneralIntegralExpireRule"  :label="0">自定义有效期
+                <el-radio  v-model="ruleForm.userGeneralIntegralExpireRule" @change="radiouserGeneralIntegralExpireRule" :label="1">通用积分策略有效期</el-radio>
+                <el-radio v-model="ruleForm.userGeneralIntegralExpireRule" @change="radiouserGeneralIntegralExpireRule" :label="0">自定义有效期
                   <el-tooltip placement="right" effect="light">
                     <div slot="content" style="line-height:20px">
                       <p style="color:#595959 font-size:14px;font-weight:600">规则说明：</p>
@@ -821,7 +821,7 @@ export default {
         integralGet: { fee: undefined, integral: undefined },
         integralGetStrategy: '1', // 取整策略 1四舍五入 2抹零 3向上取整
         integralGetFreezeDays: 1, // 获取积分冻结天数
-        integralGetEffectiveDays: 1, // 获取积分有效天
+        integralGetEffectiveDays: '', // 获取积分有效天
         integralUseStatus: 0, // 积分抵现开启 1是0否
         // integralUse: { fee: undefined, integral: undefined }, // 积分抵现 {fee:5,integral:5}
         perpetualFlag: 1,
@@ -867,6 +867,11 @@ export default {
   },
 
   methods: {
+    radiouserGeneralIntegralExpireRule(e) {
+      if(e==1) {
+        this.getPointInfo();
+      }
+    },
     // 获取通用积分策略
     getPointInfo() {
       var that = this
@@ -875,14 +880,14 @@ export default {
           var resData = res.data
           if(resData.errorCode == 0) {
             this.timeType = resData.result.memberIntegral.integralExpireType;
-            this.timeRuleType = resData.result.memberIntegral.integralExpireRule;
+            this.timeRuleType = resData.result.memberIntegral.integralExpireRule.split(',');
             if(this.timeType ==2) {
               this.yearYT = Number(this.timeRuleType[0])
-              this.yearMT = Number(this.timeRuleType[2])
-              this.yearDT = Number(this.timeRuleType[4])
+              this.yearMT = Number(this.timeRuleType[1])
+              this.yearDT = Number(this.timeRuleType[2])
             }else if(this.timeType == 3) {
               this.mouthMT = Number(this.timeRuleType[0])
-              this.mouthDT = Number(this.timeRuleType[2])
+              this.mouthDT = Number(this.timeRuleType[1])
             } else if (this.timeType == 0 || this.timeType == null) {
               this.effectiveDays = resData.result.memberIntegral.effectiveTime;
             }
@@ -1049,10 +1054,10 @@ export default {
               return;
             }
             if (data.userGeneralIntegralExpireRule == 0) {
-              if(data.integralExpireType ==3 && (this.mouthM == '' || this.mouthD == '')) {
+              if(data.integralExpireType ==3 && (this.mouthM == '' || this.mouthD == -1)) {
                 showMsg.showmsg('请选择按月失效规则','error')
                 return;
-              }else if(data.integralExpireType ==2 && (this.yearY == '' || this.yearM == '' || this.yearD == '' )) {
+              }else if(data.integralExpireType ==2 && (this.yearY == '' || this.yearM == '' || this.yearD == -1 )) {
                 showMsg.showmsg('请选择按年失效规则','error')
                 return;
               } else if (data.integralExpireType ==0  && !Number(data.integralGetEffectiveDays)) {
@@ -1405,32 +1410,34 @@ export default {
           if (resData.errorCode == 0) {
             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();
-            }
+            // if(item.userGeneralIntegralExpireRule==0){
+            //   this.ruleForm.userGeneralIntegralExpireRule = 0;
+            //   this.ruleForm.integralExpireType = item.integralExpireType;
+            //   item.integralExpireRule = item.integralExpireRule.split(',');
+            //   if(item.integralExpireType==2){
+            //     this.yearY = item.integralExpireRule[0];
+            //     this.yearM = item.integralExpireRule[1];
+            //     this.yearD = item.integralExpireRule[2];
+            //     this.ruleForm.integralGetEffectiveDays = '';
+            //   }else if(item.integralExpireType==3){
+            //     this.mouthM = Number(item.integralExpireRule[0]);
+            //     this.mouthD = Number(item.integralExpireRule[1]);
+            //     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;
+            //       this.ruleForm.integralGetEffectiveDays = '';
+            //     }
+            //   }
+            // }else if(item.userGeneralIntegralExpireRule==1){
+            //   this.ruleForm.userGeneralIntegralExpireRule = 1;
+            //   this.getPointInfo();
+            // }
             // 商户列表
             let prise = res.data.result.enterpriseList;
             prise.forEach(function(ele, index) {
@@ -1521,6 +1528,40 @@ export default {
               that.ruleForm.integralGet.fee = undefined;
               that.ruleForm.integralGet.integral = undefined;
             }
+
+            // 积分有效期
+            // 当有效期类型为null时判断有效期天数是否为null 不为null 有效期类型为0  为null 无选中状态
+            if(that.ruleForm.integralExpireType==null) {
+              if(that.ruleForm.integralGetEffectiveDays != null) {
+                this.ruleForm.integralExpireType = 0;
+              }else {
+                this.ruleForm.integralExpireType = -1;
+              }
+            }
+            // 积分有效期
+            that.ruleForm.integralExpireRule = that.ruleForm.integralExpireRule.split(',')
+            if(that.ruleForm.userGeneralIntegralExpireRule==0){
+              // 当有效期类型为null时判断有效期天数是否为null 不为null 有效期类型为0  为null 无选中状态
+              if(that.ruleForm.integralExpireType==null) {
+                if(that.ruleForm.integralGetEffectiveDays != null) {
+                  this.ruleForm.integralExpireType = 0;
+                }else {
+                  this.ruleForm.integralExpireType = -1;
+                }
+              }else if(that.ruleForm.integralExpireType==2){
+                this.yearY = Number(that.ruleForm.integralExpireRule[0]);
+                this.yearM = Number(that.ruleForm.integralExpireRule[1]);
+                this.yearD = Number(that.ruleForm.integralExpireRule[2]);
+                that.ruleForm.integralGetEffectiveDays = '';
+              }else if(that.ruleForm.integralExpireType==3){
+                this.mouthM = Number(that.ruleForm.integralExpireRule[0]);
+                this.mouthD = Number(that.ruleForm.integralExpireRule[1]);
+                that.ruleForm.integralGetEffectiveDays = '';
+              }
+            }else if(that.ruleForm.userGeneralIntegralExpireRule==1){
+              this.getPointInfo();
+            }
+
             that.$set(that.ruleForm, 'perpetualDate', []);
 
             that.ruleForm.perpetualDate[1] = this.ruleForm.endValidTime;

src/view/companyGroup/membershipSystem/pointSystem.vue

@@ -113,6 +113,7 @@
                     {{ scope.row.perpetualFlag | normalizeStatus(scope.row.endValidTime) }}
                   </template>
                 </el-table-column>
+                <el-table-column prop="createUserName" label="创建人" show-overflow-tooltip></el-table-column>
                 <el-table-column label="操作" min-width="100px">
                   <template slot-scope="scope">
                     <el-button @click="handleEditClick(scope.row, 'edit')" type="text">编辑</el-button>
@@ -226,6 +227,7 @@
                     {{ scope.row.perpetualFlag | normalizeStatus(scope.row.endValidTime) }}
                   </template>
                 </el-table-column>
+                <el-table-column prop="createUserName" label="创建人" show-overflow-tooltip></el-table-column>
                 <el-table-column label="操作" min-width="100px">
                   <template slot-scope="scope">
                     <el-button @click="handleEditClick2(scope.row)" type="text">编辑</el-button>