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
d9070324
Commit
d9070324
authored
Dec 21, 2022
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
62641282
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
92 additions
and
233 deletions
+92
-233
scattered.ts
src/api/scattered.ts
+4
-0
OrderList.vue
src/components/scattered/order/OrderList.vue
+5
-5
OrderdDetail.vue
src/components/scattered/order/OrderdDetail.vue
+74
-225
index.ts
src/i18n/zh-TW/index.ts
+3
-1
HotelOrder.vue
src/pages/scattered/HotelOrder.vue
+6
-2
No files found.
src/api/scattered.ts
View file @
d9070324
...
...
@@ -14,6 +14,10 @@ class HotelService {
static
async
getUserCanUseCouponList
(
param
:
any
):
Promise
<
HttpResponse
>
{
return
requestJava
(
'/api/b2b/user/getUserCanUseCouponList'
,
param
)
}
//散客订单详情
static
async
GetJAPANOrderDetail
(
param
:
any
):
Promise
<
HttpResponse
>
{
return
request
(
'dmc_post_Get_GetJAPAN_OrderDetail'
,
param
)
}
//散客订单列表
static
async
GetB2BJapanHotelOrderList
(
param
:
any
):
Promise
<
HttpResponse
>
{
return
request
(
'sellorder_post_GetB2BJapanHotelOrderList'
,
param
)
...
...
src/components/scattered/order/OrderList.vue
View file @
d9070324
...
...
@@ -4,7 +4,7 @@
<q-table
separator=
"cell"
:pagination=
"
{rowsPerPage:100}" dense :rows="orders" bordered :columns="cols" class="sticky-rightrowspan-column-table light-border col no-shadow">
<template
v-slot:body-cell-HotelName=
"props"
>
<q-td
:props=
"props"
>
<div
class=
"cursor-pointer"
@
click=
"
Detail(props.row
)"
>
<div
class=
"cursor-pointer"
@
click=
"
getDetail(props.row.OrderID
)"
>
<q-img
:src=
"props.row.HotelPic"
spinner-color=
"drk"
spinner-size=
"20px"
width=
"50px"
height=
"50px"
mode=
"cover"
/>
<span
class=
"q-mx-md"
>
{{
props
.
row
.
HotelName
}}
</span>
</div>
...
...
@@ -23,7 +23,7 @@
<q-inner-loading
:showing=
"loading"
:label=
"$t('loading')"
label-class=
"text-grey-6 f12"
/>
</div>
<q-dialog
v-model=
"showOrderdDetail"
>
<OrderdDetail></OrderdDetail>
<OrderdDetail
:OrderID=
"OrderID"
></OrderdDetail>
</q-dialog>
</template>
...
...
@@ -40,8 +40,6 @@ import { useI18n } from 'vue-i18n'
import
svgIcon
from
'../../../global/svg-icon.vue'
import
{
copyToClipboard
,
useQuasar
}
from
'quasar'
import
{
currentRouter
}
from
'../../../router'
// import { UploadFileInfo,NTag,NUpload } from 'naive-ui'
// import { slice } from 'lodash'
import
OrderdDetail
from
'./OrderdDetail.vue'
export
default
defineComponent
({
...
...
@@ -59,6 +57,7 @@ export default defineComponent({
})
const
data
=
reactive
({
OrderID
:
''
,
showOrderdDetail
:
false
,
orders
:
[]
as
Array
<
any
>
,
status
:
[]
as
Array
<
StandardStatus
>
,
...
...
@@ -82,8 +81,9 @@ export default defineComponent({
})
const
methods
=
{
Detail
(
row
:{}
){
getDetail
(
OrderID
){
data
.
showOrderdDetail
=
true
data
.
OrderID
=
OrderID
},
initOrders
()
{
let
param
=
Object
.
assign
(
data
.
pages
,
search
)
...
...
src/components/scattered/order/OrderdDetail.vue
View file @
d9070324
This diff is collapsed.
Click to expand it.
src/i18n/zh-TW/index.ts
View file @
d9070324
...
...
@@ -737,6 +737,7 @@ export default {
Email
:
'Email'
,
dianhua
:
'電話'
,
kehuxuqiu
:
'客戶需求'
,
kehubeizhu
:
'客戶备注'
,
fangjian
:
'房間'
,
chengrennan
:
'成人男'
,
chengrennv
:
'成人女'
,
...
...
@@ -762,7 +763,8 @@ export default {
man
:
'滿'
,
shiyong
:
'使用'
,
youxiaoqi
:
'有效期'
,
notiaojian
:
'該優惠券不滿足使用條件!'
notiaojian
:
'該優惠券不滿足使用條件!'
,
dindanhao
:
'訂單號'
,
},
scatteredOrderList
:{
state1
:
'待付款'
,
...
...
src/pages/scattered/HotelOrder.vue
View file @
d9070324
...
...
@@ -8,6 +8,7 @@
</
template
>
<
script
lang=
"ts"
>
import
Store
from
'../../store'
import
{
defineComponent
,
inject
,
provide
,
reactive
,
toRefs
,
onMounted
}
from
'vue'
;
import
{
currentRouter
}
from
'src/router'
import
useMetaModule
from
'../../module/meta/metaModule'
...
...
@@ -24,10 +25,13 @@ export default defineComponent({
const
pageTitle
=
inject
(
DirtionmaryHelper
.
PAGE_TITLE_KEY
)
as
any
pageTitle
.
value
=
t
(
'hotelorder.pageTitle'
)
setTitle
(
pageTitle
.
value
)
let
CustomerId
if
(
localStorage
.
vuex
&&
JSON
.
parse
(
localStorage
.
vuex
).
user
?.
userDetail
)
{
CustomerId
=
Store
.
state
.
user
?.
userDetail
?.
customerId
}
const
search
=
reactive
({
B2BSelectOrderState
:
0
,
CustomerId
:
""
,
CustomerId
:
''
,
HotelName
:
''
})
// search.OrderId = currentRouter.currentRoute.value.params.orderId
...
...
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