Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
b2488947
Commit
b2488947
authored
Apr 07, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
bf22a39e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
7 deletions
+11
-7
BasicDocuments.vue
src/components/FinancialModule/BasicDocuments.vue
+3
-2
FinancialDocumentsDetail.vue
src/components/FinancialModule/FinancialDocumentsDetail.vue
+3
-2
addFinancialDocuments.vue
src/components/FinancialModule/addFinancialDocuments.vue
+1
-0
orderList.vue
...omponents/busManagement/BookAcar/components/orderList.vue
+3
-1
allList.vue
src/components/myOrdersAllType/components/allList.vue
+1
-2
No files found.
src/components/FinancialModule/BasicDocuments.vue
View file @
b2488947
...
@@ -376,7 +376,7 @@
...
@@ -376,7 +376,7 @@
<div
v-if=
"GetDetail.OtherType==66"
class=
"illustrate-right fygsbumen-box-right"
<div
v-if=
"GetDetail.OtherType==66"
class=
"illustrate-right fygsbumen-box-right"
@
click=
"ImpressionSingleDetails('SingleticketOrderListOP')"
>
{{'单项门票订单:'+GetDetail.ReFinanceId}}
</div>
@
click=
"ImpressionSingleDetails('SingleticketOrderListOP')"
>
{{'单项门票订单:'+GetDetail.ReFinanceId}}
</div>
<div
v-if=
"GetDetail.OtherType==67"
class=
"illustrate-right fygsbumen-box-right"
<div
v-if=
"GetDetail.OtherType==67"
class=
"illustrate-right fygsbumen-box-right"
@
click=
"ImpressionSingleDetails('
SingleCa
rOrderListOP')"
>
{{'单项车订单:'+GetDetail.ReFinanceId}}
</div>
@
click=
"ImpressionSingleDetails('
Charte
rOrderListOP')"
>
{{'单项车订单:'+GetDetail.ReFinanceId}}
</div>
<div
v-if=
"GetDetail.OtherType==63"
class=
"illustrate-right fygsbumen-box-right"
<div
v-if=
"GetDetail.OtherType==63"
class=
"illustrate-right fygsbumen-box-right"
@
click=
"ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)"
>
{{'单项销售提成详情'}}
</div>
@
click=
"ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)"
>
{{'单项销售提成详情'}}
</div>
...
@@ -1630,12 +1630,13 @@ export default {
...
@@ -1630,12 +1630,13 @@ export default {
},
},
// 单项酒店订单
// 单项酒店订单
ImpressionSingleDetails
(
path
){
ImpressionSingleDetails
(
path
){
if
(
this
.
GetDetail
.
OtherType
==
67
){
if
(
(
this
.
GetDetail
.
RelevanceFrId
==
''
||
this
.
GetDetail
.
RelevanceFrId
==
null
)
&&
this
.
GetDetail
.
OtherType
==
67
){
this
.
GetCarList
(
path
)
this
.
GetCarList
(
path
)
}
else
{
}
else
{
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
path
,
path
:
path
,
query
:
{
query
:
{
OrderType
:
this
.
GetDetail
.
RelevanceFrId
,
//1接机 2送机 3包车
OrderId
:
this
.
GetDetail
.
ReFinanceId
,
OrderId
:
this
.
GetDetail
.
ReFinanceId
,
blank
:
'y'
blank
:
'y'
}
}
...
...
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @
b2488947
...
@@ -448,7 +448,7 @@
...
@@ -448,7 +448,7 @@
<div
v-if=
"GetDetail.OtherType==66"
class=
"illustrate-right fygsbumen-box-right"
<div
v-if=
"GetDetail.OtherType==66"
class=
"illustrate-right fygsbumen-box-right"
@
click=
"ImpressionSingleDetails('SingleticketOrderListOP')"
>
{{
'单项门票订单:'
+
GetDetail
.
ReFinanceId
}}
</div>
@
click=
"ImpressionSingleDetails('SingleticketOrderListOP')"
>
{{
'单项门票订单:'
+
GetDetail
.
ReFinanceId
}}
</div>
<div
v-if=
"GetDetail.OtherType==67"
class=
"illustrate-right fygsbumen-box-right"
<div
v-if=
"GetDetail.OtherType==67"
class=
"illustrate-right fygsbumen-box-right"
@
click=
"ImpressionSingleDetails('
SingleCa
rOrderListOP')"
>
{{
'单项车订单:'
+
GetDetail
.
ReFinanceId
}}
</div>
@
click=
"ImpressionSingleDetails('
Charte
rOrderListOP')"
>
{{
'单项车订单:'
+
GetDetail
.
ReFinanceId
}}
</div>
<div
v-if=
"GetDetail.OtherType==63"
class=
"illustrate-right fygsbumen-box-right"
<div
v-if=
"GetDetail.OtherType==63"
class=
"illustrate-right fygsbumen-box-right"
@
click=
"ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)"
>
{{
'单项销售提成详情'
}}
</div>
@
click=
"ImpressionSingleCommissionDetails('ServiceCommissiondetails',1)"
>
{{
'单项销售提成详情'
}}
</div>
...
@@ -1100,12 +1100,13 @@ export default {
...
@@ -1100,12 +1100,13 @@ export default {
},
},
// 单项酒店订单
// 单项酒店订单
ImpressionSingleDetails
(
path
){
ImpressionSingleDetails
(
path
){
if
(
this
.
GetDetail
.
OtherType
==
67
){
if
(
(
this
.
GetDetail
.
RelevanceFrId
==
''
||
this
.
GetDetail
.
RelevanceFrId
==
null
)
&&
this
.
GetDetail
.
OtherType
==
67
){
this
.
GetCarList
(
path
)
this
.
GetCarList
(
path
)
}
else
{
}
else
{
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
path
,
path
:
path
,
query
:
{
query
:
{
OrderType
:
this
.
GetDetail
.
RelevanceFrId
,
//1接机 2送机 3包车
OrderId
:
this
.
GetDetail
.
ReFinanceId
,
OrderId
:
this
.
GetDetail
.
ReFinanceId
,
blank
:
'y'
blank
:
'y'
}
}
...
...
src/components/FinancialModule/addFinancialDocuments.vue
View file @
b2488947
...
@@ -967,6 +967,7 @@ export default {
...
@@ -967,6 +967,7 @@ export default {
this
.
msg
.
ReFinanceId
=
this
.
tradeObj
.
ReFinanceId
?
this
.
tradeObj
.
ReFinanceId
:
0
;
this
.
msg
.
ReFinanceId
=
this
.
tradeObj
.
ReFinanceId
?
this
.
tradeObj
.
ReFinanceId
:
0
;
this
.
msg
.
ReFinanceId2
=
this
.
tradeObj
.
ReFinanceId2
?
this
.
tradeObj
.
ReFinanceId2
:
0
;
this
.
msg
.
ReFinanceId2
=
this
.
tradeObj
.
ReFinanceId2
?
this
.
tradeObj
.
ReFinanceId2
:
0
;
this
.
msg
.
MatchFrId
=
this
.
tradeObj
.
MatchFrId
?
this
.
tradeObj
.
MatchFrId
:
0
;
this
.
msg
.
MatchFrId
=
this
.
tradeObj
.
MatchFrId
?
this
.
tradeObj
.
MatchFrId
:
0
;
this
.
msg
.
RelevanceFrId
=
this
.
tradeObj
.
RelevanceFrId
?
this
.
tradeObj
.
RelevanceFrId
:
0
;
//1接机 2送机 3包车
}
}
// crm自动登陆传过来的参数
// crm自动登陆传过来的参数
if
(
this
.
crmOrderObj
){
if
(
this
.
crmOrderObj
){
...
...
src/components/busManagement/BookAcar/components/orderList.vue
View file @
b2488947
...
@@ -822,7 +822,8 @@
...
@@ -822,7 +822,8 @@
// EmpIds:'',
// EmpIds:'',
OtherType
:
61
,
OtherType
:
61
,
ReFinanceId
:
""
,
ReFinanceId
:
""
,
ReFinanceId2
:
""
ReFinanceId2
:
""
,
RelevanceFrId
:
""
,
// 1接机 2送机 3包车
},
},
userInfo
:
{},
userInfo
:
{},
msg
:
{
msg
:
{
...
@@ -1035,6 +1036,7 @@
...
@@ -1035,6 +1036,7 @@
}
else
{
}
else
{
type
=
num
type
=
num
}
}
this
.
BillMakingMsg
.
RelevanceFrId
=
row
.
OrderType
//1接机 2送机 3包车
this
.
BillMakingMsg
.
ReFinanceId
=
row
.
OrderId
;
this
.
BillMakingMsg
.
ReFinanceId
=
row
.
OrderId
;
this
.
BillMakingMsg
.
ReFinanceId2
=
num
;
this
.
BillMakingMsg
.
ReFinanceId2
=
num
;
this
.
BillMakingMsg
.
OtherType
=
67
;
this
.
BillMakingMsg
.
OtherType
=
67
;
...
...
src/components/myOrdersAllType/components/allList.vue
View file @
b2488947
...
@@ -234,8 +234,7 @@
...
@@ -234,8 +234,7 @@
<div
class=
"groupTourOrder_count"
>
<div
class=
"groupTourOrder_count"
>
<el-row
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<template
v-for=
"(item,index) in SummaryList"
>
<template
v-for=
"(item,index) in SummaryList"
>
<!-- groupTourOrder_count_col -->
<el-col
:xs=
"8"
:sm=
"8"
:md=
"8"
:lg=
"8"
:xl=
"6"
>
<el-col
:xs=
"8"
:sm=
"8"
:md=
"8"
:lg=
"8"
:xl=
"6"
class=
""
>
<div
class=
"groupTourOrder_count_item HT_total"
>
<div
class=
"groupTourOrder_count_item HT_total"
>
<div>
<div>
<span>
{{
item
.
CurrencyName
}}
</span>
<span>
{{
item
.
CurrencyName
}}
</span>
...
...
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