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
eb18bbc4
Commit
eb18bbc4
authored
Feb 21, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
66c67711
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletion
+21
-1
CostNewPriceAudit.vue
...ts/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
+19
-1
QuotationAduit.vue
...nents/TravelManager/TravelNewQuotation/QuotationAduit.vue
+2
-0
No files found.
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @
eb18bbc4
...
@@ -166,6 +166,7 @@
...
@@ -166,6 +166,7 @@
{{
getCurrencyName
(
subItem
.
CurrencyId
)
}}
{{
getCurrencyName
(
subItem
.
CurrencyId
)
}}
</td>
</td>
<td
v-if=
"childIndex==0"
:rowspan=
"CostNumberList.length"
>
<td
v-if=
"childIndex==0"
:rowspan=
"CostNumberList.length"
>
{{
subItem
.
HotelName
}}
<br/>
<template
v-if=
"subItem.ContainDinnerType==0"
>
含餐类型
</
template
>
<template
v-if=
"subItem.ContainDinnerType==0"
>
含餐类型
</
template
>
<
template
v-if=
"subItem.ContainDinnerType==1"
>
含早餐
</
template
>
<
template
v-if=
"subItem.ContainDinnerType==1"
>
含早餐
</
template
>
<
template
v-if=
"subItem.ContainDinnerType==2"
>
含晚餐
</
template
>
<
template
v-if=
"subItem.ContainDinnerType==2"
>
含晚餐
</
template
>
...
@@ -284,6 +285,7 @@
...
@@ -284,6 +285,7 @@
{{
getCurrencyName
(
subItem
.
CurrencyId
)
}}
{{
getCurrencyName
(
subItem
.
CurrencyId
)
}}
</td>
</td>
<td>
<td>
{{
subItem
.
HotelName
}}
<br/>
<template
v-if=
"subItem.ContainDinnerType==0"
>
含餐类型
</
template
>
<template
v-if=
"subItem.ContainDinnerType==0"
>
含餐类型
</
template
>
<
template
v-if=
"subItem.ContainDinnerType==1"
>
含早餐
</
template
>
<
template
v-if=
"subItem.ContainDinnerType==1"
>
含早餐
</
template
>
<
template
v-if=
"subItem.ContainDinnerType==2"
>
含晚餐
</
template
>
<
template
v-if=
"subItem.ContainDinnerType==2"
>
含晚餐
</
template
>
...
@@ -455,7 +457,14 @@
...
@@ -455,7 +457,14 @@
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td
colspan=
"6"
></td>
<td
class=
"CP_ComTitle2 CostcomCenter"
>
4
</td>
<td
class=
"CP_ComTitle2"
>
国际段机票(每人)
</td>
<td
colspan=
"2"
>
{{getCurrencyName(OtherPrice.InternationalAirTicketCurrency)}}
</td>
<td
colspan=
"2"
>
{{OtherPrice.InternationalAirTicket}}
</td>
<td
class=
"CP_ComTitle2 CostcomCenter"
>
4
</td>
<td
class=
"CP_ComTitle2 CostcomCenter"
>
4
</td>
<td
colspan=
"2"
class=
"CP_ComTitle2"
>
司机、导游小费
</td>
<td
colspan=
"2"
class=
"CP_ComTitle2"
>
司机、导游小费
</td>
<td>
<td>
...
@@ -775,6 +784,12 @@
...
@@ -775,6 +784,12 @@
trafficTotal
+=
Number
(
this
.
OtherPrice
.
InlandTrainTicketMoney
)
*
this
.
getCurrencyMoney
(
this
.
OtherPrice
trafficTotal
+=
Number
(
this
.
OtherPrice
.
InlandTrainTicketMoney
)
*
this
.
getCurrencyMoney
(
this
.
OtherPrice
.
InlandTrainTicketCurrency
);
.
InlandTrainTicketCurrency
);
}
}
if
(
this
.
OtherPrice
.
InternationalAirTicketCurrency
==
1
)
{
trafficTotal
+=
Number
(
this
.
OtherPrice
.
InternationalAirTicket
);
}
else
{
trafficTotal
+=
Number
(
this
.
OtherPrice
.
InternationalAirTicket
)
*
this
.
getCurrencyMoney
(
this
.
OtherPrice
.
InternationalAirTicketCurrency
);
}
}
}
//外币
//外币
else
{
else
{
...
@@ -787,6 +802,9 @@
...
@@ -787,6 +802,9 @@
if
(
this
.
OtherPrice
.
InlandTrainTicketCurrency
!=
1
)
{
if
(
this
.
OtherPrice
.
InlandTrainTicketCurrency
!=
1
)
{
trafficTotal
+=
Number
(
this
.
OtherPrice
.
InlandTrainTicketMoney
);
trafficTotal
+=
Number
(
this
.
OtherPrice
.
InlandTrainTicketMoney
);
}
}
if
(
this
.
OtherPrice
.
InternationalAirTicketCurrency
!=
1
)
{
trafficTotal
+=
Number
(
this
.
OtherPrice
.
InternationalAirTicket
);
}
}
}
return
trafficTotal
.
toFixed
(
0
);
return
trafficTotal
.
toFixed
(
0
);
},
},
...
...
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @
eb18bbc4
...
@@ -94,6 +94,8 @@
...
@@ -94,6 +94,8 @@
DriverGuideMoneyCurrencyId
:
0
,
//司机小费币种
DriverGuideMoneyCurrencyId
:
0
,
//司机小费币种
GuideMoneyCurrencyId
:
0
,
//导游小费币种
GuideMoneyCurrencyId
:
0
,
//导游小费币种
GuideMoney
:
0
,
//导游小费
GuideMoney
:
0
,
//导游小费
InternationalAirTicket
:
0
,
//国际段机票
InternationalAirTicketCurrency
:
0
,
//国际段机票币种
},
},
CostCurrencyList
:
[],
//选择的币种
CostCurrencyList
:
[],
//选择的币种
CostNumberList
:
[],
//人数
CostNumberList
:
[],
//人数
...
...
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