Skip to content

C
clique-web
Commit 034b6e5b by huaying
Options

fix: 特殊积分抵现策略

parent cacc5a24
Showing with 56 additions and 21 deletions
src/components/memberShip/point-form.vue
<template>
<div class="form-wrap">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
<dm-sub-title type="fill" text="积分获取策略" style="margin-bottom: 20px;"/>
<el-form-item label="积分获取规则:" prop="integralGetStatus">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="90px" class="demo-ruleForm">
<dm-sub-title type="fill" text="积分获取策略" style="margin-bottom: 20px;margin-top:10px;"/>
<el-form-item label="获取规则:" prop="integralGetStatus">
<div>
<el-radio v-model="ruleForm.integralGetStatus" label="0">不获取积分</el-radio>
</div>
......@@ -41,7 +41,7 @@
<span style="font-size: 12px;color: #828282;padding-left: 10px;">仅对通过订单获取的积分生效，活动类获取的积分没有冻结期</span></el-form-item>
</div>
</el-form-item>
<dm-sub-title type="fill" text="积分抵现策略" style="margin-bottom: 20px;margin-top:40px; "/>
<dm-sub-title type="fill" text="积分抵现策略" style="margin-bottom: 20px;margin-top:30px; "/>
<el-form-item label="抵现规则:" prop="integralUseStatus" class="margin-20">
<div>
<el-radio v-model="ruleForm.integralUseStatus" label="0">不支持抵现</el-radio>
......
src/view/companyGroup/membershipSystem/addIntegralSytem.vue
......@@ -45,7 +45,7 @@
<el-form-item label="达摩微商城：" prop="" :key="index">
<el-switch v-model="item.openStatus"> </el-switch>
<span style="color: #909399;font-size:12px; margin-left:16px;">客户在达摩微商城产生的订单</span>
<div class="form-child margin-20" v-if="item.openStatus" :key="index">
<div class="form-child margin-20" v-if="item.openStatus == 1" :key="index">
<el-form-item label="选择商户：">
<el-select
v-model="item.enterpriseRelationIdArr"
......@@ -117,6 +117,7 @@
<div class="radio-cell margin-20 padding-bottom-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
<el-input-number
placeholder="请输入"
v-model="item.integralUseDiscountControlLower"
:precision="2"
:controls="false"
......@@ -125,6 +126,7 @@
></el-input-number>
<label>至</label>
<el-input-number
placeholder="请输入"
v-model="item.integralUseDiscountControlUpper"
:precision="2"
:controls="false"
......@@ -143,7 +145,7 @@
<el-form-item label="微盟渠道：" prop="" :key="index">
<el-switch v-model="item.openStatus"> </el-switch>
<span style="color: #909399;font-size:12px; margin-left:16px;">客户在微盟微商城产生的订单</span>
<div class="form-child margin-20" v-if="item.openStatus == true" :key="index">
<div class="form-child margin-20" v-if="item.openStatus == 1" :key="index">
<el-form-item label="选择商户：">
<el-select size="small" v-model="item.enterpriseRelationIdArr" placeholder="请选择" multiple class="w240">
<el-option v-for="(item, ind) in mechantOption" :key="ind" :label="item.label" :value="item.value"> </el-option>
......@@ -166,9 +168,9 @@
</div>
<div class="radio-cell margin-20">
<el-radio v-model="item.integralUseDiscountControl" label="2">折扣</el-radio>
<el-input-number v-model="item.integralUseDiscountControlLower" :precision="2" :controls="false" :max="10.0" :min="1"></el-input-number>
<el-input-number placeholder="请输入" v-model="item.integralUseDiscountControlLower" :precision="2" :controls="false" :max="10.0" :min="1"></el-input-number>
<label>至</label>
<el-input-number v-model="item.integralUseDiscountControlUpper" :precision="2" :controls="false" :max="10.0" :min="1"></el-input-number>
<el-input-number placeholder="请输入" v-model="item.integralUseDiscountControlUpper" :precision="2" :controls="false" :max="10.0" :min="1"></el-input-number>
<label>折商品都适用</label>
<span style="font-size: 13px;color: #828282;line-height: 1;padding-left: 10px;">折扣范围1-10，填写8.8，则表示“打8.8折”，也即商品原价*8.8/10=商品折后价</span>
</div>
......@@ -185,12 +187,14 @@
<div class="margin-20">
<el-radio v-model="ruleForm.integralUseStatus" label="1">每使用</el-radio>
<el-input-number
placeholder="请输入"
v-model="ruleForm.integralUse.integral"
:controls="false"
step-strictly
></el-input-number>
<label>积分,抵</label>
<el-input-number
placeholder="请输入"
v-model="ruleForm.integralUse.fee"
:precision="1"
:controls="false"
......@@ -401,14 +405,14 @@ export default {
enterpriseId: '',
integralStrategyId: '', //策略id
channelType: '1', //渠道类型 1微信 3:线下 5淘宝 6京东 7唯品会 8天猫
openStatus: true, //渠道配置是否启用 1启用 0停用
openStatus: 0, //渠道配置是否启用 1启用 0停用
channelRelationEnterpriseType: '1', // 策略关联企业 1所有企业 2部分企业
channelRelationStoreType: '1', //策略关联门店类型 1所有门店 2门店分组 3部分门店
channelStoreType: '-1', // 策略选择门店类型 （-1:所有 0:自营 1:联营 2:加盟,3代销4托管）
channelRelationProType: '1', // 策略关联商品类型 1所有商品 2商品品牌 3商品类目 4部分商品
integralUseDiscountControl: '1', // 折扣控制 1所有折扣商品适用 2折扣范围
integralUseDiscountControlUpper: '',
integralUseDiscountControlLower: '',
integralUseDiscountControlUpper: undefined,
integralUseDiscountControlLower: undefined,
useProportionalRestriction: '', // 抵现比例限制
strategyGoodsRelationIdArr: [], // 商品
storeRelationIdArr: [], //门店
......@@ -419,14 +423,14 @@ export default {
enterpriseId: '',
integralStrategyId: '', //策略id
channelType: '9', //渠道类型 1微信 3:线下 5淘宝 6京东 7唯品会 8天猫
openStatus: true, //渠道配置是否启用 1启用 0停用
openStatus: 0, //渠道配置是否启用 1启用 0停用
channelRelationEnterpriseType: '1', // 策略关联企业 1所有企业 2部分企业
channelRelationStoreType: '1', //策略关联门店类型 1所有门店 2门店分组 3部分门店
channelStoreType: '-1', // 策略选择门店类型 （-1:所有 0:自营 1:联营 2:加盟,3代销4托管）
channelRelationProType: '1', // 策略关联商品类型 1所有商品 2商品品牌 3商品类目 4部分商品
integralUseDiscountControl: '1', // 折扣控制 1所有折扣商品适用 2折扣范围
integralUseDiscountControlUpper: '',
integralUseDiscountControlLower: '',
integralUseDiscountControlUpper: undefined,
integralUseDiscountControlLower: undefined,
useProportionalRestriction: '', // 抵现比例限制
strategyGoodsRelationIdArr: [], // 商品
storeRelationIdArr: [], //门店
......
src/view/companyGroup/membershipSystem/editIntegralSytem.vue
......@@ -44,9 +44,9 @@
<template v-for="(item, index) in ruleForm.channelList">
<template v-if="item.channelType == 1">
<el-form-item label="达摩微商城" prop="" :key="index">
<el-switch v-model="item.openStatus" :active-value="1" :inactive-value="0"> </el-switch>
<span style="color: #909399;font-size:12px; margin-left:16px;">客户在微盟微商城产生的订单</span>
<div class="form-child margin-20" v-if="item.openStatus" :key="index">
<el-switch v-model="item.openStatus"> </el-switch>
<span style="color: #909399;font-size:12px; margin-left:16px;">客户在达摩微商城产生的订单</span>
<div class="form-child margin-20" v-if="item.openStatus == 1" :key="index">
<el-form-item label="选择商户">
<el-select
v-model="item.enterpriseRelationIdArr"
......@@ -152,7 +152,7 @@
<el-form-item label="微盟渠道" prop="" :key="index">
<el-switch v-model="item.openStatus"> </el-switch>
<span style="color: #909399;font-size:12px; margin-left:16px;">客户在微盟微商城产生的订单</span>
<div class="form-child margin-20" v-if="item.openStatus" :key="index">
<div class="form-child margin-20" v-if="item.openStatus == 1" :key="index">
<el-form-item label="选择商户">
<el-select size="small" v-model="item.enterpriseRelationIdArr" placeholder="请选择" multiple class="w240">
<el-option v-for="(item, ind) in mechantOption" :key="ind" :label="item.label" :value="item.value"> </el-option>
......@@ -380,7 +380,7 @@ export default {
enterpriseId: 'ff8080815dacd3a2015dacd3ef5c0000',
integralStrategyId: 'ff80808163a7a09b0163b01171e202db', //策略id
channelType: '1', //渠道类型 1微信 3:线下 5淘宝 6京东 7唯品会 8天猫
openStatus: true, //渠道配置是否启用 1启用 0停用
openStatus: 1, //渠道配置是否启用 1启用 0停用
channelRelationEnterpriseType: '1', // 策略关联企业 1所有企业 2部分企业
channelRelationStoreType: '1', //策略关联门店类型 1所有门店 2门店分组 3部分门店
channelStoreType: '-1', // 策略选择门店类型 （-1:所有 0:自营 1:联营 2:加盟,3代销4托管）
......@@ -392,7 +392,25 @@ export default {
strategyGoodsRelationIdArr: [], // 商品
storeRelationIdArr: [], //门店
enterpriseRelationIdArr: [] //商户
}
},
{
integralStrategyChannelId: "", //id
enterpriseId: "",
integralStrategyId: "", //策略id
channelType: "9", //渠道类型 1微信 3:线下 5淘宝 6京东 7唯品会 8天猫
openStatus: 1, //渠道配置是否启用 1启用 0停用
channelRelationEnterpriseType: "1", // 策略关联企业 1所有企业 2部分企业
channelRelationStoreType: "1", //策略关联门店类型 1所有门店 2门店分组 3部分门店
channelStoreType: "-1", // 策略选择门店类型 （-1:所有 0:自营 1:联营 2:加盟,3代销4托管）
channelRelationProType: "1", // 策略关联商品类型 1所有商品 2商品品牌 3商品类目 4部分商品
integralUseDiscountControl: "1", // 折扣控制 1所有折扣商品适用 2折扣范围
integralUseDiscountControlUpper: "0.0",
integralUseDiscountControlLower: "0.0",
useProportionalRestriction: "0.0", // 抵现比例限制
strategyGoodsRelationIdArr: [], // 商品
storeRelationIdArr: [], //门店
enterpriseRelationIdArr: [] //商户
},
],
perpetualDate: [new Date(timeStramp.year, timeStramp.month, timeStramp.day, 0, 0, 0).getTime(), new Date(timeStramp.year, timeStramp.month, timeStramp.day, 23, 59, 59).getTime()]
},
......
src/view/companyGroup/membershipSystem/pointSystem.vue
......@@ -144,7 +144,7 @@
<div class="fr btn-r-wrap"><el-button :disabled="tpnEditBool" type="primary" @click="handleAdd('integ')">新增策略</el-button></div>
<!-- table -->
<el-table :data="exchangeTableData" style="width: 100%">
<el-table-column prop="strategyName" label="策略名称"> </el-table-column>
<el-table-column prop="strategyName" label="策略名称" :show-overflow-tooltip="true" min-width="126"> </el-table-column>
<!-- <el-table-column prop="" label="线下渠道">
<template slot-scope="scope">
<span v-for="(item, index) in scope.row.channelList" v-show="item.channelType == 3" :key="index">
......@@ -329,6 +329,15 @@ export default {
// this.selectReplayStyle()
},
methods: {
// 搜索
onSearch() {
this.pageNum = 1;
this.getPointInfo();
},
onSearch1() {
this.pageNum1 = 1;
this.getIntefralInfo();
},
// 新增
handleAdd(flag) {
if (!this.tpnEditBool) {
......@@ -453,6 +462,10 @@ export default {
that.pageSize1 = resData.result.pageSize;
that.pageNum1 = resData.result.pageNum;
that.exchangeTableData = resData.result.result;
that.exchangeTableData.forEach((ele,index)=>{
ele.integralGet = JSON.parse(ele.integralGet);
ele.integralUse = JSON.parse(ele.integralUse);
})
}
// that.userFormVisible = false;
......
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