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
d26931ca
Commit
d26931ca
authored
Sep 07, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
f9fd6f5c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
45 deletions
+48
-45
roomReservationsDetails.vue
src/components/Hotel/roomReservationsDetails.vue
+23
-24
bookDinnerStatisticsDetails.vue
src/components/Restaurant/bookDinnerStatisticsDetails.vue
+23
-16
dmcTotalTable.vue
src/components/dmc/manager/dmcTotalTable.vue
+2
-5
No files found.
src/components/Hotel/roomReservationsDetails.vue
View file @
d26931ca
...
...
@@ -603,6 +603,7 @@
export
default
{
data
()
{
return
{
LineId
:
0
,
EditBtn
:
false
,
//房餐景点修改权限
defaultSelectValue
:
0
,
list
:
[],
...
...
@@ -1016,25 +1017,27 @@
})
totalPrice
+=
obj
.
ParkFee
+
obj
.
CityTax
+
obj
.
InTangTax
;
obj
.
TotalPrice
=
totalPrice
.
toFixed
(
2
);
if
(
currentObj
&&
currentObj
.
ID
>
0
)
{
//人民币
if
(
currentObj
.
ID
==
1
)
{
obj
.
NewTotalPrice
=
currentObj
.
Name
+
":"
+
(
totalPrice
*
jpaObj
.
PayRate
).
toFixed
(
2
);
}
//日元
else
if
(
currentObj
.
ID
==
3
)
{
obj
.
NewTotalPrice
=
""
;
}
else
{
if
(
currentObj
.
CurrentRate
>
1
)
{
obj
.
NewTotalPrice
=
currentObj
.
Name
+
":"
+
((
totalPrice
*
jpaObj
.
PayRate
)
/
currentObj
.
CurrentRate
)
.
toFixed
(
2
);
if
(
this
.
LineId
==
14
)
{
if
(
currentObj
&&
currentObj
.
ID
>
0
)
{
//人民币
if
(
currentObj
.
ID
==
1
)
{
obj
.
NewTotalPrice
=
currentObj
.
Name
+
":"
+
(
totalPrice
*
jpaObj
.
PayRate
).
toFixed
(
2
);
}
//日元
else
if
(
currentObj
.
ID
==
3
)
{
obj
.
NewTotalPrice
=
""
;
}
else
{
obj
.
NewTotalPrice
=
currentObj
.
Name
+
":"
+
((
totalPrice
*
jpaObj
.
PayRate
)
*
currentObj
.
CurrentRate
)
.
toFixed
(
2
);
if
(
currentObj
.
CurrentRate
>
1
)
{
obj
.
NewTotalPrice
=
currentObj
.
Name
+
":"
+
((
totalPrice
*
jpaObj
.
PayRate
)
/
currentObj
.
CurrentRate
)
.
toFixed
(
2
);
}
else
{
obj
.
NewTotalPrice
=
currentObj
.
Name
+
":"
+
((
totalPrice
*
jpaObj
.
PayRate
)
*
currentObj
.
CurrentRate
)
.
toFixed
(
2
);
}
}
}
else
{
obj
.
NewTotalPrice
=
""
;
}
}
else
{
obj
.
NewTotalPrice
=
""
;
}
this
.
$forceUpdate
();
},
...
...
@@ -1090,10 +1093,7 @@
}
});
})
// if(!isUpload){
// this.Error(str);
// return;
// }
this
.
loading
=
true
;
this
.
apipost
(
'dmcstatistics_get_SetHotelOrder'
,
this
.
list
,
res
=>
{
this
.
loading
=
false
;
...
...
@@ -1146,10 +1146,6 @@
}
});
})
// if(!isUpload){
// this.Error(str);
// return;
// }
let
mag
=
{
TotalList
:
this
.
list
,
SingleItem
:
item
...
...
@@ -1204,6 +1200,9 @@
},
},
mounted
()
{
if
(
this
.
$route
.
query
.
LineId
)
{
this
.
LineId
=
this
.
$route
.
query
.
LineId
;
}
this
.
GetAuth
();
this
.
getAllCurrency
();
this
.
LeaderName
=
this
.
$route
.
query
.
LeaderName
;
...
...
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @
d26931ca
...
...
@@ -260,6 +260,7 @@
allCurrencyList
:
[],
findex
:
0
,
childIndex
:
0
,
LineId
:
0
,
};
},
components
:
{
...
...
@@ -388,25 +389,28 @@
totalPrice
+=
tempPrice
;
})
obj
.
TotalPrice
=
totalPrice
.
toFixed
(
2
);
if
(
currentObj
&&
currentObj
.
ID
>
0
)
{
//人民币
if
(
currentObj
.
ID
==
1
)
{
obj
.
NewTotalPrice
=
currentObj
.
Name
+
":"
+
(
totalPrice
*
jpaObj
.
PayRate
).
toFixed
(
2
);
}
//日元
else
if
(
currentObj
.
ID
==
3
)
{
obj
.
NewTotalPrice
=
""
;
}
else
{
if
(
currentObj
.
CurrentRate
>
1
)
{
obj
.
NewTotalPrice
=
currentObj
.
Name
+
":"
+
((
totalPrice
*
jpaObj
.
PayRate
)
/
currentObj
.
CurrentRate
)
.
toFixed
(
2
);
if
(
this
.
LineId
==
14
)
{
if
(
currentObj
&&
currentObj
.
ID
>
0
)
{
//人民币
if
(
currentObj
.
ID
==
1
)
{
obj
.
NewTotalPrice
=
currentObj
.
Name
+
":"
+
(
totalPrice
*
jpaObj
.
PayRate
).
toFixed
(
2
);
}
//日元
else
if
(
currentObj
.
ID
==
3
)
{
obj
.
NewTotalPrice
=
""
;
}
else
{
obj
.
NewTotalPrice
=
currentObj
.
Name
+
":"
+
((
totalPrice
*
jpaObj
.
PayRate
)
*
currentObj
.
CurrentRate
)
.
toFixed
(
2
);
if
(
currentObj
.
CurrentRate
>
1
)
{
obj
.
NewTotalPrice
=
currentObj
.
Name
+
":"
+
((
totalPrice
*
jpaObj
.
PayRate
)
/
currentObj
.
CurrentRate
)
.
toFixed
(
2
);
}
else
{
obj
.
NewTotalPrice
=
currentObj
.
Name
+
":"
+
((
totalPrice
*
jpaObj
.
PayRate
)
*
currentObj
.
CurrentRate
)
.
toFixed
(
2
);
}
}
}
else
{
obj
.
NewTotalPrice
=
""
;
}
}
else
{
obj
.
NewTotalPrice
=
""
;
}
this
.
$forceUpdate
();
},
...
...
@@ -499,6 +503,9 @@
this
.
GetAuth
();
this
.
TCNUM
=
this
.
$route
.
query
.
TCNUM
;
this
.
GuestNum
=
this
.
$route
.
query
.
GuestNum
;
if
(
this
.
$route
.
query
.
LineId
)
{
this
.
LineId
=
this
.
$route
.
query
.
LineId
;
}
this
.
getList
();
this
.
apipost
(
"financeinfo_post_GetList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
...
...
src/components/dmc/manager/dmcTotalTable.vue
View file @
d26931ca
...
...
@@ -283,7 +283,6 @@
</div>
</td>
<td>
<!--"goUrlT('TravelPassengerList2',item.TCID,'旅客名单') @click="goRoomTip()" -->
<div
class=
"fz16 fbold linkspan"
>
<span
style=
"color: #4BCA81;"
v-if=
"item.HouseResult==1"
>
√
</span>
<span
class=
"colorE95252"
v-else
>
{{
item
.
HouseResult
==
'-1'
?
"x"
:
"O"
}}
</span>
...
...
@@ -682,7 +681,6 @@
},
methods
:
{
goDinnerUrl
(
obj
,
outItem
)
{
// if (this.IsEditDinner == 1) {
this
.
$router
.
push
({
name
:
'bookDinnerStatisticsDetails'
,
query
:
{
...
...
@@ -695,13 +693,11 @@
'GuideName'
:
obj
.
GuideName
,
'IsCombine'
:
outItem
.
PriceCommonList
.
length
>
1
,
'NewTCIDs'
:
outItem
.
TCIDS
,
'LineId'
:
obj
.
LineId
,
blank
:
'y'
,
tab
:
"餐厅详情"
}
})
// } else {
// this.Error("请联系地接部操作!");
// }
},
getLeaderTypeStr
:
function
(
clas
)
{
if
(
clas
==
1
)
{
...
...
@@ -908,6 +904,7 @@
'GuideName'
:
obj
.
GuideName
,
'IsCombine'
:
outItem
.
PriceCommonList
.
length
>
1
,
'NewTCIDs'
:
outItem
.
TCIDS
,
LineId
:
obj
.
LineId
,
blank
:
'y'
,
tab
:
title
}
...
...
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