fix: 有效期

src/view/companyGroup/membershipSystem/addPointSystem.vue

@@ -297,7 +297,7 @@
                     <label>日失效</label>
                   </div>
                   <!-- <div class="radio-cell" v-else-if="timeType == 0 || timeType == null"> -->
-                  <div class="radio-cell" v-else-if="timeType == 0">
+                  <div class="radio-cell" v-else-if="timeType == 0 || timeType == null">
                     <el-radio  v-model="timeType" :label="0" disabled="true">
                     <label>每天获取的所有积分，在获取之日起</label></el-radio>
                     <el-input placeholder="请输入" style="width:115px" v-model="effectiveDays" @keyup.native="formatInputNum($event)" disabled="true"></el-input>
@@ -458,7 +458,7 @@ export default {
       mouthMT: '', //按月失效 月
       mouthDT: '', //按月失效 月
       effectiveDays: '',
-      timeType: -1,
+      timeType: '',
       timeRuleType: '',
       dayList: dayList(),
       mouthList: mouthList(),
@@ -800,9 +800,9 @@ export default {
       postRequest('/api-admin/get-member-integral-setting',{requestProject: that.projectName})
         .then((res) => {
           var resData = res.data
-          console.log(resData.result,'resData');
+          console.log(resData,'resData');
           if(resData.errorCode == 0) {
-            this.timeType = resData.result.memberIntegral.integralExpireType ? resData.result.memberIntegral.integralExpireType : '';
+            this.timeType = resData.result.memberIntegral.integralExpireType ? resData.result.memberIntegral.integralExpireType : 0;
             this.timeRuleType = resData.result.memberIntegral.integralExpireRule ? resData.result.memberIntegral.integralExpireRule.split(',') : '';
             if(this.timeType ==2) {
               this.yearYT = Number(this.timeRuleType[0])
@@ -814,6 +814,7 @@ export default {
             } else if (this.timeType == 0 || this.timeType == null) {
               this.effectiveDays = resData.result.memberIntegral.effectiveTime;
             }
+            console.log(this.timeType,'this.timeType');
           }
         })
     },
@@ -1011,13 +1012,26 @@ export default {
                 showMsg.showmsg('请完善积分有效期信息','error')
                 return;
               }
-            } else if (data.userGeneralIntegralExpireRule == 1) {
-              console.log(11111, data.integralExpireType);
-              if(this.timeType == -1) {
-                console.log(222);
-                this.scrollToError(this, 'eff');
-                showMsg.showmsg('请设置积分有效期','error')
-                return;
+            }
+            if(data.userGeneralIntegralExpireRule == 1) {
+              data.integralExpireType = this.timeType
+              if(this.timeType==0 || this.timeType == null){
+                data.integralGetEffectiveDays = this.effectiveDays
+              }else {
+                data.integralExpireRule = this.timeRuleType.toString()
+              }
+            }else if (data.userGeneralIntegralExpireRule == 0) {
+              if(data.integralExpireType == 0) {
+                data.integralExpireRule = ''
+              }else if(data.integralExpireType == 1) {
+                data.integralExpireRule = ''
+                data.integralGetEffectiveDays = ''
+              } else if(data.integralExpireType == 2) {
+                data.integralExpireRule = `${this.yearY},${this.yearM},${this.yearD}`
+                data.integralGetEffectiveDays = ''
+              }else if(data.integralExpireType == 3) {
+                data.integralExpireRule = `${this.mouthM},${this.mouthD}`
+                data.integralGetEffectiveDays = ''
               }
             }
             that.checkListValue(data).then(res => {
@@ -1079,27 +1093,6 @@ export default {
                   data.endValidTime = data.perpetualDate[1];
                 }
                 delete data.perpetualDate;
-                if(data.userGeneralIntegralExpireRule == 1) {
-                  data.integralExpireType = this.timeType
-                  if(this.timeType==0 || this.timeType == null){
-                    data.integralGetEffectiveDays = this.effectiveDays
-                  }else {
-                    data.integralExpireRule = this.timeRuleType.toString()
-                  }
-                }else if (data.userGeneralIntegralExpireRule == 0) {
-                  if(data.integralExpireType == 0) {
-                    data.integralExpireRule = ''
-                  }else if(data.integralExpireType == 1) {
-                    data.integralExpireRule = ''
-                    data.integralGetEffectiveDays = ''
-                  } else if(data.integralExpireType == 2) {
-                    data.integralExpireRule = `${this.yearY},${this.yearM},${this.yearD}`
-                    data.integralGetEffectiveDays = ''
-                  }else if(data.integralExpireType == 3) {
-                    data.integralExpireRule = `${this.mouthM},${this.mouthD}`
-                    data.integralGetEffectiveDays = ''
-                  }
-                }
                 that.saveForm(data);
               }
             });

src/view/companyGroup/membershipSystem/editPointSystem.vue

@@ -895,8 +895,8 @@ export default {
           var resData = res.data
           if(resData.errorCode == 0) {
             if(!resData.result.memberIntegral) return;
-            this.timeType = resData.result.memberIntegral.integralExpireType ? resData.result.memberIntegral.integralExpireType : '';
-            this.timeRuleType = resData.result.memberIntegral.integralExpireRule.split(',');
+            this.timeType = resData.result.memberIntegral.integralExpireType ? resData.result.memberIntegral.integralExpireType : 0;
+            this.timeRuleType = resData.result.memberIntegral.integralExpireRule ? resData.result.memberIntegral.integralExpireRule.split(',') : '';
             if(this.timeType ==2) {
               this.yearYT = Number(this.timeRuleType[0])
               this.yearMT = Number(this.timeRuleType[1])
@@ -1530,8 +1530,10 @@ export default {
             // 积分有效期
             // 当有效期类型为null时判断有效期天数是否为null 不为null 有效期类型为0  为null 无选中状态
             if(that.ruleForm.integralExpireType==null) {
-              this.ruleForm.integralExpireType = 0;
-              this.ruleForm.userGeneralIntegralExpireRule = 0;
+              if(!that.ruleForm.userGeneralIntegralExpireRule) {
+                this.ruleForm.integralExpireType = 0;
+                this.ruleForm.userGeneralIntegralExpireRule = 0;
+              }
             }
             // 积分有效期
             that.ruleForm.integralExpireRule = that.ruleForm.integralExpireRule ? that.ruleForm.integralExpireRule.split(',') : '';
@@ -1554,6 +1556,7 @@ export default {
                 that.ruleForm.integralGetEffectiveDays = '';
               }
             }else if(that.ruleForm.userGeneralIntegralExpireRule==1){
+              that.ruleForm.userGeneralIntegralExpireRule==1
               this.getPointInfo();
             }
 
@@ -1857,6 +1860,17 @@ export default {
     // 获取门店分组
     that.getStoreGroup();
     that.getLoginInfo();
+  },
+  watch: {
+    'ruleForm.integralExpireType': {
+      handler: function(val){
+        this.ruleForm.integralExpireType = val;
+        if(this.ruleForm.integralExpireType != 0) {
+          this.ruleForm.integralGetEffectiveDays = ''
+        }
+      },
+      immediate: true
+    }
   }
 };
 </script>