Skip to content

C
confucius
Commit e9cfccfb authored by zhengke's avatar zhengke
Browse files
Options

1

parent a104a9fd
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 41 deletions
src/components/course/courseprice-form.vue
View file @ e9cfccfb
......@@ -13,7 +13,7 @@
<q-card-section class="q-pt-none scroll" style="max-height: 70vh">
<div class="text-caption q-mb-lg text-grey-6">基础价格设置</div>
<div class="row wrap">
<div class="col-6">
<!-- <div class="col-6">
<q-input
filled
stack-label
......@@ -23,10 +23,11 @@
ref="OriginalPrice"
class="col-6 q-pr-lg q-pb-lg"
label="基础收费"
style="display:none;"
@keyup.native="checkPrice(priceObj.courseObj, 'OriginalPrice')"
:rules="[val => !!val || '请填写基础收费']"
/>
</div>
</div> -->
<div class="col-6">
<q-input
filled
......@@ -36,13 +37,83 @@
v-model="priceObj.courseObj.SellPrice"
ref="SellPrice"
class="col-6 q-pr-lg q-pb-lg"
label="卖价"
label="直客价"
@keyup.native="checkPrice(priceObj.courseObj, 'SellPrice')"
:rules="[val => !!val || '请填写卖价']"
:rules="[val => !!val || '请填写直客价']"
/>
</div>
<div class="col-6">
<q-input
filled
stack-label
maxlength="8"
:dense="false"
v-model="priceObj.courseObj.B2BPrice"
ref="B2BPrice"
class="col-6 q-pr-lg q-pb-lg"
label="同业价"
@keyup.native="checkPrice(priceObj.courseObj, 'B2BPrice')"
:rules="[val => !!val || '请填写同业价']"
/>
</div>
</div>
<div class="q-pt-none scroll" style="max-height:60hv">
<div class="row wrap">
<div class="col-6">
<q-input
filled
stack-label
:dense="false"
v-model="priceObj.courseObj.B2BRebateRatio"
ref="B2BRebateRatio"
class="col-6 q-pr-lg"
label="同行返佣比例"
@keyup.native="checkPrice(priceObj.courseObj, 'B2BRebateRatio')"
suffix="%"
/>
</div>
<div class="col-6">
<q-input
filled
stack-label
:dense="false"
v-model="priceObj.courseObj.B2BReNewRatio"
ref="B2BReNewRatio"
class="col-6 q-pr-lg q-pb-lg"
label="一般同行续费返佣比例"
@keyup.native="checkPrice(priceObj.courseObj, 'B2BReNewRatio')"
suffix="%"
/>
</div>
</div>
<div class="row wrap">
<div class="col-6">
<q-input
filled
stack-label
:dense="false"
v-model="priceObj.courseObj.SchoolRebateRatio"
ref="SchoolRebateRatio"
class="col-6 q-pr-lg q-pb-lg"
label="校园同行返佣比例"
@keyup.native="checkPrice(priceObj.courseObj, 'SchoolRebateRatio')"
suffix="%"
/>
</div>
<div class="col-6">
<q-input
filled
stack-label
:dense="false"
v-model="priceObj.courseObj.SchoolReNewRatio"
ref="SchoolReNewRatio"
class="col-6 q-pr-lg q-pb-lg"
label="校园同行续费返佣比例"
@keyup.native="checkPrice(priceObj.courseObj, 'SchoolReNewRatio')"
suffix="%"
/>
</div>
</div>
<div class="q-pt-none scroll" style="max-height:60hv;display:none;">
<table>
<thead>
<tr style="height:60px;">
......@@ -289,7 +360,12 @@ export default {
courseObj: {
CourseId: 0, //课程编号
OriginalPrice: 0, //原价
SellPrice: 0 //售价
SellPrice: 0, //售价
B2BPrice: 0, //同业价
B2BRebateRatio: 0, //一般同行返佣比例
SchoolRebateRatio: 0, //校园同行返佣比例
B2BReNewRatio:0 ,//一般同行续费返佣比例
SchoolReNewRatio:0 //校园同行返佣比例
},
priceList: [] //价格列表
},
......@@ -365,7 +441,6 @@ export default {
},
//保存菜单
saveCourse() {
this.saveCourseLoading = true;
if (this.priceObj.priceList && this.priceObj.priceList.length > 0) {
this.priceObj.priceList.forEach(item => {
if (item.BuyNum == "") {
......@@ -388,22 +463,28 @@ export default {
}
});
}
saveCoursePreferential(this.priceObj)
.then(res => {
this.saveCourseLoading = false;
this.$q.notify({
icon: "iconfont icon-chenggong",
color: "accent",
timeout: 2000,
message: "数据保存成功！",
position: "top"
});
this.$emit("success");
this.closeSaveForm();
})
.catch(() => {
this.saveCourseLoading = false;
this.$refs.SellPrice.validate();
this.$refs.B2BPrice.validate();
if (!this.$refs.SellPrice.hasError && !this.$refs.B2BPrice.hasError){
this.saveCourseLoading = true;
saveCoursePreferential(this.priceObj)
.then(res => {
this.saveCourseLoading = false;
this.$q.notify({
icon: "iconfont icon-chenggong",
color: "accent",
timeout: 2000,
message: "数据保存成功！",
position: "top"
});
this.$emit("success");
this.closeSaveForm();
})
.catch(() => {
this.saveCourseLoading = false;
});
}
}
}
};
......
src/components/school/student/studentRight-form.vue
View file @ e9cfccfb
......@@ -477,4 +477,7 @@
display: inline-block;
text-align-last: justify;
}
.fullscreen{
z-index:9999;
}
</style>
\ No newline at end of file
src/pages/contractConfirm.vue
View file @ e9cfccfb
......@@ -236,7 +236,7 @@
<p>1、费用总计：以乙方选择课程之时，即时公布的课程收费标准为准。</p>
<div style="display:flex;margin-top:10px;">人民币（大写）：<div class="comConInput" style="width:60%">{{dataList.CNYCaps}}</div></div>
<div style="display:flex;margin:10px 0;">人民币（小写）：<div class="comConInput" style="width:60%">{{dataList.Money}}</div>元</div>
<p>2、支付方式：<span style="color:red;">扫码支付（微信、支付宝）、POS机刷卡支付（信用卡，银行借记卡）、银行汇款/转账。</span></p>
<p>2、支付方式：<span style="color:red;">现金、扫码支付（微信、支付宝）、POS机刷卡支付（信用卡，银行借记卡）、银行汇款/转账等公司支持的结算方式。缴纳的学费应通过公司帐户结算，禁止学费缴纳到非公司帐户的个人帐户，公司对缴费至私人帐户导致的纠纷概不负责。</span></p>
<p>
3、支付截止日期提醒：正式确认报名之日起，乙方须在7个工作日内足额缴纳学费（正式确认报名的时间以乙方缴纳定金之日为准，若乙方未缴纳定金的，以正式开课日前七个工作日为准），因课程一旦开始，同班级学员将统一安排课表持续学习，为了不打乱正常的授课计划，乙方应按本协议约定时间内足额缴纳学费，因逾期缴费所造成的课程延误或课程进度缺失，乙方自行承担责任。甲方因乙方逾期缴费而造成的损失，由乙方承担。
</p>
......
src/pages/contractView.vue
View file @ e9cfccfb
......@@ -473,7 +473,7 @@
人民币（小写）：<div class="contractInput" style="width:180px;">{{dataList.Money}}</div> 元
</div>
<div class="contractContent">
2、支付方式：<span style="color:red;">扫码支付（微信、支付宝）、POS机刷卡支付（信用卡，银行借记卡）、银行汇款/转账。</span>
2、支付方式：<span style="color:red;">现金、扫码支付（微信、支付宝）、POS机刷卡支付（信用卡，银行借记卡）、银行汇款/转账等公司支持的结算方式。缴纳的学费应通过公司帐户结算，禁止学费缴纳到非公司帐户的个人帐户，公司对缴费至私人帐户导致的纠纷概不负责。</span>
</div>
<div class="contractContent">
3、支付截止日期提醒：正式确认报名之日起，乙方须在7个工作日内足额缴纳学费（正式确认报名的时间以乙方缴纳定金之日为准，若乙方未缴纳定金的，以正式开课日前七个工作日为准），因课程一旦开始，同班级学员将统一安排课表持续学习，为了不打乱正常的授课计划，乙方应按本协议约定时间内足额缴纳学费，因逾期缴费所造成的课程延误或课程进度缺失，乙方自行承担责任。甲方因乙方逾期缴费而造成的损失，由乙方承担。
......
src/pages/course/course.vue
View file @ e9cfccfb
......@@ -234,47 +234,75 @@
field: (row) => row.CateName,
},
{
name: "OriginalPrice",
name: "B2BPrice",
required: true,
label: "原价",
label: "同业价",
align: "left",
field: (row) => row.OriginalPrice.toFixed(2),
field: (row) => row.B2BPrice.toFixed(2),
},
{
name: "SellPrice",
required: true,
label: "售价",
label: "直客价",
align: "left",
field: (row) => row.SellPrice.toFixed(2),
},
{
name: "PreferentialList",
name: "B2BRebateRatio",
required: true,
label: "优惠政策",
label: "一般同行返佣比例",
align: "left",
field: (row) => row.PreferentialList,
field: (row) => row.B2BRebateRatio
},
{
name: "PreferentialListSellCommission",
name: "B2BReNewRatio",
required: true,
label: "销售佣金",
label: "一般同行续费返佣比例",
align: "left",
field: (row) => row.PreferentialList,
field: (row) => row.B2BReNewRatio
},
{
name: "PreferentialListB2BCommission",
name: "SchoolRebateRatio",
required: true,
label: "同行佣金",
label: "校园同行返佣比例",
align: "left",
field: (row) => row.PreferentialList,
field: (row) => row.SchoolRebateRatio
},
{
name: "EducationCommission",
name: "SchoolReNewRatio",
required: true,
label: "教育同行佣金",
label: "校园同行续费返佣比例",
align: "left",
field: (row) => row.PreferentialList,
field: (row) => row.SchoolReNewRatio
},
// {
// 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: "ClassHours",
label: "课时长度",
......
src/pages/sale/contractEdit.vue
View file @ e9cfccfb
......@@ -153,7 +153,7 @@
</div>
</div>
<div class="Con_Normal">
2、支付方式：扫码支付（微信、支付宝）、POS机刷卡支付（信用卡，银行借记卡）、银行汇款/转账。
2、支付方式：现金、扫码支付（微信、支付宝）、POS机刷卡支付（信用卡，银行借记卡）、银行汇款/转账等公司支持的结算方式。缴纳的学费应通过公司帐户结算，禁止学费缴纳到非公司帐户的个人帐户，公司对缴费至私人帐户导致的纠纷概不负责。
</div>
<div class="Con_Normal">
3、支付截止日期提醒：正式确认报名之日起，乙方须在7个工作日内足额缴纳学费（正式确认报名的时间以乙方缴纳定金之日为准，若乙方未缴纳定金的，以正式开课日前七个工作日为准），因课程一旦开始，同班级学员将统一安排课表持续学习，为了不打乱正常的授课计划，乙方应按本协议约定时间内足额缴纳学费，因逾期缴费所造成的课程延误或课程进度缺失，乙方自行承担责任。甲方因乙方逾期缴费而造成的损失，由乙方承担。
......
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