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
e717e1fd
Commit
e717e1fd
authored
Aug 04, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
7241fcc3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
93 deletions
+51
-93
courserefund-form.vue
src/components/course/courserefund-form.vue
+24
-56
backclass-form.vue
src/components/sale/backclass-form.vue
+7
-7
editOrder-form.vue
src/components/sale/editOrder-form.vue
+6
-6
dropSchoolManage.vue
src/pages/administration/dropSchoolManage.vue
+14
-24
No files found.
src/components/course/courserefund-form.vue
View file @
e717e1fd
<
template
>
<
template
>
<div
class=
"page-content"
>
<div
class=
"page-content"
>
<q-table
:pagination=
"pageMsg"
:loading=
"loading"
no-data-label=
"暂无相关数据"
flat
class=
"sticky-column-table"
<q-table
:pagination=
"pageMsg"
:loading=
"loading"
no-data-label=
"暂无相关数据"
flat
class=
"sticky-column-table"
separator=
"none"
title=
"
合同信息
"
:data=
"dataList"
:columns=
"columns"
row-key=
"name"
>
separator=
"none"
title=
"
退课协议
"
:data=
"dataList"
:columns=
"columns"
row-key=
"name"
>
<template
v-slot:top=
"props"
>
<template
v-slot:top=
"props"
>
<div
class=
"col-2 q-table__title"
>
合同信息
</div>
<div
class=
"col-2 q-table__title"
>
退课协议
</div>
<q-space
/>
<q-space
/>
<div
class=
"page-option"
></div>
<div
class=
"page-option"
></div>
</
template
>
</
template
>
...
@@ -24,14 +24,11 @@
...
@@ -24,14 +24,11 @@
{{
props
.
row
.
StudentName
}}
{{
props
.
row
.
StudentName
}}
</q-td>
</q-td>
</
template
>
</
template
>
<
template
v-slot:body-cell-AuditStatus=
"props"
>
<
template
v-slot:body-cell-Status=
"props"
>
<q-td
auto-width
:props=
"props"
>
<q-td
auto-width
:props=
"props"
>
<span
v-if=
"props.row.Status == 0"
style=
"color: #e6a23c"
>
草稿
</span>
<span
v-if=
"props.row.AuditStatus == 1||props.row.AuditStatus == 0"
style=
"color: #409eff"
>
审核中
</span>
<span
v-if=
"props.row.Status == 1"
style=
"color: #409eff"
>
提交审核
</span>
<span
v-if=
"props.row.AuditStatus == 2"
style=
"color: #67c23a"
>
审合通过
</span>
<span
v-if=
"props.row.Status == 2"
style=
"color: #67c23a"
>
审合通过
</span>
<span
v-if=
"props.row.AuditStatus == 3"
style=
"color: #f56c6c"
>
驳回
</span>
<span
v-if=
"props.row.Status == 3"
style=
"color: #f56c6c"
>
驳回
</span>
<span
v-if=
"props.row.Status == 4"
style=
"color: #e95252"
>
取消
</span>
</q-td>
</q-td>
</
template
>
</
template
>
<
template
v-slot:body-cell-IsCompanySeal=
"props"
>
<
template
v-slot:body-cell-IsCompanySeal=
"props"
>
...
@@ -41,8 +38,7 @@
...
@@ -41,8 +38,7 @@
</q-td>
</q-td>
</
template
>
</
template
>
<
template
v-slot:bottom
>
<
template
v-slot:bottom
>
<q-pagination
class=
"full-width justify-end"
v-model=
"msg.pageIndex"
color=
"primary"
:max=
"pageCount"
:input=
"true"
@
input=
"changePage"
/>
</
template
>
</
template
>
<
template
v-slot:body-cell-optioned=
"props"
>
<
template
v-slot:body-cell-optioned=
"props"
>
<q-td
:props=
"props"
>
<q-td
:props=
"props"
>
...
@@ -51,37 +47,13 @@
...
@@ -51,37 +47,13 @@
style=
"font-weight: 400"
@
click=
"EditContract(props.row)"
label=
"编辑"
/>
style=
"font-weight: 400"
@
click=
"EditContract(props.row)"
label=
"编辑"
/>
<el-tooltip
content=
"复制链接发送给客人签字"
placement=
"top"
effect=
"light"
>
<el-tooltip
content=
"复制链接发送给客人签字"
placement=
"top"
effect=
"light"
>
<q-btn
flat
size=
"xs"
v-if=
"
<q-btn
flat
size=
"xs"
v-if=
"
props.row.Status == 2 &&
props.row.
Audit
Status == 2 &&
(props.row.Sign == '' || props.row.Sign == null)
(props.row.Sign == '' || props.row.Sign == null)
"
icon=
"iconfont icon-qianming"
color=
"accent"
style=
"font-weight: 400"
@
click=
"CopyUrl(props.row)"
"
icon=
"iconfont icon-qianming"
color=
"accent"
style=
"font-weight: 400"
@
click=
"CopyUrl(props.row)"
label=
"获取合同链接"
/>
label=
"获取合同链接"
/>
</el-tooltip>
</el-tooltip>
<q-btn
flat
size=
"xs"
icon=
"iconfont icon-View"
color=
"accent"
@
click=
"goContract(props.row)"
<q-btn
flat
size=
"xs"
icon=
"iconfont icon-View"
color=
"accent"
@
click=
"goContract(props.row)"
style=
"font-weight: 400"
label=
"查看"
/>
style=
"font-weight: 400"
label=
"查看"
/>
<q-btn-dropdown
flat
size=
"xs"
color=
"dark"
label=
"更多"
style=
"margin-left: 10px"
v-if=
"
props.row.Status == 0 ||
props.row.Status == 2 ||
props.row.Status == 3
"
>
<q-list>
<q-item
clickable
v-close-popup
v-if=
"props.row.Status == 0 || props.row.Status == 3"
@
click=
"operationContract(props.row, 1)"
>
<q-item-section>
<q-item-label>
提交审核
</q-item-label>
</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
v-if=
"props.row.Status == 2"
@
click=
"downloadContract(props.row)"
>
<q-item-section>
<q-item-label>
下载
</q-item-label>
</q-item-section>
</q-item>
<q-item
clickable
v-close-popup
v-if=
"props.row.Status == 0"
@
click=
"operationContract(props.row, 4)"
>
<q-item-section>
<q-item-label>
取消
</q-item-label>
</q-item-section>
</q-item>
</q-list>
</q-btn-dropdown>
</div>
</div>
</q-td>
</q-td>
</
template
>
</
template
>
...
@@ -103,28 +75,22 @@
...
@@ -103,28 +75,22 @@
data
()
{
data
()
{
return
{
return
{
columns
:
[{
columns
:
[{
name
:
"
ContractNo
"
,
name
:
"
ProtocolNum
"
,
label
:
"
合同
编号"
,
label
:
"
协议
编号"
,
align
:
"left"
,
align
:
"left"
,
field
:
"
ContractNo
"
,
field
:
"
ProtocolNum
"
,
},
},
{
{
name
:
"CTypeName"
,
name
:
"PartyAName"
,
label
:
"类型"
,
align
:
"left"
,
field
:
"CTypeName"
,
},
{
name
:
"StudentName"
,
label
:
"学生名称"
,
label
:
"学生名称"
,
field
:
"
Student
Name"
,
field
:
"
PartyA
Name"
,
align
:
"left"
,
align
:
"left"
,
},
},
{
{
name
:
"CourseName"
,
name
:
"
Old
CourseName"
,
label
:
"课程名称"
,
label
:
"课程名称"
,
align
:
"left"
,
align
:
"left"
,
field
:
"CourseName"
,
field
:
"
Old
CourseName"
,
},
},
{
{
name
:
"CreateByName"
,
name
:
"CreateByName"
,
...
@@ -133,22 +99,22 @@
...
@@ -133,22 +99,22 @@
field
:
"CreateByName"
,
field
:
"CreateByName"
,
},
},
{
{
name
:
"CreateTime"
,
name
:
"CreateTime
Str
"
,
label
:
"创建时间"
,
label
:
"创建时间"
,
align
:
"left"
,
align
:
"left"
,
field
:
"CreateTime"
,
field
:
"CreateTime
Str
"
,
},
},
{
{
name
:
"
SchoolStatusStr
"
,
name
:
"
ReceiptId
"
,
label
:
"关联退课申请单"
,
label
:
"关联退课申请单"
,
align
:
"left"
,
align
:
"left"
,
field
:
"
SchoolStatusStr
"
,
field
:
"
ReceiptId
"
,
},
},
{
{
name
:
"
s
tatus"
,
name
:
"
AuditS
tatus"
,
label
:
"审核状态"
,
label
:
"审核状态"
,
align
:
"left"
,
align
:
"left"
,
field
:
"
SchoolStatusStr
"
field
:
"
AuditStatus
"
},
},
{
{
name
:
"IsCompanySeal"
,
name
:
"IsCompanySeal"
,
...
@@ -167,7 +133,9 @@
...
@@ -167,7 +133,9 @@
},
},
}
}
},
},
created
()
{},
created
()
{
},
mounted
()
{},
mounted
()
{},
methods
:
{
methods
:
{
...
...
src/components/sale/backclass-form.vue
View file @
e717e1fd
...
@@ -160,7 +160,7 @@
...
@@ -160,7 +160,7 @@
</span>
</span>
</div>
</div>
</div>
</div>
<div
class=
"row"
style=
"margin-top:20px;
display:none;
"
>
<div
class=
"row"
style=
"margin-top:20px;"
>
<div
class=
"col-6 q-pr-lg"
>
<div
class=
"col-6 q-pr-lg"
>
<q-input
filled
v-model=
"BackAccountName"
label=
"退还账户名"
></q-input>
<q-input
filled
v-model=
"BackAccountName"
label=
"退还账户名"
></q-input>
</div>
</div>
...
@@ -170,8 +170,8 @@
...
@@ -170,8 +170,8 @@
</div>
</div>
<q-input
filled
stack-label
:dense=
"false"
v-model=
"applyReason"
style=
"margin-top: 20px"
type=
"textarea"
<q-input
filled
stack-label
:dense=
"false"
v-model=
"applyReason"
style=
"margin-top: 20px"
type=
"textarea"
class=
"col-12"
label=
"申请理由"
/>
class=
"col-12"
label=
"申请理由"
/>
<q-input
filled
stack-label
:dense=
"false"
v-model=
"StateMent"
style=
"margin-top: 20px;
display:none
"
type=
"textarea"
<q-input
filled
stack-label
:dense=
"false"
v-model=
"StateMent"
style=
"margin-top: 20px;"
type=
"textarea"
class=
"col-12"
label=
"协议申明"
/>
class=
"col-12"
label=
"协议申明
(在退课协议中显示)
"
/>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-12 q-mt-md text-grey-6"
>
<div
class=
"col-12 q-mt-md text-grey-6"
>
上传附件:
<span
class=
"fj-tip"
style=
"font-size: 10px; color: #f00"
>
*单文件限制5M内
</span>
上传附件:
<span
class=
"fj-tip"
style=
"font-size: 10px; color: #f00"
>
*单文件限制5M内
</span>
...
@@ -338,9 +338,10 @@
...
@@ -338,9 +338,10 @@
picIsShow
:
false
,
picIsShow
:
false
,
picObj
:
[],
picObj
:
[],
initialIndex
:
0
,
initialIndex
:
0
,
BackAccountName
:
'工行'
,
//退还户名
BackAccount
:
'123'
,
//退还账户
BackAccountName
:
''
,
//退还户名
StateMent
:
'我是协议'
//协议申明
BackAccount
:
''
,
//退还账户
StateMent
:
''
//协议申明
};
};
},
},
created
()
{
created
()
{
...
@@ -440,7 +441,6 @@
...
@@ -440,7 +441,6 @@
// 预览上传文件
// 预览上传文件
if
(
i
.
Type
==
3
)
{
if
(
i
.
Type
==
3
)
{
this
.
picObj
.
push
(
i
.
Url
);
this
.
picObj
.
push
(
i
.
Url
);
// this.imgList.push(i.Url)
this
.
picIsShow
=
true
;
this
.
picIsShow
=
true
;
}
else
{
}
else
{
if
(
if
(
...
...
src/components/sale/editOrder-form.vue
View file @
e717e1fd
...
@@ -74,9 +74,9 @@
...
@@ -74,9 +74,9 @@
<q-select
:disable=
"modityOrderType==2"
standout=
"bg-primary text-white"
option-value=
"Id"
option-label=
"Name"
<q-select
:disable=
"modityOrderType==2"
standout=
"bg-primary text-white"
option-value=
"Id"
option-label=
"Name"
v-model=
"OrderMsg.OrderSource"
:options=
"SourceEnumList"
emit-value
map-options
class=
"q-pb-lg"
v-model=
"OrderMsg.OrderSource"
:options=
"SourceEnumList"
emit-value
map-options
class=
"q-pb-lg"
label=
"客人来源"
/>
label=
"客人来源"
/>
<q-select
:disable=
"(modityOrderType==2)||(OrderMsg.JoinType==3)"
v-model=
"OrderMsg.HelpEnterId"
:options=
"EmployeeList"
filled
<q-select
:disable=
"(modityOrderType==2)||(OrderMsg.JoinType==3)"
v-model=
"OrderMsg.HelpEnterId"
use-input
label=
"协助老师"
option-label=
"EmployeeName"
option-value=
"Id"
ref=
"EmployeeName"
class=
"col-6 q-pb-lg
"
:options=
"EmployeeList"
filled
use-input
label=
"协助老师"
option-label=
"EmployeeName"
option-value=
"Id
"
emit-value
map-options
@
filter=
"filterFn"
>
ref=
"EmployeeName"
class=
"col-6 q-pb-lg"
emit-value
map-options
@
filter=
"filterFn"
>
<
template
v-slot:no-option
>
<
template
v-slot:no-option
>
<q-item>
<q-item>
<q-item-section
class=
"text-grey"
>
<q-item-section
class=
"text-grey"
>
...
@@ -172,7 +172,7 @@
...
@@ -172,7 +172,7 @@
StartClassHours
:
0
,
//已上课时
StartClassHours
:
0
,
//已上课时
EffectTime
:
''
,
//生效时间
EffectTime
:
''
,
//生效时间
UpOrderId
:
0
,
//前置订单编号
UpOrderId
:
0
,
//前置订单编号
JoinType
:
1
,
//订单报入类型
JoinType
:
1
,
//订单报入类型
},
},
IsShowUpPrice
:
false
,
//是否显示高于定价
IsShowUpPrice
:
false
,
//是否显示高于定价
UnitPrice
:
0
,
UnitPrice
:
0
,
...
@@ -302,7 +302,7 @@
...
@@ -302,7 +302,7 @@
this
.
OrderMsg
.
OrderNature
=
tempData
.
OrderNature
;
this
.
OrderMsg
.
OrderNature
=
tempData
.
OrderNature
;
this
.
OrderMsg
.
OldPreferPrice
=
tempData
.
OldPreferPrice
;
this
.
OrderMsg
.
OldPreferPrice
=
tempData
.
OldPreferPrice
;
this
.
OrderMsg
.
CourseId
=
tempData
.
CourseId
;
this
.
OrderMsg
.
CourseId
=
tempData
.
CourseId
;
this
.
OrderMsg
.
JoinType
=
tempData
.
JoinType
;
this
.
OrderMsg
.
JoinType
=
tempData
.
JoinType
;
this
.
OrderMsg
.
StartClassHours
=
tempData
.
StartClassHours
;
this
.
OrderMsg
.
StartClassHours
=
tempData
.
StartClassHours
;
this
.
OrderMsg
.
IsChaBan
=
tempData
.
IsChaBan
;
this
.
OrderMsg
.
IsChaBan
=
tempData
.
IsChaBan
;
this
.
OrderMsg
.
EffectTime
=
tempData
.
EffectTime
;
this
.
OrderMsg
.
EffectTime
=
tempData
.
EffectTime
;
...
@@ -326,7 +326,7 @@
...
@@ -326,7 +326,7 @@
this
.
OrderMsg
.
IsChaBan
=
this
.
isChaBan
;
this
.
OrderMsg
.
IsChaBan
=
this
.
isChaBan
;
this
.
OrderMsg
.
EffectTime
=
""
;
this
.
OrderMsg
.
EffectTime
=
""
;
this
.
OrderMsg
.
UpOrderId
=
0
;
this
.
OrderMsg
.
UpOrderId
=
0
;
this
.
OrderMsg
.
JoinType
=
1
;
this
.
OrderMsg
.
JoinType
=
1
;
this
.
OrderMsg
.
OrderType
=
this
.
orderType
;
this
.
OrderMsg
.
OrderType
=
this
.
orderType
;
if
(
this
.
OrderMsg
.
OrderType
==
2
)
{
if
(
this
.
OrderMsg
.
OrderType
==
2
)
{
this
.
OrderMsg
.
OrderNature
=
1
;
this
.
OrderMsg
.
OrderNature
=
1
;
...
...
src/pages/administration/dropSchoolManage.vue
View file @
e717e1fd
...
@@ -5,12 +5,12 @@
...
@@ -5,12 +5,12 @@
<div
class=
"page-search row items-center"
>
<div
class=
"page-search row items-center"
>
<div
class=
"col row wrap q-mr-lg q-col-gutter-md"
>
<div
class=
"col row wrap q-mr-lg q-col-gutter-md"
>
<div
class=
"col-3"
>
<div
class=
"col-3"
>
<q-input
@
change=
"resetSearch"
clearable
standout=
"bg-primary text-white"
v-model=
"msg.QOrderId"
label=
"订单
id
"
<q-input
@
change=
"resetSearch"
clearable
standout=
"bg-primary text-white"
v-model=
"msg.QOrderId"
label=
"订单
编号
"
@
clear=
"resetSearch"
maxlength=
"30"
/>
@
clear=
"resetSearch"
maxlength=
"30"
/>
</div>
</div>
<div
class=
"col-3"
>
<div
class=
"col-3"
>
<q-select
@
input=
"resetSearch"
standout=
"bg-primary text-white"
v-model=
"msg.AuditStatus"
:options=
"StatusOpts"
<q-select
@
input=
"resetSearch"
standout=
"bg-primary text-white"
v-model=
"msg.AuditStatus"
option-value=
"Id"
option-label=
"Name"
label=
"状态"
emit-value
map-options
/>
:options=
"StatusOpts"
option-value=
"Id"
option-label=
"Name"
label=
"状态"
emit-value
map-options
/>
</div>
</div>
<div
class=
"col-3"
>
<div
class=
"col-3"
>
<q-input
@
change=
"resetSearch"
clearable
standout=
"bg-primary text-white"
v-model=
"msg.ProtocolNum"
<q-input
@
change=
"resetSearch"
clearable
standout=
"bg-primary text-white"
v-model=
"msg.ProtocolNum"
...
@@ -23,8 +23,8 @@
...
@@ -23,8 +23,8 @@
</div>
</div>
</div>
</div>
<courserefund-form
:loading=
"loading"
:dataList=
"dataList"
></courserefund-form>
<courserefund-form
:loading=
"loading"
:dataList=
"dataList"
></courserefund-form>
<q-pagination
class=
"full-width justify-end"
v-model=
"msg.pageIndex"
color=
"primary"
:max=
"pageCount"
<q-pagination
class=
"full-width justify-end"
v-model=
"msg.pageIndex"
color=
"primary"
:max=
"pageCount"
:input=
"true"
:input=
"true"
@
input=
"changePage"
/>
@
input=
"changePage"
/>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
...
@@ -45,10 +45,10 @@
...
@@ -45,10 +45,10 @@
msg
:
{
msg
:
{
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
12
,
pageSize
:
12
,
PartyAName
:
'
张三
'
,
PartyAName
:
''
,
AuditStatus
:
-
1
,
AuditStatus
:
-
1
,
QOrderId
:
0
,
QOrderId
:
''
,
ProtocolNum
:
'
123
'
,
ProtocolNum
:
''
,
IsQueryAll
:
1
IsQueryAll
:
1
},
},
pageCount
:
0
,
pageCount
:
0
,
...
@@ -58,34 +58,24 @@
...
@@ -58,34 +58,24 @@
Id
:
-
1
,
Id
:
-
1
,
Name
:
"不限"
,
Name
:
"不限"
,
},
},
{
Id
:
0
,
Name
:
"草稿"
,
},
{
{
Id
:
1
,
Id
:
1
,
Name
:
"
提交审核
"
,
Name
:
"
审核中
"
,
},
},
{
{
Id
:
2
,
Id
:
2
,
Name
:
"审核通过(行政)"
,
Name
:
"审核通过"
,
},
{
Id
:
5
,
Name
:
"审核通过(学管)"
,
},
},
{
{
Id
:
3
,
Id
:
3
,
Name
:
"驳回"
,
Name
:
"驳回"
,
},
},
{
Id
:
4
,
Name
:
"取消"
,
},
],
],
};
};
},
},
created
()
{},
created
()
{
},
mounted
()
{
mounted
()
{
this
.
getList
();
this
.
getList
();
},
},
...
@@ -96,9 +86,9 @@
...
@@ -96,9 +86,9 @@
GetBackClassProtocolPage
(
this
.
msg
).
then
((
res
)
=>
{
GetBackClassProtocolPage
(
this
.
msg
).
then
((
res
)
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
if
(
res
.
Code
==
1
)
{
if
(
res
.
Code
==
1
)
{
console
.
log
(
res
,
'数据'
);
this
.
dataList
=
res
.
Data
.
PageData
;
this
.
dataList
=
res
.
Data
.
PageData
;
this
.
pageCount
=
res
.
Data
.
PageCount
;
this
.
pageCount
=
res
.
Data
.
PageCount
;
console
.
log
(
this
.
dataList
,
"this.dataList "
);
}
}
});
});
},
},
...
...
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