Skip to content

E
ElectricitySheep
Commit 6ab91b58 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent a3690e64
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 16 deletions
src/components/UserMan/fxDistribution.vue
View file @ 6ab91b58
......@@ -32,6 +32,12 @@
</div>
</template>
</el-table-column>
<el-table-column label="返佣类型">
<template slot-scope="scope">
<span v-if="scope.row.CommissionType==1">正常返佣</span>
<span v-if="scope.row.CommissionType==2">购买抵扣</span>
</template>
</el-table-column>
<el-table-column prop="GradeName" label="等级名称">
</el-table-column>
<el-table-column prop="IsGuest" label="会员类型">
......@@ -92,7 +98,7 @@
<el-col :span="12">
<p style="padding-left:34px;margin-bottom:15px" class="cred">注：等级需连续，从等级1开始</p>
<el-form-item label="分销商等级" prop="Grade">
<el-select v-model="addMsg.Grade" placeholder="请选择">
<el-select v-model="addMsg.Grade" placeholder="请选择" size="small">
<el-option v-for="(item,index) in numList" :key="index" :label="`等级${index+1}`" :value="item.Id"
:disabled="item.dis">
</el-option>
......@@ -102,14 +108,14 @@
<el-col :span="12">
<p style="padding-left:34px;margin-bottom:15px;visibility:hidden;" class="cred">.</p>
<el-form-item label="等级名称" prop="GradeName">
<el-input v-model="addMsg.GradeName" style="width:218px;"></el-input>
<el-input v-model="addMsg.GradeName" size="small" style="width:218px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="会员类型" prop="IsGuest">
<el-select v-model="addMsg.IsGuest" placeholder="请选择">
<el-select v-model="addMsg.IsGuest" placeholder="请选择" size="small">
<el-option label="普通" :value="1"></el-option>
<el-option label="其他" :value="2"></el-option>
<el-option label="Vip" :value="3"></el-option>
......@@ -118,7 +124,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="返佣比例">
<el-input style="width:218px;" v-model="addMsg.CommissionRatio"
<el-input style="width:218px;" size="small" v-model="addMsg.CommissionRatio"
@keyup.native="checkPrice(addMsg,'CommissionRatio')"></el-input>
</el-form-item>
</el-col>
......@@ -126,13 +132,13 @@
<el-row>
<el-col :span="12">
<el-form-item label="同级返佣比例">
<el-input v-model="addMsg.SiblingRatio" style="width:218px;"
<el-input v-model="addMsg.SiblingRatio" size="small" style="width:218px;"
@keyup.native="checkPrice(addMsg,'SiblingRatio')"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="同级返佣数量">
<el-input v-model="addMsg.SiblingRebatesNum" style="width:218px;"
<el-input v-model="addMsg.SiblingRebatesNum" size="small" style="width:218px;"
@keyup.native="checkInteger(addMsg,'SiblingRebatesNum')"></el-input>
</el-form-item>
</el-col>
......@@ -140,7 +146,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="是否可以购买">
<el-select v-model="addMsg.IsCanBuy" placeholder="请选择">
<el-select v-model="addMsg.IsCanBuy" placeholder="请选择" size="small">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="2"></el-option>
</el-select>
......@@ -148,7 +154,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="购买金额">
<el-input v-model="addMsg.BuyMoney" style="width:218px;" @keyup.native="checkPrice(addMsg,'BuyMoney')">
<el-input v-model="addMsg.BuyMoney" size="small" style="width:218px;" @keyup.native="checkPrice(addMsg,'BuyMoney')">
</el-input>
</el-form-item>
</el-col>
......@@ -156,7 +162,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="年份">
<el-select v-model="addMsg.Year" placeholder="请选择">
<el-select v-model="addMsg.Year" placeholder="请选择" size="small">
<el-option label="1" :value="1"></el-option>
<el-option label="2" :value="2"></el-option>
<el-option label="3" :value="3"></el-option>
......@@ -173,7 +179,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="是否可以升级">
<el-select v-model="addMsg.IsUpgrade" placeholder="请选择">
<el-select v-model="addMsg.IsUpgrade" size="small" placeholder="请选择">
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="2"></el-option>
</el-select>
......@@ -183,7 +189,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="小数类型">
<el-select v-model="addMsg.DecimalType" placeholder="请选择">
<el-select v-model="addMsg.DecimalType" size="small" placeholder="请选择">
<el-option label="取整" :value="1"></el-option>
<el-option label="保留两位小数" :value="2"></el-option>
</el-select>
......@@ -191,7 +197,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="升级所需下级等级">
<el-select v-model="addMsg.UpgradeId" placeholder="请选择">
<el-select v-model="addMsg.UpgradeId" placeholder="请选择" size="small">
<el-option v-for="(item,index) in UpgradeIdList" :key="index" :label="item.GradeName" :value="item.Id">
</el-option>
</el-select>
......@@ -201,9 +207,15 @@
<el-row>
<el-col :span="12">
<el-form-item label="升级所需下级等级数量">
<el-input v-model="addMsg.UpgradeNum" style="width:218px;"
<el-input v-model="addMsg.UpgradeNum" style="width:218px;" size="small"
@keyup.native="checkInteger(addMsg,'UpgradeNum')"></el-input>
</el-form-item>
<el-form-item label="返佣类型">
<el-select v-model="addMsg.CommissionType" size="small">
<el-option label="正常返佣" :value="1"></el-option>
<el-option label="购买抵扣" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="图标">
......@@ -280,6 +292,7 @@
BuyMoney: 0, //购买金额
IsUpgrade: 1, //是否可以升级 1是 2否
UpgradeNum: 0, //升级所需下级等级数量
CommissionType: 1, //返佣类型
UpgradeId: 1, //升序所需下级等级id
DecimalType: 1, //小数类型
Description: '', //描述
......@@ -370,6 +383,7 @@
BuyMoney: 0, //购买金额
IsUpgrade: 2, //是否可以升级 1是 2否
UpgradeNum: 0, //升级所需下级等级数量
CommissionType: 1, //返佣类型
UpgradeId: 1, //升序所需下级等级id
DecimalType: 1, //小数类型
Description: '', //描述
......
src/components/orderMan/orderDetails.vue
View file @ 6ab91b58
......@@ -83,6 +83,10 @@
<span class="label">积分抵用金额:</span>
<div>￥{{dataInfo.IntegralMoney}}</div>
</div>
<div flex="dir:left cross:center" class="item-box" v-if="dataInfo.OrderInfo.DeductionCommission && dataInfo.OrderInfo.DeductionCommission>0">
<span class="label">佣金抵用金额:</span>
<div>￥{{dataInfo.OrderInfo.DeductionCommission}}</div>
</div>
<div flex="dir:left cross:center" class="item-box" v-if="dataInfo.IntegralNumber && dataInfo.IntegralNumber !='' && dataInfo.IntegralNumber>0">
<span class="label">积分数:</span>
<div>￥{{dataInfo.IntegralNumber}}</div>
......@@ -212,7 +216,12 @@
</div>
<div flex="dir:left cross:center" class="item-box share-price">
<span class="label orange-label">佣金:</span>
<div>￥{{item.Commission}}</div>
<template v-if="item.Commission==0&&item.DeductionCommission>0">
<div>佣金￥{{item.Commission}}（抵扣佣金￥{{item.DeductionCommission}}）</div>
</template>
<template v-else>
<div>￥{{item.Commission}}</div>
</template>
</div>
</div>
</div>
......@@ -322,6 +331,9 @@
<el-form-item label="运费">
￥{{dataInfo.FreightMoney}}
</el-form-item>
<el-form-item label="抵扣佣金">
￥{{dataInfo.OrderInfo.DeductionCommission}}
</el-form-item>
<el-form-item label="实付款">
<span style="color: rgb(255, 69, 68);">￥<b>{{dataInfo.Income}}</b></span>
</el-form-item>
......
src/components/orderMan/orderList.vue
View file @ 6ab91b58
......@@ -292,12 +292,15 @@
<div>
<el-tag effect="dark" type="warning" size="mini">{{item.PaymentWayName}}</el-tag>
</div>
<div style="font-size: 12px" v-if="item.CouponMoney&& item.CouponMoney!=''&& item.CouponMoney>0">
<div style="font-size: 12px;margin-top:3px;" v-if="item.CouponMoney&& item.CouponMoney!=''&& item.CouponMoney>0">
<span>优惠金额:￥{{item.CouponMoney}}</span>
</div>
<div style="font-size: 12px" v-if="item.IntegralMoney&& item.IntegralMoney!=''&& item.IntegralMoney>0">
<div style="font-size: 12px;margin-top:3px;" v-if="item.IntegralMoney&& item.IntegralMoney!=''&& item.IntegralMoney>0">
<span>积分抵用金额:￥{{item.IntegralMoney}}</span>
</div>
<div style="font-size: 12px;margin-top:3px;" v-if="item.DeductionCommission&&item.DeductionCommission>0">
<span>佣金抵用金额:￥{{item.DeductionCommission}}</span>
</div>
<div style="font-size: 12px" v-if="item.IntegralNumber&& item.IntegralNumber!=''&& item.IntegralNumber>0">
<span>积分数:￥{{item.IntegralNumber}}</span>
</div>
......
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