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
8f58d180
Commit
8f58d180
authored
Dec 21, 2022
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
98dbe879
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
134 additions
and
21 deletions
+134
-21
scattered.ts
src/api/scattered.ts
+4
-0
OrderList.vue
src/components/scattered/order/OrderList.vue
+35
-3
index.ts
src/i18n/ja-RB/index.ts
+38
-0
index.ts
src/i18n/ko-HG/index.ts
+56
-18
index.ts
src/i18n/zh-TW/index.ts
+1
-0
No files found.
src/api/scattered.ts
View file @
8f58d180
...
@@ -18,6 +18,10 @@ class HotelService {
...
@@ -18,6 +18,10 @@ class HotelService {
static
async
GetJAPANOrderDetail
(
param
:
any
):
Promise
<
HttpResponse
>
{
static
async
GetJAPANOrderDetail
(
param
:
any
):
Promise
<
HttpResponse
>
{
return
request
(
'dmc_post_Get_GetJAPAN_OrderDetail'
,
param
)
return
request
(
'dmc_post_Get_GetJAPAN_OrderDetail'
,
param
)
}
}
//散客取消订单
static
async
GetJAPANReservationCancallation
(
param
:
any
):
Promise
<
HttpResponse
>
{
return
request
(
'dmc_post_Get_GetJAPAN_GetJAPAN_ReservationCancallation'
,
param
)
}
//散客订单列表
//散客订单列表
static
async
GetB2BJapanHotelOrderList
(
param
:
any
):
Promise
<
HttpResponse
>
{
static
async
GetB2BJapanHotelOrderList
(
param
:
any
):
Promise
<
HttpResponse
>
{
return
request
(
'sellorder_post_GetB2BJapanHotelOrderList'
,
param
)
return
request
(
'sellorder_post_GetB2BJapanHotelOrderList'
,
param
)
...
...
src/components/scattered/order/OrderList.vue
View file @
8f58d180
...
@@ -15,6 +15,11 @@
...
@@ -15,6 +15,11 @@
<span
:class=
"[props.row.typeInfo.Color]"
>
{{
props
.
row
.
OrderStatus
}}
</span>
<span
:class=
"[props.row.typeInfo.Color]"
>
{{
props
.
row
.
OrderStatus
}}
</span>
</q-td>
</q-td>
</
template
>
</
template
>
<
template
v-slot:body-cell-operation=
"props"
>
<q-td
:props=
"props"
>
<q-btn
:loading=
"loadingCel"
v-if=
"props.row.OrderStatus!='已取消'"
size=
"sm"
color=
"white"
text-color=
"black"
:label=
"$t('v101.scatteredOrderList.quxiaodindan')"
@
click
.
stop=
"canCelHotel(props.row.ThirdOrderNo)"
></q-btn>
</q-td>
</
template
>
<
template
v-slot:bottom
>
<
template
v-slot:bottom
>
<q-pagination
class=
"full-width justify-end"
v-model=
"pages.pageIndex"
color=
"primary"
:max=
"pages.pageCount"
:input=
"true"
@
update:model-value=
"changePageHandler"
/>
<q-pagination
class=
"full-width justify-end"
v-model=
"pages.pageIndex"
color=
"primary"
:max=
"pages.pageCount"
:input=
"true"
@
update:model-value=
"changePageHandler"
/>
</
template
>
</
template
>
...
@@ -57,8 +62,9 @@
...
@@ -57,8 +62,9 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"row justify-end q-pt-sm"
>
<div
class=
"row q-pt-sm"
:class=
"
{'justify-between items-center':props.row.OrderStatus!='已取消','justify-end items-end':props.row.OrderStatus=='已取消'}">
<span
class=
"bg-white rounded-borders q-px-sm"
:class=
"[props.row.typeInfo.Color]"
>
{{
props
.
row
.
OrderStatus
}}
</span>
<span
class=
"rounded-borders q-px-sm"
:class=
"[props.row.typeInfo.Color]"
>
{{
props
.
row
.
OrderStatus
}}
</span>
<q-btn
:loading=
"loadingCel"
v-if=
"props.row.OrderStatus!='已取消'"
size=
"sm"
color=
"white"
text-color=
"black"
:label=
"$t('v101.scatteredOrderList.quxiaodindan')"
@
click
.
stop=
"canCelHotel(props.row.ThirdOrderNo)"
></q-btn>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
...
@@ -115,6 +121,7 @@ export default defineComponent({
...
@@ -115,6 +121,7 @@ export default defineComponent({
pageSize
:
10
,
pageSize
:
10
,
pageCount
:
0
pageCount
:
0
},
},
loadingCel
:
false
,
loading
:
false
,
loading
:
false
,
cols
:
[
cols
:
[
{
name
:
'HotelName'
,
label
:
t
(
'v101.scatteredOrderList.table1'
),
align
:
'left'
},
{
name
:
'HotelName'
,
label
:
t
(
'v101.scatteredOrderList.table1'
),
align
:
'left'
},
...
@@ -124,7 +131,8 @@ export default defineComponent({
...
@@ -124,7 +131,8 @@ export default defineComponent({
{
name
:
'TotalPrice'
,
label
:
t
(
'v101.scatteredOrderList.table4'
),
field
:
(
row
:
any
)
=>
row
.
TotalPrice
.
toFixed
(
2
),
align
:
'left'
},
{
name
:
'TotalPrice'
,
label
:
t
(
'v101.scatteredOrderList.table4'
),
field
:
(
row
:
any
)
=>
row
.
TotalPrice
.
toFixed
(
2
),
align
:
'left'
},
{
name
:
'CustomerPayMoney'
,
label
:
t
(
'v101.scatteredOrderList.table5'
),
field
:
(
row
:
any
)
=>
row
.
CustomerPayMoney
.
toFixed
(
2
),
align
:
'left'
},
{
name
:
'CustomerPayMoney'
,
label
:
t
(
'v101.scatteredOrderList.table5'
),
field
:
(
row
:
any
)
=>
row
.
CustomerPayMoney
.
toFixed
(
2
),
align
:
'left'
},
{
name
:
'OrderStatus'
,
label
:
t
(
'v101.scatteredOrderList.table6'
),
align
:
'left'
},
{
name
:
'OrderStatus'
,
label
:
t
(
'v101.scatteredOrderList.table6'
),
align
:
'left'
},
{
name
:
'CreateDateStr'
,
label
:
t
(
'v101.scatteredOrderList.table7'
),
field
:
(
row
:
any
)
=>
row
.
CreateDateStr
,
align
:
'left'
}
{
name
:
'CreateDateStr'
,
label
:
t
(
'v101.scatteredOrderList.table7'
),
field
:
(
row
:
any
)
=>
row
.
CreateDateStr
,
align
:
'left'
},
{
name
:
'operation'
,
label
:
t
(
'v101.scatteredOrderList.table6'
),
align
:
'left'
},
]
as
any
,
]
as
any
,
mobileCols
:
[
mobileCols
:
[
{
name
:
'HotelName'
,
label
:
t
(
'v101.scatteredOrderList.table1'
),
align
:
'left'
},
{
name
:
'HotelName'
,
label
:
t
(
'v101.scatteredOrderList.table1'
),
align
:
'left'
},
...
@@ -134,6 +142,30 @@ export default defineComponent({
...
@@ -134,6 +142,30 @@ export default defineComponent({
})
})
const
methods
=
{
const
methods
=
{
canCelHotel
(
ThirdOrderNo
)
{
if
(
data
.
loadingCel
)
return
let
msg
=
{
bookingNumber
:
ThirdOrderNo
,
CancelBy
:
search
.
CustomerId
,
CancelType
:
2
}
let
param
=
Object
.
assign
(
msg
)
data
.
loadingCel
=
true
HotelService
.
GetJAPANReservationCancallation
(
param
)
.
then
(
r
=>
{
if
(
r
.
data
.
resultCode
==
ApiResult
.
SUCCESS
)
{
message
.
successMsg
(
`
${
t
(
'success'
)}
`
)
methods
.
initOrders
()
}
else
{
message
.
errorMsg
(
r
.
data
.
message
)
}
data
.
loadingCel
=
false
})
.
catch
(
e
=>
{
message
.
errorMsg
(
e
.
message
)
data
.
loadingCel
=
false
})
},
getDetail
(
OrderID
){
getDetail
(
OrderID
){
data
.
showOrderdDetail
=
true
data
.
showOrderdDetail
=
true
data
.
OrderID
=
OrderID
data
.
OrderID
=
OrderID
...
...
src/i18n/ja-RB/index.ts
View file @
8f58d180
...
@@ -330,6 +330,11 @@ export default {
...
@@ -330,6 +330,11 @@ export default {
second
:
'ホテル検索'
,
second
:
'ホテル検索'
,
three
:
'ホテル注文'
three
:
'ホテル注文'
},
},
scattered
:
{
first
:
'個人客の予定です'
,
second
:
'ホテル検索'
,
three
:
'ホテル注文'
},
car
:
{
car
:
{
first
:
'車両予約'
,
first
:
'車両予約'
,
second
:
'車両予約'
,
second
:
'車両予約'
,
...
@@ -405,7 +410,40 @@ export default {
...
@@ -405,7 +410,40 @@ export default {
versonDetails
:
{
versonDetails
:
{
date
:
'2022/11/29'
,
date
:
'2022/11/29'
,
content
:
''
content
:
''
},
Listofquotation
:{
pageTitle
:
'見積書です'
,
baojiadan
:
'見積書です'
,
dindanbaojia
:
'ホテルを註文します'
,
zhutuanhao
:
'団体号 です'
,
lianxiren
:
'連絡先 です'
,
dindanhao
:
'註文番号 です'
,
riqi
:
'日付 です'
,
HotelDate
:
'時間に入ります'
,
HotelName
:
'ホテル名です'
,
HotelInfor
:
'ホテルインフォー です'
,
xiaoji
:
'小計 です'
,
riben
:
'日本送金口座(海外送金もできます)'
,
heji
:
'合計します'
,
col
:
{
t1
:
'行の名前です'
,
t2
:
'支店の名前です'
,
t3
:
'お別れしました'
,
t4
:
'口に座ります'
,
t5
:
'口座名です'
,
t6
:
'銀行の住所です'
,
t7
:
'銀行郵変です'
,
t8
:
'番号を変えます'
,
t9
:
'日本の口座を送金した後に直ちに情報を知らせてください、日本の旅行社の問い合わせを便利にしてくださいありがとうございます思いやり'
,
},
btn
:{
dayin
:
'印刷 です'
,
xiaza
:
'下載 です'
,
cjfaipiao
:
'インボイスを作成します'
,
bjd
:
'見積書です'
}
}
}
}
}
//#endregion
//#endregion
}
}
src/i18n/ko-HG/index.ts
View file @
8f58d180
...
@@ -211,11 +211,11 @@ export default {
...
@@ -211,11 +211,11 @@ export default {
time
:
'h'
time
:
'h'
},
},
hotel
:
{
hotel
:
{
newDateOrder
:
'새로운 날짜 예약'
,
newDateOrder
:
'새로운 날짜 예약'
,
newDateTips
:
'예약할 날짜를 먼저 선택하세요'
,
newDateTips
:
'예약할 날짜를 먼저 선택하세요'
,
newHotelBtn
:
'호텔을 선택하라'
,
newHotelBtn
:
'호텔을 선택하라'
,
addRoomBtn
:
'조작'
,
addRoomBtn
:
'조작'
,
addRoom
:
'선택'
,
addRoom
:
'선택'
,
groupPrice
:
'합계'
,
groupPrice
:
'합계'
,
pageTitle
:
'호텔 검색'
,
pageTitle
:
'호텔 검색'
,
area
:
'검색 영역'
,
area
:
'검색 영역'
,
...
@@ -230,10 +230,10 @@ export default {
...
@@ -230,10 +230,10 @@ export default {
yg
:
'예상s '
,
yg
:
'예상s '
,
outbind
:
'기존 재고 초과입니다,즉시 호텔과 상의하겠습니다,틀림없이 순조로운 소식을 받으십시오'
,
outbind
:
'기존 재고 초과입니다,즉시 호텔과 상의하겠습니다,틀림없이 순조로운 소식을 받으십시오'
,
details
:
{
details
:
{
zuoji
:
'고정 전화'
,
zuoji
:
'고정 전화'
,
chuanzhen
:
'팩스'
,
chuanzhen
:
'팩스'
,
guanwang
:
'공식 웹사이트'
,
guanwang
:
'공식 웹사이트'
,
xiangqing
:
'호텔 정보'
,
xiangqing
:
'호텔 정보'
,
},
},
car
:
{
car
:
{
shoppingTitle
:
'쇼핑 카트'
,
shoppingTitle
:
'쇼핑 카트'
,
...
@@ -330,6 +330,11 @@ export default {
...
@@ -330,6 +330,11 @@ export default {
second
:
'호텔 검색'
,
second
:
'호텔 검색'
,
three
:
'호텔 주문서'
three
:
'호텔 주문서'
},
},
scattered
:
{
first
:
'산행객 예약'
,
second
:
'호텔 검색'
,
three
:
'호텔 주문서'
},
car
:
{
car
:
{
first
:
'차량 예약'
,
first
:
'차량 예약'
,
second
:
'차량 예약'
,
second
:
'차량 예약'
,
...
@@ -395,17 +400,50 @@ export default {
...
@@ -395,17 +400,50 @@ export default {
//eg:
//eg:
//#region v1.0.1
//#region v1.0.1
v101
:{
v101
:{
downloadHands
:
'핸드북 다운'
,
downloadHands
:
'핸드북 다운'
,
noneHands
:
'손에 쥔 책은 태어나지 않았다'
,
noneHands
:
'손에 쥔 책은 태어나지 않았다'
,
hotelTips
:
'호텔 아늑한 알람'
,
hotelTips
:
'호텔 아늑한 알람'
,
iknow
:
'나는 이미 알고 있다'
,
iknow
:
'나는 이미 알고 있다'
,
versionUpgrade
:
'버전 업데이트'
,
versionUpgrade
:
'버전 업데이트'
,
comingsoon
:
'우리는 곧'
,
comingsoon
:
'우리는 곧'
,
comingsoonDesc
:
'우리는이 기능을 개발하기 위해 노력하고 있으며, 1개월 정도의 주기를 예상하고 있다.당신의 지지에 감사 드립니다'
,
comingsoonDesc
:
'우리는이 기능을 개발하기 위해 노력하고 있으며, 1개월 정도의 주기를 예상하고 있다.당신의 지지에 감사 드립니다'
,
versonDetails
:{
versonDetails
:{
date
:
'2022/11/29'
,
date
:
'2022/11/29'
,
content
:
''
content
:
''
},
Listofquotation
:{
pagetitle
:
'견적서'
,
baojiadan
:
'견적서'
,
dindanbaojia
:
'호텔 주문 오퍼'
,
zhutuanhao
:
'단체 번호'
,
lianxiren
:
'연락처'
,
dindanhao
:
'주문서 번호'
,
riqi
:
'날짜'
,
hoteldate
:
'체크인 시간'
,
hotelname
:
'호텔명'
,
hotelinfor
:
'체크인 정보'
,
xiaoji
:
'소계'
,
riben
:
'일본 송금 계좌 (해외 송금도 가능)'
,
heji
:
'합계'
,
col
:
{
t1
:
'행명'
,
t2
:
'지점명'
,
t3
:
'구석 이별'
,
t4
:
'출구 번호'
,
t5
:
'계정명'
,
t6
:
'은행 집'
,
t7
:
'은행 이동'
,
t8
:
'다시 번호'
,
t9
:
'일본계좌를송금한후일본여행사가문의할수있도록정보를적시에 알려주십시오. 감사합니다. 양해 바랍니다'
},
btn
:{
dayin
:
'인쇄 '
,
시아자
:
'다운로드'
,
cjfaipiao
:
'영수증 만들기 '
,
bjd
:
'견적서 '
}
}
}
}
}
//#endregion
//#endregion
}
}
src/i18n/zh-TW/index.ts
View file @
8f58d180
...
@@ -778,6 +778,7 @@ export default {
...
@@ -778,6 +778,7 @@ export default {
table5
:
'實付'
,
table5
:
'實付'
,
table6
:
'訂單狀態'
,
table6
:
'訂單狀態'
,
table7
:
'下單日期'
,
table7
:
'下單日期'
,
quxiaodindan
:
'取消訂單'
}
}
...
...
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