Skip to content

C
clique-web
Commit a52e1ee2 by huaying
Options

fix: 积分失效调整

parent e97b9271
Showing with 304 additions and 111 deletions
src/components/memberShip/point-form.vue
......@@ -88,7 +88,7 @@
<label>元</label>
</el-form-item>
<dm-sub-title type="fill" text="积分有效期" style="margin-bottom: 20px; margin-top:40px;"/>
<el-form-item label="有效期:" prop="effectiveTime" class="padding-0" >
<el-form-item label="有效期:" prop="integralExpireType" class="padding-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>
......@@ -146,13 +146,14 @@
<span style="font-size: 12px;color: #909399;line-height: 1;padding-left: 10px;">建议不超过3年(1095天)</span>
</div>
</el-form-item>
<dm-sub-title type="fill" text="积分说明" style="margin-bottom: 20px; margin-top:40px;"/>
<el-form-item label="" label-width="0" prop="desc" class="margin-20">
<div class="tinymce-wrap">
<editor id="tinymce" v-model="ruleForm.integralScript" :init="init"></editor>
</div>
<!-- <div v-html='tinymceHtml'></div> -->
</el-form-item>
<dm-sub-title type="fill" text="积分说明" style="margin-bottom: 20px; margin-top:40px;"/>
<p style="font-size:12px; color:#606266">积分说明展示在会员小程序-积分商城-积分明细页</p>
<el-form-item label="" label-width="0" prop="desc" class="margin-20">
<div class="tinymce-wrap">
<editor id="tinymce" v-model="ruleForm.integralScript" :init="init"></editor>
</div>
<!-- <div v-html='tinymceHtml'></div> -->
</el-form-item>
</el-form>
</div>
<div class="bottom">
......@@ -163,7 +164,7 @@
<script type="text/javascript">
import { postRequest, postForm } from '@/api/api';
import { log } from '@/utils/index.js';
import errMsg from '@/common/js/error';
import strLength from '@/common/js/strlen';
import tinymce from 'tinymce/tinymce';
import 'tinymce/themes/modern/theme';
......@@ -244,8 +245,8 @@ export default {
integralUse: { fee: undefined, integral: undefined }, //积分使用
integralGetStrategy: '1',
integralScript: '', //说明
integralGetStatus: '1', //积分获得开启（0：否，1：是）
integralUseStatus: '1', //积分使用开启（0：否，1：是）
integralGetStatus: '0', //积分获得开启（0：否，1：是）
integralUseStatus: '0', //积分使用开启（0：否，1：是）
effectiveTime: '', //积分有效期
integralGetDiscountControl: '2',
integralGetDiscountControlUpper: undefined, // 折扣控制 折扣范围 下限
......@@ -256,7 +257,7 @@ export default {
integralUseDiscountControlLower: undefined,
useProportionalRestriction: '90', //抵现比例限制
integralCost: { fee: undefined, integral: undefined }, //积分成本
integralExpireType: '1', //积分有效期类型 0 未默认滚动到期 1永久 2 按年失效 3按月失效
integralExpireType: '', //积分有效期类型 0 未默认滚动到期 1永久 2 按年失效 3按月失效
integralExpireRule: '', //积分有效期规则 年 x(年),x(月),x(日，为0标识月末) 月,x(月),x(日，为0标识月末)
},
rules: {
......@@ -266,9 +267,9 @@ export default {
integralUseStatus: [
{ required: true, message: '请选择抵现规则', trigger: 'blur' },
],
// effectiveTime: [
// { required: true, message: '请填写有效期', trigger: 'blur' },
// ],
integralExpireType: [
{ required: true, message: '请选择积分有效期', trigger: 'blur' },
],
// strategyName: [
// { required: true, message: '请填写策略名称', trigger: 'blur' },
// ],strategyName: [
......@@ -308,6 +309,7 @@ export default {
},
created() {
// this.selectReplayStyle()
this.getPointInfos();
},
methods: {
radioEvent() {
......@@ -379,7 +381,7 @@ export default {
}
// log(String(data.integralGetFreezeDays));
if (String(data.integralGetFreezeDays) == '') {
if (data.integralGetStatus == 1 && String(data.integralGetFreezeDays) == '') {
// 积分冻结期
that.$message.error({
duration: 1000,
......@@ -388,6 +390,34 @@ export default {
return;
}
if(data.integralExpireType == ''){ // 积分有效期类型
that.$message.error({
duration: 1000,
message: "请选择积分有效期类型"
})
return;
}
if(data.integralExpireType ==3 && (this.mouthM == '' || this.mouthD == -1)) {
that.$message.error({
duration: 1000,
message: "请选择按月失效规则"
})
return;
}else if(data.integralExpireType ==2 && (this.yearY == '' || this.yearM == '' || this.yearD == -1 )) {
that.$message.error({
duration: 1000,
message: "请选择按年失效规则"
})
return;
} else if (data.integralExpireType ==0 && data.effectiveTime=='') {
that.$message.error({
duration: 1000,
message: "请填写积分有效期"
})
return;
}
if (String(data.integralExpireType)== 0 &&data.effectiveTime == '') {
// 积分有效期
that.$message.error({
......@@ -504,7 +534,7 @@ export default {
let that = this;
let param = data;
param.requestProject = that.repProjectName;
// log(param)
log(param, 9090)
postRequest('/api-admin/save-member-integral-setting', param)
.then(res => {
// log(res,res.data,res.data.errorCode)
......@@ -569,7 +599,121 @@ export default {
}
that.$forceUpdate();
}
},
// 通用积分
getPointInfos() {
var that = this
var param = {
requestProject: that.projectName
}
postRequest('/api-admin/get-member-integral-setting',param)
.then((res) => {
var resData = res.data
console.log(resData, 'ppp');
if (resData.errorCode == 0) {
// that.pointInfo = that.handleData(resData.result.memberIntegral)
that.ruleForm = that.handleData(resData.result.memberIntegral);
that.ruleForm.integralExpireRule = that.ruleForm.integralExpireRule.split(',')
if(this.ruleForm.integralGetStatus == 0) {
this.ruleForm.integralGet.fee = undefined;
this.ruleForm.integralGet.integral = undefined;
}
if(this.ruleForm.integralUseStatus == 0) {
this.ruleForm.integralUse.fee = undefined;
this.ruleForm.integralUse.integral = undefined;
}
// 给定一个默认值
if (that.ruleForm.integralGetDiscountControl == 0) {
this.ruleForm.integralGetDiscountControl = '1';
}
if (that.ruleForm.integralUseDiscountControl == 0) {
this.ruleForm.integralUseDiscountControl = '1';
}
if(this.ruleForm.integralGetDiscountControl == 1) {
this.ruleForm.integralGetDiscountControlLower = undefined;
this.ruleForm.integralGetDiscountControlUpper = undefined
}
if(this.ruleForm.integralUseDiscountControl == 1) {
this.ruleForm.integralUseDiscountControlLower = undefined;
this.ruleForm.integralUseDiscountControlUpper = undefined
}
if(this.ruleForm.integralExpireType == null){
this.ruleForm.integralExpireType = 1;
}else if(that.ruleForm.integralExpireType == 2) {
this.yearY = Number(this.ruleForm.integralExpireRule[0]);
this.yearM = Number(this.ruleForm.integralExpireRule[1]);
this.yearD = Number(this.ruleForm.integralExpireRule[2]);
this.ruleForm.effectiveTime = ''
console.log(that.yearY, that.yearM, that.yearD);
}else if(this.ruleForm.integralExpireType == 3) {
this.mouthM = Number(this.ruleForm.integralExpireRule[0]);
this.mouthD = Number(this.ruleForm.integralExpireRule[1]);
this.ruleForm.effectiveTime = ''
}else if(that.ruleForm.integralExpireType == 1) {
that.ruleForm.effectiveTime = ''
}
return;
}
errMsg.errorMsg(resData)
})
.catch(function (error) {
console.log(error);
});
},
// 处理表单中数据
handleData(item) {
item.integralGetStatus = String(item.integralGetStatus);
item.integralUseStatus = String(item.integralUseStatus);
item.integralGetStrategy = String(item.integralGetStrategy);
item.integralGetDiscountControl = String(item.integralGetDiscountControl);
item.integralUseDiscountControl = String(item.integralUseDiscountControl);
item.integralGetDiscountControlUpper = String(item.integralGetDiscountControlUpper);
item.integralGetDiscountControlLower = String(item.integralGetDiscountControlLower);
item.integralUseDiscountControlUpper = String(item.integralUseDiscountControlUpper);
item.integralUseDiscountControlLower = String(item.integralUseDiscountControlLower);
item.integralExpireType = String(item.integralExpireType);
item.integralExpireRule = String(item.integralExpireRule);
// item.integralGet = JSON.parse(item.integralGet);
// item.integralUse = JSON.parse(item.integralUse);
// item.integralCost = JSON.parse(item.integralCost);
let isJSONBool1 = this.isJSON(item.integralGet);
let isJSONBool2 = this.isJSON(item.integralUse);
let isJSONBool3 = this.isJSON(item.integralCost);
if(isJSONBool1){
item.integralGet = JSON.parse(item.integralGet);
}else{ // 不是json 先转成对象再转成json
item.integralGet = JSON.parse(JSON.stringify(eval('('+ item.integralGet +')')))
}
if(isJSONBool2){
item.integralUse = JSON.parse(item.integralUse);
}else{
item.integralUse = JSON.parse(JSON.stringify(eval('('+ item.integralUse +')')))
}
if(isJSONBool3){
item.integralCost = JSON.parse(item.integralCost);
}else{
item.integralCost = JSON.parse(JSON.stringify(eval('('+ item.integralCost +')')))
}
item.integralGet.fee = Number(item.integralGet.fee / 10).toFixed(1);
item.integralGet.integral = Number(item.integralGet.integral / 10);
return item;
},
isJSON(str) {
if (typeof str == 'string') {
try {
// var obj=JSON.parse(str);
// console.log('转换成功：'+obj);
return true;
} catch(e) {
// console.log('error：'+str+'!!!'+e);
return false;
}
}
},
},
watch: {
projectName: function(newData, oldData) {
......@@ -577,52 +721,55 @@ export default {
// log("新数据:",newData,oldData)
that.repProjectName = newData || 'gic-web';
},
pointInfo: {
handle: function(newData, oldData) {
let that = this;
if (newData) {
that.ruleForm = newData;
console.log(that.ruleForm, 'that.ruleForm999');
if(this.ruleForm.integralGetStatus == 0) {
this.ruleForm.integralGet.fee = undefined;
this.ruleForm.integralGet.integral = undefined;
}
if(this.ruleForm.integralUseStatus == 0) {
this.ruleForm.integralUse.fee = undefined;
this.ruleForm.integralUse.integral = undefined;
}
// 给定一个默认值
if (newData.integralGetDiscountControl == 0) {
this.ruleForm.integralGetDiscountControl = '1';
}
if (newData.integralUseDiscountControl == 0) {
this.ruleForm.integralUseDiscountControl = '1';
}
if(this.ruleForm.integralGetDiscountControl == 1) {
this.ruleForm.integralGetDiscountControlLower = undefined;
this.ruleForm.integralGetDiscountControlUpper = undefined
}
if(this.ruleForm.integralUseDiscountControl == 1) {
this.ruleForm.integralUseDiscountControlLower = undefined;
this.ruleForm.integralUseDiscountControlUpper = undefined
}
if(this.ruleForm.integralExpireType == null){
this.ruleForm.integralExpireType = 1;
}else if(that.ruleForm.integralExpireType == 2) {
this.yearY = Number(this.ruleForm.integralExpireRule[0]);
this.yearM = Number(this.ruleForm.integralExpireRule[2]);
this.yearD = Number(this.ruleForm.integralExpireRule[4]);
this.ruleForm.effectiveTime = ''
console.log(that.yearY, that.yearM, that.yearD);
}else if(this.ruleForm.integralExpireType == 3) {
this.mouthM = Number(this.ruleForm.integralExpireRule[0]);
this.mouthD = Number(this.ruleForm.integralExpireRule[2]);
this.ruleForm.effectiveTime = ''
}
}
},
immediate: true
}
// pointInfo: {
// handle: function(newData, oldData) {
// console.log(newData, oldData, 'newData, oldData');
// let that = this;
// if (newData) {
// that.ruleForm = newData;
// that.ruleForm.integralExpireRule = that.ruleForm.integralExpireRule.split(',')
// if(this.ruleForm.integralGetStatus == 0) {
// this.ruleForm.integralGet.fee = undefined;
// this.ruleForm.integralGet.integral = undefined;
// }
// if(this.ruleForm.integralUseStatus == 0) {
// this.ruleForm.integralUse.fee = undefined;
// this.ruleForm.integralUse.integral = undefined;
// }
// // 给定一个默认值
// if (newData.integralGetDiscountControl == 0) {
// this.ruleForm.integralGetDiscountControl = '1';
// }
// if (newData.integralUseDiscountControl == 0) {
// this.ruleForm.integralUseDiscountControl = '1';
// }
// if(this.ruleForm.integralGetDiscountControl == 1) {
// this.ruleForm.integralGetDiscountControlLower = undefined;
// this.ruleForm.integralGetDiscountControlUpper = undefined
// }
// if(this.ruleForm.integralUseDiscountControl == 1) {
// this.ruleForm.integralUseDiscountControlLower = undefined;
// this.ruleForm.integralUseDiscountControlUpper = undefined
// }
// if(this.ruleForm.integralExpireType == null){
// this.ruleForm.integralExpireType = 1;
// }else if(that.ruleForm.integralExpireType == 2) {
// this.yearY = Number(this.ruleForm.integralExpireRule[0]);
// this.yearM = Number(this.ruleForm.integralExpireRule[1]);
// this.yearD = Number(this.ruleForm.integralExpireRule[2]);
// this.ruleForm.effectiveTime = ''
// console.log(that.yearY, that.yearM, that.yearD);
// }else if(this.ruleForm.integralExpireType == 3) {
// this.mouthM = Number(this.ruleForm.integralExpireRule[0]);
// this.mouthD = Number(this.ruleForm.integralExpireRule[1]);
// this.ruleForm.effectiveTime = ''
// }else if(that.ruleForm.integralExpireType == 1) {
// that.ruleForm.effectiveTime = ''
// }
// }
// },
// immediate: true
// }
},
components: {
Editor
......@@ -631,6 +778,7 @@ export default {
let that = this;
tinymce.init({});
// 传递的数据非空赋值
console.log(Object.keys(that.pointInfo), 'Object.keys(that.pointInfo)');
if (that.pointInfo) {
if (Object.keys(that.pointInfo).length) {
that.ruleForm = that.pointInfo;
......
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>
......
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