Skip to content

C
confucius
Commit 69282796 authored by liudong1993's avatar liudong1993
Browse files
Options

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

# Conflicts:
#	src/components/school/student/stulist.vue
parents 495da956 78540c86
Show whitespace changes
Inline Side-by-side
Showing with 85 additions and 86 deletions
src/components/school/student/stulist.vue
View file @ 69282796
...@@ -818,14 +818,14 @@ ...@@ -818,14 +818,14 @@
}, },
//转订单 //转订单
transferOrder() { transferOrder() {
// let CreateTimeStr = date.formatDate(new Date(this.selection[0].CreateTimeStr), 'YYYY-MM-DD') let CreateTimeStr = date.formatDate(new Date(this.selection[0].CreateTimeStr), 'YYYY-MM-DD')
// let CreateTimeStr2 = date.formatDate(new Date('2023-03-22'), 'YYYY-MM-DD') let CreateTimeStr2 = date.formatDate(new Date('2023-03-22'), 'YYYY-MM-DD')
// if (CreateTimeStr >= CreateTimeStr2) { if (CreateTimeStr >= CreateTimeStr2) {
// if (!this.selection[0].FileVoucher) { if (!this.selection[0].FileVoucher) {
// this.$message.error('需先上传学员到访表') // this.$message.error('需先上传学员到访表')
// return // return
// } }
// } }
const firstId = this.selection[0].CustomerId; const firstId = this.selection[0].CustomerId;
const flag = this.selection.every(e => { const flag = this.selection.every(e => {
return e.CustomerId == firstId; return e.CustomerId == firstId;
...@@ -842,14 +842,14 @@ ...@@ -842,14 +842,14 @@
}, },
//转留学 //转留学
transferAbroad() { transferAbroad() {
// let CreateTimeStr = date.formatDate(new Date(this.selection[0].CreateTimeStr), 'YYYY-MM-DD') let CreateTimeStr = date.formatDate(new Date(this.selection[0].CreateTimeStr), 'YYYY-MM-DD')
// let CreateTimeStr2 = date.formatDate(new Date('2023-03-22'), 'YYYY-MM-DD') let CreateTimeStr2 = date.formatDate(new Date('2023-03-22'), 'YYYY-MM-DD')
// if (CreateTimeStr >= CreateTimeStr2) { if (CreateTimeStr >= CreateTimeStr2) {
// if (!this.selection[0].FileVoucher) { if (!this.selection[0].FileVoucher) {
// this.$message.error('需先上传学员到访表') // this.$message.error('需先上传学员到访表')
// return // return
// } }
// } }
this.isShowAbroad = true; this.isShowAbroad = true;
}, },
getCurseManager(row) { getCurseManager(row) {
......
src/pages/sale/courseList.vue
View file @ 69282796
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
<span v-if="col.value==1">比例返佣</span> <span v-if="col.value==1">比例返佣</span>
<span v-if="col.value==2">固定金额</span> <span v-if="col.value==2">固定金额</span>
</q-td> </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> <span>{{col.value}}%</span>
</q-td> </q-td>
<q-td v-else-if="col.name=='B2BReNewRatio'" :key="col.name"> <q-td v-else-if="col.name=='B2BReNewRatio'" :key="col.name">
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</q-td> </q-td>
<q-td v-else-if="col.name=='SchoolReNewRatio'" :key="col.name"> <q-td v-else-if="col.name=='SchoolReNewRatio'" :key="col.name">
<span>{{col.value}}%</span> <span>{{col.value}}%</span>
</q-td> </q-td> -->
<q-td v-else-if="col.name=='TransIntroductceRatio'" :key="col.name"> <q-td v-else-if="col.name=='TransIntroductceRatio'" :key="col.name">
<span>{{col.value}}%</span> <span>{{col.value}}%</span>
</q-td> </q-td>
...@@ -384,62 +384,62 @@ ...@@ -384,62 +384,62 @@
// align: "left", // align: "left",
// field: row => row.PreferentialList // field: row => row.PreferentialList
// }, // },
{ // {
name: "PreferentialListSellCommission", // name: "PreferentialListSellCommission",
label: "销售佣金", // label: "销售佣金",
align: "left", // align: "left",
field: row => row.PreferentialList // field: row => row.PreferentialList
}, // },
{ // {
name: "PreferentialListB2BCommission", // name: "PreferentialListB2BCommission",
label: "同行佣金", // label: "同行佣金",
align: "left", // align: "left",
field: row => row.PreferentialList // field: row => row.PreferentialList
}, // },
// 12月15号新增参数 // // 12月15号新增参数
{ // {
name: "B2CRatio", // name: "B2CRatio",
label: "直客优惠比例", // label: "直客优惠比例",
align: "left", // align: "left",
field: (row) => row.B2CRatio // field: (row) => row.B2CRatio
}, // },
{ // {
name: "B2CReNewRatio", // name: "B2CReNewRatio",
label: "直客优惠续费比例", // label: "直客优惠续费比例",
align: "left", // align: "left",
field: (row) => row.B2CReNewRatio // field: (row) => row.B2CReNewRatio
}, // },
{ // {
name: "CommissionReType", // name: "CommissionReType",
label: "返佣类型", // label: "返佣类型",
align: "left", // align: "left",
field: (row) => row.CommissionReType // field: (row) => row.CommissionReType
}, // },
{ // {
name: "B2BRebateRatio", // name: "B2BRebateRatio",
label: "一般同行返佣比例", // label: "一般同行返佣比例",
align: "left", // align: "left",
field: (row) => row.B2BRebateRatio // field: (row) => row.B2BRebateRatio
}, // },
{ // {
name: "B2BReNewRatio", // name: "B2BReNewRatio",
label: "一般同行续费返佣比例", // label: "一般同行续费返佣比例",
align: "left", // align: "left",
field: (row) => row.B2BReNewRatio // field: (row) => row.B2BReNewRatio
}, // },
{ // {
name: "SchoolRebateRatio", // name: "SchoolRebateRatio",
label: "校园同行返佣比例", // label: "校园同行返佣比例",
align: "left", // align: "left",
field: (row) => row.SchoolRebateRatio // field: (row) => row.SchoolRebateRatio
}, // },
{ // {
name: "SchoolReNewRatio", // name: "SchoolReNewRatio",
label: "校园同行续费返佣比例", // label: "校园同行续费返佣比例",
align: "left", // align: "left",
field: (row) => row.SchoolReNewRatio // field: (row) => row.SchoolReNewRatio
}, // },
{ {
name: "TransIntroductceRatio", name: "TransIntroductceRatio",
label: "转介返佣比例", label: "转介返佣比例",
...@@ -464,19 +464,18 @@ ...@@ -464,19 +464,18 @@
align: "left", align: "left",
field: (row) => row.InnerRecommendReNewRatio field: (row) => row.InnerRecommendReNewRatio
}, },
{ // {
name: "B2CRbRatio", // name: "B2CRbRatio",
label: "直客返佣", // label: "直客返佣",
align: "left", // align: "left",
field: (row) => row.B2CRbRatio // field: (row) => row.B2CRbRatio
}, // },
{ // {
name: "B2CRNRatio", // name: "B2CRNRatio",
label: "直客续费返佣", // label: "直客续费返佣",
align: "left", // align: "left",
field: (row) => row.B2CRNRatio // field: (row) => row.B2CRNRatio
}, // },
{ {
name: "TeacherList", name: "TeacherList",
label: "教师团队", 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