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
3965d0c6
Commit
3965d0c6
authored
Oct 31, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
2eb71962
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
192 additions
and
133 deletions
+192
-133
jp.js
src/assets/common/lang/jp.js
+30
-0
zh-tw.js
src/assets/common/lang/zh-tw.js
+58
-29
BulkAirTicketOrders.vue
src/components/SalesModule/BulkAirTicketOrders.vue
+47
-47
ScenTicketOrderSale.vue
src/components/SalesModule/ScenTicketOrderSale.vue
+57
-57
No files found.
src/assets/common/lang/jp.js
View file @
3965d0c6
...
...
@@ -1177,4 +1177,34 @@ export const sm={
fanhuishijain
:
'戻る時間'
,
qxzchulizt
:
'処理状態を選択してください。'
,
company
:
'会社'
,
zonge
:
'総額'
,
youhuijine
:
'割引金額'
,
daifuukuan
:
'未払い'
,
ChName
:
'中国語の名前'
,
EnName
:
'英語の名前'
,
email
:
'メールボックス'
,
exitOrder
:
'注文キャンセル'
,
exitsure
:
'キャンセル確認'
,
exitType
:
'キャンセルタイプ'
,
xingchengbhqx
:
'ストロークの変更またはキャンセル'
,
chengfuOrder
:
'注文を繰り返します。'
,
Priceyy
:
'価因'
,
gerenys
:
'個人的な要因'
,
jiaotongys
:
'交通要因'
,
exityy
:
'キャンセルの原因'
,
qxzqxlx
:
'キャンセルタイプを選択してください!'
,
QrhOrderbhzdqx
:
'確認後、注文は自動的にキャンセルされません。'
,
qxhddhzdqx
:
'キャンセル後、注文は自動的にキャンセルされます。格の原'
,
quxiaocg
:
'キャンセル成功'
,
airbianma
:
'航空券コード'
,
Date
:
'日付'
,
kersenshul
:
'お客様の数'
,
tuikanz
:
'払い戻し中'
,
イ
ituikaun
:
'は払い戻し済みです。'
,
huzhaohaohaoma
:
'パスポート番号'
,
haizi
:
'子供'
,
laoron
:
'老人'
,
nianlingType
:
'年齢タイプ'
,
}
src/assets/common/lang/zh-tw.js
View file @
3965d0c6
...
...
@@ -2162,35 +2162,64 @@ export const sm={
zuoweishu
:
'座位數'
,
cantingbiangeng
:
'餐廳變更'
,
dingdanxinxi
:
'訂單資訊'
,
yitijiao
:
'已提交'
,
fangansheji
:
'方案設計'
,
hetongqianding
:
'合同簽訂'
,
xiadan
:
'下單'
,
yichengt
:
'已成團'
,
yiguant
:
'已關團'
,
fanhuiDate
:
'返回日期'
,
xutaotig
:
'需要提供'
,
xianlushej
:
'線路設計'
,
chufadi
:
'出發地'
,
renjunyus
:
'人均估算'
,
shangchaunht
:
'上傳契约'
,
fanganshul
:
'方案數量'
,
chengren
:
'成人'
,
ertong
:
'兒童'
,
name
:
'名字'
,
chakanxcfa
:
'查看行程方案'
,
chulixcxx
:
'處理行程資訊'
,
chuliwc
:
'處理完成'
,
chulisb
:
'處理失敗'
,
xingchengxq
:
'行程詳情'
,
yujichuDate
:
'預估出行日期'
,
yujichupeople
:
'預估出行人數'
,
yujirenyunys
:
'預估人均預算'
,
xuyaotigsm
:
'需要提供什麼'
,
otherxq
:
'其他需求'
,
xiaoshousl
:
'銷售數量'
,
fanhuishijain
:
'返回時間'
,
qxzchulizt
:
'請選擇處理狀態'
,
yitijiao
:
'已提交'
,
fangansheji
:
'方案設計'
,
hetongqianding
:
'合同簽訂'
,
xiadan
:
'下單'
,
yichengt
:
'已成團'
,
yiguant
:
'已關團'
,
fanhuiDate
:
'返回日期'
,
xutaotig
:
'需要提供'
,
xianlushej
:
'線路設計'
,
chufadi
:
'出發地'
,
renjunyus
:
'人均估算'
,
shangchaunht
:
'上傳契约'
,
fanganshul
:
'方案數量'
,
chengren
:
'成人'
,
ertong
:
'兒童'
,
name
:
'名字'
,
chakanxcfa
:
'查看行程方案'
,
chulixcxx
:
'處理行程資訊'
,
chuliwc
:
'處理完成'
,
chulisb
:
'處理失敗'
,
xingchengxq
:
'行程詳情'
,
yujichuDate
:
'預估出行日期'
,
yujichupeople
:
'預估出行人數'
,
yujirenyunys
:
'預估人均預算'
,
xuyaotigsm
:
'需要提供什麼'
,
otherxq
:
'其他需求'
,
xiaoshousl
:
'銷售數量'
,
fanhuishijain
:
'返回時間'
,
qxzchulizt
:
'請選擇處理狀態'
,
company
:
'公司'
,
zonge
:
'總額'
,
youhuijine
:
'優惠金額'
,
daifukuan
:
'待付款'
,
ChName
:
'中文姓名'
,
EnName
:
'英文姓名'
,
email
:
'郵箱'
,
exitOrder
:
'取消訂單'
,
exitsure
:
'取消確認'
,
exitType
:
'取消類型'
,
xingchengbghqx
:
'行程變更或取消'
,
chongfuOrder
:
'重複訂單'
,
Priceyy
:
'價格原因'
,
gerenys
:
'個人因素'
,
jiaotongys
:
'交通因素'
,
exityy
:
'取消原因'
,
qxzqxlx
:
'請選擇取消類型!'
,
qrhOrderbhzdqx
:
'確認後,訂單不會自動取消'
,
qxhddhzdqx
:
'取消後,訂單會自動取消'
,
quxiaocg
:
'取消成功'
,
airbianma
:
'機票編碼'
,
Date
:
'日期'
,
kerenshul
:
'客人數量'
,
tuikuanz
:
'退款中'
,
yituikaun
:
'已退款'
,
huzhaohaoma
:
'護照號碼'
,
haizi
:
'孩子'
,
laoren
:
'老人'
,
nianlingType
:
'年齡類型'
,
}
import
invoicesManager
from
'./zhTW/invoicesManager'
...
...
src/components/SalesModule/BulkAirTicketOrders.vue
View file @
3965d0c6
...
...
@@ -5,18 +5,18 @@
<ul>
<li>
<span>
<em>
机票编码
</em><el-input
v-model=
'msg.AirTicketId'
class=
'w150'
></el-input>
<em>
{{
$t
(
'sm.airbianma'
)
}}
</em><el-input
v-model=
'msg.AirTicketId'
class=
'w150'
></el-input>
</span>
</li>
<li>
<span>
<em>
订单号
</em><el-input
v-model=
'msg.AirOrderId'
class=
'w150'
></el-input>
<em>
{{
$t
(
'hotel.order_Number'
)
}}
</em><el-input
v-model=
'msg.AirOrderId'
class=
'w150'
></el-input>
</span>
</li>
<li>
<span>
<em>
状态
</em>
<el-select
v-model=
"msg.Status"
placeholder=
"请选择
"
>
<em>
{{
$t
(
'hotel.hotel_status'
)
}}
</em>
<el-select
v-model=
"msg.Status"
:placeholder=
"$t('pub.pleaseSel')
"
>
<el-option
v-for=
"item in status"
:key=
"item.num"
...
...
@@ -28,7 +28,7 @@
</li>
<li>
<span><em>
日期
</em>
<span><em>
{{
$t
(
'sm.Date'
)
}}
</em>
<el-date-picker
v-model=
'msg.StartTime'
@
change=
"dataDui()"
class=
'w150'
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
-
...
...
@@ -37,7 +37,7 @@
</span>
</li>
<li>
<input
type=
"button"
class=
"hollowFixedBtn"
value=
"查询
"
@
click=
"getList();resetPageIndex()"
/>
<input
type=
"button"
class=
"hollowFixedBtn"
:value=
"$t('pub.searchBtn')
"
@
click=
"getList();resetPageIndex()"
/>
</li>
</ul>
</div>
...
...
@@ -45,21 +45,21 @@
<div
style=
"width: 100%; height: auto;min-height:500px;overflow-x: auto;"
class=
"ownScrollbarStyle"
>
<table
class=
"groupTourOrderSearchTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<tr
class=
"title_tr"
>
<th>
单号
</th>
<th
width=
"70"
>
客户信息
</th>
<th>
机票编码
</th>
<th>
客人数量
</th>
<th>
单价
</th>
<th>
成交单价
</th>
<th>
应收总额
</th>
<th>
实收
</th>
<th>
退款
</th>
<th>
平台税金
</th>
<th>
状态
</th>
<th
width=
"150"
>
操作
</th>
<th>
{{
$t
(
'sm.danhao'
)
}}
</th>
<th
width=
"70"
>
{{
$t
(
'fnc.khxinxi'
)
}}
</th>
<th>
{{
$t
(
'sm.airbianma'
)
}}
</th>
<th>
{{
$t
(
'sm.kerenshul'
)
}}
</th>
<th>
{{
$t
(
'fnc.danjia'
)
}}
</th>
<th>
{{
$t
(
'fnc.cjdanjia'
)
}}
</th>
<th>
{{
$t
(
'fnc.yszonge'
)
}}
</th>
<th>
{{
$t
(
'fnc.shishou'
)
}}
</th>
<th>
{{
$t
(
'fnc.tuikuan'
)
}}
</th>
<th>
{{
$t
(
'fnc.ptshuijin'
)
}}
</th>
<th>
{{
$t
(
'hotel.hotel_status'
)
}}
</th>
<th
width=
"150"
>
{{
$t
(
'hotel.table_operat'
)
}}
</th>
</tr>
<tr>
<td
v-show=
"dataList.length==0"
colspan=
"16"
align=
"center"
>
暂无数据
</td>
<td
v-show=
"dataList.length==0"
colspan=
"16"
align=
"center"
>
{{
$t
(
'system.content_noData'
)
}}
</td>
</tr>
<tbody
v-for=
"(item,index) in dataList"
:key=
"index"
>
<tr>
...
...
@@ -75,20 +75,20 @@
<td>
{{
item
.
PlatformTax
}}
</td>
<td>
<p
v-if=
"item.RefundStatus!=1"
>
<span
v-if=
"item.RefundStatus==2"
>
退款中
</span>
<span
v-if=
"item.RefundStatus==3"
>
已退款
</span>
<span
v-if=
"item.RefundStatus==2"
>
{{
$t
(
'sm.tuikuanz'
)
}}
</span>
<span
v-if=
"item.RefundStatus==3"
>
{{
$t
(
'sm.yituikaun'
)
}}
</span>
</p>
<p
v-else
>
<span
v-if=
"item.Status==1"
>
正常
</span>
<span
v-if=
"item.Status==2"
>
取消
</span>
<span
v-if=
"item.Status==3"
>
待付款
</span>
<span
v-if=
"item.Status==1"
>
{{
$t
(
'pub.normalSel'
)
}}
</span>
<span
v-if=
"item.Status==2"
>
{{
$t
(
'pub.cancelBtn'
)
}}
</span>
<span
v-if=
"item.Status==3"
>
{{
$t
(
'sm.daifukuan'
)
}}
</span>
</p>
</td>
<td>
<p
v-if=
"item.RefundStatus==2 && item.Status==1 && item.RefundFinanceList.length==0"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"退款
"
placement=
"top-end"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('fnc.tuikuan')
"
placement=
"top-end"
>
<el-button
@
click=
"RefundPay(item)"
type=
"danger"
icon=
"el-icon-star-off"
circle
></el-button>
</el-tooltip>
</p>
...
...
@@ -97,7 +97,7 @@
</tr>
<tr
style=
"height:20px"
>
<td
colspan=
"15"
class=
"RL_Order"
style=
"height:20px"
>
<span
class=
"RL-remarkTitle"
>
名单
:
</span>
<span
class=
"RL-remarkTitle"
>
{{
$t
(
'salesModule.MD'
)
}}
:
</span>
<span
class=
"RL-redType RL-remarkCon"
v-if=
"item.GuestList.length>0"
>
<el-popover
...
...
@@ -105,25 +105,25 @@
width=
"1000"
trigger=
"click"
>
<el-table
:data=
"item.GuestList"
>
<el-table-column
property=
"Id"
label=
"排号
"
></el-table-column>
<el-table-column
property=
"Name"
label=
"姓名
"
></el-table-column>
<el-table-column
property=
"Sex"
label=
"性别
"
>
<el-table-column
property=
"Id"
:label=
"$t('visa.v_paihao')
"
></el-table-column>
<el-table-column
property=
"Name"
:label=
"$t('system.query_name')
"
></el-table-column>
<el-table-column
property=
"Sex"
:label=
"$t('system.table_sex')
"
>
<template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.Sex=='1'"
>
男
</span>
<span
v-if=
"scope.row.Sex=='2'"
>
女
</span>
<span
v-if=
"scope.row.Sex=='1'"
>
{{
$t
(
'visaT.boy'
)
}}
</span>
<span
v-if=
"scope.row.Sex=='2'"
>
{{
$t
(
'visaT.girl'
)
}}
女
</span>
</
template
>
</el-table-column>
<el-table-column
property=
"Birthday"
label=
"生日
"
></el-table-column>
<el-table-column
property=
"PassportNo"
label=
"护照号码
"
></el-table-column>
<el-table-column
property=
"NationalityName"
label=
"国籍
"
></el-table-column>
<el-table-column
width=
"120"
property=
"MobilePhone"
label=
"手机号码
"
></el-table-column>
<el-table-column
property=
"Birthday"
:label=
"$t('admin.admin_Birthday')
"
></el-table-column>
<el-table-column
property=
"PassportNo"
:label=
"$t('sm.huzhaohaoma')
"
></el-table-column>
<el-table-column
property=
"NationalityName"
:label=
"$t('visaT.nationality')
"
></el-table-column>
<el-table-column
width=
"120"
property=
"MobilePhone"
:label=
"$t('pub.mbPhoneNum')
"
></el-table-column>
<el-table-column
property=
"AgeType"
label=
"年龄类型
"
>
<el-table-column
property=
"AgeType"
:label=
"$t('sm.nianlingType')
"
>
<
template
slot-scope=
"scope"
>
<span
v-if=
"scope.row.AgeType=='1'"
>
成人
</span>
<span
v-if=
"scope.row.AgeType=='2'"
>
孩子
</span>
<span
v-if=
"scope.row.AgeType=='3'"
>
婴儿
</span>
<span
v-if=
"scope.row.AgeType=='4'"
>
老人
</span>
<span
v-if=
"scope.row.AgeType=='1'"
>
{{
$t
(
'salesModule.Adult'
)
}}
</span>
<span
v-if=
"scope.row.AgeType=='2'"
>
{{
$t
(
'sm.haizi'
)
}}
</span>
<span
v-if=
"scope.row.AgeType=='3'"
>
{{
$t
(
'Operation.Op_baby'
)
}}
</span>
<span
v-if=
"scope.row.AgeType=='4'"
>
{{
$t
(
'sm.laoren'
)
}}
</span>
</
template
>
</el-table-column>
</el-table>
...
...
@@ -134,7 +134,7 @@
</span>
<span
class=
"RL-redType RL-remarkCon"
v-else
>
<span>
暂无名单
</span>
<span>
{{$t('salesModule.ZWMD')}}
</span>
</span>
...
...
@@ -144,14 +144,14 @@
<td
colspan=
"5"
class=
"groupTourOrder_remarks"
style=
"height: 40px;"
>
<div>
<div>
<span>
备注
:
</span>
<span>
{{$t('hotel.hotel_remark')}}
:
</span>
<p>
{{item.Remarks}}
</p>
</div>
</div>
</td>
<td
colspan=
"7"
class=
"groupTourOrder_tickets"
style=
"height: 40px;"
>
<div>
<div>
收款单据
:
</div>
<div>
{{$t('fnc.skdanju')}}
:
</div>
<div>
<span
style=
"cursor: default;"
>
<span
class=
"tickets_green"
v-for=
"(fina,fin) in item.FinanceList"
:key=
"fin"
>
...
...
@@ -161,14 +161,14 @@
<span
@
click=
"goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)"
v-else-if=
"fina.ColorState===4"
class=
"groupTourOrder_tickets_black"
>
{{fina.FrID}}
</span>
</span>
<span
v-if=
"item.FinanceList.length==0"
>
暂无数据
{{$t('system.content_noData')}}
</span>
</span>
</div>
</div>
<div>
<div>
付款单据
:
</div>
<div>
{{$t('fnc.fkdanju')}}
:
</div>
<div>
<span
style=
"cursor: default;"
>
<span
class=
"tickets_green"
v-for=
"(fina,fin) in item.RefundFinanceList"
:key=
"fin"
>
...
...
@@ -179,7 +179,7 @@
<!-- <span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span> -->
</span>
<span
v-if=
"item.RefundFinanceList.length==0"
>
暂无数据
{{$t('system.content_noData')}}
</span>
</span>
</div>
...
...
@@ -279,7 +279,7 @@ export default {
// 结束日期不能大于开始日期
dataDui
()
{
if
(
this
.
msg
.
StartTime
>
this
.
msg
.
EndTime
&&
this
.
msg
.
EndTime
!==
""
)
{
this
.
$message
.
error
(
"结束日期不能大于开始日期"
);
this
.
$message
.
error
(
this
.
$t
(
'tips.jsrqbndyksriqi'
)
);
this
.
msg
.
CEndDate
=
""
;
}
}
...
...
src/components/SalesModule/ScenTicketOrderSale.vue
View file @
3965d0c6
...
...
@@ -149,13 +149,13 @@
<div
class=
"query-box"
>
<ul>
<li>
<span><em>
关键字
</em>
<span><em>
{{
$t
(
'salesModule.keyWords'
)
}}
</em>
<el-input
v-model=
'msg.searchKey'
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</li>
<li>
<span>
<em>
订单状态
</em>
<em>
{{
$t
(
'hotel.hotel_OrderStates'
)
}}
</em>
<el-select
v-model=
'msg.status'
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
v-for=
"item in orderStatus"
:label=
'item.Name'
:value=
'item.Id'
:key=
'item.Id'
>
</el-option>
...
...
@@ -164,8 +164,8 @@
</li>
<li>
<span>
<em>
公司
</em>
<el-select
v-model=
"msg.rbBranchId"
placeholder=
"请选择公司
"
>
<em>
{{
$t
(
'sm.company'
)
}}
</em>
<el-select
v-model=
"msg.rbBranchId"
:placeholder=
"$t('pub.pleaseSel')
"
>
<el-option
:value=
"-1"
:label=
"$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for=
'item in CompanyList'
:label=
'item.BName'
...
...
@@ -205,14 +205,14 @@
<li>
<span>
<em>
开始时间
</em>
<em>
{{
$t
(
'system.table_begTime'
)
}}
</em>
<el-date-picker
type=
"date"
v-model=
"msg.startDate"
:picker-options=
"StartTimeBefore"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
</li>
<li>
<span>
<em>
结束时间
</em>
<em>
{{
$t
(
'MarketingActi.endTime'
)
}}
</em>
<el-date-picker
type=
"date"
v-model=
"msg.endDate"
:picker-options=
"EndTimeAfter"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
...
...
@@ -226,19 +226,19 @@
<table
class=
"SalesHotelOrderTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<tr>
<th>
订单号
</th>
<th>
数量
</th>
<th>
总额
</th>
<th>
已收金额
</th>
<th>
退款金额
</th>
<th>
待收金额
</th>
<th>
优惠金额
</th>
<th>
订单状态
</th>
<th>
创建时间
</th>
<th>
游玩时间
</th>
<th>
门票名称
</th>
<th>
客户信息
</th>
<th>
操作
</th>
<th>
{{
$t
(
'hotel.order_Number'
)
}}
</th>
<th>
{{
$t
(
'restaurant.res_Number'
)
}}
</th>
<th>
{{
$t
(
'salesModule.zonge'
)
}}
</th>
<th>
{{
$t
(
'fnc.yishoujine'
)
}}
</th>
<th>
{{
$t
(
'fnc.tkjine'
)
}}
</th>
<th>
{{
$t
(
'Operation.Op_daishou'
)
}}
</th>
<th>
{{
$t
(
'sm.youhuijine'
)
}}
</th>
<th>
{{
$t
(
'hotel.hotel_OrderStates'
)
}}
</th>
<th>
{{
$t
(
'fnc.cjshijian'
)
}}
</th>
<th>
{{
$t
(
'scen.sc_etTime'
)
}}
</th>
<th>
{{
$t
(
'scen.sc_name'
)
}}
</th>
<th>
{{
$t
(
'fnc.khxinxi'
)
}}
</th>
<th>
{{
$t
(
'system.table_operation'
)
}}
</th>
</tr>
<tbody
v-for=
"(item,index) in dataList"
:key=
"index+500"
>
<tr>
...
...
@@ -253,38 +253,38 @@
<td>
{{
item
.
discountMoney
}}
</td>
<td>
{{
item
.
duein
}}
</td>
<td>
<span
v-if=
"item.status==1"
>
正常
</span>
<span
class=
"color_red_order"
v-if=
"item.status==2"
>
取消
</span>
<span
v-if=
"item.status==3"
>
待付款
</span>
<span
v-if=
"item.status==1"
>
{{
$t
(
'system.ph_zhengchang'
)
}}
</span>
<span
class=
"color_red_order"
v-if=
"item.status==2"
>
{{
$t
(
'pub.cancelBtn'
)
}}
</span>
<span
v-if=
"item.status==3"
>
{{
$t
(
'sm.daifukuan'
)
}}
</span>
</td>
<td>
{{
item
.
createDate
}}
</td>
<td>
{{
item
.
useDate
}}
</td>
<td>
{{
item
.
couponsName
}}
</td>
<td>
<p>
中文姓名
:
{{
item
.
contactCNName
}}
</p>
<p>
英文姓名
:
{{
item
.
contactENName
}}
</p>
<p>
联系电话
:
{{
item
.
contactEmail
}}
</p>
<p>
邮箱
:
{{
item
.
contactMobile
}}
</p>
<p>
{{
$t
(
'sm.ChName'
)
}}
:
{{
item
.
contactCNName
}}
</p>
<p>
{{
$t
(
'sm.EnName'
)
}}
:
{{
item
.
contactENName
}}
</p>
<p>
{{
$t
(
'scen.sc_tel'
)
}}
:
{{
item
.
contactEmail
}}
</p>
<p>
{{
$t
(
'sm.email'
)
}}
:
{{
item
.
contactMobile
}}
</p>
</td>
<td>
<el-row>
<el-button-group>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"付款
"
placement=
"top-start"
v-if=
"item.OrderStatus!=='已取消'"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('fnc.fukuan')
"
placement=
"top-start"
v-if=
"item.OrderStatus!=='已取消'"
>
<el-button
type=
"primary"
icon=
"iconfont icon-fukuan2"
@
click=
"getShouKuan(item)"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"取消订单
"
placement=
"top-start"
v-if=
"item.OrderStatus!=='已取消'"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('sm.exitOrder')
"
placement=
"top-start"
v-if=
"item.OrderStatus!=='已取消'"
>
<el-button
type=
"info"
v-if=
"item.IsCanOrder == 0"
icon=
"iconfont icon-quxiao1"
@
click=
"Exit(item)"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"确定
"
placement=
"top-start"
v-if=
"item.OrderStatus!=='已取消'"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('pub.sureBtn')
"
placement=
"top-start"
v-if=
"item.OrderStatus!=='已取消'"
>
<el-button
type=
"success"
icon=
"iconfont icon-duigou"
v-if=
"item.IsCanClear == 0"
@
click=
"queren(1, item.OrderID)"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"取消确认
"
placement=
"top-start"
v-if=
"item.OrderStatus!=='已取消'"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('sm.exitsure')
"
placement=
"top-start"
v-if=
"item.OrderStatus!=='已取消'"
>
<el-button
type=
"info"
icon=
" iconfont icon-quxiao1"
v-if=
"item.IsCanClear == 1"
@
click=
"queren(0, item.OrderID)"
></el-button>
</el-tooltip>
<!--
<el-tooltip
class=
"item"
effect=
"dark"
content=
"关联团"
placement=
"top-start"
>
<el-button
type=
"warning"
icon=
"iconfont icon-guanlian"
@
click=
"TCID = '',GLOrderID = item.OrderID,dialogFormVisible = true"
></el-button>
</el-tooltip>
-->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"详情
"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('fnc.xiangqing')
"
placement=
"top-start"
>
<el-button
type=
"success"
icon=
"iconfont icon-sousuo"
@
click=
"goOrderDetails(item.id)"
></el-button>
</el-tooltip>
</el-button-group>
...
...
@@ -295,7 +295,7 @@
<td
colspan=
"7"
style=
"text-align:left;width:600px"
>
<div
class=
"clearfix"
>
<div
class=
"SH_beizhu"
style=
""
>
备注
:
{{
$t
(
'pub.pubRemark'
)
}}
:
</div>
<div
class=
"SH_beizhuInner"
>
{{
item
.
Remark
}}
...
...
@@ -304,7 +304,7 @@
</td>
<td
colspan=
"8"
style=
"text-align:left;width:600px"
>
<div
class=
"SH_OrderDan"
>
<div>
收款单据
:
</div>
<div>
{{
$t
(
'fnc.skdanju'
)
}}
:
</div>
<div>
<span
v-for=
"(subItem,index) in item.Revenue"
:key=
"index+5000"
>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-if=
"subItem.color===1"
class=
"groupTourOrder_tickets_blue"
>
{{
subItem
.
FrID
}}
</span>
...
...
@@ -312,11 +312,11 @@
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-else-if=
"subItem.color===3"
class=
"groupTourOrder_tickets_blue"
>
{{
subItem
.
FrID
}}
</span>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-else-if=
"subItem.color===4"
class=
"groupTourOrder_tickets_blue"
>
{{
subItem
.
FrID
}}
</span>
</span>
<span
v-if=
"item.Revenue==0"
>
暂无数据
</span>
<span
v-if=
"item.Revenue==0"
>
{{
$t
(
'system.content_noData'
)
}}
</span>
</div>
</div>
<div
class=
"SH_OrderDan"
>
<div>
付款单据
:
</div>
<div>
{{
$t
(
'fnc.fkdanju'
)
}}
:
</div>
<div>
<span
v-for=
"(subItem,index) in item.expend"
:key=
"index+1000"
>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-if=
"subItem.color===1"
class=
"groupTourOrder_tickets_blue"
>
{{
subItem
.
FrID
}}
</span>
...
...
@@ -324,7 +324,7 @@
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-else-if=
"subItem.color===3"
class=
"groupTourOrder_tickets_red"
>
{{
subItem
.
FrID
}}
</span>
<span
style=
"margin-right:6px"
@
click=
"goUrlFinacel('财务单据','FinancialDocumentsDetail',subItem.FrID)"
v-else-if=
"subItem.color===4"
class=
"groupTourOrder_tickets_black"
>
{{
subItem
.
FrID
}}
</span>
</span>
<span
v-if=
"item.expend==0"
>
暂无数据
</span>
<span
v-if=
"item.expend==0"
>
{{
$t
(
'system.content_noData'
)
}}
</span>
</div>
</div>
...
...
@@ -336,9 +336,9 @@
<i
class=
"iconfont icon-kong"
></i>
<p>
{{
$t
(
"active.ld_noData"
)
}}
</p>
</div>
<el-dialog
title=
"请选择团号
"
width=
"400px"
:visible
.
sync=
"dialogFormVisible"
center
:before-close=
"closeChangeMachie"
>
<el-dialog
:title=
"$t('pub.pleaseSel')
"
width=
"400px"
:visible
.
sync=
"dialogFormVisible"
center
:before-close=
"closeChangeMachie"
>
<el-form
label-width=
"110px"
>
<el-form-item
label=
"团号
"
>
<el-form-item
:label=
"$t('visa.v_tuanhao')
"
>
<el-select
v-model=
"TCID"
filterable
...
...
@@ -365,28 +365,28 @@
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
msg.pageSize
:total=
total
>
</el-pagination>
<el-dialog
title=
"取消订单
"
width=
"400px"
:visible
.
sync=
"dialogFormVisible"
>
<el-dialog
:title=
"$t('sm.exitOrder')
"
width=
"400px"
:visible
.
sync=
"dialogFormVisible"
>
<el-form
:model=
"exitMsg"
label-width=
"80px"
>
<el-form-item
label=
"取消类型
"
>
<el-select
size=
"small"
v-model=
"exitMsg.cancel_type"
placeholder=
"请选择取消类型
"
>
<el-option
label=
"行程变更或取消
"
value=
"MC001"
></el-option>
<el-option
label=
"重复订单
"
value=
"MC002"
></el-option>
<el-option
label=
"价格原因
"
value=
"MC003"
></el-option>
<el-option
label=
"个人因素
"
value=
"MC004"
></el-option>
<el-option
label=
"交通因素
"
value=
"MC005"
></el-option>
<el-option
label=
"交通因素
"
value=
"MC006"
></el-option>
<el-option
label=
"其他
"
value=
"MC999"
></el-option>
<el-form-item
:label=
"$t('sm.exitType')
"
>
<el-select
size=
"small"
v-model=
"exitMsg.cancel_type"
:placeholder=
"$t('pub.pleaseSel')
"
>
<el-option
:label=
"$t('sm.xingchengbghqx')
"
value=
"MC001"
></el-option>
<el-option
:label=
"$t('sm.chongfuOrder')
"
value=
"MC002"
></el-option>
<el-option
:label=
"$t('sm.Priceyy')
"
value=
"MC003"
></el-option>
<el-option
:label=
"$t('sm.gerenys')
"
value=
"MC004"
></el-option>
<el-option
:label=
"$t('sm.jiaotongys')
"
value=
"MC005"
></el-option>
<el-option
:label=
"$t('sm.jiaotongys')
"
value=
"MC006"
></el-option>
<el-option
:label=
"$t('active.cl_qita')
"
value=
"MC999"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"
取消原因
"
>
<el-form-item
label=
"
$t('sm.exityy')
"
>
<el-input
v-model=
"exitMsg.cancel_desc"
autocomplete=
"off"
type=
"textarea"
:rows=
"2"
></el-input>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"small"
@
click=
"dialogFormVisible = false"
>
取 消
</el-button>
<el-button
size=
"small"
type=
"danger"
@
click=
"ExitOrder"
>
确 定
</el-button>
<el-button
size=
"small"
@
click=
"dialogFormVisible = false"
>
{{
$t
(
'pub.cancelBtn'
)
}}
</el-button>
<el-button
size=
"small"
type=
"danger"
@
click=
"ExitOrder"
>
{{
$t
(
'pub.sureBtn'
)
}}
</el-button>
</div>
</el-dialog>
</div>
...
...
@@ -450,13 +450,13 @@ export default {
},
orderStatus
:[{
Name
:
'正常'
,
Name
:
this
.
$t
(
'pub.normalSel'
)
,
Id
:
0
},{
Name
:
'取消'
,
Name
:
this
.
$t
(
'pub.cancelBtn'
)
,
Id
:
1
},{
Name
:
'待付款'
,
Name
:
this
.
$t
(
'sm.daifukuan'
)
,
Id
:
2
}],
dataList
:
[],
...
...
@@ -495,7 +495,7 @@ export default {
},
ExitOrder
(){
if
(
this
.
exitMsg
.
cancel_type
==
""
){
this
.
Error
(
"请选择取消类型!"
);
this
.
Error
(
this
.
$t
(
'sm.qxzqxlx'
)
);
return
;
}
...
...
@@ -557,7 +557,7 @@ export default {
}
},
queren
(
type
,
OrderID
){
let
text
=
type
==
1
?
'确认后,订单不会自动取消'
:
'取消后,订单会自动取消'
let
text
=
type
==
1
?
this
.
$t
(
'sm.qrhOrderbhzdqx'
):
this
.
$t
(
'sm.qxhddhzdqx'
)
this
.
$confirm
(
text
,
this
.
$t
(
'tips.tips'
),
{
confirmButtonText
:
this
.
$t
(
'pub.sureBtn'
),
cancelButtonText
:
this
.
$t
(
'pub.cancelBtn'
),
...
...
@@ -643,7 +643,7 @@ export default {
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
Success
(
'取消成功'
);
this
.
Success
(
this
.
$t
(
'sm.quxiaocg'
)
);
this
.
getList
();
}
else
{
this
.
Error
(
res
.
data
.
message
);
...
...
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