Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
bigwood
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
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
罗超
bigwood
Commits
a0338343
Commit
a0338343
authored
Mar 10, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
30063448
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
98 additions
and
89 deletions
+98
-89
OrderList.vue
src/components/hotel/order/list/OrderList.vue
+97
-86
OrderList.vue
src/components/scattered/order/OrderList.vue
+0
-1
TicketOrderPreview.vue
src/pages/ticket/TicketOrderPreview.vue
+1
-2
No files found.
src/components/hotel/order/list/OrderList.vue
View file @
a0338343
<
template
>
<div>
<q-card
class=
"light-shadow q-pa-md bg-white rounded-borders q-mb-md"
flat
v-for=
"
x in orders
"
>
<q-card
class=
"light-shadow q-pa-md bg-white rounded-borders q-mb-md"
flat
v-for=
"
(x,index) in orders"
:key=
"index
"
>
<div
class=
"row items-center desktop-only"
>
<div
class=
"q-mr-md"
>
<q-btn
:color=
"x.OrderType == 1 ? 'cyan' : 'negative'"
unelevated
disable
size=
"sm"
...
...
@@ -53,9 +53,9 @@
<div
class=
"f12 text-grey-6"
>
{{
$t
(
'hotelorder.createTime'
)
}}
:
{{
x
.
CreateTime
}}
</div>
</div>
</div>
<div
class=
"reactive"
>
<div
class=
"q-mt-md row"
>
<q-table
separator=
"cell"
:hide-bottom=
"!x.Remark"
:pagination=
"
{ rowsPerPage: 100 }" dense :rows="x.
DetailList"
<q-table
separator=
"cell"
:hide-bottom=
"!x.Remark||!x.isMore"
:pagination=
"
{ rowsPerPage: 100 }" dense :rows="x.New
DetailList"
bordered :columns="cols" class="sticky-rightrowspan-column-table light-border col no-shadow">
<template
v-slot:header-cell-Room=
"props"
>
<q-th
:props=
"props"
>
...
...
@@ -105,11 +105,17 @@
<q-tooltip>
{{
props
.
value
}}
</q-tooltip>
</q-td>
</
template
>
<
template
v-slot:bottom
>
<div
class=
"msl text-negative"
>
{{
$t
(
'v101.hotelRemark'
)
}}
:
{{
x
.
Remark
}}
</div>
<
template
v-slot:bottom=
"props"
>
<div
v-if=
"x.Remark"
class=
"msl text-negative"
>
{{
$t
(
'v101.hotelRemark'
)
}}
:
{{
x
.
Remark
}}
</div>
<more
v-if=
"x.isMore"
@
change=
"ViewMore(x,index)"
:upIcon=
"x.upIcon"
></more>
</
template
>
</q-table>
</div>
</div>
<div
class=
"q-mt-md"
v-if=
"x.OrderStatus != 3"
:class=
"{ row: $q.platform.is.desktop, 'column reverse': $q.platform.is.mobile }"
>
<div
class=
"pay row text-grey rounded-borders q-pa-md"
...
...
@@ -240,33 +246,6 @@
<svg-icon
:size=
"50"
color=
"nav"
icon=
"General/Clipboard.svg"
></svg-icon>
<div
class=
"q-mt-md f12 text-grey-6"
>
{{ $t('noneData') }}
</div>
</div>
<!-- <q-dialog v-model="PaymentDialog">
<div class="rounded-borders bg-white q-pb-lg q-pt-lg" style="width: 450px">
<div class="orderListDialog-title row justify-center q-pb-xs">
<span class="text-weight-bold">{{ $t('hotelorder.dialog.title') }}</span>
<q-icon class="orderListDialog-close text-grey" name="close" @click="PaymentDialog = false"></q-icon>
</div>
<div class="orderListDialog-bg column rounded-borders q-ma-lg q-py-lg q-px-lg">
<div class="orderListDialog-img">
<div class="row items-end q-pb-md">
<span class="text-grey-3">{{ $t('hotelorder.dialog.AccountName') }}:</span>
<span class="text-weight-bold text-white" style="font-size: 18px">株式会社ピースインターナショナル</span>
</div>
<div class="q-pb-sm" :class="{'row items-center justify-between':$q.platform.is.desktop}">
<div :class="{'q-mb-sm':$q.platform.is.mobile,'col':$q.platform.is.desktop}" >
<span class="text-grey-3">{{ $t('hotelorder.dialog.account') }}:</span>
<span class="text-cyan-12 text-weight-bold din" style="font-size: 18px">593-1070078</span>
</div >
<q-btn :class="{'q-ml-xl':$q.platform.is.mobile}" unelevated size="xs" class="bg-blue-11 text-white" v-if="copyId != -1" :label="$t('hotelorder.dialog.copy')" @click="setCopyHandler(null,'開戶名:張三,帳戶:7489 3272 7942 311')"></q-btn>
<q-btn :class="{'q-ml-xl':$q.platform.is.mobile}" icon="check" unelevated size="xs" class="bg-blue-11 text-white" :label="$t('hotelorder.copyed')" v-else></q-btn>
</div>
</div>
</div>
<div class="row justify-center q-pb-lg">
<span class="text-center f12 text-grey-6 q-px-lg">{{ $t('hotelorder.dialog.prompt') }}</span>
</div>
</div>
</q-dialog> -->
<q-dialog
v-model=
"showBankAccount"
>
<BankAccount
@
change=
"showBankAccount=false"
></BankAccount>
</q-dialog>
...
...
@@ -287,9 +266,10 @@ import { currentRouter } from '../../../../router'
import
{
UploadFileInfo
,
NTag
,
NUpload
}
from
'naive-ui'
import
{
slice
}
from
'lodash'
import
BankAccount
from
'../../../BankAccount.vue'
import
more
from
'../../../more.vue'
export
default
defineComponent
({
components
:
{
svgIcon
,
NTag
,
NUpload
,
BankAccount
},
components
:
{
svgIcon
,
NTag
,
NUpload
,
BankAccount
,
more
},
setup
(
props
)
{
const
search
=
inject
(
DirtionmaryHelper
.
HOTEL_ORDER_SEARCH
)
as
any
const
{
t
}
=
useI18n
()
...
...
@@ -333,6 +313,20 @@ export default defineComponent({
})
const
methods
=
{
ViewMore
(
x
:
any
,
index
:
Number
){
x
.
upIcon
=
!
x
.
upIcon
if
(
x
.
upIcon
){
x
.
NewDetailList
=
JSON
.
parse
(
JSON
.
stringify
(
x
.
DetailList
))
}
else
{
x
.
NewDetailList
=
[]
x
.
DetailList
.
forEach
((
y
:
any
,
index
:
Number
)
=>
{
if
(
index
==
0
){
x
.
NewDetailList
.
push
(
y
)
}
})
}
},
goUrl
(
id
:
number
)
{
currentRouter
.
push
(
'/hotel/offer/'
+
id
)
},
...
...
@@ -345,9 +339,22 @@ export default defineComponent({
HotelService
.
GetHotelOrders
(
param
)
.
then
(
r
=>
{
if
(
r
.
data
.
resultCode
==
ApiResult
.
SUCCESS
)
{
let
arrList
=
function
(
arr
:
Array
<
any
>
){
arr
.
forEach
(
item
=>
{
item
.
isMore
=
false
item
.
upIcon
=
false
item
.
NewDetailList
=
[]
});
}
arrList
(
r
.
data
.
data
.
pageData
)
r
.
data
.
data
.
pageData
.
forEach
((
x
:
any
)
=>
{
x
.
typeInfo
=
data
.
status
.
find
(
y
=>
y
.
StatusId
==
x
.
OrderStatus
)
??
data
.
status
[
1
]
x
.
DetailList
.
forEach
((
y
:
any
)
=>
{
if
(
x
.
DetailList
.
length
>
1
){
x
.
isMore
=
true
}
let
dataLists
=
[]
x
.
DetailList
.
forEach
((
y
:
any
,
index
:
Number
)
=>
{
let
PeopleNum
=
0
y
.
RoomList
.
forEach
((
z
:
any
)
=>
{
z
.
RoomInfo
=
data
.
rooms
.
find
(
r
=>
r
.
TypeId
==
z
.
RoomType
)
??
data
.
rooms
[
0
]
...
...
@@ -355,7 +362,11 @@ export default defineComponent({
})
console
.
log
(
PeopleNum
)
y
.
PeopleNum
=
PeopleNum
if
(
index
<
1
){
dataLists
.
push
(
y
)
}
})
x
.
NewDetailList
=
JSON
.
parse
(
JSON
.
stringify
(
dataLists
))
})
data
.
orders
=
r
.
data
.
data
.
pageData
data
.
pages
.
pageCount
=
r
.
data
.
data
.
pageCount
...
...
src/components/scattered/order/OrderList.vue
View file @
a0338343
...
...
@@ -302,7 +302,6 @@ export default defineComponent({
x
.
Money
=
0
x
.
Money
+=
Number
(
x
.
CustomerPayMoney
-
x
.
DiscountMoney
)
})
console
.
log
(
r
.
data
.
data
.
pageData
,
'-----'
)
data
.
orders
=
r
.
data
.
data
.
pageData
data
.
pages
.
pageCount
=
r
.
data
.
data
.
pageCount
}
else
{
...
...
src/pages/ticket/TicketOrderPreview.vue
View file @
a0338343
...
...
@@ -41,12 +41,11 @@
<div
:class=
"{'column':($q.screen.width<1200 || $q.platform.is.mobile),'row items-center':!($q.screen.width<1200 || $q.platform.is.mobile)}"
>
<div
class=
"f12 text-dark"
:class=
"{ 'col-2': $q.platform.is.desktop, 'col-3': $q.platform.is.mobile }"
>
{{ $t('v102.ticket.tt') }}:
</div>
<div
class=
"row items-center col wrap q-mt-md"
>
<!-- {{types}} -->
<div
class=
"q-pa-sm rounded-borders q-mr-md q-mb-md cursor-pointer row items-center"
:class=
"{ 'bg-grey-2': !x.checked, 'bg-primary text-white': x.checked }"
@
click=
"changeDetailListHandler(x)"
v-for=
"x in types"
>
<!-- v-if="x.RemainingInventory>0" -->
<
template
>
<span
style=
"border-right: 1px solid #eee"
class=
"q-mr-sm q-pr-sm"
>
{{ x.TicketName }}
</span>
<span>
{{ x.B2BPrice.toFixed(2) }}
</span>
</
template
>
</div>
</div>
</div>
...
...
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