Skip to content

C
confucius
Commit 0ef83732 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

parents ed6c583e 08d1bb27
Show whitespace changes
Inline Side-by-side
Showing with 342 additions and 92 deletions
src/components/sale/addSuppliesStockOut-from.vue
View file @ 0ef83732
......@@ -399,7 +399,7 @@ import {
haochaimsg: {
pageIndex: 1,
pageSize: 10,
FeeType:1,
FeeType:0,
Name: "",
SuppliesNum: "",
BrandName: "",
......
src/components/studyAbroad/studyproauditinfo-form.vue
View file @ 0ef83732
......@@ -121,6 +121,33 @@
.studyDrawerTop{
font-weight: bold;
}
.studyproauditInfo .payTable {
width: 100%;
border-collapse: collapse;
}
.studyproauditInfo .payTable tr th {
background: #fff;
height: 40px;
font-size: 12px;
font-weight: bold;
color: #2D2D2D;
background: #DDDEE0;
}
.studyproauditInfo .payTable tr {
background: #fff;
text-align: center;
height: 40px;
}
.studyproauditInfo .payTable tr td {
font-size: 13px;
text-align: center;
color: #2D2D2D;
padding: 10px 0;
font-weight: bold;
border-bottom: 1px solid #E5E5E5;}
</style>
<template>
<q-dialog v-model="persistent" persistent maximized full-height seamless position="right" @hide="closeperForm">
......@@ -200,82 +227,71 @@
优惠政策
</div>
<div class="col-4">
销售佣金
优惠比例
</div>
<div class="col-4">
同行佣金
优惠价格
</div>
</div>
<div class="row audit_List" v-for="(x,index) in saveObj.PreferentialList" :key="index">
<div class="row audit_List" >
<div class="col-4">
<template v-if="saveObj.PreferentialList.length>0">
<div class="border-bottom" v-if="x.PriceDiscountType == 1">
买{{ x.BuyNum }}送{{ x.SendNum }}
</div>
<div class="border-bottom" v-if="x.PriceDiscountType == 2">
单人报名享 <template v-if="x.PriceType==0">
{{ 100 - x.PriceMoney }}折
</template>
<template v-else>
{{ x.PriceMoney }}元
</template>优惠
</div>
<div class="border-bottom" v-if="x.PriceDiscountType == 3">
双人报名享 <template v-if="x.PriceType==0">
{{ 100 - x.PriceMoney }}折
</template>
<template v-else>
{{ x.PriceMoney }}元
</template>优惠
</div>
<div class="border-bottom" v-if="x.PriceDiscountType == 4">
续费享 <template v-if="x.PriceType==0">
{{ 100 - x.PriceMoney }}折
</template>
<template v-else>
{{ x.PriceMoney }}元
</template>优惠
</div>
<div class="remark-font" v-if="x.PriceDiscountType == 0">
暂无优惠政策
</div>
</template>
<template v-else>
<span>暂无优惠政策</span>
</template>
<div class="border-bottom">首次报名优惠</div>
<div class="border-bottom">续费报名优惠</div>
</div>
<div class="col-4">
<template v-if="saveObj.PreferentialList.length>0">
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px"
:class="{ 'text-red': x.SaleCommissionType == 1 }" v-if="x.PriceDiscountType != 0">
{{ x.SaleCommissionType == 1 ? "￥" : ""
}}{{ x.SaleCommissionMoney
}}{{ x.SaleCommissionType == 0 ? "%" : "" }}
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px" >
{{saveObj.B2CRatio}}%
</div>
<div v-if="x.PriceDiscountType == 0">
<div class="remark-font">暂无佣金信息</div>
<div class="border-bottom" style="padding-left: 16px;padding-right: 16px" >
{{saveObj.B2CReNewRatio}}%
</div>
</template>
<template v-else>
<span>暂无优惠政策</span>
</template>
</div>
<div class="col-4">
<template v-if="saveObj.PreferentialList.length>0">
<div class="border-bottom" style="padding-left: 16px" :class="{ 'text-red': x.B2BCommissionType == 1 }"
v-if="x.PriceDiscountType != 0">
{{ x.B2BCommissionType == 1 ? "￥" : ""
}}{{ x.B2BCommissionMoney
}}{{ x.B2BCommissionType == 0 ? "%" : "" }}
<div class="border-bottom" >
{{getPrePrice(1)}}
</div>
<div v-if="x.PriceDiscountType == 0">
<div class="remark-font">暂无佣金信息</div>
<div class="border-bottom" >
{{getPrePrice(2)}}
</div>
</template>
<template v-else>
<span>暂无优惠政策</span>
</template>
</div>
</div>
<div class="row">
<div class="col-12">
<span class="stidyRoleLine"></span>
<span>返佣</span>
</div>
<div style="margin-top: 10px;" v-if="saveObj.CommissionReType==1">返佣类型：比例返佣</div>
<div style="margin-top: 10px;" v-if="saveObj.CommissionReType==2">返佣类型：固定金额返佣</div>
<table class="payTable">
<tr>
<th>同行</th>
<th>{{saveObj.CommissionReType==1?'首报返佣比例':'首报固定金额'}}</th>
<th v-if="saveObj.CommissionReType==1">首报返佣值</th>
<th>{{saveObj.CommissionReType==1?'续费比例':'续费固定金额'}}</th>
<th v-if="saveObj.CommissionReType==1">续费返佣值</th>
</tr>
<tr v-for="(item,index) in saveObj.scalelist" :key="index">
<td>
<span>{{item.Name}}</span>
</td>
<td>
<span>{{item.scale}}{{saveObj.CommissionReType==1?'%':''}}</span>
</td>
<td v-if="saveObj.CommissionReType==1">
<span>{{item.scalevalue}}</span>
</td>
<td>
<span>{{item.continue}}{{saveObj.CommissionReType==1?'%':''}}</span>
</td>
<td v-if="saveObj.CommissionReType==1">
<span>{{item.continuevalue}}</span>
</td>
</tr>
</table>
</div>
<template>
<div class="studyDrawerTop">
......@@ -285,7 +301,7 @@
</span>
</div>
</div>
<div class="row" style="margin-bottom:10px;">
<div class="row" style="margin-bottom:100px;">
<div class="col-6">
<span class="auditName">{{saveObj.DirectorName}}</span>
<span class="studyPass" v-if="saveObj.DirectorStatus==0" style="background-color:#1273bc;">待审核</span>
......@@ -344,7 +360,9 @@
<script>
import {
queryStudyAbroadInfo,
} from "../../api/studyabroad/index";
import {
mapState
} from "vuex";
......@@ -365,7 +383,7 @@
msg: {
Id: 0,
IsGetPrice: 1
}
},
}
},
computed: mapState({
......@@ -394,7 +412,8 @@
return action && action.FunctionCode;
}
return false;
}
},
}),
mounted() {
this.msg.Id = this.Id;
......@@ -406,12 +425,115 @@
initObj() {
queryStudyAbroadInfo(this.msg).then(res => {
this.saveObj = res.Data;
let scalelist= [
{Name:'同行返佣',scale:this.saveObj.B2BRebateRatio,scalevalue:this.getShouBAO(3),continue:this.saveObj.B2BReNewRatio,continuevalue:this.getShouBAO(4)},
{Name:'校代返佣',scale:this.saveObj.SchoolRebateRatio,scalevalue:this.getShouBAO(5),continue:this.saveObj.SchoolReNewRatio,continuevalue:this.getShouBAO(6)},
{Name:'学员转介返佣',scale:this.saveObj.TransIntroductceRatio,scalevalue:this.getShouBAO(7),continue:this.saveObj.TransIntroductceReNewRatio,continuevalue:this.getShouBAO(8)},
{Name:'内推返佣',scale:this.saveObj.InnerRecommendRatio,scalevalue:this.getShouBAO(9),continue:this.saveObj.InnerRecommendReNewRatio,continuevalue:this.getShouBAO(10)},
{Name:'直客返佣',scale:this.saveObj.B2CRbRatio,scalevalue:this.getShouBAO(11),continue:this.saveObj.B2CRNRatio,continuevalue:this.getShouBAO(12)},
]
this.saveObj.scalelist = scalelist
})
.catch(() => {});
},
closeperForm() {
this.$emit("close");
this.persistent = false;
},
getPrePrice(type) {
//首次优惠
var Count = ''
if (type == 1) {
if (this.saveObj.B2CRatio) {
let num = Number(100 - this.saveObj.B2CRatio) / 100;
Count = (num * this.saveObj.SellPrice).toFixed(2);
}
}
if (type == 2) {
if (this.saveObj.B2CReNewRatio) {
let num = Number(100 - this.saveObj.B2CReNewRatio) / 100;
Count = (num * this.saveObj.SellPrice).toFixed(2);
}
}
return Count;
},
//获取首报返佣比例
getShouBAO(type) {
//首次优惠
var Count = ''
var currentPrice = Number(100 - this.saveObj.B2CRatio) * this.saveObj.SellPrice / 100;
var currrntXufei = Number(100 - this.saveObj.B2CReNewRatio) * this.saveObj.SellPrice / 100;
if (type == 3) {
if (this.saveObj.B2BRebateRatio) {
let num = currentPrice * Number(this.saveObj.B2BRebateRatio) / 100;
Count = num.toFixed(2);
return Count;
}
}
if (type == 4) {
if (this.saveObj.B2BReNewRatio) {
let num = currrntXufei * Number(this.saveObj.B2BReNewRatio) / 100;
Count = num.toFixed(2);
return Count;
}
}
if (type == 5) {
if (this.saveObj.SchoolRebateRatio) {
let num = currentPrice * Number(this.saveObj.SchoolRebateRatio) / 100;
Count = num.toFixed(2);
return Count;
}
}
if (type == 6) {
if (this.saveObj.SchoolReNewRatio) {
let num = currrntXufei * Number(this.saveObj.SchoolReNewRatio) / 100;
Count = num.toFixed(2);
return Count;
}
}
if (type == 7) {
if (this.saveObj.TransIntroductceRatio) {
let num = currentPrice * Number(this.saveObj.TransIntroductceRatio) / 100;
Count = num.toFixed(2);
return Count;
}
}
if (type == 8) {
if (this.saveObj.TransIntroductceReNewRatio) {
let num = currrntXufei * Number(this.saveObj.TransIntroductceReNewRatio) / 100;
Count = num.toFixed(2);
return Count;
}
}
if (type == 9) {
if (this.saveObj.InnerRecommendRatio) {
let num = currentPrice * Number(this.saveObj.InnerRecommendRatio) / 100;
Count = num.toFixed(2);
return Count;
}
}
if (type == 10) {
if (this.saveObj.InnerRecommendReNewRatio) {
let num = currrntXufei * Number(this.saveObj.InnerRecommendReNewRatio) / 100;
Count = num.toFixed(2);
return Count;
}
}
if (type == 11) {
if (this.saveObj.B2CRbRatio) {
let num = currentPrice * Number(this.saveObj.B2CRbRatio) / 100;
Count = num.toFixed(2);
return Count;
}
}
if (type == 12) {
if (this.saveObj.B2CRNRatio) {
let num = currrntXufei * Number(this.saveObj.B2CRNRatio) / 100;
Count = num.toFixed(2);
return Count;
}
}
}
}
}
......@@ -420,4 +542,5 @@
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
src/pages/studyAbroad/employment.vue
View file @ 0ef83732
......@@ -58,7 +58,46 @@
<q-td key="SellPrice" :props="props">
{{props.row.SellPrice}}
</q-td>
<q-td key="PreferentialList" style="padding-right:0px">
<q-td key="B2CRatio" :props="props">
{{props.row.B2CRatio}}%
</q-td>
<q-td key="B2CReNewRatio" :props="props">
{{props.row.B2CReNewRatio}}%
</q-td>
<q-td key="B2BRebateRatio" :props="props">
{{props.row.B2BRebateRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="B2BReNewRatio" :props="props">
{{props.row.B2BReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="SchoolRebateRatio" :props="props">
{{props.row.SchoolRebateRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="SchoolReNewRatio" :props="props">
{{props.row.SchoolReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="TransIntroductceRatio" :props="props">
{{props.row.TransIntroductceRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="TransIntroductceReNewRatio" :props="props">
{{props.row.TransIntroductceReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="InnerRecommendRatio" :props="props">
{{props.row.InnerRecommendRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="InnerRecommendReNewRatio" :props="props">
{{props.row.InnerRecommendReNewRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="B2CRbRatio" :props="props">
{{props.row.B2CRbRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<q-td key="B2CRNRatio" :props="props">
{{props.row.B2CRNRatio}}{{props.row.CommissionReType==1?'%':''}}
</q-td>
<!-- <q-td key="PreferentialList" style="padding-right:0px">
<div v-for="(x,index) in props.row.PreferentialList" :key="index">
<div class="border-bottom" v-if="x.PriceDiscountType == 1">
买{{ x.BuyNum }}送{{ x.SendNum }}
......@@ -145,7 +184,7 @@
<div v-if="!props.row.EducationCommission || props.row.EducationCommission.length == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
</q-td>
</q-td> -->
<q-td key="SaleStateName">
<template v-if="props.row.SaleState==1">
{{props.row.SaleStateName}}
......@@ -158,13 +197,15 @@
<q-td key="Id" style="width:200px;">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
@click="EditStudy(props.row)" />
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="价格设置"
@click="EditStudyPrice(props.row)" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
<q-list>
<q-item clickable v-close-popup @click="EditStudyPrice(props.row)">
<!-- <q-item clickable v-close-popup @click="EditStudyPrice(props.row)">
<q-item-section>
<q-item-label>价格设置</q-item-label>
</q-item-section>
</q-item>
</q-item> -->
<q-item clickable v-close-popup
v-if="props.row.SaleState==1||props.row.SaleState==4||props.row.SaleState==5"
@click="applyApply(props.row,2)">
......@@ -220,7 +261,7 @@
@success="refreshPage">
</studyAbroad-form>
<studyAbroadprice-form v-if="isShowStudyPrice" :save-obj="studyObj" :Type="2" @close="closeStudyForm"
@success="refreshPage">
@success="refreshPage(),isShowStudyPrice=false">
</studyAbroadprice-form>
<studyproauditinfo-form v-if="isShowInfo" :Id="studyObj.Id" @close="closeStudyForm"></studyproauditinfo-form>
</div>
......@@ -235,7 +276,8 @@
deleteStudyAbroad
} from '../../api/studyabroad/index'
import studyAbroadForm from '../../components/studyAbroad/studyAbroad-form'
import studyAbroadpriceForm from '../../components/studyAbroad/studyAbroadprice-form'
// import studyAbroadpriceForm from '../../components/studyAbroad/studyAbroadprice-form'
import studyAbroadpriceForm from '../../components/studyAbroad/newstudyAbroadprice-form'
import studyproauditinfoForm from '../../components/studyAbroad/studyproauditinfo-form'
import {
mapState
......@@ -298,13 +340,14 @@
field: 'SchoolName',
align: 'left'
},
{
name: 'SuggestPrice',
label: '建议卖价',
field: 'SuggestPrice',
align: 'left',
field: row => row.SuggestPrice.toFixed(2)
},
// {
// name: 'SuggestPrice',
// label: '建议卖价',
// field: 'SuggestPrice',
// align: 'left',
// field: row => row.SuggestPrice.toFixed(2)
// },
{
name: 'SellPrice',
label: '实际卖价',
......@@ -313,33 +356,117 @@
field: row => row.SellPrice.toFixed(2)
},
{
name: "PreferentialList",
name: "B2CRatio",
required: true,
label: "直客优惠",
align: "left",
field: (row) => row.B2CRatio
},
{
name: "B2CReNewRatio",
required: true,
label: "优惠政策",
label: "直客优惠续费",
align: "left",
field: row => row.PreferentialList
field: (row) => row.B2CReNewRatio
},
{
name: "PreferentialListSellCommission",
name: "B2BRebateRatio",
required: true,
label: "销售佣金",
label: "一般同行返佣比例",
align: "left",
field: row => row.PreferentialList
field: (row) => row.B2BRebateRatio
},
{
name: "PreferentialListB2BCommission",
name: "B2BReNewRatio",
required: true,
label: "同行佣金",
label: "一般同行续费返佣",
align: "left",
field: row => row.PreferentialList
field: (row) => row.B2BReNewRatio
},
{
name: "EducationCommission",
name: "SchoolRebateRatio",
required: true,
label: "教育同行佣金",
label: "校园同行返佣比例",
align: "left",
field: row => row.PreferentialList
field: (row) => row.SchoolRebateRatio
},
{
name: "SchoolReNewRatio",
required: true,
label: "校园同行续费返佣",
align: "left",
field: (row) => row.SchoolReNewRatio
},
{
name: "TransIntroductceRatio",
required: true,
label: "转介返佣",
align: "left",
field: (row) => row.TransIntroductceRatio
},
{
name: "TransIntroductceReNewRatio",
required: true,
label: "转介续费返佣",
align: "left",
field: (row) => row.TransIntroductceReNewRatio
},
{
name: "InnerRecommendRatio",
required: true,
label: "内推返佣",
align: "left",
field: (row) => row.InnerRecommendRatio
},
{
name: "InnerRecommendReNewRatio",
required: true,
label: "内推续费返佣",
align: "left",
field: (row) => row.InnerRecommendReNewRatio
},
{
name: "B2CRbRatio",
required: true,
label: "直客返佣",
align: "left",
field: (row) => row.B2CRbRatio
},
{
name: "B2CRNRatio",
required: true,
label: "直客续费返佣",
align: "left",
field: (row) => row.B2CRNRatio
},
// {
// name: "PreferentialList",
// required: true,
// label: "优惠政策",
// align: "left",
// field: row => row.PreferentialList
// },
// {
// name: "PreferentialListSellCommission",
// required: true,
// label: "销售佣金",
// align: "left",
// field: row => row.PreferentialList
// },
// {
// name: "PreferentialListB2BCommission",
// required: true,
// label: "同行佣金",
// align: "left",
// field: row => row.PreferentialList
// },
// {
// name: "EducationCommission",
// required: true,
// label: "教育同行佣金",
// align: "left",
// field: row => row.PreferentialList
// },
{
name: 'SaleStateName',
label: '销售状态',
......
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