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
7a821cc5
Commit
7a821cc5
authored
Dec 15, 2020
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
35d0524a
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
85 additions
and
22 deletions
+85
-22
myOrder-form.vue
src/components/sale/myOrder-form.vue
+4
-0
orderlist.vue
src/components/sale/orderlist.vue
+21
-8
classorder.vue
src/pages/course/classorder.vue
+49
-0
RecPayQuery.vue
src/pages/financial/financalDocument/RecPayQuery.vue
+1
-0
japaneseTrain.vue
src/pages/sale/japaneseTrain.vue
+5
-10
myOrder.vue
src/pages/sale/myOrder.vue
+5
-4
No files found.
src/components/sale/myOrder-form.vue
View file @
7a821cc5
...
@@ -473,6 +473,10 @@
...
@@ -473,6 +473,10 @@
}
}
},
},
created
(){
created
(){
if
(
this
.
saveObj
.
tab
){
this
.
tab
=
(
this
.
saveObj
.
tab
).
toString
();
}
this
.
msg
.
OrderId
=
this
.
saveObj
.
OrderId
;
this
.
msg
.
OrderId
=
this
.
saveObj
.
OrderId
;
this
.
msg2
.
OrderId
=
this
.
saveObj
.
OrderId
;
this
.
msg2
.
OrderId
=
this
.
saveObj
.
OrderId
;
this
.
msg3
.
SourceId
=
this
.
saveObj
.
OrderId
;
this
.
msg3
.
SourceId
=
this
.
saveObj
.
OrderId
;
...
...
src/components/sale/orderlist.vue
View file @
7a821cc5
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
<tr>
<tr>
<td
:rowspan=
"3"
style=
"text-align: left"
>
<td
:rowspan=
"3"
style=
"text-align: left"
>
<div
style=
"font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold"
<div
style=
"font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold"
@
click=
"goOrderdetails(item)"
>
{{
item
.
OrderId
}}
</div>
@
click=
"goOrderdetails(item
,1
)"
>
{{
item
.
OrderId
}}
</div>
<div>
{{
item
.
EnterName
}}
</div>
<div>
{{
item
.
EnterName
}}
</div>
<div
style=
"margin-top: 10px"
>
{{
item
.
CreateTime
}}
</div>
<div
style=
"margin-top: 10px"
>
{{
item
.
CreateTime
}}
</div>
...
@@ -210,7 +210,7 @@
...
@@ -210,7 +210,7 @@
<div
class=
"finance row"
v-for=
"(x,j) in item.FinanceList"
:index=
"j"
:style=
"
{
<div
class=
"finance row"
v-for=
"(x,j) in item.FinanceList"
:index=
"j"
:style=
"
{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span>
{{
x
.
FrID
}}
</span>
<span
style=
"cursor: pointer"
@
click=
"goOrderdetails(item,4)"
>
{{
x
.
FrID
}}
</span>
</div>
</div>
</div>
</div>
<div
class=
"row"
style=
"justify-content: space-between"
>
<div
class=
"row"
style=
"justify-content: space-between"
>
...
@@ -221,7 +221,7 @@
...
@@ -221,7 +221,7 @@
<div
class=
"finance row"
v-for=
"(x,j) in item.RefundFinanceList"
:index=
"j"
:style=
"
{
<div
class=
"finance row"
v-for=
"(x,j) in item.RefundFinanceList"
:index=
"j"
:style=
"
{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span>
{{
x
.
FrID
}}
</span>
<span
style=
"cursor: pointer"
@
click=
"goOrderdetails(item,4)"
>
{{
x
.
FrID
}}
</span>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -429,7 +429,7 @@
...
@@ -429,7 +429,7 @@
<div
class=
"finance row"
v-for=
"(x,j) in item.FinanceList"
:index=
"j"
:style=
"
{
<div
class=
"finance row"
v-for=
"(x,j) in item.FinanceList"
:index=
"j"
:style=
"
{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span>
{{
x
.
FrID
}}
</span>
<span
style=
"cursor: pointer"
@
click=
"goOrderdetails(item,4)"
>
{{
x
.
FrID
}}
</span>
</div>
</div>
</div>
</div>
<div
class=
"row"
style=
"justify-content: space-between"
>
<div
class=
"row"
style=
"justify-content: space-between"
>
...
@@ -440,7 +440,7 @@
...
@@ -440,7 +440,7 @@
<div
class=
"finance row"
v-for=
"(x,j) in item.RefundFinanceList"
:index=
"j"
:style=
"
{
<div
class=
"finance row"
v-for=
"(x,j) in item.RefundFinanceList"
:index=
"j"
:style=
"
{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}">
<span>
{{
x
.
FrID
}}
</span>
<span
style=
"cursor: pointer"
@
click=
"goOrderdetails(item,4)"
>
{{
x
.
FrID
}}
</span>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -461,6 +461,8 @@
...
@@ -461,6 +461,8 @@
<!--转交订单-->
<!--转交订单-->
<transOrder-form
v-if=
"isShowTransOrderForm"
:save-obj=
"orderObj"
@
close=
"closeTransOrderForm"
<transOrder-form
v-if=
"isShowTransOrderForm"
:save-obj=
"orderObj"
@
close=
"closeTransOrderForm"
@
success=
"refreshClassOrder"
></transOrder-form>
@
success=
"refreshClassOrder"
></transOrder-form>
<myOrder-form
v-if=
"isShowmyorderForm"
:save-obj=
"myorderObjOption"
@
close=
"closeMOSaveForm"
></myOrder-form>
</div>
</div>
</
template
>
</
template
>
...
@@ -471,11 +473,13 @@
...
@@ -471,11 +473,13 @@
import
{
import
{
cancelClassOrder
,
//取消订单
cancelClassOrder
,
//取消订单
}
from
'../../api/sale/sale'
}
from
'../../api/sale/sale'
import
myOrderForm
from
'../../components/sale/myOrder-form'
export
default
{
export
default
{
components
:
{
components
:
{
editorderForm
,
editorderForm
,
orderremarkForm
,
orderremarkForm
,
transOrderForm
transOrderForm
,
myOrderForm
},
},
props
:
{
props
:
{
//正常订单
//正常订单
...
@@ -497,15 +501,25 @@
...
@@ -497,15 +501,25 @@
orderObj
:
{},
//订单信息
orderObj
:
{},
//订单信息
isShowCancel
:
false
,
//是否显示取消订单
isShowCancel
:
false
,
//是否显示取消订单
remarkType
:
0
,
//备注类型
remarkType
:
0
,
//备注类型
isShowmyorderForm
:
false
,
//显示详情
myorderObjOption
:{},
//详情的数据
}
}
},
},
created
()
{
created
()
{
console
.
log
(
this
.
dataList
)
},
},
mounted
()
{
mounted
()
{
},
},
methods
:
{
methods
:
{
goOrderdetails
(
item
,
tab
){
item
.
tab
=
tab
this
.
myorderObjOption
=
item
;
this
.
isShowmyorderForm
=
true
;
},
closeMOSaveForm
(){
this
.
isShowmyorderForm
=
false
;
},
//订单转交
//订单转交
transferOrder
(
item
)
{
transferOrder
(
item
)
{
this
.
orderObj
=
item
;
this
.
orderObj
=
item
;
...
@@ -597,7 +611,6 @@
...
@@ -597,7 +611,6 @@
'blank'
:
'y'
,
'blank'
:
'y'
,
'orderObj'
:
JSON
.
stringify
(
orderObj
),
'orderObj'
:
JSON
.
stringify
(
orderObj
),
'tradeWay'
:
obj
.
tradeWay
,
'tradeWay'
:
obj
.
tradeWay
,
}
}
});
});
},
},
...
...
src/pages/course/classorder.vue
View file @
7a821cc5
...
@@ -71,14 +71,63 @@
...
@@ -71,14 +71,63 @@
this
.
data
=
res
.
Data
;
this
.
data
=
res
.
Data
;
if
(
this
.
data
&&
this
.
data
.
OrderList
&&
this
.
data
.
OrderList
.
NorList
)
{
if
(
this
.
data
&&
this
.
data
.
OrderList
&&
this
.
data
.
OrderList
.
NorList
)
{
this
.
dataList
=
this
.
data
.
OrderList
.
NorList
;
this
.
dataList
=
this
.
data
.
OrderList
.
NorList
;
let
OrderIds
=
[]
this
.
dataList
.
forEach
(
x
=>
{
OrderIds
.
push
(
x
.
OrderId
)
})
if
(
OrderIds
.
length
>
0
){
OrderIds
=
OrderIds
.
join
(
','
)
this
.
getOrderFinanceList
(
OrderIds
,
1
)
}
}
}
if
(
this
.
data
&&
this
.
data
.
OrderList
&&
this
.
data
.
OrderList
.
CancelList
)
{
if
(
this
.
data
&&
this
.
data
.
OrderList
&&
this
.
data
.
OrderList
.
CancelList
)
{
this
.
CancelList
=
this
.
data
.
OrderList
.
CancelList
;
this
.
CancelList
=
this
.
data
.
OrderList
.
CancelList
;
let
OrderIds
=
[]
this
.
CancelList
.
forEach
(
x
=>
{
OrderIds
.
push
(
x
.
OrderId
)
})
if
(
OrderIds
.
length
>
0
){
OrderIds
=
OrderIds
.
join
(
','
)
this
.
getOrderFinanceList
(
OrderIds
,
2
)
}
}
}
}).
catch
(()
=>
{
}).
catch
(()
=>
{
this
.
loading
=
false
this
.
loading
=
false
})
})
},
},
getOrderFinanceList
(
msg
,
type
){
this
.
apipost
(
'sellorder_post_GetOrderFinanceListForEdu'
,{
OrderIds
:
msg
},
res
=>
{
if
(
res
.
data
.
resultCode
===
1
){
this
.
loading
=
false
;
let
data
=
res
.
data
.
data
;
if
(
type
==
1
){
this
.
dataList
.
forEach
(
x
=>
{
data
.
forEach
(
j
=>
{
if
(
x
.
OrderId
==
j
.
OrderId
){
x
.
FinanceList
=
j
.
FinanceList
x
.
RefundFinanceList
=
j
.
RefundFinanceList
}
})
})
}
else
if
(
type
==
2
){
this
.
CancelList
.
forEach
(
x
=>
{
data
.
forEach
(
j
=>
{
if
(
x
.
OrderId
==
j
.
OrderId
){
x
.
FinanceList
=
j
.
FinanceList
x
.
RefundFinanceList
=
j
.
RefundFinanceList
}
})
})
}
}
else
{
this
.
loading
=
false
;
this
.
$message
.
error
(
res
.
data
.
message
);
}
},
err
=>
{})
},
//刷新页面
//刷新页面
refreshClassOrder
()
{
refreshClassOrder
()
{
this
.
getList
();
this
.
getList
();
...
...
src/pages/financial/financalDocument/RecPayQuery.vue
View file @
7a821cc5
...
@@ -965,6 +965,7 @@
...
@@ -965,6 +965,7 @@
Remark
:
''
,
//备注查询
Remark
:
''
,
//备注查询
Sort
:
'2'
,
Sort
:
'2'
,
EmployeeId
:
''
,
EmployeeId
:
''
,
IsSellOrderForm
:
1
},
},
getCompanyMsg
:
{
// 校区
getCompanyMsg
:
{
// 校区
RB_Group_Id
:
'0'
,
RB_Group_Id
:
'0'
,
...
...
src/pages/sale/japaneseTrain.vue
View file @
7a821cc5
...
@@ -80,19 +80,16 @@
...
@@ -80,19 +80,16 @@
</div>
</div>
</div>
</div>
<div
v-if=
"item.ClassStyle==3"
>
<div
v-if=
"item.ClassStyle==3"
>
<el-calendar
v-model=
"elvalue"
id=
"calendar"
style=
"width:
454
px;"
>
<el-calendar
v-model=
"elvalue"
id=
"calendar"
style=
"width:
500
px;"
>
<!-- 这里使用的是 2.5 slot 语法,对于新项目请使用 2.6 slot 语法-->
<!-- 这里使用的是 2.5 slot 语法,对于新项目请使用 2.6 slot 语法-->
<
template
slot=
"dateCell"
slot-scope=
"{date, data}"
class=
"row"
style=
"height: 45px"
>
<
template
slot=
"dateCell"
slot-scope=
"{date, data}"
class=
"row"
style=
"height: 45px"
>
<!--自定义内容-->
<!--自定义内容-->
<div
class=
"calendar-day"
>
{{
data
.
day
.
split
(
'-'
).
slice
(
2
).
join
(
'-'
)
}}
</div>
<div
class=
"calendar-day"
>
{{
data
.
day
.
split
(
'-'
).
slice
(
2
).
join
(
'-'
)
}}
</div>
<div
v-for=
"x in item.ClassPlanList"
>
<div
v-for=
"x in item.ClassPlanList"
>
<div
v-if=
"x.ClassDate == data.day"
style=
"align-items: center;justify-content: center;margin-top: 1
0
px"
class=
"row"
>
<div
v-if=
"x.ClassDate == data.day"
style=
"align-items: center;justify-content: center;margin-top: 1
5
px"
class=
"row"
>
<img
src=
"../../assets/images/administration/gou.png"
alt=
""
style=
"width: 16px;height: 12px"
>
<img
src=
"../../assets/images/administration/gou.png"
alt=
""
style=
"width: 16px;height: 12px"
>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
</el-calendar>
</el-calendar>
</div>
</div>
...
@@ -536,10 +533,8 @@
...
@@ -536,10 +533,8 @@
.japaneseTrain
.el-calendar
{
.japaneseTrain
.el-calendar
{
width
:
454px
;
width
:
454px
;
}
}
.japaneseTrain
.el-calendar-table
.el-calendar-day
{
.japaneseTrain
.el-calendar-table
.el-calendar-day
{
height
:
0
;
height
:
60px
!important
;
}
.japaneseTrain
#calendar
{
width
:
454px
;
}
}
</
style
>
</
style
>
src/pages/sale/myOrder.vue
View file @
7a821cc5
...
@@ -122,7 +122,7 @@
...
@@ -122,7 +122,7 @@
<tbody
v-for=
"(item,index) in data.List"
:key=
"index"
>
<tbody
v-for=
"(item,index) in data.List"
:key=
"index"
>
<tr>
<tr>
<td
:rowspan=
"3"
style=
"text-align: left"
>
<td
:rowspan=
"3"
style=
"text-align: left"
>
<div
style=
"font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold;cursor: pointer;"
@
click=
"goOrderdetails(item)"
>
{{item.OrderId}}
</div>
<div
style=
"font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold;cursor: pointer;"
@
click=
"goOrderdetails(item
,1
)"
>
{{item.OrderId}}
</div>
<div>
{{item.EnterName}}
</div>
<div>
{{item.EnterName}}
</div>
<div
style=
"margin-top: 10px"
>
{{item.CreateTime}}
</div>
<div
style=
"margin-top: 10px"
>
{{item.CreateTime}}
</div>
<div
style=
"margin-top: 30px;margin-bottom: 10px"
>
班级
</div>
<div
style=
"margin-top: 30px;margin-bottom: 10px"
>
班级
</div>
...
@@ -303,7 +303,7 @@
...
@@ -303,7 +303,7 @@
<div
class=
"finance row"
v-for=
"(x,j) in item.FinanceList"
:index=
"j"
:style=
"{
<div
class=
"finance row"
v-for=
"(x,j) in item.FinanceList"
:index=
"j"
:style=
"{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}"
>
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}"
>
<span>
{{x.FrID}}
</span>
<span
style=
"cursor: pointer"
@
click=
"goOrderdetails(item,4)"
>
{{x.FrID}}
</span>
</div>
</div>
</div>
</div>
<div
class=
"row"
style=
"justify-content: space-between"
>
<div
class=
"row"
style=
"justify-content: space-between"
>
...
@@ -314,7 +314,7 @@
...
@@ -314,7 +314,7 @@
<div
class=
"finance row"
v-for=
"(x,j) in item.RefundFinanceList"
:index=
"j"
:style=
"{
<div
class=
"finance row"
v-for=
"(x,j) in item.RefundFinanceList"
:index=
"j"
:style=
"{
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
background:x.ColorState==1 ? 'rgba(41, 97, 254, 0.2)':(x.ColorState==2 ? 'rgba(2, 196, 153, 0.2)':(x.ColorState==3 ? 'rgba(242, 140, 29, 0.2)':'rgba(63, 196, 255, 0.2)')),
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}"
>
color: x.ColorState==1 ? '#2961FE':(x.ColorState==2 ? '#02C499':(x.ColorState==3 ? '#F28C1D':'#3FC4FF'))}"
>
<span>
{{x.FrID}}
</span>
<span
style=
"cursor: pointer"
@
click=
"goOrderdetails(item,4)"
>
{{x.FrID}}
</span>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -493,7 +493,8 @@
...
@@ -493,7 +493,8 @@
},
},
methods
:
{
methods
:
{
goOrderdetails
(
item
){
goOrderdetails
(
item
,
tab
){
item
.
tab
=
tab
this
.
myorderObjOption
=
item
;
this
.
myorderObjOption
=
item
;
this
.
isShowmyorderForm
=
true
;
this
.
isShowmyorderForm
=
true
;
},
},
...
...
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