Skip to content

C
confucius
Commit bcaac4ce authored by Mac's avatar Mac
Browse files
Options

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

parents 5efcc578 23828f33
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 9 deletions
src/components/course/courseprice-form.vue
View file @ bcaac4ce
......@@ -60,7 +60,7 @@
<td style="width:200px">
优惠类型
</td>
<td style="width:200px">
<td style="width:150px">
优惠条件
</td>
<td style="width:140px">
......@@ -69,6 +69,9 @@
<td style="width:140px">
销售返佣
</td>
<td style="width:140px">
教育同行返佣
</td>
<td>
操作
</td>
......@@ -131,7 +134,7 @@
ref="PriceMoney"
label="优惠"
@keyup.native="checkPrice(item, 'PriceMoney')"
style="width:165px"
style="width:120px"
suffix="%"
/>
</template>
......@@ -193,6 +196,35 @@
</template>
</q-input>
</td>
<td>
<q-input
filled
stack-label
dense
v-model="item.EduCommissionMoney"
ref="EduCommissionMoney"
label="销售返佣"
@keyup.native="checkPrice(item, 'EduCommissionMoney')"
class="q-pr-none"
style="width:100px"
>
<template v-slot:append>
<div class="text-dark text-center text-dark cursor-pointer" style="width:30px;margin-right:-12px;height:100%;font-size:14px;border-left:1px solid #ddd;padding-top:15px;" >
<span>{{item.EduCommissionType==0?'%':'￥'}}</span>
<q-menu auto-close>
<q-list>
<q-item clickable v-close-popup @click="item.EduCommissionType=0">
<q-item-section>按百分比（%）</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="item.EduCommissionType=1">
<q-item-section>按固定额度（￥）</q-item-section>
</q-item>
</q-list>
</q-menu>
</div>
</template>
</q-input>
</td>
<td>
<q-btn
flat
......@@ -287,6 +319,8 @@ export default {
SaleCommissionMoney: 0, //销售返佣
B2BCommissionType: 0, //同行返佣类型(0-百分比，1-固定金额)
B2BCommissionMoney: 0, //同行返佣
EduCommissionType: 0, //教育返佣类型
EduCommissionMoney: 0, //教育同行佣金
PriceDiscountType: 0, //课程价格优惠类型(见枚举)
BuyNum: 0, //购买人数
SendNum: 0, //赠送人数
......@@ -349,6 +383,9 @@ export default {
if (item.SaleCommissionMoney == "") {
item.SaleCommissionMoney = 0;
}
if (item.EduCommissionMoney == "") {
item.EduCommissionMoney = 0;
}
});
}
saveCoursePreferential(this.priceObj)
......
src/components/studyAbroad/studyAbroadprice-form.vue
View file @ bcaac4ce
......@@ -30,7 +30,7 @@
<td style="width:200px">
优惠类型
</td>
<td style="width:200px">
<td style="width:150px">
优惠条件
</td>
<td style="width:140px">
......@@ -39,6 +39,9 @@
<td style="width:140px">
销售返佣
</td>
<td style="width:140px;">
教育同行返佣
</td>
<td>
操作
</td>
......@@ -55,16 +58,16 @@
<!--买送-->
<template v-if="item.PriceDiscountType == 1">
<q-input filled stack-label dense v-model="item.BuyNum" ref="BuyNum" label="买"
@keyup.native="checkPrice(item, 'BuyNum')" style="width:80px;display:inline-block;" suffix="" />
@keyup.native="checkPrice(item, 'BuyNum')" style="width:60px;display:inline-block;" suffix="" />
<q-input filled stack-label class="q-ml-xs" v-model="item.SendNum" ref="SendNum" dense label="送"
@keyup.native="checkPrice(item, 'SendNum')" style="width:80px;display:inline-block;" suffix="">
@keyup.native="checkPrice(item, 'SendNum')" style="width:60px;display:inline-block;" suffix="">
</q-input>
</template>
<!--刷卡分期-->
<template v-else-if="item.PriceDiscountType == 5"> </template>
<template v-else>
<q-input filled stack-label dense v-model="item.PriceMoney" ref="PriceMoney" label="优惠"
@keyup.native="checkPrice(item, 'PriceMoney')" style="width:165px" suffix="%" />
@keyup.native="checkPrice(item, 'PriceMoney')" style="width:125px" suffix="%" />
</template>
</td>
<td>
......@@ -110,6 +113,28 @@
</template>
</q-input>
</td>
<td>
<q-input filled stack-label dense v-model="item.EduCommissionMoney" ref="EduCommissionMoney"
label="教育同行返佣" @keyup.native="checkPrice(item, 'EduCommissionMoney')" class="q-pr-none"
style="width:100px">
<template v-slot:append>
<div class="text-dark text-center text-dark cursor-pointer"
style="width:30px;margin-right:-12px;height:100%;font-size:14px;border-left:1px solid #ddd;padding-top:15px;">
<span>{{item.EduCommissionType==0?'%':'￥'}}</span>
<q-menu auto-close>
<q-list>
<q-item clickable v-close-popup @click="item.EduCommissionType=0">
<q-item-section>按百分比（%）</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="item.EduCommissionType=1">
<q-item-section>按固定额度（￥）</q-item-section>
</q-item>
</q-list>
</q-menu>
</div>
</template>
</q-input>
</td>
<td>
<q-btn flat size="xs" icon="iconfont icon-shanchu" title="删除" color="negative" style="font-weight:400"
class="q-mr-xs" label="" @click="delPrice(index)" />
......@@ -189,6 +214,8 @@
SaleCommissionMoney: 0, //销售返佣
B2BCommissionType: 0, //同行返佣类型(0-百分比，1-固定金额)
B2BCommissionMoney: 0, //同行返佣
EduCommissionType: 0, //教育同行返佣类型(0-百分比，1-固定金额)
EduCommissionMoney: 0, //教育同行返佣
PriceDiscountType: 0, //课程价格优惠类型(见枚举)
BuyNum: 0, //购买人数
SendNum: 0, //赠送人数
......@@ -246,6 +273,9 @@
if (item.SaleCommissionMoney == "") {
item.SaleCommissionMoney = 0;
}
if (item.EduCommissionMoney == "") {
item.EduCommissionMoney = 0;
}
});
}
saveBatchStudyAbroad(this.priceObj)
......
src/pages/course/course.vue
View file @ bcaac4ce
......@@ -99,6 +99,24 @@
</div>
</q-td>
</template>
<template v-slot:body-cell-EducationCommission="props">
<q-td :props="props" style="padding-left:0px">
<div v-for="x in props.value">
<div class="border-bottom" style="padding-left: 16px" :class="{ 'text-red': x.EduCommissionType == 1 }"
v-if="x.PriceDiscountType != 0">
{{ x.EduCommissionType == 1 ? "￥" : ""
}}{{ x.EduCommissionMoney
}}{{ x.EduCommissionType == 0 ? "%" : "" }}
</div>
<div v-if="x.PriceDiscountType == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
</div>
<div v-if="!props.value || props.value.length == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
</q-td>
</template>
<template v-slot:body-cell-Status="props">
<q-td :props="props">
<q-badge :color="props.value == 1 ? 'negative' : 'primary'" :label="props.value == 0 ? '正常' : '禁用'" />
......@@ -207,6 +225,13 @@
align: "left",
field: row => row.PreferentialList
},
{
name: "EducationCommission",
required: true,
label: "教育同行佣金",
align: "left",
field: row => row.PreferentialList
},
{
name: "ClassHours",
label: "课时长度",
......
src/pages/studyAbroad/employment.vue
View file @ bcaac4ce
......@@ -100,7 +100,23 @@
<div class="remark-font">暂无佣金信息</div>
</div>
</q-td>
<q-td v-if="col.name=='SaleStateName'">
<q-td v-else-if="col.name=='EducationCommission'" style="padding-left:0px">
<div v-for="x in col.value">
<div class="border-bottom" style="padding-left: 16px"
:class="{ 'text-red': x.EduCommissionType == 1 }" v-if="x.PriceDiscountType != 0">
{{ x.EduCommissionType == 1 ? "￥" : ""
}}{{ x.EduCommissionMoney
}}{{ x.EduCommissionType == 0 ? "%" : "" }}
</div>
<div v-if="x.PriceDiscountType == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
</div>
<div v-if="!col.value || col.value.length == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
</q-td>
<q-td v-else-if="col.name=='SaleStateName'">
{{col.value}}
</q-td>
<q-td v-else-if="col.name == 'Id'" style="width:200px;">
......@@ -215,7 +231,13 @@
align: "left",
field: row => row.PreferentialList
},
{
name: "EducationCommission",
required: true,
label: "教育同行佣金",
align: "left",
field: row => row.PreferentialList
},
{
name: 'SaleStateName',
label: '销售状态',
......
src/pages/studyAbroad/studyabroad.vue
View file @ bcaac4ce
......@@ -101,7 +101,23 @@
<div class="remark-font">暂无佣金信息</div>
</div>
</q-td>
<q-td v-if="col.name=='SaleStateName'">
<q-td v-else-if="col.name=='EducationCommission'" style="padding-left:0px">
<div v-for="x in col.value">
<div class="border-bottom" style="padding-left: 16px"
:class="{ 'text-red': x.EduCommissionType == 1 }" v-if="x.PriceDiscountType != 0">
{{ x.EduCommissionType == 1 ? "￥" : ""
}}{{ x.EduCommissionMoney
}}{{ x.EduCommissionType == 0 ? "%" : "" }}
</div>
<div v-if="x.PriceDiscountType == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
</div>
<div v-if="!col.value || col.value.length == 0">
<div class="remark-font">暂无佣金信息</div>
</div>
</q-td>
<q-td v-else-if="col.name=='SaleStateName'">
{{col.value}}
</q-td>
<q-td v-else-if="col.name == 'Id'" style="width:200px;">
......@@ -216,6 +232,13 @@
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