Skip to content

C
confucius
Commit a9d017e3 authored by 吴春's avatar 吴春
Browse files
Options

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

parents 89351e9e 69282796
Show whitespace changes
Inline Side-by-side
Showing with 214 additions and 236 deletions
src/components/course/courseprice-form.vue
View file @ a9d017e3
......@@ -19,6 +19,7 @@
.courseMainTbale td {
padding: 0 3px;
}
</style>
<template>
<q-dialog v-model="persistent" persistent content-class="bg-grey-1" transition-show="scale" transition-hide="scale">
......@@ -31,55 +32,21 @@
<span class="course_Line"></span>
基础价格设置
</div>
<div>
<table style="margin-left:10px;">
<tr>
<td style="width:110px;text-align:right;">
<el-select v-model="priceObj.courseObj.SellPriceType" placeholder="请选择报价类型">
<el-option
v-for="item in PriceTypeList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</td>
<td colspan="2">
<q-input filled stack-label maxlength="8" style="padding-bottom:0;width:390px;margin-left:10px;" dense
v-model="priceObj.courseObj.SellPrice" ref="SellPrice" label="卖价"
<div class="row">
<q-select filled stack-label dense class="col-2 q-pr-lg q-pb-lg" v-model="priceObj.courseObj.SellPriceType"
:options="PriceTypeList" emit-value map-options option-value="Id" option-label="Name" label="价格类型" />
<q-input filled stack-label dense class="col-2 q-pr-lg q-pb-lg" maxlength="8"
v-model="priceObj.courseObj.SellPrice" ref="SellPrice"
:label="priceObj.courseObj.SellPriceType==1?'课程总价':'课时单价'"
@keyup.native="checkPrice(priceObj.courseObj, 'SellPrice')" :rules="[val => !!val || '请填写卖价']" />
</td>
</tr>
</table>
</div>
<div class="text-caption q-mb-lg q-mt-lg text-grey-6 row wrap">
<span class="course_Line"></span>
其他价格设置
</div>
<div>
<table style="margin-left:10px;">
<tr>
<td style="width:110px;text-align:right;">
教材费
</td>
<td colspan="2">
<q-input filled stack-label maxlength="8" style="padding-bottom:0;width:390px;margin-left:10px;" dense
v-model="priceObj.courseObj.TextbookFee" ref="TextbookFee" label="价格"
@keyup.native="checkPrice(priceObj.courseObj, 'TextbookFee')" :rules="[val => !!val || '请填写教材费价格']" />
</td>
</tr>
<tr>
<td style="width:110px;text-align:right;">
课件费
</td>
<td colspan="2">
<q-input filled stack-label maxlength="8" style="padding-bottom:0;width:390px;margin-left:10px;" dense
v-model="priceObj.courseObj.CoursewareFee" ref="CoursewareFee" label="价格"
@keyup.native="checkPrice(priceObj.courseObj, 'CoursewareFee')" :rules="[val => !!val || '请填写课件费价格']" />
</td>
</tr>
</table>
<template v-if="priceObj.courseObj.SellPriceType==1">
<q-input filled stack-label class="col-2 q-pr-lg q-pb-lg" maxlength="8" dense
v-model="priceObj.courseObj.TextbookFee" ref="TextbookFee" label="教材费"
@keyup.native="checkPrice(priceObj.courseObj, 'TextbookFee')" />
<q-input filled stack-label class="col-2 q-pr-lg q-pb-lg" maxlength="8" dense
v-model="priceObj.courseObj.CoursewareFee" ref="CoursewareFee" label="课件费"
@keyup.native="checkPrice(priceObj.courseObj, 'CoursewareFee')" />
</template>
</div>
<div class="text-caption q-mb-lg q-mt-lg text-grey-6" v-if="false">
<span class="course_Line"></span>
......@@ -122,7 +89,7 @@
<div class="text-caption q-mb-lg q-mt-lg text-grey-6 row wrap" style="align-items:center;">
<div>
<span class="course_Line"></span>
返佣
返佣设置
</div>
<!--只保留内部介绍返佣和学员介绍返佣。-->
<q-select style="width:200px;margin-left:35px;" filled dense v-model="priceObj.courseObj.CommissionReType"
......@@ -130,8 +97,7 @@
</div>
<table style="border-collapse: collapse;width:100%;" class="coursePrice_table courseMainTbale">
<tr style="height:40px;">
<th>同行
</th>
<th>返佣类型</th>
<th>
首报名返佣比例
</th>
......@@ -400,12 +366,12 @@
},
data() {
return {
PriceTypeList:[{
value: 1,
label: '课程总价'
PriceTypeList: [{
Id: 1,
Name: '课程总价'
}, {
value: 2,
label: '课时单价'
Id: 2,
Name: '课时单价'
}],
persistent: true,
optionTitle: "",
......@@ -416,9 +382,9 @@
CourseId: 0, //课程编号
OriginalPrice: 0, //原价
SellPrice: 0, //售价
SellPriceType:1,//价格类型：基础售价1/课时售价2
TextbookFee:0,//教材费
CoursewareFee:0,//课件费
SellPriceType: 1, //价格类型：基础售价1/课时售价2
TextbookFee: 0, //教材费
CoursewareFee: 0, //课件费
CommissionReType: 1, //返佣类型(1比例返佣,2-固定金额返佣)
B2CRatio: 0, //直客首次报名优惠比例
B2CReNewRatio: 0, //直客续费优惠比例
......@@ -728,4 +694,5 @@
}
}
};
</script>
src/components/sale/categoryEdit-form.vue
View file @ a9d017e3
......@@ -135,6 +135,18 @@
</div>
</div>
</template>
<div class="row wrap">
<div class="col-12">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.RebateRate" ref="RebateRate"
class="col-12 q-pb-lg" label="返佣比例%" />
</div>
</div>
<div class="row wrap">
<div class="col-12">
<q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.RebateMoney" ref="RebateMoney"
class="col-12 q-pb-lg" label="返佣固定金额" />
</div>
</div>
</q-card-section>
<q-separator />
<q-card-actions align="right" class="bg-white">
......@@ -172,6 +184,8 @@
CategoryId: 0,
linkMan: "",
linkTel: "",
RebateRate : 0,
RebateMoney : 0,
IsContract: 0, //是否签约
ContractUrl: "", //合同信息
},
......@@ -207,6 +221,8 @@
this.objOption.CategoryId = tempData.CategoryId;
this.objOption.IsContract = tempData.IsContract;
this.objOption.ContractUrl = tempData.ContractUrl;
this.objOption.RebateRate = tempData.RebateRate;
this.objOption.RebateMoney = tempData.RebateMoney;
}
})
this.optionTitle = "修改客户信息"
......@@ -216,6 +232,8 @@
this.objOption.CategoryId = 0;
this.objOption.linkMan = '';
this.objOption.linkTel = '';
this.objOption.RebateRate = 0;
this.objOption.RebateMoney = 0;
this.objOption.IsContract = 0;
this.objOption.ContractUrl = '';
this.optionTitle = "新增客户信息"
......
src/components/sale/customcategorylist.vue
View file @ a9d017e3
......@@ -132,6 +132,18 @@
field: "OrderCount",
align: "left"
},
{
name: "RebateRate",
label: "返佣比例%",
field: "RebateRate",
align: "left"
},
{
name: "RebateMoney",
label: "返佣固定金额",
field: "RebateMoney",
align: "left"
},
{
name: "CreateByName",
label: "创建人",
......
src/components/school/student/student-genjin.vue
View file @ a9d017e3
......@@ -18,8 +18,7 @@
<div class="stuGenJin">
<div class="row wrap">
<q-btn label="新增" color="accent q-mb-lg" size="sm"
v-if="!saveObj.IsHaveCurseManager || userInfo.IsCourseConsultant == 1" @click="isShowAdd = true" />
<span v-else class="text-grey-4">学员已推送课程顾问，只能进行查看</span>
@click="isShowAdd = true" />
<q-btn label="取消" style="margin-left:20px;" v-if="isShowAdd" flat color="grey-10 q-mb-lg" size="sm"
@click="isShowAdd = false" />
</div>
......@@ -28,7 +27,8 @@
<q-select filled v-model="flowMsg.PurposeType" dense :options="PurposeTypeList" option-label="ConfigName"
option-value="Id" emit-value map-options label="意向度" class="col-6 q-pb-lg q-pr-lg" />
<q-select filled v-model="flowMsg.ConsultCourseIdList" dense :options="CourseList" option-label="CourseName"
option-value="CourseId" emit-value map-options label="咨询课程" class="col-6 q-pb-lg" multiple />
option-value="CourseId" emit-value map-options label="咨询课程" class="col-6 q-pb-lg" multiple use-input
@filter="filterCourse" />
<q-input filled stack-label maxlength="50" dense v-model="flowMsg.ConsultKeyWords" class="col-6 q-pb-lg q-pr-lg"
label="关键词" />
<q-field filled class="col-6 q-pb-lg" dense>
......@@ -159,6 +159,7 @@
userInfo: {},
PurposeTypeList: [], //意向度下拉列表
CourseList: [], //课程下拉列表
AllCourseList: [], //所有课程列表
};
},
created() {
......@@ -181,13 +182,26 @@
this.getCourseList();
},
methods: {
//筛选课程
filterCourse(val, update) {
update(() => {
if (val === '') {
this.CourseList = JSON.parse(JSON.stringify(this.AllCourseList))
} else {
const needle = val.toLowerCase()
this.CourseList = this.AllCourseList.filter(v => v.CourseName.toLowerCase().indexOf(needle) > -1)
}
})
},
//获取课程列表
getCourseList() {
queryCourseDropdownList({
IsQPrice: 0
IsQPrice: 0,
SaleState: 1,
}).then(res => {
if (res.Code == 1) {
this.CourseList = res.Data;
this.AllCourseList=res.Data;
}
})
},
......
src/components/school/student/student-studyabroad.vue
View file @ a9d017e3
<style></style>
<template>
<div>
<studyabroad :saveObj="saveObj" @close="closeReserveForm" @success="closeReserveForm"
v-if="!saveObj.IsHaveCurseManager || userInfo.IsCourseConsultant == 1"></studyabroad>
<studyabroad :saveObj="saveObj" @close="closeReserveForm" @success="closeReserveForm"></studyabroad>
<div style="display:flex;flex:1;flex-direction: column;overflow:hidden;">
<div class="TimeLineDiv">
<q-timeline color="primary">
......@@ -10,11 +9,8 @@
<template v-slot:title>
<div class="visit_Cont">
<div class="Log_Content">
<div >
留学需求：{{ tItem.Remark }}
<div v-html="tItem.Remark">
</div>
</div>
<div @click="DeleteVisitorReserve(tItem.Id)" style="margin-top:10px;"
class="visit_delete text-negative">
......@@ -40,16 +36,9 @@
</template>
<script>
import {
SetVisitorReserve,
queryVisitorReservePage,
RemoveVisitorReserve
} from "../../../api/scheduling/schedu";
import {
getTeacherDropDownList,
queryClassRoomList,
GetTrialLessonList
} from "../../../api/school/index";
import studyabroad from "./studyabroad";
export default {
meta: {
......@@ -71,7 +60,7 @@
pageIndex: 1,
pageSize: 12,
Visitor_Id: 0,
IsReserve:2,
IsReserve: 2,
},
dataList: [],
page_Count: 0,
......@@ -89,32 +78,32 @@
},
methods: {
//获得年月日时分秒
//传入日期//例：2020-10-27T14:36:23
timeFormatSeconds(time,type) {
let timeStr="";
//传入日期//例：2020-10-27T14:36:23
timeFormatSeconds(time, type) {
let timeStr = "";
var d = time ? new Date(time) : new Date();
var year = d.getFullYear();
var month = d.getMonth() + 1;
var day = d.getDate();
if (month < 10) month = '0' + month;
if (day < 10) day = '0' + day;
if(type==2){
if (type == 2) {
var hours = d.getHours();
var min = d.getMinutes();
var seconds = d.getSeconds();
if (hours < 0) hours = '0' + hours;
if (min < 10) min = '0' + min;
if (seconds < 10) seconds = '0' + seconds;
timeStr+= ' ' + hours + ':' + min + ':' + seconds;
timeStr += ' ' + hours + ':' + min + ':' + seconds;
}
timeStr=year + '-' + month + '-' + day +timeStr;
return timeStr;
timeStr = year + '-' + month + '-' + day + timeStr;
return timeStr;
// return (year + '-' + month + '-' + day + ' ' + hours + ':' + min + ':' + seconds);
},
},
//获取试听列表
getList() {
queryVisitorReservePage(this.qMsg).then(res => {
......
src/components/school/student/studyabroad.vue
View file @ a9d017e3
......@@ -12,42 +12,24 @@
<q-btn label="新增留学需求" color="accent q-mb-lg" size="sm" @click="isShowReserve = true" />
</div>
<template v-if="isShowReserve">
<div class="row studentDate" >
<q-input
style="width:257px;"
v-model="addMsg.Remark"
placeholder="留学需求"
filled
type="textarea"
/>
<div class="row studentDate">
<UeEditor v-model="addMsg.Remark" class="q-pb-sm" :config="config"></UeEditor>
</div>
<div class="row wrap justify-end q-pr-lg" style="margin-bottom:10px;">
<q-btn label="关闭" flat color="accent q-mb-lg" size="md" style="margin-right:10px;" @click="closeClassForm" />
<q-btn label="保存" color="accent q-mb-lg" size="md" @click="saveAppointForm()" />
</div>
</template>
</div>
</template>
<script>
import UeEditor from "../../editor/UeEditor";
import {
SetStudyAbroad
} from "../../../api/scheduling/schedu";
import {
getTeacherDropDownList,
queryClassRoomList,
GetTrialLessonList
} from "../../../api/school/index";
// import auditionForm from "../../schedul/audition-form";
export default {
components: {
// auditionForm,
UeEditor
},
props: {
saveObj: {
......@@ -57,6 +39,10 @@
},
data() {
return {
config: {
initialFrameWidth: null,
initialFrameHeight: 90
},
isShowReserve: false,
addMsg: {
Id: 0, //编号
......@@ -71,12 +57,12 @@
TrialLessonId: "",
ReserveType: 0,
ClassPlanId: 0,
Demand:"",
Demand: "",
},
isShowTeacher: false, //是否显示试听课弹窗
showObj:{
className:"",
courseName:"",
showObj: {
className: "",
courseName: "",
}
};
},
......@@ -95,7 +81,6 @@
this.isShowReserve = false;
this.$emit("success");
},
//清除
clearMsg() {
this.addMsg.Id = 0;
......@@ -109,7 +94,7 @@
this.addMsg.TrialLessonId = "";
this.addMsg.ReserveType = 0;
this.addMsg.ClassPlanId = 0;
this.addMsg.Demand="";
this.addMsg.Demand = "";
},
//保存
saveAppointForm() {
......@@ -160,7 +145,6 @@
this.addMsg.EndTime = obj.EndTime;
this.addMsg.ClassContent = obj.ClassContent;
this.addMsg.TrialLessonId = obj.TrialLessonId;
this.isShowReserve = true;
}
}
......
src/components/school/student/stulist.vue
View file @ a9d017e3
......@@ -367,11 +367,6 @@
align: "left",
field: row => row.StuName
},
{
name: "CurseManager",
label: "课程顾问",
align: "left"
},
{
name: "TeacherManager",
label: "协助老师",
......@@ -827,8 +822,8 @@
let CreateTimeStr2 = date.formatDate(new Date('2023-03-22'), 'YYYY-MM-DD')
if (CreateTimeStr >= CreateTimeStr2) {
if (!this.selection[0].FileVoucher) {
this.$message.error('需先上传学员到访表')
return
// this.$message.error('需先上传学员到访表')
// return
}
}
const firstId = this.selection[0].CustomerId;
......@@ -851,8 +846,8 @@
let CreateTimeStr2 = date.formatDate(new Date('2023-03-22'), 'YYYY-MM-DD')
if (CreateTimeStr >= CreateTimeStr2) {
if (!this.selection[0].FileVoucher) {
this.$message.error('需先上传学员到访表')
return
// this.$message.error('需先上传学员到访表')
// return
}
}
this.isShowAbroad = true;
......
src/pages/sale/courseList.vue
View file @ a9d017e3
......@@ -224,7 +224,7 @@
<span v-if="col.value==1">比例返佣</span>
<span v-if="col.value==2">固定金额</span>
</q-td>
<q-td v-else-if="col.name=='B2BRebateRatio'" :key="col.name">
<!-- <q-td v-else-if="col.name=='B2BRebateRatio'" :key="col.name">
<span>{{col.value}}%</span>
</q-td>
<q-td v-else-if="col.name=='B2BReNewRatio'" :key="col.name">
......@@ -235,7 +235,7 @@
</q-td>
<q-td v-else-if="col.name=='SchoolReNewRatio'" :key="col.name">
<span>{{col.value}}%</span>
</q-td>
</q-td> -->
<q-td v-else-if="col.name=='TransIntroductceRatio'" :key="col.name">
<span>{{col.value}}%</span>
</q-td>
......@@ -384,62 +384,62 @@
// align: "left",
// field: row => row.PreferentialList
// },
{
name: "PreferentialListSellCommission",
label: "销售佣金",
align: "left",
field: row => row.PreferentialList
},
{
name: "PreferentialListB2BCommission",
label: "同行佣金",
align: "left",
field: row => row.PreferentialList
},
// 12月15号新增参数
{
name: "B2CRatio",
label: "直客优惠比例",
align: "left",
field: (row) => row.B2CRatio
},
{
name: "B2CReNewRatio",
label: "直客优惠续费比例",
align: "left",
field: (row) => row.B2CReNewRatio
},
{
name: "CommissionReType",
label: "返佣类型",
align: "left",
field: (row) => row.CommissionReType
},
// {
// name: "PreferentialListSellCommission",
// label: "销售佣金",
// align: "left",
// field: row => row.PreferentialList
// },
// {
// name: "PreferentialListB2BCommission",
// label: "同行佣金",
// align: "left",
// field: row => row.PreferentialList
// },
// // 12月15号新增参数
// {
// name: "B2CRatio",
// label: "直客优惠比例",
// align: "left",
// field: (row) => row.B2CRatio
// },
// {
// name: "B2CReNewRatio",
// label: "直客优惠续费比例",
// align: "left",
// field: (row) => row.B2CReNewRatio
// },
// {
// name: "CommissionReType",
// label: "返佣类型",
// align: "left",
// field: (row) => row.CommissionReType
// },
{
name: "B2BRebateRatio",
label: "一般同行返佣比例",
align: "left",
field: (row) => row.B2BRebateRatio
},
{
name: "B2BReNewRatio",
label: "一般同行续费返佣比例",
align: "left",
field: (row) => row.B2BReNewRatio
},
{
name: "SchoolRebateRatio",
label: "校园同行返佣比例",
align: "left",
field: (row) => row.SchoolRebateRatio
},
{
name: "SchoolReNewRatio",
label: "校园同行续费返佣比例",
align: "left",
field: (row) => row.SchoolReNewRatio
},
// {
// name: "B2BRebateRatio",
// label: "一般同行返佣比例",
// align: "left",
// field: (row) => row.B2BRebateRatio
// },
// {
// name: "B2BReNewRatio",
// label: "一般同行续费返佣比例",
// align: "left",
// field: (row) => row.B2BReNewRatio
// },
// {
// name: "SchoolRebateRatio",
// label: "校园同行返佣比例",
// align: "left",
// field: (row) => row.SchoolRebateRatio
// },
// {
// name: "SchoolReNewRatio",
// label: "校园同行续费返佣比例",
// align: "left",
// field: (row) => row.SchoolReNewRatio
// },
{
name: "TransIntroductceRatio",
label: "转介返佣比例",
......@@ -464,19 +464,18 @@
align: "left",
field: (row) => row.InnerRecommendReNewRatio
},
{
name: "B2CRbRatio",
label: "直客返佣",
align: "left",
field: (row) => row.B2CRbRatio
},
{
name: "B2CRNRatio",
label: "直客续费返佣",
align: "left",
field: (row) => row.B2CRNRatio
},
// {
// name: "B2CRbRatio",
// label: "直客返佣",
// align: "left",
// field: (row) => row.B2CRbRatio
// },
// {
// name: "B2CRNRatio",
// label: "直客续费返佣",
// align: "left",
// field: (row) => row.B2CRNRatio
// },
{
name: "TeacherList",
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