Skip to content

C
clique-web
Commit f36224a8 by liuchenxi
Options

Merge branch 'feature/1月迭代-年后'

parents 1959878e f6a6c09d
Showing with 228 additions and 283 deletions
src/view/companyGroup/membershipSystem/addGroupGrade.vue
......@@ -137,6 +137,11 @@
</el-form-item>
<el-form-item label="升级条件" prop="" v-if="ruleForm.autoUpgrade">
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelConsumeSelect">单笔消费满</el-checkbox>
<el-input v-model="ruleForm.upLevelConsumeCost" @focus="inputFocus('upLevelConsumeCost', 'money')" @keyup.native="formatInput($event)"/>
<label> 元 </label>
</div>
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelHighcostSelect">当天消费满</el-checkbox>
<el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
......@@ -187,6 +192,13 @@
</el-form-item>
<el-form-item label="保级条件" prop="">
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelConsumeSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelConsumeDays" @focus="inputFocus('lowLevelConsumeDays', 'day')" @keyup.native="formatInput($event)" />
<label>天内单笔消费满</label>
<el-input v-model="ruleForm.lowLevelConsumeCost" @focus="inputFocus('lowLevelConsumeCost', 'money')" @keyup.native="formatInput($event)"/>
<label> 元 </label>
</div>
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelHighcostSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelHighcostDays" @focus="inputFocus('lowLevelHighcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内单天消费满</label>
......@@ -322,6 +334,8 @@ export default {
upLevelSumintegralSelect: false, //x天内获得x积分
upLevelSumintegral: '0',
upLevelSumintegralDays: '',
upLevelConsumeSelect: false, // x天内消费满x元-开关
upLevelConsumeCost: '0', // x天内消费满x元
autoDowngrade: true, //自动降级 1启用 2停用
gradeEffectDay: '0', //自升级之日起算X天
lowLevelHighcostDays: '0', //x天内单天消费满x元
......@@ -340,6 +354,9 @@ export default {
lowLevelSumstored: '0',
lowLevelSumstoredDays: '0',
lowLevelSumintegralSelect: false, //x天内获得x积分
lowLevelConsumeSelect: false, // x天内单笔消费-开关
lowLevelConsumeDays: '0', // x天内单笔消费
lowLevelConsumeCost: '0', // x天内单笔消费x元
lowLevelSumintegral: '0',
lowLevelSumintegralDays: '0',
gradeDescribe: '', //会员等级说明
......@@ -447,6 +464,10 @@ export default {
if (!!data.upLevelSumintegralSelect && (!data.upLevelSumintegralDays || !data.upLevelSumintegral)) {
flag = false;
}
// x天内消费满x元
if (!!data.upLevelConsumeSelect && !data.upLevelConsumeCost) {
flag = false;
}
}
return flag;
......@@ -480,6 +501,10 @@ export default {
if (!!data.lowLevelSumintegralSelect && (!data.lowLevelSumintegralDays || !data.lowLevelSumintegral)) {
flag = false;
}
// x天内消费满x元
if (!!data.lowLevelConsumeSelect && (!data.lowLevelConsumeDays || !data.lowLevelConsumeCost)) {
flag = false;
}
}
return flag;
......@@ -545,6 +570,7 @@ export default {
data.upLevelCostimesSelect = data.upLevelCostimesSelect == true ? 1 : 0;
data.upLevelSumstoredSelect = data.upLevelSumstoredSelect == true ? 1 : 0;
data.upLevelSumintegralSelect = data.upLevelSumintegralSelect == true ? 1 : 0;
data.upLevelConsumeSelect = data.upLevelConsumeSelect==true? 1:0
log(data.lowLevelHighcostSelect, data.lowLevelDaystoredSelect, data.lowLevelSumcostSelect, data.lowLevelCosttimesSelect, data.lowLevelSumstoredSelect, data.lowLevelSumintegralSelect);
data.lowLevelHighcostSelect = data.lowLevelHighcostSelect == true ? 1 : 0;
data.lowLevelDaystoredSelect = data.lowLevelDaystoredSelect == true ? 1 : 0;
......@@ -552,6 +578,7 @@ export default {
data.lowLevelCosttimesSelect = data.lowLevelCosttimesSelect == true ? 1 : 0;
data.lowLevelSumstoredSelect = data.lowLevelSumstoredSelect == true ? 1 : 0;
data.lowLevelSumintegralSelect = data.lowLevelSumintegralSelect == true ? 1 : 0;
data.lowLevelConsumeSelect = data.lowLevelConsumeSelect==true? 1:0
data.discountControlUpper = data.discountControlUpper || '0';
data.discountControlLower = data.discountControlLower || '0';
......@@ -567,6 +594,7 @@ export default {
data.upLevelSumstored = data.upLevelSumstored || 0;
data.upLevelSumintegralDays = data.upLevelSumintegralDays || 0;
data.upLevelSumintegral = data.upLevelSumintegral || 0;
data.upLevelConsumeCost = data.upLevelConsumeCost || 0;
data.gradeEffectDay = data.gradeEffectDay || 0;
data.lowLevelHighcostDays = data.lowLevelHighcostDays || 0;
......@@ -581,6 +609,8 @@ export default {
data.lowLevelSumstored = data.lowLevelSumstored || 0;
data.lowLevelSumintegralDays = data.lowLevelSumintegralDays || 0;
data.lowLevelSumintegral = data.lowLevelSumintegral || 0;
data.lowLevelConsumeDays = data.lowLevelConsumeDays || 0;
data.lowLevelConsumeCost = data.lowLevelConsumeCost || 0;
// 关联商户等级
let relation = '';
......
src/view/companyGroup/membershipSystem/addMemberGrade.vue
......@@ -18,8 +18,8 @@
<label class="input-label">{{ inputNumObj.gradeCode }}/6</label>
</el-form-item>
<el-form-item label="等级类型" prop="gradeType">
<el-radio v-model="ruleForm.gradeType" label="1">常规卡</el-radio>
<el-radio v-model="ruleForm.gradeType" label="2">特殊卡</el-radio>
<el-radio :value="ruleForm.gradeType" :disabled="ruleForm.gradeType == 2" label="1">常规卡</el-radio>
<el-radio :value="ruleForm.gradeType" :disabled="ruleForm.gradeType == 1" label="2">特殊卡</el-radio>
</el-form-item>
<!-- 自动升级 -->
<!-- 自动升级 -->
......@@ -27,6 +27,11 @@
<el-switch v-model="ruleForm.autoUpgrade"> </el-switch>
</el-form-item>
<el-form-item label="升级条件" prop="" v-if="ruleForm.autoUpgrade">
<div class="check-cell" v-if="isNormal">
<el-checkbox v-model="ruleForm.upLevelConsumeSelect">单笔消费满</el-checkbox>
<el-input v-model="ruleForm.upLevelConsumeCost" @focus="inputFocus('upLevelConsumeCost', 'money')" @keyup.native="formatInput($event)"/>
<label> 元 </label>
</div>
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelHighcostSelect">当天消费满</el-checkbox>
<el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
......@@ -77,6 +82,13 @@
<label> 天 </label>
</el-form-item>
<el-form-item label="保级条件" prop="">
<div class="check-cell" v-if="isNormal">
<el-checkbox v-model="ruleForm.lowLevelConsumeSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelConsumeDays" @focus="inputFocus('lowLevelConsumeDays', 'day')" @keyup.native="formatInput($event)" />
<label>天内单笔消费满</label>
<el-input v-model="ruleForm.lowLevelConsumeCost" @focus="inputFocus('lowLevelConsumeCost', 'money')" @keyup.native="formatInput($event)"/>
<label> 元 </label>
</div>
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelHighcostSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelHighcostDays" @focus="inputFocus('lowLevelHighcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -210,6 +222,8 @@ export default {
upLevelSumintegralSelect: false, //x天内获得x积分
upLevelSumintegral: '',
upLevelSumintegralDays: '',
upLevelConsumeSelect: false, // x天内消费满x元-开关
upLevelConsumeCost: '', // x天内消费满x元
autoDowngrade: true, //自动降级 1启用 2停用
gradeEffectDay: '', //自升级之日起算X天
lowLevelHighcostDays: '', //x天内单天消费满x元
......@@ -230,6 +244,9 @@ export default {
lowLevelSumintegralSelect: false, //x天内获得x积分
lowLevelSumintegral: '',
lowLevelSumintegralDays: '',
lowLevelConsumeSelect: false, // x天内单笔消费-开关
lowLevelConsumeDays: '', // x天内单笔消费
lowLevelConsumeCost: '', // x天内单笔消费x元
gradeDescribe: '', //会员等级说明
upCliqueEnterpriseRelation: null
},
......@@ -313,6 +330,11 @@ export default {
if (!!data.upLevelSumintegralSelect && (!data.upLevelSumintegralDays || !data.upLevelSumintegral)) {
flag = false;
}
// x天内消费满x元
if (this.isNormal && !!data.upLevelConsumeSelect && !data.upLevelConsumeCost) {
flag = false;
}
}
return flag;
},
......@@ -345,6 +367,11 @@ export default {
if (!!data.lowLevelSumintegralSelect && (!data.lowLevelSumintegralDays || !data.lowLevelSumintegral)) {
flag = false;
}
// x天内消费满x元
if (this.isNormal && !!data.lowLevelConsumeSelect && (!data.lowLevelConsumeDays || !data.lowLevelConsumeCost)) {
flag = false;
}
}
return flag;
},
......@@ -422,6 +449,12 @@ export default {
data.lowLevelSumintegralDays = data.lowLevelSumintegralDays || 0;
data.lowLevelSumintegral = data.lowLevelSumintegral || 0;
// 单笔消费
data.upLevelConsumeSelect = data.upLevelConsumeSelect==true? 1:0
data.upLevelConsumeCost = data.upLevelConsumeCost || 0;
data.lowLevelConsumeSelect = data.lowLevelConsumeSelect==true? 1:0
data.lowLevelConsumeDays = data.lowLevelConsumeDays || 0;
data.lowLevelConsumeCost = data.lowLevelConsumeCost || 0;
that.saveInfo(data);
} else {
log('error submit!!');
......@@ -473,6 +506,12 @@ export default {
components: {
topNavNew
},
computed: {
// 是否为常规卡类型
isNormal() {
return this.$route.query.type == 1;
}
},
mounted() {
let that = this;
that.cliqueId = that.$route.query.enterpriseId;
......@@ -481,6 +520,7 @@ export default {
that.navpath[3].path = '/memberGrade?enterpriseId=' + that.cliqueId + '&name=' + that.cliqueName;
that.navpath[4].name = '新增【' + that.cliqueName + '】等级';
that.enterpId = sessionStorage.getItem('enterpriseId');
this.ruleForm.gradeType = this.$route.query.type + '';
}
};
</script>
......
src/view/companyGroup/membershipSystem/components/MemberCardTable.vue
......@@ -55,7 +55,7 @@
</el-table-column>
<el-table-column prop="" label="操作">
<template slot-scope="{$index,row}">
<el-button @click="editCliqueLevel($index,row,list)" type="text" :disabled="isEditSort">编辑</el-button>
<el-button @click="editCliqueLevel($index, row, list, type)" type="text" :disabled="isEditSort">编辑</el-button>
<delete-tip @confirm="delCliqueLevel($index,row,list)" tips="确认删除吗?">
<el-button type="text" :disabled="isEditSort">删除</el-button>
</delete-tip>
......@@ -94,6 +94,11 @@ export default {
typeL: String,
default: '1' // type 1 常规卡 2 特殊卡 3 付费卡
},
// 企业id，不传时查集团数据，否则查该id的商户数据
enterpriseId: {
type: String,
default: ''
}
},
watch: {
tableData: {
......@@ -138,14 +143,8 @@ export default {
},
methods: {
// 编辑集团
editCliqueLevel(index, row, obj) {
this.$router.push({
path: '/editGroupGrade',
query: {
gradeId: row.gradeId
}
});
editCliqueLevel(index, row, obj, type) {
this.$emit('edit', row, type);
},
// 删除
delCliqueLevel(index, row, obj) {
......@@ -169,12 +168,7 @@ export default {
},
addCard(type) {
if (this.tableData.length===10) return this.$message.warning('每个卡类型最多可创建10张会员卡')
this.$router.push({
path: '/addGroupGrade',
query: {
type
}
});
this.$emit('add', type);
},
editSort() {
if (!this.list.length) return this.$message.warning(`暂无${this.$options.filters.typeFilter(this.type)}！`);
......@@ -194,6 +188,9 @@ export default {
gradeIds: this.list.map(el => (el.gradeId)),
gradeType: this.type
};
if (this.enterpriseId) {
data.enterpriseId = this.enterpriseId;
}
postJson('/api-admin/sort-member-grade', data)
.then((res) => {
let resData = res.data;
......@@ -220,10 +217,6 @@ export default {
}
});
},
// 取消删除
cancelPop(index, row, obj) {
row.popVisible = false;
},
}
}
</script>
......@@ -264,11 +257,11 @@ export default {
}
}
.card-cell {
display: flex;
display: inline-flex;
align-items: center;
width: 120px;
padding: 0 15px;
max-width: 150px;
height: 40px;
padding-left: 10px;
border-radius: 4px;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
......
src/view/companyGroup/membershipSystem/editGroupGrade.vue
......@@ -130,6 +130,11 @@
</el-form-item>
<el-form-item label="升级条件" prop="" v-if="ruleForm.autoUpgrade">
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelConsumeSelect">单笔消费满</el-checkbox>
<el-input v-model="ruleForm.upLevelConsumeCost" @focus="inputFocus('upLevelConsumeCost', 'money')" @keyup.native="formatInput($event)"/>
<label> 元 </label>
</div>
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelHighcostSelect">当天消费满</el-checkbox>
<el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
<label> 元 </label>
......@@ -180,6 +185,13 @@
</el-form-item>
<el-form-item label="保级条件" prop="">
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelConsumeSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelConsumeDays" @focus="inputFocus('lowLevelConsumeDays', 'day')" @keyup.native="formatInput($event)" />
<label>天内单笔消费满</label>
<el-input v-model="ruleForm.lowLevelConsumeCost" @focus="inputFocus('lowLevelConsumeCost', 'money')" @keyup.native="formatInput($event)"/>
<label> 元 </label>
</div>
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelHighcostSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelHighcostDays" @focus="inputFocus('lowLevelHighcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
<label>天内单天消费满</label>
......@@ -314,6 +326,8 @@ export default {
upLevelSumintegralSelect: false, //x天内获得x积分
upLevelSumintegral: '',
upLevelSumintegralDays: '',
upLevelConsumeSelect: false, // x天内消费满x元-开关
upLevelConsumeCost: '', // x天内消费满x元
autoDowngrade: true, //自动降级 1启用 2停用
gradeEffectDay: '', //自升级之日起算X天
lowLevelHighcostDays: '', //x天内单天消费满x元
......@@ -331,6 +345,9 @@ export default {
lowLevelSumstoredSelect: false, //x天内储值满x元
lowLevelSumstored: '',
lowLevelSumstoredDays: '',
lowLevelConsumeSelect: false, // x天内单笔消费-开关
lowLevelConsumeDays: '', // x天内单笔消费
lowLevelConsumeCost: '', // x天内单笔消费x元
lowLevelSumintegralSelect: false, //x天内获得x积分
lowLevelSumintegral: '',
lowLevelSumintegralDays: '',
......@@ -464,6 +481,10 @@ export default {
if (!!data.upLevelSumintegralSelect && (!data.upLevelSumintegralDays || !data.upLevelSumintegral)) {
flag = false;
}
// x天内消费满x元
if (!!data.upLevelConsumeSelect && !data.upLevelConsumeCost) {
flag = false;
}
}
return flag;
......@@ -497,6 +518,10 @@ export default {
if (!!data.lowLevelSumintegralSelect && (!data.lowLevelSumintegralDays || !data.lowLevelSumintegral)) {
flag = false;
}
// x天内消费满x元
if (!!data.lowLevelConsumeSelect && (!data.lowLevelConsumeDays || !data.lowLevelConsumeCost)) {
flag = false;
}
}
return flag;
......@@ -561,6 +586,7 @@ export default {
data.upLevelCostimesSelect = data.upLevelCostimesSelect == true ? 1 : 0;
data.upLevelSumstoredSelect = data.upLevelSumstoredSelect == true ? 1 : 0;
data.upLevelSumintegralSelect = data.upLevelSumintegralSelect == true ? 1 : 0;
data.upLevelConsumeSelect = data.upLevelConsumeSelect==true? 1:0
log(data.lowLevelHighcostSelect, data.lowLevelDaystoredSelect, data.lowLevelSumcostSelect, data.lowLevelCosttimesSelect, data.lowLevelSumstoredSelect, data.lowLevelSumintegralSelect);
data.lowLevelHighcostSelect = data.lowLevelHighcostSelect == true ? 1 : 0;
data.lowLevelDaystoredSelect = data.lowLevelDaystoredSelect == true ? 1 : 0;
......@@ -568,6 +594,7 @@ export default {
data.lowLevelCosttimesSelect = data.lowLevelCosttimesSelect == true ? 1 : 0;
data.lowLevelSumstoredSelect = data.lowLevelSumstoredSelect == true ? 1 : 0;
data.lowLevelSumintegralSelect = data.lowLevelSumintegralSelect == true ? 1 : 0;
data.lowLevelConsumeSelect = data.lowLevelConsumeSelect==true? 1:0
data.discountControlUpper = data.discountControlUpper || '0';
data.discountControlLower = data.discountControlLower || '0';
......@@ -582,7 +609,8 @@ export default {
data.upLevelSumstoredDays = data.upLevelSumstoredDays || 0;
data.upLevelSumstored = data.upLevelSumstored || 0;
data.upLevelSumintegralDays = data.upLevelSumintegralDays || 0;
data.upLevelSumintegral = data.upLevelSumintegral || 0;
data.upLevelSumintegral = data.upLevelSumintegra
data.upLevelConsumeCost = data.upLevelConsumeCost || 0;
data.gradeEffectDay = data.gradeEffectDay || 0;
data.lowLevelHighcostDays = data.lowLevelHighcostDays || 0;
......@@ -597,6 +625,8 @@ export default {
data.lowLevelSumstored = data.lowLevelSumstored || 0;
data.lowLevelSumintegralDays = data.lowLevelSumintegralDays || 0;
data.lowLevelSumintegral = data.lowLevelSumintegral || 0;
data.lowLevelConsumeDays = data.lowLevelConsumeDays || 0;
data.lowLevelConsumeCost = data.lowLevelConsumeCost || 0;
// 关联商户等级
let relation = '';
......@@ -771,6 +801,7 @@ export default {
data.upLevelCostimesSelect = data.upLevelCostimesSelect == 1 ? true : false;
data.upLevelSumstoredSelect = data.upLevelSumstoredSelect == 1 ? true : false;
data.upLevelSumintegralSelect = data.upLevelSumintegralSelect == 1 ? true : false;
data.upLevelConsumeSelect = data.upLevelConsumeSelect==1? true:false;
log(data.lowLevelHighcostSelect, data.lowLevelDaystoredSelect, data.lowLevelSumcostSelect, data.lowLevelCosttimesSelect, data.lowLevelSumstoredSelect, data.lowLevelSumintegralSelect);
data.lowLevelHighcostSelect = data.lowLevelHighcostSelect == 1 ? true : false;
data.lowLevelDaystoredSelect = data.lowLevelDaystoredSelect == 1 ? true : false;
......@@ -778,6 +809,7 @@ export default {
data.lowLevelCosttimesSelect = data.lowLevelCosttimesSelect == 1 ? true : false;
data.lowLevelSumstoredSelect = data.lowLevelSumstoredSelect == 1 ? true : false;
data.lowLevelSumintegralSelect = data.lowLevelSumintegralSelect == 1 ? true : false;
data.lowLevelConsumeSelect = data.lowLevelConsumeSelect==1? true:false;
that.ruleForm = data;
that.inputNumObj.gradeName = strLength.getZhLen(that.ruleForm.gradeName);
......
src/view/companyGroup/membershipSystem/editMemberGrade.vue
......@@ -18,8 +18,8 @@
<label class="input-label">{{ inputNumObj.gradeCode }}/6</label>
</el-form-item>
<el-form-item label="等级类型" prop="gradeType">
<el-radio v-model="ruleForm.gradeType" label="1">常规卡</el-radio>
<el-radio v-model="ruleForm.gradeType" label="2">特殊卡</el-radio>
<el-radio :value="ruleForm.gradeType" :disabled="ruleForm.gradeType == 2" label="1">常规卡</el-radio>
<el-radio :value="ruleForm.gradeType" :disabled="ruleForm.gradeType == 1" label="2">特殊卡</el-radio>
</el-form-item>
<!-- 自动升级 -->
<!-- 自动升级 -->
......@@ -27,6 +27,11 @@
<el-switch v-model="ruleForm.autoUpgrade"> </el-switch>
</el-form-item>
<el-form-item label="升级条件" prop="" v-if="ruleForm.autoUpgrade">
<div class="check-cell" v-if="isNormal">
<el-checkbox v-model="ruleForm.upLevelConsumeSelect">单笔消费满</el-checkbox>
<el-input v-model="ruleForm.upLevelConsumeCost" @focus="inputFocus('upLevelConsumeCost', 'money')" @keyup.native="formatInput($event)"/>
<label> 元 </label>
</div>
<div class="check-cell">
<el-checkbox v-model="ruleForm.upLevelHighcostSelect">当天消费满</el-checkbox>
<el-input v-model="ruleForm.upLevelHighcost" @focus="inputFocus('upLevelHighcost', 'money')" @keyup.native="formatInput($event)"></el-input>
......@@ -77,6 +82,13 @@
<label> 天 </label>
</el-form-item>
<el-form-item label="保级条件" prop="">
<div class="check-cell" v-if="isNormal">
<el-checkbox v-model="ruleForm.lowLevelConsumeSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelConsumeDays" @focus="inputFocus('lowLevelConsumeDays', 'day')" @keyup.native="formatInput($event)" />
<label>天内单笔消费满</label>
<el-input v-model="ruleForm.lowLevelConsumeCost" @focus="inputFocus('lowLevelConsumeCost', 'money')" @keyup.native="formatInput($event)"/>
<label> 元 </label>
</div>
<div class="check-cell">
<el-checkbox v-model="ruleForm.lowLevelHighcostSelect"></el-checkbox>
<el-input v-model="ruleForm.lowLevelHighcostDays" @focus="inputFocus('lowLevelHighcostDays', 'day')" @keyup.native="formatInput($event)"></el-input>
......@@ -262,6 +274,11 @@ export default {
if (!!data.upLevelSumintegralSelect && (!data.upLevelSumintegralDays || !data.upLevelSumintegral)) {
flag = false;
}
// x天内消费满x元
if (this.isNormal && !!data.upLevelConsumeSelect && !data.upLevelConsumeCost) {
flag = false;
}
}
return flag;
},
......@@ -294,6 +311,11 @@ export default {
if (!!data.lowLevelSumintegralSelect && (!data.lowLevelSumintegralDays || !data.lowLevelSumintegral)) {
flag = false;
}
// x天内消费满x元
if (this.isNormal && !!data.lowLevelConsumeSelect && (!data.lowLevelConsumeDays || !data.lowLevelConsumeCost)) {
flag = false;
}
}
return flag;
},
......@@ -375,6 +397,14 @@ export default {
data.lowLevelSumintegralDays = data.lowLevelSumintegralDays || 0;
data.lowLevelSumintegral = data.lowLevelSumintegral || 0;
// 单笔消费
if(this.isNormal) {
data.upLevelConsumeSelect = data.upLevelConsumeSelect==true? 1:0
data.upLevelConsumeCost = data.upLevelConsumeCost || 0;
data.lowLevelConsumeSelect = data.lowLevelConsumeSelect==true? 1:0
data.lowLevelConsumeDays = data.lowLevelConsumeDays || 0;
data.lowLevelConsumeCost = data.lowLevelConsumeCost || 0;
}
that.saveInfo(data);
} else {
log('error submit!!');
......@@ -451,7 +481,11 @@ export default {
data.lowLevelCosttimesSelect = data.lowLevelCosttimesSelect == 1 ? true : false;
data.lowLevelSumstoredSelect = data.lowLevelSumstoredSelect == 1 ? true : false;
data.lowLevelSumintegralSelect = data.lowLevelSumintegralSelect == 1 ? true : false;
// 单笔消费
if(this.isNormal) {
data.upLevelConsumeSelect = data.upLevelConsumeSelect==1? true:false;
data.lowLevelConsumeSelect = data.lowLevelConsumeSelect==1? true:false;
}
that.ruleForm = data;
that.inputNumObj.gradeName = strLength.getZhLen(that.ruleForm.gradeName);
......@@ -471,6 +505,12 @@ export default {
});
}
},
computed: {
// 是否为常规卡类型
isNormal() {
return this.$route.query.type == 1;
}
},
components: {
topNavNew
},
......
src/view/companyGroup/membershipSystem/memberCardSet.vue
......@@ -276,8 +276,8 @@
</el-form-item>
</el-form>
<!-- type 1 常规卡 2 特殊卡 3 付费卡(集团不展示) -->
<member-card-table :tableData="generalCardList" type="1" :logoImg="logoImg"/>
<member-card-table :tableData="specialCardList" type="2" :logoImg="logoImg"/>
<member-card-table :tableData="generalCardList" type="1" :logoImg="logoImg" @add="onAdd" @edit="onEdit"/>
<member-card-table :tableData="specialCardList" type="2" :logoImg="logoImg" @add="onAdd" @edit="onEdit"/>
</div>
</div>
<!-- end -->
......@@ -506,10 +506,23 @@ export default {
that.changeRoute('/memberGrade');
},
// 新增
onAdd(type) {
this.$router.push({
path: '/addGroupGrade',
query: {
type
}
});
},
// 编辑集团
editCliqueLevel(index, row, obj) {
let that = this;
that.changeRoute('/editGroupGrade');
onEdit(row) {
this.$router.push({
path: '/editGroupGrade',
query: {
gradeId: row.gradeId
}
});
},
// 取消删除
......
src/view/companyGroup/membershipSystem/memberGrade.vue
......@@ -4,59 +4,33 @@
<div class="right-content">
<div class="right-box">
<div class="attention-wrap">
<div class="title">
<div>会员等级根据从低到高的顺序，自上而下进行排序</div>
<div class="add-btn"><el-button type="primary" @click="addGrade">新增等级</el-button></div>
<!-- 常规卡 -->
<member-card-table
:tableData="generalCardList"
:logoImg="logoImg"
:enterpriseId="cliqueId"
type="1"
@add="addGrade"
@edit="editGrade"></member-card-table>
<!-- 特殊卡 -->
<member-card-table
:tableData="specialCardList"
:logoImg="logoImg"
:enterpriseId="cliqueId"
type="2"
@add="addGrade"
@edit="editGrade"></member-card-table>
</div>
<div class="table-wrap">
<el-table :data="memberTableData" style="width: 100%">
<el-table-column prop="gradeName" label="会员等级名称"> </el-table-column>
<el-table-column prop="gradeCode" label="等级编码"> </el-table-column>
<el-table-column prop="" label="等级类型">
<template slot-scope="scope">
{{ scope.row.gradeType == 1 ? '常规卡' : '特殊卡' }}
</template>
</el-table-column>
<el-table-column prop="" label="移动">
<template slot-scope="scope">
<i :class="['icon-color', 'el-icon-upload2', scope.$index == 0 ? 'disable' : '']" @click="toUp(scope.$index, scope.row, memberTableData)"></i>
<i :class="['icon-color', 'el-icon-back', 'icon-to-pre', scope.$index == 0 ? 'disable' : '']" @click="toPre(scope.$index, scope.row, memberTableData)"></i>
<i :class="['icon-color', 'el-icon-back', 'icon-to-next', scope.$index == memberTableData.length - 1 ? 'disable' : '']" @click="toNext(scope.$index, scope.row, memberTableData)"></i>
<i :class="['icon-color', 'el-icon-download', scope.$index == memberTableData.length - 1 ? 'disable' : '']" @click="toBottom(scope.$index, scope.row, memberTableData)"></i>
</template>
</el-table-column>
<el-table-column prop="" label="操作">
<template slot-scope="scope">
<el-button @click="editGrade(scope.$index, scope.row, memberTableData)" type="text" size="small">
编辑
</el-button>
<el-popover placement="top" width="160" v-model="scope.row.popVisible">
<p style="line-height: 1.5; padding: 10px 10px 20px;">确认删除吗？</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="cancelPop(scope.$index, scope.row, memberTableData)">取消</el-button>
<el-button type="primary" size="mini" @click="delGrade(scope.$index, scope.row, memberTableData)">确定</el-button>
</div>
<el-button slot="reference" class="m-l-10" type="text">
删除
</el-button>
</el-popover>
</template>
</el-table-column>
</el-table>
</div>
</div>
</div>
</div>
<!-- <vue-gic-footer></vue-gic-footer> -->
</div>
</template>
<script>
import topNavNew from 'components/nav/navNew';
import MemberCardTable from './components/MemberCardTable.vue';
import showMsg from '@/common/js/showmsg';
import errMsg from '@/common/js/error';
import { getRequest, postRequest } from '@/api/api';
import { log } from '@/utils/index.js';
import { getRequest } from '@/api/api';
export default {
name: 'memberGrade',
......@@ -80,198 +54,67 @@ export default {
path: ''
}
],
// 商户id
cliqueId: '',
generalCardList: [], // 常规卡列表数据
specialCardList: [], // 特殊卡列表数据
logoImg: '', // 商户logo
cliqueId: '', // 商户id
cliqueName: '', //商户 name
memberTableData: []
};
},
mounted() {
let that = this;
that.cliqueId = that.$route.query.enterpriseId;
that.cliqueName = that.$route.query.name;
that.navpath[3].name = '编辑【' + that.cliqueName + '】会员等级';
that.getList();
const { enterpriseId, name } = this.$route.query;
this.cliqueId = enterpriseId;
this.cliqueName = name;
this.navpath[3].name = '编辑【' + name + '】会员等级';
sessionStorage.removeItem('enterpriseId');
this.getList();
},
methods: {
//获取列表
getList() {
let that = this;
let para = {
enterpriseId: that.cliqueId
};
postRequest('/api-admin/get-enterprise-member-grade-list', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
if (!!resData.result.List && !!resData.result.List.length) {
resData.result.List.forEach(function(ele, index) {
ele.popVisible = false;
});
that.memberTableData = resData.result.List;
}
return;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {});
},
// 置顶 先删除后追加首部
toUp(index, row, obj) {
let that = this;
if (index == 0) {
return;
}
log(index, row, obj);
let newTable = JSON.parse(JSON.stringify(that.memberTableData));
newTable.splice(index, 1);
newTable.unshift(row);
log(newTable);
// 保存设置
that.setSort(row.gradeId, 10, that.cliqueId);
that.memberTableData = newTable;
},
// 向上
toPre(index, row, obj) {
let that = this;
if (index == 0) {
return;
}
log(index, row, obj);
let newTable = JSON.parse(JSON.stringify(that.memberTableData));
let temp = {};
temp = newTable[index - 1];
newTable[index - 1] = row;
newTable[index] = temp;
// 保存设置
that.setSort(row.gradeId, 20, that.cliqueId);
that.memberTableData = newTable;
},
// 向下
toNext(index, row, obj) {
let that = this;
if (index == obj.length - 1) {
return;
}
log(index, row, obj);
let newTable = JSON.parse(JSON.stringify(that.memberTableData));
let temp = {};
temp = newTable[index + 1];
newTable[index + 1] = row;
newTable[index] = temp;
// 保存设置
that.setSort(row.gradeId, 30, that.cliqueId);
that.memberTableData = newTable;
},
//置底 先删除后追加尾部
toBottom(index, row, obj) {
let that = this;
if (index == obj.length - 1) {
return;
}
log(index, row, obj);
let newTable = JSON.parse(JSON.stringify(that.memberTableData));
newTable.splice(index, 1);
newTable.push(row);
// 保存设置
that.setSort(row.gradeId, 40, that.cliqueId);
that.memberTableData = newTable;
},
// 等级排序
setSort(gradeId, type, enterpriseId) {
let that = this;
let para = {
gradeId: gradeId,
sortType: type,
enterpriseId: enterpriseId
};
postRequest('/api-admin/sort-member-grade', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
showMsg.showmsg('设置成功', 'success');
const para = { enterpriseId: this.cliqueId };
getRequest('/api-admin/get-enterprise-grade-info', para).then(res => {
const { errorCode, message, result } = res.data || {};
if (errorCode != 0) {
errMsg.errorMsg(message);
return;
}
errMsg.errorMsg(resData);
this.logoImg = result.logoImg;
// 常规卡
this.generalCardList = result.generalCardList || [];
// 特殊卡
this.specialCardList = result.specialCardList || [];
})
.catch(function(error) {
log(error);
that.$message.error({
duration: 1000,
message: error.message
});
});
},
// 编辑
editGrade(index, row, obj) {
editGrade(row, type) {
console.log(type);
this.$router.push({
path: '/editMemberGrade',
query: {
gradeId: row.gradeId,
enterpriseId: this.cliqueId,
name: this.cliqueName
name: this.cliqueName,
type
}
});
},
// 新增等级
addGrade() {
addGrade(type) {
this.$router.push({
path: '/addMemberGrade',
query: {
enterpriseId: this.cliqueId,
name: this.cliqueName
name: this.cliqueName,
type
}
});
},
// 取消删除
cancelPop(index, row, obj) {
row.popVisible = false;
},
// 删除
delGrade(index, row, obj) {
let para = {
gradeId: row.gradeId,
enterpriseId: ''
};
getRequest('/api-admin/delete-member-grade', para)
.then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
showMsg.showmsg('删除成功', 'success');
obj.splice(index, 1);
return;
}
errMsg.errorMsg(resData);
})
.catch(function(error) {});
},
// 路由跳转
changeRoute(route) {
this.$router.push(route);
}
},
components: {
topNavNew
},
components: { topNavNew, MemberCardTable },
beforeRouteLeave(to, from, next) {
let that = this;
let d = to;
if (d.path == '/editMemberGrade' || d.path == '/addMemberGrade') {
sessionStorage.setItem('enterpriseId', that.cliqueId);
if (to.path == '/editMemberGrade' || to.path == '/addMemberGrade') {
sessionStorage.setItem('enterpriseId', this.cliqueId);
}
next();
}
......@@ -284,51 +127,5 @@ export default {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
.item-label {
font-size: 14px;
color: #606266;
margin-bottom: 30px;
span {
display: inline-block;
width: 80px;
}
}
.title {
padding: 0 0 22px 0;
display: -webkit-flex;
display: flex;
align-items: center;
color: #828282;
.add-btn {
text-align: right;
}
div {
-webkit-flex: 1;
-moz-flex: 1;
-ms-flex: 1;
-o-flex: 1;
flex: 1;
font-size: 13px;
}
}
.el-icon-upload2 {
font-size: 22px;
cursor: pointer;
}
.el-icon-download {
font-size: 22px;
cursor: pointer;
}
i.icon-color {
color: #606266;
}
i.disable {
color: #e6e6e6;
cursor: not-allowed;
}
}
</style>
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