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
3f756676
Commit
3f756676
authored
Mar 28, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加国际化和bus样式
parent
cf3107cf
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
193 additions
and
144 deletions
+193
-144
zh.js
src/assets/common/lang/zh.js
+50
-0
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+53
-53
BusInfo.vue
src/components/busManagement/BusInfo.vue
+82
-91
config.js
src/router/config.js
+8
-0
No files found.
src/assets/common/lang/zh.js
View file @
3f756676
...
...
@@ -658,6 +658,12 @@ export const visa = {
v_yibaoru
:
'已报入'
,
v_houbu
:
'候补'
,
v_yxhoubu
:
'允许候补'
,
v_byxhoubu
:
'不允许候补'
,
v_sqtime
:
'送签日期'
,
v_cqtime
:
'出签日期'
,
v_kptime
:
'开票日期'
,
v_EuropeanVisaType
:
'欧洲签证类型'
,
v_britishVisa
:
'英国签证'
,
...
...
@@ -1217,6 +1223,50 @@ export const Operation = {
Op_localBranchPrice
:
'当地分公司价格'
,
Op_localdaiPrice
:
'当地代销商价格'
,
Op_localDangPrice
:
'当地当团利润归属'
,
Op_Country
:
'国别'
,
Op_WarningTeam
:
'预警团'
,
Op_TransportState
:
'联运状态'
,
Op_hide
:
'隐藏'
,
Op_TeamWarningSearch
:
'团控预警查询'
,
Op_daysChoice
:
'天数选择'
,
Op_Attendance
:
'上座率'
,
Op_warningSearch
:
'预警查询'
,
Op_TeamName
:
'团名'
,
Op_nei
:
'内'
,
Op_zhu
:
'主'
,
Op_lian
:
'联'
,
Op_jietuan
:
'结团'
,
Op_night
:
'晚'
,
Op_teamNotice
:
'出团通知书'
,
Op_downLoadword
:
'下载WORD行程'
,
Op_PriceInfo
:
'价格信息'
,
Op_tradePrice
:
'同业价'
,
Op_directPrice
:
'直客价'
,
Op_fellowMember
:
'同行会员'
,
Op_standard
:
'标准'
,
Op_fellow
:
'同行'
,
Op_directMember
:
'直客会员'
,
Op_direct
:
'直客'
,
Op_baby
:
'婴儿'
,
Op_spickupPrice
:
'单地接价格'
,
Op_Income
:
'增收'
,
Op_childBed
:
'儿童占床'
,
Op_childSurcharge
:
'儿童附加费'
,
Op_oldmanSurcharge
:
'老人附加费'
,
Op_visaPrice
:
'签证费'
,
Op_singleRoomcha
:
'单房差'
,
Op_insurance
:
'保险'
,
Op_zafei
:
'杂费'
,
Op_jianmian
:
'减免'
,
Op_childNobed
:
'儿童不占床'
,
Op_visafeeBack
:
'退签证费'
,
Op_priceDetail
:
'查看价格明细'
,
Op_people
:
'人'
,
Op_takeSeat
:
'占位'
,
Op_nozhipai
:
'尚未指派'
,
Op_caozuoop
:
'操作op'
,
Op_bindNum
:
'绑定数量'
,
Op_Warmprompt
:
'温馨提示'
,
}
export
const
rule
=
{
company
:
'请选择公司'
,
...
...
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
3f756676
...
...
@@ -447,91 +447,91 @@
<div
class=
"el-col"
style=
"width:220px;"
>
<div
class=
"d3"
>
<p>
<i
class=
"iconfont icon-tuandui"
></i>
团队信息
<i
class=
"iconfont icon-tuandui"
></i>
{{
$t
(
'visa.v_teaminfo'
)
}}
</p>
<p>
<em>
{{
item
.
DayNum
}}
天
{{
item
.
NightNum
}}
晚
</em>
<em>
{{
item
.
DayNum
}}
{{
$t
(
'hotel.hotel_day'
)
}}{{
item
.
NightNum
}}{{
$t
(
'Operation.Op_night'
)
}}
</em>
</p>
<p
class=
"travelnowrap"
>
<span>
出发时间
</span>
<span>
{{
$t
(
'Airticket.Air_StartTime'
)
}}
</span>
<span
class=
"go_date"
>
{{
item
.
StartDate
}}
</span>
</p>
<p
class=
"travelnowrap"
>
<span>
出团通知书
</span>
<span>
{{
$t
(
'Operation.Op_teamNotice'
)
}}
</span>
{{
item
.
OutNotice
==
1
?
'OK'
:
'暂定'
}}
</p>
<p
class=
"travelnowrap"
>
<span>
出团公司
</span>
<span>
{{
$t
(
'scen.sc_cp'
)
}}
</span>
{{
item
.
OutBranchName
}}
</p>
<p
class=
"travelnowrap"
v-if=
"item.WordPath!=''"
>
<a
style=
"corsor:pointer;"
:href=
"domainManager().ViittoFileUrl+item.WordPath"
>
下载WORD行程
</a>
<a
style=
"corsor:pointer;"
:href=
"domainManager().ViittoFileUrl+item.WordPath"
>
{{
$t
(
'Operation.Op_downLoadword'
)
}}
</a>
</p>
</div>
</div>
<div
class=
"el-col"
style=
"width:190px;"
>
<div
class=
"d4"
>
<p>
<i
class=
"iconfont icon-jiage"
></i>
价格信息
<i
class=
"iconfont icon-jiage"
></i>
{{
$t
(
'Operation.Op_PriceInfo'
)
}}
</p>
<p
class=
"travelprice"
>
同业价
:¥
{{
item
.
B2BMemberPrice
|
priceFormat
(
item
.
B2BMemberPrice
)
}}
</p>
<p
class=
"travelprice"
>
直客价
:¥
{{
item
.
B2CMemberPrice
|
priceFormat
(
item
.
B2CMemberPrice
)
}}
</p>
<p
class=
"travelprice"
>
{{
$t
(
'Operation.Op_tradePrice'
)
}}
:¥
{{
item
.
B2BMemberPrice
|
priceFormat
(
item
.
B2BMemberPrice
)
}}
</p>
<p
class=
"travelprice"
>
{{
$t
(
'Operation.Op_directPrice'
)
}}
:¥
{{
item
.
B2CMemberPrice
|
priceFormat
(
item
.
B2CMemberPrice
)
}}
</p>
<p>
<el-popover
width=
"700"
trigger=
"click"
popper-class=
"TC_customerInfo"
>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<td
rowspan=
"2"
style=
"text-align:center"
width=
"60"
>
<i>
标准
</i>
<i>
{{
$t
(
'Operation.Op_standard'
)
}}
</i>
</td>
<td
class=
"TC_cusTitle"
>
同行会员
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_fellowMember'
)
}}
</td>
<td><b>
{{
item
.
B2BMemberPrice
|
priceFormat
(
item
.
B2BMemberPrice
)
}}
</b></td>
<td
class=
"TC_cusTitle"
>
同行
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_fellow'
)
}}
</td>
<td><b>
{{
item
.
B2BPrice
|
priceFormat
(
item
.
B2BPrice
)
}}
</b></td>
<td
class=
"TC_cusTitle"
>
直客会员
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_directMember'
)
}}
</td>
<td><b>
{{
item
.
B2CMemberPrice
|
priceFormat
(
item
.
B2CMemberPrice
)
}}
</b></td>
<td
class=
"TC_cusTitle"
>
直客
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_direct'
)
}}
</td>
<td><b>
{{
item
.
B2CPrice
|
priceFormat
(
item
.
B2CPrice
)
}}
</b></td>
</tr>
<tr>
<td
class=
"TC_cusTitle"
>
婴儿
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_baby'
)
}}
</td>
<td><b>
{{
item
.
BabyPrice
|
priceFormat
(
item
.
BabyPrice
)
}}
</b></td>
<td
class=
"TC_cusTitle"
>
单地接价格
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_spickupPrice'
)
}}
</td>
<td
colspan=
"5"
>
<b>
{{
item
.
SingleDMCPrice
|
priceFormat
(
item
.
SingleDMCPrice
)
}}
</b>
</td>
</tr>
<tr>
<td
rowspan=
"2"
style=
"text-align:center"
>
<i>
增收
</i>
<i>
{{
$t
(
'Operation.Op_Income'
)
}}
</i>
</td>
<td
class=
"TC_cusTitle"
>
儿童占床
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_childBed'
)
}}
</td>
<td><b>
{{
(
item
.
ChildNeedPrice
)
|
priceFormat
(
item
.
ChildNeedPrice
)
}}
</b></td>
<td
class=
"TC_cusTitle"
>
儿童附加费
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_childSurcharge'
)
}}
</td>
<td><b>
{{
item
.
BabyChargePrice
|
priceFormat
(
item
.
BabyChargePrice
)
}}
</b></td>
<td
class=
"TC_cusTitle"
>
老人附加费
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_oldmanSurcharge'
)
}}
</td>
<td><b>
{{
item
.
OldManChargePrice
|
priceFormat
(
item
.
OldManChargePrice
)
}}
</b></td>
<td
class=
"TC_cusTitle"
>
签证费
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_visaPrice'
)
}}
</td>
<td><b>
{{
item
.
VisaPrice
|
priceFormat
(
item
.
VisaPrice
)
}}
</b></td>
</tr>
<tr>
<td
class=
"TC_cusTitle"
>
单房差
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_singleRoomcha'
)
}}
</td>
<td><b>
{{
item
.
SingleRoomPrice
|
priceFormat
(
item
.
SingleRoomPrice
)
}}
</b></td>
<td
class=
"TC_cusTitle"
>
保险
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_insurance'
)
}}
</td>
<td><b>
{{
item
.
SafeMoney
|
priceFormat
(
item
.
SafeMoney
)
}}
</b></td>
<td
class=
"TC_cusTitle"
>
杂费
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_zafei'
)
}}
</td>
<td
colspan=
"3"
><b>
{{
item
.
OtherPrice
|
priceFormat
(
item
.
OtherPrice
)
}}
</b></td>
</tr>
<tr>
<td
style=
"text-align:center"
>
<i>
减免
</i>
<i>
{{
$t
(
'Operation.Op_jianmian'
)
}}
</i>
</td>
<td
class=
"TC_cusTitle"
>
儿童不占床
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_childNobed'
)
}}
</td>
<td><b>
{{
item
.
ChildNoNeedPrice
|
priceFormat
(
item
.
ChildNoNeedPrice
)
}}
</b></td>
<td
class=
"TC_cusTitle"
>
退签证费
</td>
<td
class=
"TC_cusTitle"
>
{{
$t
(
'Operation.Op_visafeeBack'
)
}}
</td>
<td
colspan=
"6"
><b>
{{
item
.
BackVisaPrice
|
priceFormat
(
item
.
BackVisaPrice
)
}}
</b></td>
</tr>
</table>
<span
slot=
"reference"
class=
"price"
>
查看价格明细
</span>
<span
slot=
"reference"
class=
"price"
>
{{
$t
(
'Operation.Op_priceDetail'
)
}}
</span>
</el-popover>
</p>
</div>
...
...
@@ -539,31 +539,31 @@
<div
class=
"el-col"
style=
"width:150px;"
>
<div
class=
"d5"
>
<p>
<i
class=
"iconfont icon-tuanwei"
></i>
团位信息
<i
class=
"iconfont icon-tuanwei"
></i>
{{
$t
(
'visa.v_tuanweiinfo'
)
}}
</p>
<p>
<span>
当前余位
</span>
<span>
{{
$t
(
'visa.v_currentseat'
)
}}
</span>
<i>
{{
item
.
SurplusSeat
=
item
.
SurplusSeat
<
0
?
0
:
item
.
SurplusSeat
}}
</i></p>
<p>
<span>
已报入
</span>
<span>
{{
$t
(
'visa.v_yibaoru'
)
}}
</span>
<i>
{{
item
.
OrderGuestNum
}}
<span
class=
"TCL-redType"
v-if=
"item.OrderLeaderGuestNum>=1"
>
+
{{
item
.
OrderLeaderGuestNum
}}
</span>
人
<span
class=
"TCL-redType"
v-if=
"item.OrderLeaderGuestNum>=1"
>
+
{{
item
.
OrderLeaderGuestNum
}}
</span>
{{
$t
(
'Operation.Op_people'
)
}}
</i>
</p>
<p>
<span>
占位
</span>
<i>
{{
item
.
Occupied
}}
</i>
人
<span>
{{
$t
(
'Operation.Op_takeSeat'
)
}}
</span>
<i>
{{
item
.
Occupied
}}
</i>
{{
$t
(
'Operation.Op_people'
)
}}
</p>
<p
class=
"travelnowrap"
>
<span>
候补
</span>
<span
v-if=
"item.IsSubstitution==1"
class=
"TCL-greenType"
>
允许候补(候补
{{
item
.
HBNum
}}
人
)
</span>
<span
v-else
class=
"TCL-redType"
>
不允许候补
</span>
<span>
{{
$t
(
'visa.v_houbu'
)
}}
</span>
<span
v-if=
"item.IsSubstitution==1"
class=
"TCL-greenType"
>
{{
$t
(
'visa.v_yxhoubu'
)
}}
(
{{
$t
(
'visa.v_houbu'
)
}}{{
item
.
HBNum
}}{{
$t
(
'Operation.Op_people'
)
}}
)
</span>
<span
v-else
class=
"TCL-redType"
>
{{
$t
(
'visa.v_byxhoubu'
)
}}
</span>
</p>
<p>
<span>
领队
</span>
<span
v-if=
"item.LeaderName==null"
class=
"TCL-redType"
>
尚未指派
</span>
<span>
{{
$t
(
'leader.leader_Leader'
)
}}
</span>
<span
v-if=
"item.LeaderName==null"
class=
"TCL-redType"
>
{{
$t
(
'Operation.Op_nozhipai'
)
}}
</span>
<span
v-else
class=
"TCL-greenType"
>
{{
item
.
LeaderName
}}
</span>
</p>
</div>
...
...
@@ -571,7 +571,7 @@
<div
class=
"el-col"
style=
"width:130px;"
>
<div
class=
"d5 TC-oparation"
>
<p>
<i
class=
"iconfont icon-yuangong"
></i>
操作OP
<i
class=
"iconfont icon-yuangong"
></i>
{{
$t
(
'Operation.Op_caozuoop'
)
}}
</p>
<div
class=
"clearfix TC-OpInfo"
>
<div
class=
"TC-leftIMG"
>
...
...
@@ -580,38 +580,38 @@
</div>
<div
class=
"TC-OPName"
>
{{
item
.
OPName
}}
</div>
</div>
<div
class=
"TC_SeatList"
>
头等舱
:
{{
item
.
FSeat
}}
</div>
<div
class=
"TC_SeatList"
>
商务舱
:
{{
item
.
CSeat
}}
</div>
<div
class=
"TC_SeatList"
>
经济舱
:
{{
item
.
YSeat
}}
</div>
<div
class=
"TC_SeatList"
>
绑定数量
:
<span
style=
"color:red"
>
{{
item
.
BindNum
}}
</span></div>
<div
class=
"TC_SeatList"
>
{{
$t
(
'Airticket.Air_firstClass'
)
}}
:
{{
item
.
FSeat
}}
</div>
<div
class=
"TC_SeatList"
>
{{
$t
(
'Airticket.Air_businessClass'
)
}}
:
{{
item
.
CSeat
}}
</div>
<div
class=
"TC_SeatList"
>
{{
$t
(
'Airticket.Air_EconomyClass'
)
}}
:
{{
item
.
YSeat
}}
</div>
<div
class=
"TC_SeatList"
>
{{
$t
(
'Operation.Op_bindNum'
)
}}
:
<span
style=
"color:red"
>
{{
item
.
BindNum
}}
</span></div>
</div>
</div>
<div
class=
"el-col"
style=
"width:200px;"
>
<div
class=
"d3"
>
<p>
<i
class=
"iconfont icon-wenxintishi"
></i>
温馨提示
<i
class=
"iconfont icon-wenxintishi"
></i>
{{
$t
(
'Operation.Op_Warmprompt'
)
}}
</p>
<p
v-if=
"item.VisaType"
>
<span>
签证类型
</span>
<span
v-if=
"item.VisaType==1"
>
个签
</span>
<span
v-else-if=
"item.VisaType==2"
>
团签
</span>
<span>
{{
$t
(
'visa.v_visaType'
)
}}
</span>
<span
v-if=
"item.VisaType==1"
>
{{
$t
(
'visa.v_gvisa'
)
}}
</span>
<span
v-else-if=
"item.VisaType==2"
>
{{
$t
(
'visa.v_tvisa'
)
}}
</span>
</p>
<p>
<span>
送签日期
</span>
<span>
{{
$t
(
'visa.v_sqtime'
)
}}
</span>
<span
class=
"TCL-redType"
>
{{
item
.
SendVisaTime
}}
</span>
</p>
<p>
<span>
出签日期
</span>
<span>
{{
$t
(
'visa.v_cqtime'
)
}}
</span>
{{
item
.
OutVisaTime
}}
</p>
<p>
<span>
开票日期
</span>
<span>
{{
$t
(
'visa.v_kptime'
)
}}
</span>
{{
item
.
TicketDeadline
}}
</p>
<p
v-if=
"item.LineID==2&&item.EuropeVisaType>0"
>
<span>
<span
v-if=
"item.EuropeVisaType"
>
欧洲签证类型
</span>
<span
v-if=
"item.EuropeVisaType==1"
>
英国签证
</span>
<span
v-if=
"item.EuropeVisaType"
>
{{
$t
(
'visa.v_EuropeanVisaType'
)
}}
</span>
<span
v-if=
"item.EuropeVisaType==1"
>
{{
$t
(
'visa.v_britishVisa'
)
}}
</span>
<span
v-else-if=
"item.EuropeVisaType==2"
>
申根签证
</span>
</span>
</p>
...
...
src/components/busManagement/BusInfo.vue
View file @
3f756676
...
...
@@ -103,7 +103,7 @@
cursor
:
pointer
;
}
.BusTyleFirst
.w1
5
0
{
.BusTyleFirst
.w1
7
0
{
margin-right
:
22px
;
}
...
...
@@ -157,79 +157,66 @@
<el-form
:model=
"PostData"
:rules=
"rules"
ref=
"PostData"
>
<table
class=
"bo_bus"
cellspacing=
"1"
>
<tr>
<th
width=
"100"
>
日期
</th>
<th
width=
"280"
>
酒店名称
</th>
<th
width=
"50"
>
停车场
</th>
<th
width=
"400"
>
用车计划
</th>
<th
width=
"200"
>
订团号
</th>
<th
width=
"100"
>
司机姓名
</th>
<th
width=
"100"
>
联系电话
</th>
<th
width=
"280"
>
联系电话
</th>
<th
width=
"50"
>
车牌号码
</th>
<th
width=
"120"
>
供应商
</th>
<th
width=
"120"
>
付款方式
</th>
<th
width=
"200"
>
订团号
</th>
<th
width=
"250"
>
司机住宿
</th>
<th>
泊车说明
</th>
<th
width=
"120"
>
车辆类型
</th>
<th
width=
"120"
>
使用人数
</th>
<th
width=
"120"
>
车牌号码
</th>
<th
width=
"120"
>
供应商
</th>
<th>
成本价
</th>
<th
width=
"120"
>
付款方式
</th>
<th
width=
"120"
>
备注
</th>
<th
width=
"400"
>
用车计划
</th>
<th
width=
"100"
>
日期
</th>
<th
width=
"100"
>
酒店名称
</th>
<th
width=
"120"
>
车辆类型
</th>
<th
width=
"120"
>
停车场
</th>
<th
width=
"120"
>
小计
</th>
</tr>
<tr
v-for=
"(item,index) in PlanTableData"
>
<td>
<div
class=
"w100"
>
{{
item
.
PlanDateStr
}}
</div>
<el-input
class=
"w100"
v-model=
"item.DriverName"
></el-input>
</td>
<td>
<div
class=
"w280"
>
{{
item
.
HotelName
}}
</div>
<el-input
class=
"w100"
v-model=
"item.DriverTel"
></el-input>
</td>
<td>
<div
class=
"w50"
>
{{
item
.
IsHavearking
==
'0'
?
'无'
:
'有'
}}
<div
class=
"w
1
50"
>
<el-input
class=
"w135"
v-model=
"item.BusNum"
></el-input>
</div>
</td>
<td
class=
"carPlanOne"
:class=
"
{'otherSpan':index!=0
&&
index!=PlanTableData.length-1}">
<div
class=
"w320"
v-for=
"(subItem,subIndex) in item.DetailList"
>
<em>
<!--接机送机-->
<el-select
class=
"w150"
placeholder=
"请选择"
v-model=
"subItem.AirportPickUp"
:disabled=
"forbidInput"
>
<el-option
:key=
"0"
:value=
"0"
label=
"请选择"
></el-option>
<el-option
v-for=
"childitem in BusAirportPickUpList"
:key=
"childitem.Id"
:label=
"childitem.Name"
:value=
"childitem.Id"
>
<td>
<div
class=
"w200"
>
<el-select
class=
"w150"
filterable
placeholder=
"请选择"
v-model=
"item.BusCompany"
>
<el-option
v-for=
"item in SupplierList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
</em>
<!--用车类型-->
<span
v-for=
"childItem in UseTypeArray"
class=
"BusinfoSpan"
>
<span
v-if=
"childItem.Id==1"
class=
"subName"
:class=
"
{'spanCked':subItem.UseType==childItem.Id,'disSpan':forbidInput==true}"
@click="UseTypeClick(childItem.Id,index,subIndex);getBusPrice(subItem)">
{{
childItem
.
Name
}}
</span>
</span>
<span
style=
"width:30px;display:inline-block;"
>
<a
v-if=
"subIndex>0"
@
click=
"DeleteSubItem(item,subIndex)"
style=
"color:blue;cursor:pointer"
>
删除
</a>
</span>
<span
style=
"display:inline-block;width:30px;margin-left:5px;"
>
<span
class=
"busAddbtn"
v-if=
"subIndex==item.DetailList.length-1"
@
click=
"AddSubItem(item)"
style=
"margin-bottom:10px;"
>
<i
class=
"iconfont icon-img_haha"
></i>
</span>
</span>
</div>
</td>
<td>
<el-input
class=
'w170'
type=
"text"
v-model=
"item.BookGroup"
></el-input>
</td>
<td>
<el-input
class=
"w100"
v-model=
"item.DriverName"
></el-input>
<div
class=
"w120"
>
<el-select
class=
'w100 sel'
v-model=
'item.PayType'
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
label=
'请选择'
:value=
'0'
></el-option>
<el-option
label=
'现付'
:value=
'1'
></el-option>
<el-option
label=
'公司结算'
:value=
'2'
></el-option>
<el-option
label=
'预付'
:value=
'3'
></el-option>
</el-select>
</div>
</td>
<td>
<el-input
class=
"w100"
v-model=
"item.DriverTel"
></el-input>
<div
class=
"w200"
:class=
"
{'BusTyleFirst':index==0}">
<el-input
class=
'w170'
type=
"text"
v-model=
"item.BookGroup"
></el-input>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"同上"
placement=
"top"
>
<i
class=
"iconfont icon-tongshang"
style=
"cursor:pointer;"
v-if=
"index!=0"
@
click=
"getBeforeInfo(index)"
></i>
</el-tooltip>
</div>
</td>
<td
class=
"carPlanOne"
>
<!--司机住宿类型-->
<div
class=
"w2
6
0"
>
<div
class=
"w2
0
0"
>
<span
v-for=
"subItem in AccommodationTypeArray"
>
<span
class=
"subName"
:class=
"
{'spanCked':item.AccommodationType==subItem.Id}"
@click="AccommodationCLick(subItem.Id,index)">
{{
subItem
.
Name
}}
</span>
...
...
@@ -244,59 +231,70 @@
<el-input
class=
"w135"
v-model=
"item.ParkExplain"
placeholder=
"请输入说明"
></el-input>
</div>
</td>
<td>
<div
class=
"w180"
:class=
"
{'BusTyleFirst':index==0}">
<el-select
clearable
class=
"w150"
filterable
placeholder=
"请选择"
v-model=
"item.BusType"
:disabled=
"forbidInput"
@
change=
'getBusPrice(item)'
>
<el-option
:key=
"0"
:value=
"0"
label=
"请选择"
></el-option>
<el-option
v-for=
"item in BusTypeList"
:key=
"item.Id"
:label=
"item.newName"
:value=
"item.Id"
>
</el-option>
</el-select>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"同上"
placement=
"top"
>
<i
class=
"iconfont icon-tongshang"
style=
"cursor:pointer;"
v-if=
"index!=0"
@
click=
"getBeforeInfo(index)"
></i>
</el-tooltip>
</div>
</td>
<td>
<div
class=
"w80"
>
<el-input
class=
"w50"
v-model=
"item.UseNum"
@
keyup
.
native=
"checkPrice(item,'UseNum')"
></el-input>
</div>
</td>
<td>
<div
class=
"w150"
>
<el-input
class=
"w135"
v-model=
"item.BusNum"
></el-input>
<div
class=
"w120"
>
<el-input
class=
"w120"
v-model=
"item.CostPrice"
@
keyup
.
native=
"checkPrice(item,'CostPrice')"
placeholder=
"请输入成本价"
></el-input>
</div>
</td>
<td>
<div
class=
"w200"
>
<el-select
class=
"w150"
filterable
placeholder=
"请选择"
v-model=
"item.BusCompany"
>
<el-option
v-for=
"item in SupplierList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
<div
class=
"w180"
>
<el-input
class=
'w180'
type=
"text"
v-model=
"item.Remarks"
></el-input>
</div>
</td>
<td
class=
"carPlanOne"
:class=
"
{'otherSpan':index!=0
&&
index!=PlanTableData.length-1}">
<div
class=
"w320"
v-for=
"(subItem,subIndex) in item.DetailList"
>
<em>
<!--接机送机-->
<el-select
class=
"w150"
placeholder=
"请选择"
v-model=
"subItem.AirportPickUp"
:disabled=
"forbidInput"
>
<el-option
:key=
"0"
:value=
"0"
label=
"请选择"
></el-option>
<el-option
v-for=
"childitem in BusAirportPickUpList"
:key=
"childitem.Id"
:label=
"childitem.Name"
:value=
"childitem.Id"
>
</el-option>
</el-select>
</em>
<!--用车类型-->
<span
v-for=
"childItem in UseTypeArray"
class=
"BusinfoSpan"
>
<span
v-if=
"childItem.Id==1"
class=
"subName"
:class=
"
{'spanCked':subItem.UseType==childItem.Id,'disSpan':forbidInput==true}"
@click="UseTypeClick(childItem.Id,index,subIndex);getBusPrice(subItem)">
{{
childItem
.
Name
}}
</span>
</span>
<span
style=
"width:30px;display:inline-block;"
>
<a
v-if=
"subIndex>0"
@
click=
"DeleteSubItem(item,subIndex)"
style=
"color:blue;cursor:pointer"
>
删除
</a>
</span>
<span
style=
"display:inline-block;width:30px;margin-left:5px;"
>
<span
class=
"busAddbtn"
v-if=
"subIndex==item.DetailList.length-1"
@
click=
"AddSubItem(item)"
style=
"margin-bottom:10px;"
>
<i
class=
"iconfont icon-img_haha"
></i>
</span>
</span>
</div>
</td>
<td>
<div
class=
"w100"
>
<el-input
class=
"w80"
v-model=
"item.CostPrice"
@
keyup
.
native=
"checkPrice(item,'CostPrice')"
placeholder=
"请输入成本价"
></el-input>
{{
item
.
PlanDateStr
}}
</div>
</td>
<td>
<div
class=
"w120"
>
<el-select
class=
'w100 sel'
v-model=
'item.PayType'
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
label=
'请选择'
:value=
'0'
></el-option>
<el-option
label=
'现付'
:value=
'1'
></el-option>
<el-option
label=
'公司结算'
:value=
'2'
></el-option>
<el-option
label=
'预付'
:value=
'3'
></el-option>
<div
class=
"w280"
>
{{
item
.
HotelName
}}
</div>
</td>
<td>
<div
class=
"w180"
>
<el-select
clearable
class=
"w150"
filterable
placeholder=
"请选择"
v-model=
"item.BusType"
:disabled=
"forbidInput"
@
change=
'getBusPrice(item)'
>
<el-option
:key=
"0"
:value=
"0"
label=
"请选择"
></el-option>
<el-option
v-for=
"item in BusTypeList"
:key=
"item.Id"
:label=
"item.newName"
:value=
"item.Id"
>
</el-option>
</el-select>
</div>
</td>
<td>
<div
class=
"w
8
0"
>
<el-input
class=
'w80'
type=
"text"
v-model=
"item.Remarks"
></el-input>
<div
class=
"w
5
0"
>
{{
item
.
IsHavearking
==
'0'
?
'无'
:
'有'
}}
</div>
</td>
<td>
...
...
@@ -569,6 +567,7 @@
x
.
BookGroup
=
this
.
$route
.
query
.
NewCombinationNum
;
}
})
console
.
log
(
this
.
PlanTableData
,
'planTabledata'
);
}
},
null
...
...
@@ -753,20 +752,12 @@
getBeforeInfo
(
index
)
{
let
oldPlanData
=
this
.
PlanTableData
[
index
-
1
];
let
newPlanData
=
this
.
PlanTableData
[
index
];
newPlanData
.
AirportPickUp
=
oldPlanData
.
AirportPickUp
;
newPlanData
.
UseType
=
oldPlanData
.
UseType
;
newPlanData
.
UseTime
=
oldPlanData
.
UseTime
;
newPlanData
.
BookGroup
=
oldPlanData
.
BookGroup
;
newPlanData
.
DriverName
=
oldPlanData
.
DriverName
;
newPlanData
.
DriverTel
=
oldPlanData
.
DriverTel
;
newPlanData
.
AccommodationType
=
oldPlanData
.
AccommodationType
;
newPlanData
.
AccommodationRemark
=
oldPlanData
.
AccommodationRemark
;
newPlanData
.
BusType
=
oldPlanData
.
BusType
;
newPlanData
.
UseNum
=
oldPlanData
.
UseNum
;
newPlanData
.
BusNum
=
oldPlanData
.
BusNum
;
newPlanData
.
BusCompany
=
oldPlanData
.
BusCompany
;
newPlanData
.
Pa
rkExplain
=
oldPlanData
.
ParkExplain
;
newPlanData
.
CostPrice
=
oldPlanData
.
CostPrice
;
newPlanData
.
Pa
yType
=
oldPlanData
.
PayType
;
newPlanData
.
BookGroup
=
oldPlanData
.
BookGroup
;
}
},
mounted
()
{
...
...
src/router/config.js
View file @
3f756676
...
...
@@ -1443,6 +1443,14 @@ export default {
title
:
'一日游'
},
},
{
path
:
'/oneDayTrip2'
,
//一日游销售自主开团用
name
:
'oneDayTrip2'
,
component
:
resolve
=>
require
([
'@/components/TravelManager/TravelList/oneDayTrip'
],
resolve
),
meta
:
{
title
:
'一日游'
},
},
{
path
:
'/priceIncomeConfirmInfo'
,
///priceIncomeConfirmInfo
name
:
'priceIncomeConfirmInfo'
,
...
...
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