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
b45895be
Commit
b45895be
authored
Apr 03, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
416cf4cf
9e8501a8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
513 additions
and
417 deletions
+513
-417
zh.js
src/assets/common/lang/zh.js
+25
-1
roomReservations.vue
src/components/Hotel/roomReservations.vue
+1
-1
TicketManager.vue
src/components/Ticketing/TicketManager.vue
+267
-277
seatStatistics.vue
src/components/Ticketing/seatStatistics.vue
+5
-5
Leader.vue
src/components/TravelManager/TravelLeader/Leader.vue
+4
-4
OpTripList.vue
src/components/TravelManager/TravelList/OpTripList.vue
+13
-13
RegistrationStatistics.vue
...nents/TravelManager/TravelList/RegistrationStatistics.vue
+19
-19
todayOrderTotal.vue
src/components/TravelManager/TravelList/todayOrderTotal.vue
+70
-70
tripsManager.vue
src/components/dmc/manager/tripsManager.vue
+23
-23
TravelConfig.vue
...ents/newTravelmanager/TravelGroupControl/TravelConfig.vue
+1
-0
TravelManager2.vue
...ts/newTravelmanager/TravelGroupControl/TravelManager2.vue
+1
-0
TravelPrice3.vue
...ents/newTravelmanager/TravelGroupControl/TravelPrice3.vue
+84
-4
No files found.
src/assets/common/lang/zh.js
View file @
b45895be
...
@@ -1394,7 +1394,31 @@ export const Operation = {
...
@@ -1394,7 +1394,31 @@ export const Operation = {
Op_carType
:
'车型'
,
Op_carType
:
'车型'
,
Op_choicePlat
:
'请选择上架平台'
,
Op_choicePlat
:
'请选择上架平台'
,
Op_salesPlat
:
'销售平台'
,
Op_salesPlat
:
'销售平台'
,
Op_scTrip
:
'上传WORD行程'
Op_scTrip
:
'上传WORD行程'
,
Op_longTerm
:
'长线'
,
Op_shortTerm
:
'短线'
,
Op_hetuan
:
'合团团号'
,
Op_shipNum
:
'舱位'
,
Op_chaifen
:
'团队拆分'
,
Op_orderNum
:
'收订人数'
,
Op_signUp
:
'报名'
,
Op_price
:
'价格'
,
Op_ArriveTime
:
'抵离时间'
,
Op_jinchudian
:
'进出点'
,
Op_chutuan
:
'出团'
,
Op_jiweiTotal
:
'机位统计 共'
,
Op_taoTotal
:
'套, 总机位数'
,
Op_baomingCompany
:
'报名公司'
,
Op_peopleChoice
:
'人员选择'
,
Op_salesTotal
:
'销售额统计'
,
Op_yingPay
:
'应付款'
,
Op_yiShou
:
'已收款'
,
Op_weiShou
:
'未收款'
,
Op_platZaitu
:
'平台在途'
,
Op_daishou
:
'待收金额'
,
Op_teamInfo
:
'团期信息'
,
Op_tripUpdate
:
'行程修改'
,
Op_tripCopy
:
'行程复制'
,
}
}
export
const
rule
=
{
export
const
rule
=
{
company
:
'请选择公司'
,
company
:
'请选择公司'
,
...
...
src/components/Hotel/roomReservations.vue
View file @
b45895be
...
@@ -180,7 +180,7 @@
...
@@ -180,7 +180,7 @@
</table>
</table>
</div>
</div>
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
msg.pageSize
:total=
total
></el-pagination>
layout=
"total,prev, pager, next, jumper"
:page-size=
"msg.pageSize"
:total=
"total"
></el-pagination>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
...
src/components/Ticketing/TicketManager.vue
View file @
b45895be
This diff is collapsed.
Click to expand it.
src/components/Ticketing/seatStatistics.vue
View file @
b45895be
...
@@ -193,7 +193,7 @@
...
@@ -193,7 +193,7 @@
<ul>
<ul>
<li>
<li>
<span>
<span>
<em>
线路
</em>
<em>
{{
$t
(
'advmanager.v_line'
)
}}
</em>
<el-select
v-model=
"msg.QLineId"
:placeholder=
"$t('pub.pleaseSel')"
filterable
>
<el-select
v-model=
"msg.QLineId"
:placeholder=
"$t('pub.pleaseSel')"
filterable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"defaultSelectValue"
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"defaultSelectValue"
></el-option>
<el-option
<el-option
...
@@ -207,7 +207,7 @@
...
@@ -207,7 +207,7 @@
</li>
</li>
<li>
<li>
<span>
<span>
<em>
出发城市
</em>
<em>
{{
$t
(
'system.table_goCity'
)
}}
</em>
<el-select
v-model=
"msg.QCityId"
:placeholder=
"$t('system.ph_in')"
filterable
>
<el-select
v-model=
"msg.QCityId"
:placeholder=
"$t('system.ph_in')"
filterable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"defaultSelectValue"
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"defaultSelectValue"
></el-option>
<el-option
<el-option
...
@@ -221,7 +221,7 @@
...
@@ -221,7 +221,7 @@
</li>
</li>
<li>
<li>
<span>
<span>
<em>
操作人
</em>
<em>
{{
$t
(
'admin.admin_czPerson'
)
}}
</em>
<el-select
<el-select
v-model=
"msg.QCreateBy"
v-model=
"msg.QCreateBy"
filterable
filterable
...
@@ -248,8 +248,8 @@
...
@@ -248,8 +248,8 @@
</ul>
</ul>
</div>
</div>
<div
class=
"title"
>
<div
class=
"title"
>
机位统计 共
{{
$t
(
'Operation.Op_jiweiTotal'
)
}}
<span
class=
"Owe_Room"
>
{{
TotalCount
}}
</span>
套, 总机位数
<span
class=
"Owe_Room"
>
{{
TotalCount
}}
</span>
{{
$t
(
'Operation.Op_taoTotal'
)
}}
<span
class=
"Owe_Room"
>
{{
TotalSeat
}}
</span>
<span
class=
"Owe_Room"
>
{{
TotalSeat
}}
</span>
</div>
</div>
<div
class=
"month"
>
<div
class=
"month"
>
...
...
src/components/TravelManager/TravelLeader/Leader.vue
View file @
b45895be
...
@@ -252,7 +252,7 @@
...
@@ -252,7 +252,7 @@
<span
@
click=
"goUrl('leaderChedule',item.ID)"
>
{{
$t
(
'leader.leader_schedule'
)
}}
<i></i></span>
<span
@
click=
"goUrl('leaderChedule',item.ID)"
>
{{
$t
(
'leader.leader_schedule'
)
}}
<i></i></span>
<span
@
click=
"goUrl2('leaderStateDetails',item.ID)"
>
{{
$t
(
'leader.leader_performance'
)
}}
<i></i></span>
<span
@
click=
"goUrl2('leaderStateDetails',item.ID)"
>
{{
$t
(
'leader.leader_performance'
)
}}
<i></i></span>
<span
@
click=
"deletelist(item.ID)"
>
{{
$t
(
'system.table_delete'
)
}}
<i></i></span>
<span
@
click=
"deletelist(item.ID)"
>
{{
$t
(
'system.table_delete'
)
}}
<i></i></span>
<span
@
click=
"AccountManage(item)"
>
账户管理
</span>
<span
@
click=
"AccountManage(item)"
>
{{
$t
(
'visaT.Accountmanagement'
)
}}
</span>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -274,10 +274,10 @@
...
@@ -274,10 +274,10 @@
</el-option>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"类型
"
v-if=
"addMsg.Type==2"
>
<el-form-item
:label=
"$t('system.query_type')
"
v-if=
"addMsg.Type==2"
>
<el-radio-group
v-model=
"addMsg.LeaderGuidType"
>
<el-radio-group
v-model=
"addMsg.LeaderGuidType"
>
<el-radio
label=
"1"
>
长线
</el-radio>
<el-radio
label=
"1"
>
{{
$t
(
'Operation.Op_longTerm'
)
}}
</el-radio>
<el-radio
label=
"2"
>
短线
</el-radio>
<el-radio
label=
"2"
>
{{
$t
(
'Operation.Op_shortTerm'
)
}}
</el-radio>
</el-radio-group>
</el-radio-group>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('system.query_goCoun')"
prop=
"CountryID"
>
<el-form-item
:label=
"$t('system.query_goCoun')"
prop=
"CountryID"
>
...
...
src/components/TravelManager/TravelList/OpTripList.vue
View file @
b45895be
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<ul>
<ul>
<li>
<li>
<span>
<span>
<em>
所属线路
</em>
<em>
{{
$t
(
'system.table_ssLine'
)
}}
</em>
<el-select
class=
'w150'
v-model=
"queryMsg.LineId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"getLineTeamList()"
>
<el-select
class=
'w150'
v-model=
"queryMsg.LineId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"getLineTeamList()"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'queryCommonData.SelectDefaultValue'
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'queryCommonData.SelectDefaultValue'
></el-option>
<el-option
v-for=
"item in queryCommonData.LineList"
:label=
'item.LineName'
:value=
'item.LineID'
:key=
'item.LineID'
>
<el-option
v-for=
"item in queryCommonData.LineList"
:label=
'item.LineName'
:value=
'item.LineID'
:key=
'item.LineID'
>
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
</li>
</li>
<li>
<li>
<span>
<span>
<em>
系列名称
</em>
<em>
{{
$t
(
'active.ad_xlmc'
)
}}
</em>
<el-select
class=
'w150'
v-model=
"queryMsg.LineteamId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
'w150'
v-model=
"queryMsg.LineteamId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'queryCommonData.SelectDefaultValue'
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'queryCommonData.SelectDefaultValue'
></el-option>
<el-option
v-for=
"item in queryCommonData.LineTeamList"
:label=
'item.LtName'
:value=
'item.LtID'
:key=
'item.LtID'
>
<el-option
v-for=
"item in queryCommonData.LineTeamList"
:label=
'item.LtName'
:value=
'item.LtID'
:key=
'item.LtID'
>
...
@@ -28,14 +28,14 @@
...
@@ -28,14 +28,14 @@
</li>
</li>
<li>
<li>
<span>
<span>
<em>
团号
</em>
<em>
{{
$t
(
'visa.v_tuanhao'
)
}}
</em>
<el-input
maxlength=
"50"
v-model=
"queryMsg.TCNUMS"
class=
"permiss-input w150"
<el-input
maxlength=
"50"
v-model=
"queryMsg.TCNUMS"
class=
"permiss-input w150"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</span>
</li>
</li>
<li>
<li>
<span>
<span>
<em>
操作人
</em>
<em>
{{
$t
(
'admin.admin_czPerson'
)
}}
</em>
<el-select
class=
'w150'
v-model=
"queryMsg.CreateBy"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
'w150'
v-model=
"queryMsg.CreateBy"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'queryCommonData.SelectDefaultValue'
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'queryCommonData.SelectDefaultValue'
></el-option>
<el-option
v-for=
"item in queryCommonData.EmployeeList"
:label=
'item.EmName'
:value=
'item.EmployeeId'
<el-option
v-for=
"item in queryCommonData.EmployeeList"
:label=
'item.EmName'
:value=
'item.EmployeeId'
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
</li>
</li>
<li>
<li>
<span>
<span>
<em>
发团日期
</em>
<em>
{{
$t
(
'scen.sc_ftTime'
)
}}
</em>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"queryMsg.StartGroupDate"
:picker-options=
"pickerBeginDateBefore"
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"queryMsg.StartGroupDate"
:picker-options=
"pickerBeginDateBefore"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"queryMsg.EndGroupDate"
:picker-options=
"pickerBeginDateAfter"
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"queryMsg.EndGroupDate"
:picker-options=
"pickerBeginDateAfter"
...
@@ -77,19 +77,19 @@
...
@@ -77,19 +77,19 @@
</div>
</div>
<div
class=
"el-col"
style=
"width:220px;"
>
<div
class=
"el-col"
style=
"width:220px;"
>
<div
class=
"d3"
>
<div
class=
"d3"
>
<p><i
class=
"iconfont icon-tuandui"
></i>
团队信息
</p>
<p><i
class=
"iconfont icon-tuandui"
></i>
{{
$t
(
'visa.v_teaminfo'
)
}}
</p>
<p><em>
{{
item
.
DayNum
}}
天
{{
item
.
NightNum
}}
晚
</em></p>
<p><em>
{{
item
.
DayNum
}}
{{
$t
(
'hotel.hotel_day'
)
}}{{
item
.
NightNum
}}{{
$t
(
'Operation.Op_night'
)
}}
</em></p>
</div>
</div>
</div>
</div>
<div
class=
"el-col"
style=
"width:220px;"
>
<div
class=
"el-col"
style=
"width:220px;"
>
<div
class=
"d3"
>
<div
class=
"d3"
>
<p><i
class=
"iconfont icon-tuandui"
></i>
团期信息
</p>
<p><i
class=
"iconfont icon-tuandui"
></i>
{{
$t
(
'Operation.Op_teamInfo'
)
}}
</p>
<p
class=
"d12p"
>
{{
item
.
TCNUMS
}}
</p>
<p
class=
"d12p"
>
{{
item
.
TCNUMS
}}
</p>
</div>
</div>
</div>
</div>
<div
class=
"el-col"
style=
"width:130px;"
>
<div
class=
"el-col"
style=
"width:130px;"
>
<div
class=
"d5 TC-oparation"
style=
"padding-top:10px;"
>
<div
class=
"d5 TC-oparation"
style=
"padding-top:10px;"
>
<p><i
class=
"iconfont icon-yuangong"
></i>
操作
OP
</p>
<p><i
class=
"iconfont icon-yuangong"
></i>
{{
$t
(
'system.table_operation'
)
}}
OP
</p>
<div
class=
"clearfix TC-OpInfo"
>
<div
class=
"clearfix TC-OpInfo"
>
<div
class=
"TC-leftIMG"
>
<div
class=
"TC-leftIMG"
>
<img
v-if=
"item.OPPhoto"
:src=
"item.OPPhoto"
alt=
""
>
<img
v-if=
"item.OPPhoto"
:src=
"item.OPPhoto"
alt=
""
>
...
@@ -101,15 +101,15 @@
...
@@ -101,15 +101,15 @@
</div>
</div>
<div
class=
"el-col"
>
<div
class=
"el-col"
>
<div
class=
"d7"
>
<div
class=
"d7"
>
<el-button
@
click=
"goToOpenTravel('TravelManager2',item.ID)"
type=
"primary"
>
行程修改
</el-button>
<el-button
@
click=
"goToOpenTravel('TravelManager2',item.ID)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripUpdate'
)
}}
</el-button>
<el-button
@
click=
"copyTravelInfo(item.ID)"
type=
"primary"
>
行程复制
</el-button>
<el-button
@
click=
"copyTravelInfo(item.ID)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripCopy'
)
}}
</el-button>
<el-button
v-if=
"item.TCNUMS==''"
@
click=
"delConfig(item.ID)"
type=
"primary"
>
删除
</el-button>
<el-button
v-if=
"item.TCNUMS==''"
@
click=
"delConfig(item.ID)"
type=
"primary"
>
{{
$t
(
'system.table_delete'
)
}}
</el-button>
</div>
</div>
</div>
</div>
</div>
</div>
<div
class=
"TC_remarkContent"
>
<div
class=
"TC_remarkContent"
>
<div
class=
"clearfix"
>
<div
class=
"clearfix"
>
<div
class=
"TCL_remarkTitle TCL-redType"
>
团名
:
</div>
<div
class=
"TCL_remarkTitle TCL-redType"
>
{{
$t
(
'Operation.Op_TeamName'
)
}}
:
</div>
<div
class=
"TCL_Content"
>
{{
item
.
Title
}}
</div>
<div
class=
"TCL_Content"
>
{{
item
.
Title
}}
</div>
</div>
</div>
</div>
</div>
...
...
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @
b45895be
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
<ul>
<ul>
<li>
<li>
<span>
<span>
<em>
公司
</em>
<em>
{{
$t
(
'system.table_company'
)
}}
</em>
<el-select
class=
"w150"
filterable
placeholder=
"公司"
v-model=
"queryMsg.OutBranchId"
>
<el-select
class=
"w150"
filterable
placeholder=
"公司"
v-model=
"queryMsg.OutBranchId"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'queryCommonData.SelectDefaultValue2'
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'queryCommonData.SelectDefaultValue2'
></el-option>
<el-option
v-for=
'item in queryCommonData.BranchList'
:key=
"item.Id"
:label=
"item.BName"
:value=
"item.Id"
>
<el-option
v-for=
'item in queryCommonData.BranchList'
:key=
"item.Id"
:label=
"item.BName"
:value=
"item.Id"
>
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
</li>
</li>
<li>
<li>
<span>
<span>
<em>
线路
</em>
<em>
{{
$t
(
'advmanager.v_line'
)
}}
</em>
<el-select
class=
'w150'
v-model=
"queryMsg.LineID"
filterable
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"getLineTeamList()"
>
<el-select
class=
'w150'
v-model=
"queryMsg.LineID"
filterable
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"getLineTeamList()"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'queryCommonData.SelectDefaultValue'
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'queryCommonData.SelectDefaultValue'
></el-option>
<el-option
v-for=
"item in queryCommonData.LineList"
:label=
'item.LineName'
:value=
'item.LineID'
:key=
'item.LineID'
>
<el-option
v-for=
"item in queryCommonData.LineList"
:label=
'item.LineName'
:value=
'item.LineID'
:key=
'item.LineID'
>
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
</li>
</li>
<li>
<li>
<span>
<span>
<em>
系列
</em>
<em>
{{
$t
(
'advmanager.v_xilie'
)
}}
</em>
<el-select
class=
'w150'
v-model=
"queryMsg.ltID"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
'w150'
v-model=
"queryMsg.ltID"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'queryCommonData.SelectDefaultValue'
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'queryCommonData.SelectDefaultValue'
></el-option>
<el-option
v-for=
"item in queryCommonData.LineTeamList"
:label=
'item.LtName'
:value=
'item.LtID'
:key=
'item.LtID'
>
<el-option
v-for=
"item in queryCommonData.LineTeamList"
:label=
'item.LtName'
:value=
'item.LtID'
:key=
'item.LtID'
>
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
</li>
</li>
<li>
<li>
<span>
<span>
<em>
团期
</em>
<em>
{{
$t
(
'fnc.tuanqi'
)
}}
</em>
<el-date-picker
class=
"w150"
type=
"date"
value-format=
"yyyy-MM-dd"
placeholder=
""
v-model=
"queryMsg.QStartDate"
>
<el-date-picker
class=
"w150"
type=
"date"
value-format=
"yyyy-MM-dd"
placeholder=
""
v-model=
"queryMsg.QStartDate"
>
</el-date-picker>
</el-date-picker>
<el-date-picker
class=
"w150"
type=
"date"
value-format=
"yyyy-MM-dd"
placeholder=
""
v-model=
"queryMsg.QEndDate"
>
<el-date-picker
class=
"w150"
type=
"date"
value-format=
"yyyy-MM-dd"
placeholder=
""
v-model=
"queryMsg.QEndDate"
>
...
@@ -81,26 +81,26 @@
...
@@ -81,26 +81,26 @@
</span>
</span>
</li>
</li>
<li>
<li>
<input
type=
"button"
class=
"hollowFixedBtn"
value=
"查询
"
@
click=
"getList()"
/>
<input
type=
"button"
class=
"hollowFixedBtn"
:value=
"$t('pub.searchBtn')
"
@
click=
"getList()"
/>
<button
class=
"hollowFixedBtn"
@
click=
"DownLoadFile()"
>
下载
</button>
<button
class=
"hollowFixedBtn"
@
click=
"DownLoadFile()"
>
{{
$t
(
'adm.adm_download'
)
}}
</button>
</li>
</li>
</ul>
</ul>
</div>
</div>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'queryCommonData.loading'
>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'queryCommonData.loading'
>
<tr>
<tr>
<th
width=
"50"
>
序
</th>
<th
width=
"50"
>
{{
$t
(
'active.ad_xuhao'
)
}}
</th>
<th
width=
"80"
>
出团
</th>
<th
width=
"80"
>
{{
$t
(
'Operation.Op_chutuan'
)
}}
</th>
<th
width=
'200'
>
团名
</th>
<th
width=
'200'
>
{{
$t
(
'Operation.Op_TeamName'
)
}}
</th>
<th
width=
"80"
>
团期
</th>
<th
width=
"80"
>
{{
$t
(
'fnc.tuanqi'
)
}}
</th>
<th
width=
"80"
>
进出点
</th>
<th
width=
"80"
>
{{
$t
(
'Operation.Op_jinchudian'
)
}}
</th>
<th
width=
"100"
>
抵离时间
</th>
<th
width=
"100"
>
{{
$t
(
'Operation.Op_ArriveTime'
)
}}
</th>
<th
width=
"50"
>
价格
</th>
<th
width=
"50"
>
{{
$t
(
'Operation.Op_price'
)
}}
</th>
<th
width=
"100"
>
机位
</th>
<th
width=
"100"
>
{{
$t
(
'Airticket.Air_reservation'
)
}}
</th>
<th
width=
"80"
>
报名
</th>
<th
width=
"80"
>
{{
$t
(
'Operation.Op_signUp'
)
}}
</th>
<th
width=
"80"
>
收订人数
</th>
<th
width=
"80"
>
{{
$t
(
'Operation.Op_orderNum'
)
}}
</th>
<th
width=
"100"
>
领队
</th>
<th
width=
"100"
>
{{
$t
(
'leader.leader_Leader'
)
}}
</th>
<th
width=
"100"
>
导游
</th>
<th
width=
"100"
>
{{
$t
(
'leader.leader_Guide'
)
}}
</th>
<th>
备注
</th>
<th>
{{
$t
(
'hotel.hotel_remark'
)
}}
</th>
</tr>
</tr>
<tbody
v-for=
"item in DataList"
>
<tbody
v-for=
"item in DataList"
>
<tr>
<tr>
...
...
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @
b45895be
This diff is collapsed.
Click to expand it.
src/components/dmc/manager/tripsManager.vue
View file @
b45895be
...
@@ -337,7 +337,7 @@
...
@@ -337,7 +337,7 @@
<ul>
<ul>
<li>
<li>
<span>
<span>
<em>
系列名称
</em>
<em>
{{
$t
(
'active.ad_xlmc'
)
}}
</em>
<el-select
class=
"w150"
v-model=
"queryMsg.LineteamId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
"w150"
v-model=
"queryMsg.LineteamId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"queryCommonData.SelectDefaultValue"
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"queryCommonData.SelectDefaultValue"
></el-option>
<el-option
v-for=
"item in queryCommonData.LineTeamList"
:label=
"item.LtName"
:value=
"item.LtID"
:key=
"item.LtID"
></el-option>
<el-option
v-for=
"item in queryCommonData.LineTeamList"
:label=
"item.LtName"
:value=
"item.LtID"
:key=
"item.LtID"
></el-option>
...
@@ -346,14 +346,14 @@
...
@@ -346,14 +346,14 @@
</li>
</li>
<li>
<li>
<span>
<span>
<em>
团号
</em>
<em>
{{
$t
(
'visa.v_tuanhao'
)
}}
</em>
<el-input
maxlength=
"50"
v-model=
"queryMsg.TCNUM"
class=
"permiss-input w150"
@
keyup
.
native
.
enter=
"getControlList"
<el-input
maxlength=
"50"
v-model=
"queryMsg.TCNUM"
class=
"permiss-input w150"
@
keyup
.
native
.
enter=
"getControlList"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</span>
</li>
</li>
<li>
<li>
<span>
<span>
<em>
发团日期
</em>
<em>
{{
$t
(
'scen.sc_ftTime'
)
}}
</em>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"queryMsg.StartGroupDate"
:picker-options=
"pickerBeginDateBefore"
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"queryMsg.StartGroupDate"
:picker-options=
"pickerBeginDateBefore"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"queryMsg.EndGroupDate"
:picker-options=
"pickerBeginDateAfter"
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"queryMsg.EndGroupDate"
:picker-options=
"pickerBeginDateAfter"
...
@@ -362,7 +362,7 @@
...
@@ -362,7 +362,7 @@
</li>
</li>
<li>
<li>
<span>
<span>
<em>
团队状态
</em>
<em>
{{
$t
(
'scen.sc_temStatu'
)
}}
</em>
<el-select
class=
"w150"
v-model=
"queryMsg.QTCState"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
"w150"
v-model=
"queryMsg.QTCState"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"queryCommonData.SelectDefaultValue"
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"queryCommonData.SelectDefaultValue"
></el-option>
<el-option
v-for=
"tcItem in $tripUtils.TeamStatesList.TeamStates"
:label=
"tcItem.Name"
:key=
"tcItem.Id"
<el-option
v-for=
"tcItem in $tripUtils.TeamStatesList.TeamStates"
:label=
"tcItem.Name"
:key=
"tcItem.Id"
...
@@ -372,7 +372,7 @@
...
@@ -372,7 +372,7 @@
</li>
</li>
<li>
<li>
<span>
<span>
<em>
出团公司
</em>
<em>
{{
$t
(
'scen.sc_cp'
)
}}
</em>
<el-select
class=
"w150"
v-model=
"queryMsg.OutBranchId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
"w150"
v-model=
"queryMsg.OutBranchId"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"queryCommonData.BranchDefaultValue"
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"queryCommonData.BranchDefaultValue"
></el-option>
<el-option
v-for=
"item in queryCommonData.BranchList"
:label=
"item.BName"
:key=
"item.Id"
:value=
"item.Id"
>
{{
item
.
BName
}}
</el-option>
<el-option
v-for=
"item in queryCommonData.BranchList"
:label=
"item.BName"
:key=
"item.Id"
:value=
"item.Id"
>
{{
item
.
BName
}}
</el-option>
...
@@ -381,7 +381,7 @@
...
@@ -381,7 +381,7 @@
</li>
</li>
<li>
<li>
<span>
<span>
<em>
合团团号
</em>
<em>
{{
$t
(
'Operation.Op_hetuan'
)
}}
</em>
<el-input
maxlength=
"50"
v-model=
"queryMsg.CombinationNum"
class=
"permiss-input w150"
@
keyup
.
native
.
enter=
"getControlList"
<el-input
maxlength=
"50"
v-model=
"queryMsg.CombinationNum"
class=
"permiss-input w150"
@
keyup
.
native
.
enter=
"getControlList"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</span>
...
@@ -418,16 +418,16 @@
...
@@ -418,16 +418,16 @@
<td>
<td>
<div
class=
"d2"
style=
"width: 100%!important;"
>
<div
class=
"d2"
style=
"width: 100%!important;"
>
<p
class=
"TCLflight_GO"
>
<p
class=
"TCLflight_GO"
>
<i
class=
"iconfont icon-hangban1"
></i>
航班
<i
class=
"iconfont icon-hangban1"
></i>
{{
$t
(
'visa.v_hangban'
)
}}
</p>
</p>
<el-popover
width=
"900"
trigger=
"click"
popper-class=
"TC_tripDetails"
>
<el-popover
width=
"900"
trigger=
"click"
popper-class=
"TC_tripDetails"
>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr
class=
"_color_666"
style=
"text-align:center;"
>
<tr
class=
"_color_666"
style=
"text-align:center;"
>
<th
width=
"60"
>
{{
$t
(
'Airticket.Air_segment'
)
}}
</th>
<th
width=
"60"
>
{{
$t
(
'Airticket.Air_segment'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'system.query_flightNum'
)
}}
</th>
<th
width=
"80"
>
{{
$t
(
'system.query_flightNum'
)
}}
</th>
<th
width=
"150"
>
起飞时间
</th>
<th
width=
"150"
>
{{
$t
(
'system.ph_flightTime'
)
}}
</th>
<th
width=
"80"
>
到达时间
</th>
<th
width=
"80"
>
{{
$t
(
'system.query_arrivalTime'
)
}}
</th>
<th
width=
"100"
>
经停城市
</th>
<th
width=
"100"
>
{{
$t
(
'system.query_stopCity'
)
}}
</th>
</tr>
</tr>
<tr
v-for=
"(ds,din) in item.flightList"
:key=
"din"
style=
"text-align:center;"
>
<tr
v-for=
"(ds,din) in item.flightList"
:key=
"din"
style=
"text-align:center;"
>
<td
class=
"_d_name _color_666"
>
<td
class=
"_d_name _color_666"
>
...
@@ -457,8 +457,8 @@
...
@@ -457,8 +457,8 @@
<span
class=
"TCL-FlightNumber"
>
{{
subItem
.
Flight_number
}}
</span>
{{
subItem
.
DepartureName
}}
<span
class=
"TCL-FlightNumber"
>
{{
subItem
.
Flight_number
}}
</span>
{{
subItem
.
DepartureName
}}
{{
subItem
.
StopoverName
==
""
?
""
:
"-"
+
subItem
.
StopoverName
}}
{{
subItem
.
StopoverName
==
""
?
""
:
"-"
+
subItem
.
StopoverName
}}
{{
subItem
.
ArrivalCityName
==
""
?
""
:
"-"
+
subItem
.
ArrivalCityName
}}
{{
subItem
.
ArrivalCityName
==
""
?
""
:
"-"
+
subItem
.
ArrivalCityName
}}
<span
v-if=
"subItem.FlightState==1"
class=
"TCL-greenType"
>
【
确定
】
</span>
<span
v-if=
"subItem.FlightState==1"
class=
"TCL-greenType"
>
【
{{
$t
(
'pub.sureBtn'
)
}}
】
</span>
<span
v-if=
"subItem.FlightState==2"
class=
"TCL-redType"
>
【
暂定
】
</span>
<span
v-if=
"subItem.FlightState==2"
class=
"TCL-redType"
>
【
{{
$t
(
'visa.v_zanding'
)
}}
】
</span>
</span>
</span>
</div>
</div>
</div>
</div>
...
@@ -468,11 +468,11 @@
...
@@ -468,11 +468,11 @@
<td>
<td>
<div
class=
"d3"
>
<div
class=
"d3"
>
<p>
<p>
<i
class=
"iconfont icon-tuandui"
></i>
团队信息
<i
class=
"iconfont icon-tuandui"
></i>
{{
$t
(
'visa.v_teaminfo'
)
}}
<em>
{{
item
.
DayNum
}}
天
{{
item
.
NightNum
}}
晚
</em>
<em>
{{
item
.
DayNum
}}
天
{{
item
.
NightNum
}}
晚
</em>
</p>
</p>
<p>
<p>
<span>
出发时间
</span>
<span>
{{
$t
(
'Airticket.Air_StartTime'
)
}}
</span>
{{
item
.
StartDate
}}
{{
item
.
StartDate
}}
</p>
</p>
...
@@ -481,36 +481,36 @@
...
@@ -481,36 +481,36 @@
<td>
<td>
<div
class=
"d5"
>
<div
class=
"d5"
>
<p>
<p>
<i
class=
"iconfont icon-tuanwei"
></i>
团位信息
<i
class=
"iconfont icon-tuanwei"
></i>
{{
$t
(
'visa.v_tuanweiinfo'
)
}}
</p>
</p>
<p>
<p>
<span>
舱位
</span>
<span>
{{
$t
(
'Operation.Op_shipNum'
)
}}
</span>
<i>
{{
item
.
YSeat
}}
Y +
{{
item
.
FSeat
}}
F +
{{
item
.
CSeat
}}
F
</i>
<i>
{{
item
.
YSeat
}}
Y +
{{
item
.
FSeat
}}
F +
{{
item
.
CSeat
}}
F
</i>
</p>
</p>
<p>
<p>
<span>
已报入
</span>
<span>
{{
$t
(
'visa.v_yibaoru'
)
}}
</span>
<i>
{{
item
.
Seat
==
''
?
"0"
:
item
.
Seat
}}
人
</i>
<i>
{{
item
.
Seat
==
''
?
"0"
:
item
.
Seat
}}
人
</i>
<!-- (占位:
{{
item
.
Occupied
}}
人) -->
<!-- (占位:
{{
item
.
Occupied
}}
人) -->
</p>
</p>
<p>
<p>
<span>
候补
</span>
<span>
{{
$t
(
'visa.v_houbu'
)
}}
</span>
<span
v-if=
"item.IsSubstitution==1"
>
允许候补
</span>
<span
v-if=
"item.IsSubstitution==1"
>
{{
$t
(
'visa.v_yxhoubu'
)
}}
</span>
<span
v-else
class=
"TCL-redType"
>
不允许候补
</span>
<span
v-else
class=
"TCL-redType"
>
{{
$t
(
'visa.v_byxhoubu'
)
}}
</span>
</p>
</p>
</div>
</div>
</td>
</td>
<td
width=
"240"
>
<td
width=
"240"
>
<div
class=
"d7"
>
<div
class=
"d7"
>
<el-button-group
v-if=
'outItem.TravelPriceList.length>1'
>
<el-button-group
v-if=
'outItem.TravelPriceList.length>1'
>
<el-button
@
click
.
native=
'chaiTuan(item)'
type=
"primary"
style=
"background:#00C6FF; border-color:#00C6FF"
>
团队分拆
</el-button>
<el-button
@
click
.
native=
'chaiTuan(item)'
type=
"primary"
style=
"background:#00C6FF; border-color:#00C6FF"
>
{{
$t
(
'Operation.Op_chaifen'
)
}}
</el-button>
</el-button-group>
</el-button-group>
</div>
</div>
</td>
</td>
</tr>
</tr>
<tr
height=
"40"
>
<tr
height=
"40"
>
<td
colspan=
"5"
style=
"padding-left: 30px;"
>
<td
colspan=
"5"
style=
"padding-left: 30px;"
>
<div>
备注
:
{{
item
.
OPRemark
}}
</div>
<div>
{{
$t
(
'fnc.beizhu'
)
}}
:
{{
item
.
OPRemark
}}
</div>
<div
v-if=
"item.DmcRemarkLast"
>
地接备注
:
{{
item
.
DmcRemarkLast
.
DMCRemark
}}
</div>
<div
v-if=
"item.DmcRemarkLast"
>
{{
$t
(
'Operation.Op_dijieRemark'
)
}}
:
{{
item
.
DmcRemarkLast
.
DMCRemark
}}
</div>
</td>
</td>
</tr>
</tr>
</
template
>
</
template
>
...
...
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @
b45895be
...
@@ -275,6 +275,7 @@
...
@@ -275,6 +275,7 @@
/*初始化组件*/
/*初始化组件*/
init
()
{
init
()
{
this
.
$emit
(
"headCallBack"
,
this
.
PostConfig
);
this
.
$emit
(
"headCallBack"
,
this
.
PostConfig
);
console
.
log
(
this
.
PostConfig
,
'postconfig'
);
},
},
//上传图片
//上传图片
reUpload
(
file
)
{
reUpload
(
file
)
{
...
...
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @
b45895be
...
@@ -401,6 +401,7 @@
...
@@ -401,6 +401,7 @@
//初始化团的幻灯片
//初始化团的幻灯片
initFileList
()
{
initFileList
()
{
this
.
PostConfig
.
fileList
=
[];
for
(
var
i
=
0
;
i
<
5
;
i
++
)
{
for
(
var
i
=
0
;
i
<
5
;
i
++
)
{
var
fileObj
=
this
.
$commonUtils
.
FileObject
();
var
fileObj
=
this
.
$commonUtils
.
FileObject
();
this
.
PostConfig
.
fileList
.
push
(
fileObj
);
this
.
PostConfig
.
fileList
.
push
(
fileObj
);
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @
b45895be
...
@@ -21,7 +21,12 @@
...
@@ -21,7 +21,12 @@
.TPDateContent
.currentInput
{
.TPDateContent
.currentInput
{
background-color
:
transparent
;
background-color
:
transparent
;
}
}
/* .TPDateContent .month ul li {
font-size: 12px;
position: relative;
float: left;
letter-spacing: 3px;
} */
.TP_tips
{
.TP_tips
{
display
:
inline-block
;
display
:
inline-block
;
padding
:
5px
;
padding
:
5px
;
...
@@ -328,7 +333,6 @@
...
@@ -328,7 +333,6 @@
cursor
:
default
!important
;
cursor
:
default
!important
;
box-shadow
:
none
!important
;
box-shadow
:
none
!important
;
}
}
</
style
>
</
style
>
<
template
>
<
template
>
...
@@ -348,18 +352,23 @@
...
@@ -348,18 +352,23 @@
<div
class=
"TPDateContent"
id=
"DayAll"
>
<div
class=
"TPDateContent"
id=
"DayAll"
>
<div
class=
"month"
>
<div
class=
"month"
>
<ul>
<ul>
<li>
<li
style=
"margin:0 0 0 20px;"
>
<i
class=
"arrow monthminus"
@
click=
"currentYear-=1,getDateString(),initCalendar(dateString)"
>
<
</i>
<i
class=
"arrow monthminus"
@
click=
"currentYear-=1,getDateString(),initCalendar(dateString)"
>
<
</i>
<input
type=
"text"
v-model=
"currentYear"
disabled
class=
"currentInput"
<input
type=
"text"
v-model=
"currentYear"
disabled
class=
"currentInput"
@
input=
"getDateString(),initCalendar(dateString)"
>
年
@
input=
"getDateString(),initCalendar(dateString)"
>
年
<i
class=
"arrow monthadd"
@
click=
"currentYear+=1,getDateString(),initCalendar(dateString)"
>
>
</i>
<i
class=
"arrow monthadd"
@
click=
"currentYear+=1,getDateString(),initCalendar(dateString)"
>
>
</i>
</li>
</li>
<li>
<li
style=
"margin:0 40px 0 40px;"
>
<i
class=
"arrow monthminus"
@
click=
"pickPre(currentYear,currentMonth)"
>
<
</i>
<i
class=
"arrow monthminus"
@
click=
"pickPre(currentYear,currentMonth)"
>
<
</i>
<input
type=
"text"
v-model=
"currentMonth"
disabled
class=
"currentInput"
<input
type=
"text"
v-model=
"currentMonth"
disabled
class=
"currentInput"
@
input=
"getDateString(),initCalendar(dateString)"
>
月
@
input=
"getDateString(),initCalendar(dateString)"
>
月
<i
class=
"arrow monthadd"
@
click=
"pickNext(currentYear,currentMonth)"
>
>
</i>
<i
class=
"arrow monthadd"
@
click=
"pickNext(currentYear,currentMonth)"
>
>
</i>
</li>
</li>
<li
style=
"margin:25px 0 0 0;"
>
<div
class=
"ckAll"
>
<el-checkbox
class=
"checkBox"
v-model=
'isCheckAll'
@
change=
"checkAll"
>
全选
</el-checkbox>
</div>
</li>
</ul>
</ul>
</div>
</div>
<!-- 星期 -->
<!-- 星期 -->
...
@@ -816,6 +825,7 @@
...
@@ -816,6 +825,7 @@
data
()
{
data
()
{
return
{
return
{
outerVisible
:
false
,
outerVisible
:
false
,
isCheckAll
:
false
,
currentDay
:
1
,
currentDay
:
1
,
currentMonth
:
1
,
currentMonth
:
1
,
currentYear
:
1970
,
currentYear
:
1970
,
...
@@ -1014,6 +1024,76 @@
...
@@ -1014,6 +1024,76 @@
break
;
break
;
}
}
},
},
//日历全选
checkAll
()
{
this
.
returnPriceList
=
[];
if
(
this
.
isCheckAll
){
this
.
days
.
forEach
(
x
=>
{
x
.
checkState
=
'1'
;
let
obj
=
{
AdImage
:
''
,
AirTicketId
:
0
,
AirportService
:
''
,
AirticketBindList
:[],
AirticketMoney
:
0
,
B2BMemberPrice
:
0
,
B2BPrice
:
0
,
B2CMemberPrice
:
0
,
B2CPrice
:
0
,
BabyChargePrice
:
0
,
BabyPrice
:
0
,
BackSafeMoney
:
0
,
BackVisaPrice
:
0
,
CSeat
:
0
,
CanSellTicketNum
:
0
,
Checked
:
false
,
ChildNeedPrice
:
0
,
ChildNoNeedPrice
:
0
,
ChooseHotelArray
:[],
ClearOrderHour
:
''
,
ContractArray
:[],
ContractUrl
:
''
,
DeleteAirticketIds
:
''
,
DiscountPrice
:
0
,
FSeat
:
0
,
GatherAddress
:
''
,
GatherTag
:
''
,
GatherTime
:
''
,
Inventory
:
0
,
IsB2B
:
0
,
IsB2C
:
0
,
IsBookTeam
:
0
,
IsNew
:
false
,
IsOrder
:
0
,
IsSubstitution
:
1
,
IsSupportChildren
:
1
,
LeaderNum
:
0
,
OPRemark
:
""
,
OfferId
:
0
,
OldManChargePrice
:
0
,
OtherPrice
:
0
,
OutBranchId
:
0
,
PeopleNum
:
0
,
PriceFlight
:
[],
RebatePrice
:
0
,
SafeMoney
:
0
,
SaleBranchId
:
""
,
SaleBranchIdArray
:
[],
SendVisaTime
:
""
,
SingleDMCPrice
:
0
,
SingleRoomPrice
:
0
,
StartDate
:
this
.
getDayStr
(
x
.
day
),
TCID
:
0
,
TCSaleState
:
1
,
VisaPrice
:
0
,
YSeat
:
0
,
}
this
.
returnPriceList
.
push
(
obj
);
})
}
},
//单团期修改重置日历选中
//单团期修改重置日历选中
initDatePickerCheched
()
{
initDatePickerCheched
()
{
...
...
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