Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
罗超
confucius
Commits
48896a1f
Commit
48896a1f
authored
Apr 25, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
36a7b8ca
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
628 additions
and
744 deletions
+628
-744
course-form.vue
src/components/course/course-form.vue
+44
-29
orderlist.vue
src/components/sale/orderlist.vue
+0
-1
course.vue
src/pages/course/course.vue
+545
-688
lessonNotes.vue
src/pages/course/lessonNotes.vue
+7
-1
courseList.vue
src/pages/sale/courseList.vue
+32
-25
No files found.
src/components/course/course-form.vue
View file @
48896a1f
...
...
@@ -83,13 +83,13 @@
<div
class=
"row wrap"
>
<div
class=
"col-6"
>
<q-input
filled
stack-label
:disable=
"!isHaveCourseHoursEdit"
@
keyup
.
native=
"checkPrice(objOption, 'C
lassHours')"
reverse-fill-mask
v-model=
"objOption.Class
Hours"
ref=
"C
lassHours"
class=
"col-6 q-pr-lg q-pb-lg"
label=
"课时数量"
:rules=
"[val => !!val || '请填写课时信息']
"
/>
@
keyup
.
native=
"checkPrice(objOption, 'C
hineseHours')"
reverse-fill-mask
v-model=
"objOption.Chinese
Hours"
ref=
"C
hineseHours"
class=
"col-6 q-pr-lg q-pb-lg"
label=
"中教课时
"
/>
</div>
<div
class=
"col-6"
>
<q-
select
filled
stack-label
@
input=
"changeCourseSubject(objOption.CateId)"
option-value=
"CateId
"
option-label=
"CateName"
v-model=
"objOption.CateId"
ref=
"CateId"
:options=
"TreeCategoryList"
label=
"所属系列
"
class=
"col-6 q-pr-lg q-pb-lg"
emit-value
map-options
:rules=
"[val => !!val || '请选择课程所属系列']
"
/>
<q-
input
filled
stack-label
:disable=
"!isHaveCourseHoursEdit
"
@
keyup
.
native=
"checkPrice(objOption, 'ForeignHours')"
reverse-fill-mask
v-model=
"objOption.ForeignHours
"
ref=
"ForeignHours"
class=
"col-6 q-pr-lg q-pb-lg"
label=
"外教课时
"
/>
</div>
</div>
<div
class=
"row wrap"
>
...
...
@@ -99,13 +99,18 @@
class=
"col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
</div>
<div
class=
"col-6"
>
<q-select
filled
stack-label
option-value=
"Id"
option-label=
"Name"
v-model=
"objOption.CourseRate
"
ref=
"CourseRate"
:options=
"courseLevelList"
label=
"课程等级"
class=
"col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
<q-select
filled
stack-label
@
input=
"changeCourseSubject(objOption.CateId)"
option-value=
"CateId
"
option-label=
"CateName"
v-model=
"objOption.CateId"
ref=
"CateId"
:options=
"TreeCategoryList"
label=
"所属系列"
class=
"col-6 q-pr-lg q-pb-lg"
emit-value
map-options
:rules=
"[val => !!val || '请选择课程所属系列']"
/>
</div>
</div>
<div
class=
"row"
>
<div
class=
"col-6"
>
<q-select
filled
stack-label
option-value=
"Id"
option-label=
"Name"
v-model=
"objOption.CourseRate"
ref=
"CourseRate"
:options=
"courseLevelList"
label=
"课程等级"
class=
"col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
</div>
<q-field
label=
"是否支持约课报名"
stack-label
filled
class=
"col-6 q-pr-lg q-pb-lg"
>
<
template
v-slot:control
>
<div
class=
"row col-12"
>
...
...
@@ -114,10 +119,20 @@
</div>
</
template
>
</q-field>
<q-select
filled
stack-label
option-value=
"Id"
option-label=
"Name"
v-model=
"objOption.CourseTimeId"
ref=
"CourseTime"
:options=
"CourseTimeList"
label=
"关联上课时段"
class=
"col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
</div>
<div
class=
"row"
>
<div
class=
"col-6"
>
<q-select
filled
stack-label
option-value=
"Id"
option-label=
"Name"
v-model=
"objOption.CourseTimeId"
ref=
"CourseTime"
:options=
"CourseTimeList"
label=
"关联上课时段"
class=
"col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
</div>
<div
class=
"col-6"
>
<q-select
filled
stack-label
option-value=
"Id"
option-label=
"Name"
v-model=
"objOption.OpenBankLevelList"
multiple
use-chips
ref=
"LevelData"
:options=
"LevelData"
label=
"课程关联题库"
class=
"col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
</div>
</div>
<div
class=
"row"
v-if=
"objOption.IsScrollClass==1"
>
<q-input
filled
stack-label
v-model=
"objOption.ScrollMinNum"
ref=
"ScrollMinNum"
class=
"col-6 q-pr-lg q-pb-lg"
label=
"最小上课人数"
:rules=
"[val => !!val || '请填写最小上课人数']"
/>
...
...
@@ -125,10 +140,10 @@
label=
"最大上课人数"
:rules=
"[val => !!val || '请填写最大上课人数']"
/>
</div>
<div
class=
"row"
>
<q-input
filled
stack-label
v-model=
"objOption.FreeCoffeeNum"
ref=
"FreeCoffeeNum"
class=
"col-6 q-pr-lg q-pb-lg"
label=
"赠送咖啡杯数"
:rules=
"[val => val >=0 || '请填写赠送咖啡杯数']"
/>
<q-input
filled
stack-label
v-model=
"objOption.AddHoursMoney"
ref=
"AddHoursMoney"
class=
"col-6 q-pr-lg q-pb-lg"
label=
"课程增加课时费"
:rules=
"[val => val >=0 || '请填写课程增加课时费']"
/>
<q-input
filled
stack-label
v-model=
"objOption.FreeCoffeeNum"
ref=
"FreeCoffeeNum"
class=
"col-6 q-pr-lg q-pb-lg"
label=
"赠送咖啡杯数"
:rules=
"[val => val >=0 || '请填写赠送咖啡杯数']"
/>
<q-input
filled
stack-label
v-model=
"objOption.AddHoursMoney"
ref=
"AddHoursMoney"
class=
"col-6 q-pr-lg q-pb-lg"
label=
"课程增加课时费"
:rules=
"[val => val >=0 || '请填写课程增加课时费']"
/>
</div>
<div
class=
"row wrap"
>
<div
class=
"col-6"
>
...
...
@@ -153,13 +168,7 @@
style=
"display:none"
/>
</div>
</div>
<div
class=
"row wrap"
>
<div
class=
"col-6"
>
<q-select
filled
stack-label
option-value=
"Id"
option-label=
"Name"
v-model=
"objOption.OpenBankLevelList"
multiple
use-chips
ref=
"LevelData"
:options=
"LevelData"
label=
"课程关联题库"
class=
"col-6 q-pr-lg q-pb-lg"
emit-value
map-options
/>
</div>
</div>
<div
class=
"row wrap"
>
<div
class=
"col-12 q-pr-lg q-pb-lg"
>
<q-input
v-model=
"objOption.ContractInfo"
filled
type=
"textarea"
placeholder=
"合同补充协议"
/>
...
...
@@ -267,8 +276,10 @@
FreeCoffeeNum
:
0
,
// 赠送咖啡
AddHoursMoney
:
0
,
// 课程增加课时费
CourseTimeId
:
0
,
// 关联上课时段
ContractInfo
:
""
,
//合同补充协议
OpenBankLevelList
:
[]
ContractInfo
:
""
,
//合同补充协议
OpenBankLevelList
:
[],
//开放题库
ChineseHours
:
""
,
//中教课时
ForeignHours
:
""
,
//外教课时
},
CourseTimeList
:
[],
//上课时段列表
CourseEmphasis
:
[],
//数据临时存放
...
...
@@ -288,7 +299,7 @@
courseLevelList
:
[],
//课程等级列表
courseSubjectList
:
[],
//课程科目列表
keynoteList
:
[],
//重点枚举列表
LevelData
:[]
LevelData
:
[]
};
},
created
()
{
...
...
@@ -327,9 +338,9 @@
},
methods
:
{
//获取关联考试等级
getLevel
(){
getLevel
()
{
GetBankTypeList
({}).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
if
(
res
.
Code
==
1
)
{
this
.
LevelData
=
res
.
Data
;
}
})
...
...
@@ -510,6 +521,8 @@
this
.
objOption
.
AddHoursMoney
=
res
.
Data
.
AddHoursMoney
;
this
.
objOption
.
CourseTimeId
=
res
.
Data
.
CourseTimeId
;
this
.
objOption
.
OpenBankLevelList
=
res
.
Data
.
OpenBankLevelList
;
this
.
objOption
.
ChineseHours
=
res
.
Data
.
ChineseHours
;
this
.
objOption
.
ForeignHours
=
res
.
Data
.
ForeignHours
;
this
.
CourseEmphasis
=
[];
setTimeout
(()
=>
{
//Todo 暂时不知道什么原因 偶尔会出现2个 所以加了一个延迟
...
...
@@ -570,6 +583,8 @@
this
.
objOption
.
AddHoursMoney
=
0
;
this
.
objOption
.
CourseTimeId
=
0
;
this
.
objOption
.
OpenBankLevelList
=
[];
this
.
objOption
.
ChineseHours
=
""
;
this
.
objOption
.
ForeignHours
=
""
;
}
},
//关闭弹窗
...
...
@@ -580,13 +595,13 @@
//保存菜单
saveCourse
()
{
this
.
$refs
.
CourseName
.
validate
();
this
.
$refs
.
ClassHours
.
validate
();
//
this.$refs.ClassHours.validate();
this
.
$refs
.
CateId
.
validate
();
this
.
$refs
.
FreeCoffeeNum
.
validate
();
this
.
$refs
.
AddHoursMoney
.
validate
();
//!this.$refs.ClassHours.hasError &&
if
(
!
this
.
$refs
.
CourseName
.
hasError
&&
!
this
.
$refs
.
ClassHours
.
hasError
&&
!
this
.
$refs
.
CateId
.
hasError
&&
!
this
.
$refs
.
FreeCoffeeNum
.
hasError
&&
!
this
.
$refs
.
AddHoursMoney
.
hasError
...
...
src/components/sale/orderlist.vue
View file @
48896a1f
...
...
@@ -1640,7 +1640,6 @@
item
.
tab
=
tab
;
this
.
myorderObjOption
=
item
;
this
.
isShowmyorderForm
=
true
;
console
.
log
(
this
.
myorderObjOption
,
'===='
)
},
//关闭订单详情
closeMOSaveForm
()
{
...
...
src/pages/course/course.vue
View file @
48896a1f
This diff is collapsed.
Click to expand it.
src/pages/course/lessonNotes.vue
View file @
48896a1f
...
...
@@ -95,6 +95,13 @@
</div>
</q-td>
</
template
>
<
template
v-slot:body-cell-ClassHours=
"props"
>
<q-td
:props=
"props"
>
<span>
总
课
时:
{{
props
.
row
.
ClassHours
}}
</span><br
/>
<span>
中教课时:
{{
props
.
row
.
ChineseHours
}}
</span><br
/>
<span>
外教课时:
{{
props
.
row
.
ForeignHours
}}
</span>
</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 ? '正常' : '删除'"
/>
...
...
@@ -170,7 +177,6 @@
label
:
"课时长度"
,
field
:
"ClassHours"
,
align
:
"left"
,
format
:
(
val
,
row
)
=>
`
${
val
}
课时`
},
{
name
:
"UpdateTimeStr"
,
...
...
src/pages/sale/courseList.vue
View file @
48896a1f
...
...
@@ -109,7 +109,6 @@
line-height
:
25px
;
background-color
:
#004d40
;
}
</
style
>
<
template
>
<div
class=
"page-body courseList"
>
...
...
@@ -117,8 +116,8 @@
<div
class=
"col row wrap q-mr-lg q-col-gutter-md"
>
<div
class=
"col-3"
>
<q-select
@
input=
"resetSearch"
standout=
"bg-primary text-white"
v-model=
"msg.CourseSubject"
:options=
"CourseSubjectList"
option-label=
"SubjectName"
option-value=
"Id"
emit-value
map-options
label=
"所属科目"
clearable
/>
:options=
"CourseSubjectList"
option-label=
"SubjectName"
option-value=
"Id"
emit-value
map-options
label=
"所属科目"
clearable
/>
</div>
<div
class=
"col-3"
>
<q-input
@
input=
"resetSearch"
clearable
standout=
"bg-primary text-white"
v-model=
"msg.CourseName"
label=
"课程名称"
...
...
@@ -136,11 +135,6 @@
<!--
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
icon=
"add"
label=
"创建报价单"
@
click=
"createQuotation"
/>
-->
</div>
</
template
>
<!-- <template v-slot:body-cell-OpenBankLevelNameList="props">
<q-td auto-width :props="props">
<span v-for="item in props.row.OpenBankLevelNameList">{{item}}</span>
</q-td>
</template> -->
<
template
v-slot:body=
"props"
>
<q-tr
:props=
"props"
>
<q-td
auto-width
>
...
...
@@ -154,7 +148,7 @@
</q-img>
</q-td>
<q-td
v-else-if=
"col.name=='OpenBankLevelNameList'"
:key=
"col.name"
>
<span
style=
"margin-right:10px;"
v-for=
"
x in col.value
"
>
{{
x
}}
</span>
<span
style=
"margin-right:10px;"
v-for=
"
(x,index) in col.value"
:key=
"index
"
>
{{
x
}}
</span>
</q-td>
<q-td
v-else-if=
"col.name == 'PreferentialList'"
style=
"padding-right:0px"
:key=
"col.name"
>
<div
v-for=
"(x,index) in col.value"
:key=
"index"
>
...
...
@@ -193,7 +187,8 @@
<div
class=
"remark-font"
>
暂无优惠政策
</div>
</div>
</q-td>
<q-td
v-else-if=
"col.name == 'PreferentialListSellCommission'"
style=
"padding-right:0px;padding-left:0px"
:key=
"col.name"
>
<q-td
v-else-if=
"col.name == 'PreferentialListSellCommission'"
style=
"padding-right:0px;padding-left:0px"
:key=
"col.name"
>
<div
v-for=
"(x,index) in col.value"
:key=
"index"
>
<div
class=
"border-bottom"
style=
"padding-left: 16px;padding-right: 16px"
:class=
"{'text-red':x.SaleCommissionType==1}"
v-if=
"x.PriceDiscountType!=0"
>
...
...
@@ -211,7 +206,6 @@
<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>
<div
v-if=
"x.PriceDiscountType == 0"
>
<div
class=
"remark-font"
>
暂无佣金信息
</div>
</div>
...
...
@@ -226,7 +220,7 @@
<q-td
v-else-if=
"col.name == 'B2CReNewRatio' "
style=
"padding-left:0px"
:key=
"col.name"
>
{{col.value}}%
</q-td>
<q-td
v-else-if=
"col.name == 'CommissionReType' "
style=
"padding-left:0px"
:key=
"col.name"
>
<q-td
v-else-if=
"col.name == 'CommissionReType' "
style=
"padding-left:0px"
:key=
"col.name"
>
<span
v-if=
"col.value==1"
>
比例返佣
</span>
<span
v-if=
"col.value==2"
>
固定金额
</span>
</q-td>
...
...
@@ -265,6 +259,12 @@
</q-chip>
</div>
</q-td>
<q-td
v-else-if=
"col.name=='ClassHours'"
:key=
"col.name"
>
<span>
总
课
时:{{ props.row.ClassHours }}
</span><br
/>
<span>
中教课时:{{ props.row.ChineseHours }}
</span><br
/>
<span>
外教课时:{{ props.row.ForeignHours }}
</span>
</q-td>
<q-td
v-else-if=
"col.name=='CourseIntro'"
:key=
"col.name"
>
<q-btn
flat
color=
"primary"
label=
"查看详情"
@
click=
"showContentDialog(col.value)"
/>
</q-td>
...
...
@@ -311,7 +311,9 @@
getCourseSubject
}
from
"../../api/course/index"
;
import
quotationForm
from
'../../components/sale/quotation-form'
import
{
mapState
}
from
"vuex"
;
import
{
mapState
}
from
"vuex"
;
export
default
{
meta
:
{
title
:
"课程报价表"
...
...
@@ -395,7 +397,7 @@
field
:
row
=>
row
.
PreferentialList
},
// 12月15号新增参数
{
{
name
:
"B2CRatio"
,
label
:
"直客优惠比例"
,
align
:
"left"
,
...
...
@@ -413,7 +415,7 @@
align
:
"left"
,
field
:
(
row
)
=>
row
.
CommissionReType
},
{
name
:
"B2BRebateRatio"
,
label
:
"一般同行返佣比例"
,
...
...
@@ -518,10 +520,10 @@
CourseSubjectList
:
[],
//科目列表
};
},
created
(){
created
()
{
var
localStorageData
=
window
.
localStorage
[
"loginUserInfo"
];
let
ActionMenuList
=
JSON
.
parse
(
localStorageData
).
data
.
ActionMenuList
;
var
isShowPrice
=
false
;
var
isShowPrice
=
false
;
if
(
ActionMenuList
&&
ActionMenuList
.
length
>
0
)
{
ActionMenuList
.
forEach
((
x
)
=>
{
if
(
x
.
FunctionCode
==
"IsShow_CoursePrice"
)
{
...
...
@@ -529,13 +531,19 @@
}
});
}
if
(
isShowPrice
){
this
.
visibleColumns
=
[
'CourseFeature'
,
'CoverImg'
,
'CourseSubjectName'
,
'CourseName'
,
'OpenBankLevelNameList'
,
'CateName'
,
'OriginalPrice'
,
'SellPrice'
,
'PreferentialListSellCommission'
,
'PreferentialListB2BCommission'
,
'B2CRatio'
,
'B2CReNewRatio'
,
'CommissionReType'
,
'B2BRebateRatio'
,
'B2BReNewRatio'
,
'SchoolRebateRatio'
,
'SchoolReNewRatio'
,
'TransIntroductceRatio'
,
'TransIntroductceReNewRatio'
,
'InnerRecommendRatio'
,
'InnerRecommendReNewRatio'
,
'B2CRbRatio'
,
'B2CRNRatio'
,
'TeacherList'
,
'ClassHours'
,
'CourseIntro'
,
'UpdateTimeStr'
]
}
else
{
this
.
visibleColumns
=
[
'CourseFeature'
,
'CoverImg'
,
'CourseSubjectName'
,
'CourseName'
,
'OpenBankLevelNameList'
,
'CateName'
,
'TeacherList'
,
'ClassHours'
,
'CourseIntro'
,
'UpdateTimeStr'
]
if
(
isShowPrice
)
{
this
.
visibleColumns
=
[
'CourseFeature'
,
'CoverImg'
,
'CourseSubjectName'
,
'CourseName'
,
'OpenBankLevelNameList'
,
'CateName'
,
'OriginalPrice'
,
'SellPrice'
,
'PreferentialListSellCommission'
,
'PreferentialListB2BCommission'
,
'B2CRatio'
,
'B2CReNewRatio'
,
'CommissionReType'
,
'B2BRebateRatio'
,
'B2BReNewRatio'
,
'SchoolRebateRatio'
,
'SchoolReNewRatio'
,
'TransIntroductceRatio'
,
'TransIntroductceReNewRatio'
,
'InnerRecommendRatio'
,
'InnerRecommendReNewRatio'
,
'B2CRbRatio'
,
'B2CRNRatio'
,
'TeacherList'
,
'ClassHours'
,
'CourseIntro'
,
'UpdateTimeStr'
]
}
else
{
this
.
visibleColumns
=
[
'CourseFeature'
,
'CoverImg'
,
'CourseSubjectName'
,
'CourseName'
,
'OpenBankLevelNameList'
,
'CateName'
,
'TeacherList'
,
'ClassHours'
,
'CourseIntro'
,
'UpdateTimeStr'
]
}
},
mounted
()
{
...
...
@@ -590,7 +598,6 @@
}
}
};
</
script
>
<
style
lang=
"sass"
>
@import
url('~assets/css/table.sass')
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment