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
4097af95
Commit
4097af95
authored
Jan 23, 2025
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
11
parent
6f6336f9
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
86 additions
and
59 deletions
+86
-59
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+24
-8
QuotationNewPrice.vue
...ts/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
+4
-2
TravelManagerThree.vue
...ewTravelmanager/TravelGroupControl/TravelManagerThree.vue
+1
-1
TravelPrice.vue
...nents/newTravelmanager/TravelGroupControl/TravelPrice.vue
+13
-11
TravelPrice2.vue
...ents/newTravelmanager/TravelGroupControl/TravelPrice2.vue
+31
-23
TravelPrice3.vue
...ents/newTravelmanager/TravelGroupControl/TravelPrice3.vue
+5
-6
TravelPrice4.vue
...ents/newTravelmanager/TravelGroupControl/TravelPrice4.vue
+8
-8
No files found.
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
4097af95
...
...
@@ -187,6 +187,14 @@
:picker-options=
"pickerBeginDateAfter"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
</li>
<li>
<span><em>
团队类型
</em></span>
<el-select
class=
"w150"
v-model=
"queryMsg.QTeamType"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
value=
""
></el-option>
<el-option
label=
"常规团"
:value=
"0"
:key=
"0"
></el-option>
<el-option
label=
"切位团"
:value=
"5"
:key=
"5"
></el-option>
</el-select>
</li>
<li
class=
"advancedLi"
style=
"height: 34px"
>
<el-popover
popper-class=
"advanceQueryList"
v-model=
"queryCommonData.showHigradeSearch"
trigger=
"click"
>
<div>
...
...
@@ -491,8 +499,12 @@
<span
v-if=
"item.Status == 1"
:title=
"$t('visaT.sale')"
>
{{
$t("visaT.sale")
}}
</span>
<span
v-if=
"item.IsNewArrival == 1"
title=
"新品上市"
>
新
</span>
<span
v-if=
"item.GroupRecommendType == 1"
:title=
"$t('objFill.jingping')"
>
{{ $t("objFill.jing") }}
</span>
<label
style=
"display: inline-block; margin: 5px 0 0 5px; font-size: 12px;color:red;font-weight:bold;"
>
{{ item.TeamTypeName }}
</label>
<label
style=
"display: inline-block; margin: 5px 0 0 5px; font-size: 12px"
>
{{ item.PriceTeamTypeName }}
</label>
</div>
...
...
@@ -515,7 +527,9 @@
: $t("objFill.v101.baozhangzhong")
}}
</span>
</div>
<div
class=
"TCL-TOPTCNUM"
>
({{ item.TCID }}) {{ item.TCNUM }}
</div>
<div
class=
"TCL-TOPTCNUM"
>
({{ item.TCID }}) {{ item.TCNUM }}
</div>
<div
class=
"d12"
style=
"float: none; margin: 3px auto"
>
<p>
<i
class=
"iconfont icon-biaoti1"
></i>
...
...
@@ -670,7 +684,8 @@
</p>
<p
class=
"travelnowrap"
>
<span>
{{ $t("Airticket.Air_StartTime") }}
</span>
<span
class=
"go_date"
>
{{ item.StartDate }}(
<font
style=
"color:red;font-weight:bold;"
>
{{item.StartDateWeekStr}}
</font>
)
</span>
<span
class=
"go_date"
>
{{ item.StartDate }}(
<font
style=
"color:red;font-weight:bold;"
>
{{item.StartDateWeekStr}}
</font>
)
</span>
<
template
v-if=
"item.RelationPriceList && item.RelationPriceList.length > 0"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('objFill.xilietdate')"
>
<el-popover
width=
"350"
trigger=
"click"
popper-class=
"TC_HotelPop"
>
...
...
@@ -836,12 +851,12 @@
</p>
<p
class=
"travelprice"
>
{{ $t("Operation.Op_tradePrice") }}:¥{{
item.B2B
MemberPrice | priceFormat(item.B2BMember
Price)
item.B2B
Price | priceFormat(item.B2B
Price)
}}
</p>
<p
class=
"travelprice"
>
{{ $t("Operation.Op_directPrice") }}:¥{{
item.B2C
MemberPrice | priceFormat(item.B2CMember
Price)
item.B2C
Price | priceFormat(item.B2C
Price)
}}
</p>
<p>
...
...
@@ -851,26 +866,26 @@
<td
rowspan=
"3"
style=
"text-align: center"
width=
"60"
>
<i>
{{ $t("Operation.Op_standard") }}
</i>
</td>
<td
class=
"TC_cusTitle"
>
<
!-- <
td class="TC_cusTitle">
{{ $t("Operation.Op_fellowMember") }}
</td>
<td>
<b>{{
item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
}}</b>
</td>
</td>
-->
<td
class=
"TC_cusTitle"
>
{{ $t("Operation.Op_fellow") }}
</td>
<td>
<b>
{{ item.B2BPrice | priceFormat(item.B2BPrice) }}
</b>
</td>
<td
class=
"TC_cusTitle"
>
<
!-- <
td class="TC_cusTitle">
{{ $t("Operation.Op_directMember") }}
</td>
<td>
<b>{{
item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
}}</b>
</td>
</td>
-->
<td
class=
"TC_cusTitle"
>
{{ $t("Operation.Op_direct") }}
</td>
<td>
<b>
{{ item.B2CPrice | priceFormat(item.B2CPrice) }}
</b>
...
...
@@ -1978,6 +1993,7 @@
QBusNumber
:
""
,
PriceTeamType
:
""
,
//团队类型
Title
:
""
,
//团名
QTeamType
:
""
,
},
TeamListArr
:
[],
//团队类型
//报价单查询条件
...
...
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @
4097af95
...
...
@@ -67,6 +67,7 @@
font-weight
:
bold
;
color
:
#f12a2a
;
}
</
style
>
<
template
>
<div
class=
"DirectQuotation clearfix"
v-loading=
"loading"
>
...
...
@@ -203,7 +204,7 @@
getLineList
()
{
var
chooseLineList
=
[];
//散拼
if
(
this
.
postData
.
TeamType
==
0
)
{
if
(
this
.
postData
.
TeamType
==
0
||
this
.
postData
.
TeamType
==
5
)
{
chooseLineList
=
this
.
LineList
.
filter
(
qItem
=>
qItem
.
LineDirection
==
2
);
}
//小包团
else
if
(
this
.
postData
.
TeamType
==
1
)
{
...
...
@@ -633,4 +634,5 @@
this
.
getPostData
();
}
};
</
script
>
\ No newline at end of file
</
script
>
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @
4097af95
...
...
@@ -88,7 +88,7 @@
v-bind:CountryID="PostConfig.CountryID">
</TravelNotice>
<div
id=
"fiveAnchor"
>
<!--常规团-->
<TravelPrice
v-show=
"PostConfig.TeamType==0"
@
saveMsg=
"SaveData(1)"
ref=
"TravelPrice1"
@
headCallBack=
"getPrice"
<TravelPrice
v-show=
"PostConfig.TeamType==0
||PostConfig.TeamType==5
"
@
saveMsg=
"SaveData(1)"
ref=
"TravelPrice1"
@
headCallBack=
"getPrice"
:priceList=
"PriceList"
:PostConfig=
"PostConfig"
:modifyTcid=
"modifyTcid"
:CurrentUserInfo=
"CurrentUserInfo"
:IsDirect=
"PostConfig.IsDirect"
></TravelPrice>
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @
4097af95
...
...
@@ -447,6 +447,9 @@
</div>
<div
class=
"TPright"
>
<div
class=
"TP_noneed"
>
<el-checkbox
v-model=
"priceData.IsNewArrival"
:true-label=
"CheckedVaule"
:false-label=
"UnCheckedVaule"
>
新品上市
</el-checkbox>
<el-checkbox
v-model=
"priceData.IsSupportChildren"
:true-label=
"CheckedVaule"
:false-label=
"UnCheckedVaule"
>
{{
$t
(
'op.SupportChild'
)
}}
</el-checkbox>
...
...
@@ -456,10 +459,10 @@
<el-checkbox
v-model=
"priceData.IsLessPrice"
:true-label=
"CheckedVaule"
:false-label=
"UnCheckedLessPrice"
>
{{
$t
(
'op.CanLessPrice'
)
}}
</el-checkbox>
<el-checkbox
v-model=
"priceData.IsNeedAirportShuttle"
@
change=
"IsNeedAirportShuttleChange"
<
!--
<
el-checkbox
v-model=
"priceData.IsNeedAirportShuttle"
@
change=
"IsNeedAirportShuttleChange"
:true-label=
"CheckedVaule"
:false-label=
"UnCheckedLessPrice"
>
{{
$t
(
'objFill.v101.myOrdersAllType.shifouxyst'
)
}}
</el-checkbox>
</el-checkbox>
-->
<template
v-if=
"CurrentUserInfo.RB_Group_id==2"
>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('op.HotelUse')"
@
click=
"outerVisible=true"
v-if=
"(PostConfig.LineId==14 || PostConfig.LineId==131|| PostConfig.LineId==90||PostConfig.LineId==168||PostConfig.LineId==118) "
/>
...
...
@@ -469,7 +472,7 @@
v-if=
"IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0"
/>
</
template
>
</div>
<div
style=
"margin:0 0 20px 10px;height:34px;"
>
<
!-- <
div style="margin:0 0 20px 10px;height:34px;">
<div style="display:inline-block;height:34px;line-height:34px;">
<el-checkbox v-model="priceData.IsUseCompanyBus" :true-label="CheckedVaule"
:false-label="UnCheckedLessPrice" :label="$t('objFill.v101.myOrdersAllType.gongsichel')">
...
...
@@ -483,25 +486,25 @@
</el-option>
</el-select>
</template>
</div>
<el-form-item
prop=
"B2BMemberPrice"
>
</div>
-->
<
!-- <
el-form-item prop="B2BMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template>
</el-input>
</el-form-item>
</el-form-item>
-->
<el-form-item
prop=
"B2BPrice"
>
<el-input
:placeholder=
"$t('pub.pleaseImport')"
class=
"w190 ComSeat"
v-model=
"priceData.B2BPrice"
@
keyup
.
native=
"checkPrice(priceData,'B2BPrice')"
>
<
template
slot=
"prepend"
>
{{
$t
(
'Operation.Op_fellow'
)
}}
</
template
>
</el-input>
</el-form-item>
<el-form-item
prop=
"B2CMemberPrice"
>
<
!-- <
el-form-item prop="B2CMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_directMember')}}</template>
</el-input>
</el-form-item>
</el-form-item>
-->
<el-form-item
prop=
"B2CPrice"
>
<el-input
:placeholder=
"$t('pub.pleaseImport')"
class=
"w190 ComSeat"
v-model=
"priceData.B2CPrice"
@
keyup
.
native=
"checkPrice(priceData,'B2CPrice')"
>
...
...
@@ -904,7 +907,7 @@
</div>
<div
class=
"clearfix"
>
<div
class=
"TPright clearfix"
>
<el-form-item
style=
"margin-top:1px;"
>
<el-form-item
style=
"margin-top:1px;"
>
<span
class=
"TP_Sendprepend"
style=
"margin:3px -1px 0 0"
>
{{$t('objFill.tuanduilx')}}
</span>
<el-select
class=
"w180"
v-model=
"priceData.PriceTeamType"
>
<
template
v-for=
"item in TeamListArr"
>
...
...
@@ -1422,6 +1425,7 @@
GuideNum
:
0
,
//导游人数
IsLeaderDaiTuan
:
1
,
//领队带团/不带团
IsGuideDaiTuan
:
1
,
//导游带团/不带团
IsNewArrival
:
0
,
//是否新品
};
}
this
.
returnPriceList
.
push
(
objItem
);
...
...
@@ -1593,9 +1597,7 @@
//数据验证
validateTeamQuot
(
quotationPrice
)
{
if
(
this
.
isNullOrEmpty
(
quotationPrice
.
B2BMemberPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
B2BPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
B2CMemberPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
B2CPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
BabyChargePrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
BabyPrice
)
||
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @
4097af95
...
...
@@ -446,6 +446,9 @@
</div>
<div
class=
"TPright"
>
<div
class=
"TP_noneed"
>
<el-checkbox
v-model=
"priceData.IsNewArrival"
:true-label=
"CheckedVaule"
:false-label=
"UnCheckedVaule"
>
新品上市
</el-checkbox>
<el-checkbox
v-model=
"priceData.IsSupportChildren"
:true-label=
"CheckedVaule"
:false-label=
"UnCheckedVaule"
>
{{
$t
(
'op.SupportChild'
)
}}
</el-checkbox>
...
...
@@ -456,7 +459,8 @@
:false-label=
"UnCheckedLessPrice"
>
{{
$t
(
'op.CanLessPrice'
)
}}
</el-checkbox>
<el-checkbox
v-model=
"priceData.IsNeedAirportShuttle"
@
change=
"IsNeedAirportShuttleChange"
:true-label=
"CheckedVaule"
:false-label=
"UnCheckedLessPrice"
>
{{
$t
(
'objFill.v101.myOrdersAllType.shifouxyst'
)
}}
:true-label=
"CheckedVaule"
:false-label=
"UnCheckedLessPrice"
>
{{
$t
(
'objFill.v101.myOrdersAllType.shifouxyst'
)
}}
</el-checkbox>
<template
v-if=
"CurrentUserInfo.RB_Group_id==2"
>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('op.HotelUse')"
@
click=
"outerVisible=true"
...
...
@@ -482,24 +486,24 @@
</el-select>
</
template
>
</div>
<el-form-item
prop=
"B2BMemberPrice"
>
<
!-- <
el-form-item prop="B2BMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template>
</el-input>
</el-form-item>
</el-form-item>
-->
<el-form-item
prop=
"B2BPrice"
>
<el-input
:placeholder=
"$t('pub.pleaseImport')"
class=
"w190 ComSeat"
v-model=
"priceData.B2BPrice"
@
keyup
.
native=
"checkPrice(priceData,'B2BPrice')"
>
<
template
slot=
"prepend"
>
{{
$t
(
'Operation.Op_fellow'
)
}}
</
template
>
</el-input>
</el-form-item>
<el-form-item
prop=
"B2CMemberPrice"
>
<
!-- <
el-form-item prop="B2CMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_directMember')}}</template>
</el-input>
</el-form-item>
</el-form-item>
-->
<el-form-item
prop=
"B2CPrice"
>
<el-input
:placeholder=
"$t('pub.pleaseImport')"
class=
"w190 ComSeat"
v-model=
"priceData.B2CPrice"
@
keyup
.
native=
"checkPrice(priceData,'B2CPrice')"
>
...
...
@@ -710,13 +714,14 @@
</el-input>
</el-form-item>
<el-form-item>
<span
class=
"TP_Sendprepend"
style=
"margin:3px -1px 0 0"
>
{{$t('objFill.v101.myOrdersAllType.lindudtbdt')}}
</span>
<el-select
class=
"w180"
v-model=
"priceData.IsLeaderDaiTuan"
>
<
template
v-for=
"item in DaiTuanList"
>
<el-option
:key=
"item.Id"
:label=
"item.name"
:value=
"item.Id"
>
</el-option>
</
template
>
</el-select>
<span
class=
"TP_Sendprepend"
style=
"margin:3px -1px 0 0"
>
{{$t('objFill.v101.myOrdersAllType.lindudtbdt')}}
</span>
<el-select
class=
"w180"
v-model=
"priceData.IsLeaderDaiTuan"
>
<
template
v-for=
"item in DaiTuanList"
>
<el-option
:key=
"item.Id"
:label=
"item.name"
:value=
"item.Id"
>
</el-option>
</
template
>
</el-select>
</el-form-item>
<el-form-item>
<el-input
:placeholder=
"$t('op.CanSallTicketNum')"
class=
"w290"
v-model=
"priceData.CanSellTicketNum"
...
...
@@ -749,8 +754,8 @@
</el-input>
</el-form-item>
<el-form-item
prop=
"SendPersion"
>
<el-input
class=
"w260"
:disabled=
"!priceData.IsNeedAirportShuttle"
:placeholder=
"$t('objFill.v101.myOrdersAllType.qingsrstr')"
v-model=
"priceData.SendPersion"
>
<el-input
class=
"w260"
:disabled=
"!priceData.IsNeedAirportShuttle"
:placeholder=
"$t('objFill.v101.myOrdersAllType.qingsrstr')"
v-model=
"priceData.SendPersion"
>
<
template
slot=
"prepend"
>
{{
$t
(
'objFill.v101.myOrdersAllType.shongtuanr'
)
}}
</
template
>
</el-input>
</el-form-item>
...
...
@@ -898,7 +903,8 @@
</el-select>
</el-form-item>
<el-form-item
style=
"margin-top:1px;"
>
<span
class=
"TP_Sendprepend"
style=
"margin:3px -1px 0 0"
>
{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}
</span>
<span
class=
"TP_Sendprepend"
style=
"margin:3px -1px 0 0"
>
{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}
</span>
<el-upload
class=
"upload-demo"
style=
"display:inline-block;position:relative;top:-1px;left:3px;"
:http-request=
"uploadFileBtn"
:multiple=
"true"
:show-file-list=
"false"
action=
""
>
<el-button
size=
"small"
type=
"primary"
>
{{$t('objFill.shangchuan')}}
</el-button>
...
...
@@ -937,7 +943,9 @@
<span
class=
"TCswitch"
>
<el-switch
v-model=
"priceData.IsB2B"
:active-value=
"inActive"
:inactive-value=
"notInActive"
>
</el-switch>
<div
class=
"TC-config"
>
{{$t('sm.cpjhtuiB2bzzd')}}
<br/><font
style=
"color:red;"
>
{{$t('objFill.v101.myOrdersAllType.qieweitqgbcx')}}
</font></div>
<div
class=
"TC-config"
>
{{$t('sm.cpjhtuiB2bzzd')}}
<br
/>
<font
style=
"color:red;"
>
{{$t('objFill.v101.myOrdersAllType.qieweitqgbcx')}}
</font>
</div>
</span>
</div>
</el-form-item>
...
...
@@ -1404,8 +1412,9 @@
BusPriceId
:
0
,
//公司车辆编号
EmergencyContact
:
""
,
//紧急联系人
IsNeedAirportShuttle
:
0
,
//是否需要接送服务
GuideNum
:
0
,
//导游人数
IsLeaderDaiTuan
:
1
,
//领队带团/不带团
GuideNum
:
0
,
//导游人数
IsLeaderDaiTuan
:
1
,
//领队带团/不带团
IsNewArrival
:
0
,
//是否新品
};
}
this
.
returnPriceList
.
push
(
objItem
);
...
...
@@ -1579,9 +1588,7 @@
//数据验证
validateTeamQuot
(
quotationPrice
)
{
if
(
this
.
isNullOrEmpty
(
quotationPrice
.
B2BMemberPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
B2BPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
B2CMemberPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
B2CPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
BabyChargePrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
BabyPrice
)
||
...
...
@@ -1813,7 +1820,8 @@
parseInt
(
this
.
priceData
.
FSeat
);
if
(
Number
(
fitem
.
TicketNum
)
-
Number
(
fitem
.
OtherTeamUseNum
)
<
Number
(
fitem
.
BindNum
))
{
fitem
.
BindNum
=
0
;
this
.
Error
(
this
.
$t
(
'objFill.v101.myOrdersAllType.zuiduoznbd'
)
+
(
Number
(
fitem
.
TicketNum
)
-
Number
(
fitem
.
OtherTeamUseNum
))
+
this
.
$t
(
'objFill.v101.myOrdersAllType.gejiwei'
));
this
.
Error
(
this
.
$t
(
'objFill.v101.myOrdersAllType.zuiduoznbd'
)
+
(
Number
(
fitem
.
TicketNum
)
-
Number
(
fitem
.
OtherTeamUseNum
))
+
this
.
$t
(
'objFill.v101.myOrdersAllType.gejiwei'
));
}
this
.
selectFilghtList
.
forEach
((
x
,
index
)
=>
{
if
(
x
.
IsSelected
)
{
...
...
@@ -1921,7 +1929,7 @@
if
(
type
==
2
)
{
that
.
btnTongBu
=
that
.
$t
(
'objFill.v101.myOrdersAllType.tongbujd'
);
}
else
{
that
.
btnText
=
that
.
$t
(
'pub.saveBtn'
)
+
'...'
;
that
.
btnText
=
that
.
$t
(
'pub.saveBtn'
)
+
'...'
;
}
});
},
...
...
@@ -2075,7 +2083,7 @@
priceList
.
push
(
x
);
}
});
if
(
priceList
.
length
>
0
)
this
.
returnPriceList
=
priceList
;
if
(
priceList
.
length
>
0
)
this
.
returnPriceList
=
priceList
;
}
this
.
returnPriceList
.
sort
(
this
.
$commonUtils
.
createComprisonFunction
(
"StartDate"
)
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @
4097af95
...
...
@@ -447,24 +447,24 @@
v-if=
"IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0"
/>
</
template
>
</div>
<el-form-item
prop=
"B2BMemberPrice"
>
<
!-- <
el-form-item prop="B2BMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_fellowMember')}}</template>
</el-input>
</el-form-item>
</el-form-item>
-->
<el-form-item
prop=
"B2BPrice"
>
<el-input
:placeholder=
"$t('pub.pleaseImport')"
class=
"w190 ComSeat"
v-model=
"priceData.B2BPrice"
@
keyup
.
native=
"checkPrice(priceData,'B2BPrice')"
>
<
template
slot=
"prepend"
>
{{
$t
(
'Operation.Op_fellow'
)
}}
</
template
>
</el-input>
</el-form-item>
<el-form-item
prop=
"B2CMemberPrice"
>
<
!-- <
el-form-item prop="B2CMemberPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_directMember')}}</template>
</el-input>
</el-form-item>
</el-form-item>
-->
<el-form-item
prop=
"B2CPrice"
>
<el-input
:placeholder=
"$t('pub.pleaseImport')"
class=
"w190 ComSeat"
v-model=
"priceData.B2CPrice"
@
keyup
.
native=
"checkPrice(priceData,'B2CPrice')"
>
...
...
@@ -1180,6 +1180,7 @@
EmergencyContact
:
""
,
//紧急联系人
IsNeedAirportShuttle
:
0
,
//是否需要接送服务
GuideNum
:
0
,
//导游人数
IsNewArrival
:
0
,
//是否新品
};
}
this
.
returnPriceList
.
push
(
objItem
);
...
...
@@ -1434,9 +1435,7 @@
//数据验证
validateTeamQuot
(
quotationPrice
)
{
if
(
this
.
isNullOrEmpty
(
quotationPrice
.
B2BMemberPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
B2BPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
B2CMemberPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
B2CPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
BabyChargePrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
BabyPrice
)
||
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @
4097af95
...
...
@@ -457,24 +457,24 @@
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('op.HotelUse')"
@
click=
"outerVisible=true"
v-if=
"((userInfo.RB_Group_id==QjGroupId() && PostConfig.LineId==14) || userInfo.RB_Group_id!=2) && priceData.PriceHotelList&&priceData.PriceHotelList.length>0"
/>
</div>
<el-form-item
prop=
"B2BMemberPrice"
>
<
!--
<
el-form-item
prop=
"B2BMemberPrice"
>
<el-input
:placeholder=
"$t('pub.pleaseImport')"
class=
"w190 ComSeat"
v-model=
"priceData.B2BMemberPrice"
@
keyup
.
native=
"checkPrice(priceData,'B2BMemberPrice')"
>
<template
slot=
"prepend"
>
{{
$t
(
'Operation.Op_fellowMember'
)
}}
</
template
>
</el-input>
</el-form-item>
</el-form-item>
-->
<el-form-item
prop=
"B2BPrice"
>
<el-input
:placeholder=
"$t('pub.pleaseImport')"
class=
"w190 ComSeat"
v-model=
"priceData.B2BPrice"
@
keyup
.
native=
"checkPrice(priceData,'B2BPrice')"
>
<
template
slot=
"prepend"
>
{{
$t
(
'Operation.Op_fellow'
)
}}
</
template
>
</el-input>
</el-form-item>
<el-form-item
prop=
"B2CMemberPrice"
:class=
"{'showOther':TeamType==3}"
>
<
!-- <
el-form-item prop="B2CMemberPrice" :class="{'showOther':TeamType==3}">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.B2CMemberPrice" @keyup.native="checkPrice(priceData,'B2CMemberPrice')">
<template slot="prepend">{{$t('Operation.Op_directMember')}}</template>
</el-input>
</el-form-item>
</el-form-item>
-->
<el-form-item
prop=
"B2CPrice"
:class=
"{'showOther':TeamType==3}"
>
<el-input
:placeholder=
"$t('pub.pleaseImport')"
class=
"w190 ComSeat"
v-model=
"priceData.B2CPrice"
@
keyup
.
native=
"checkPrice(priceData,'B2CPrice')"
>
...
...
@@ -1281,6 +1281,7 @@
EmergencyContact
:
""
,
//紧急联系人
IsNeedAirportShuttle
:
0
,
//是否需要接送服务
GuideNum
:
0
,
//导游人数
IsNewArrival
:
0
,
//是否新品
};
}
this
.
returnPriceList
.
push
(
objItem
);
...
...
@@ -1452,9 +1453,7 @@
//数据验证
validateTeamQuot
(
quotationPrice
)
{
if
(
this
.
isNullOrEmpty
(
quotationPrice
.
B2BMemberPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
B2BPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
B2CMemberPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
B2CPrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
BabyChargePrice
)
||
this
.
isNullOrEmpty
(
quotationPrice
.
BabyPrice
)
||
...
...
@@ -1675,7 +1674,8 @@
parseInt
(
this
.
priceData
.
FSeat
);
if
(
Number
(
fitem
.
TicketNum
)
-
Number
(
fitem
.
OtherTeamUseNum
)
<
Number
(
fitem
.
BindNum
))
{
fitem
.
BindNum
=
0
;
this
.
Error
(
this
.
$t
(
'objFill.v101.myOrdersAllType.zuiduoznbd'
)
+
(
Number
(
fitem
.
TicketNum
)
-
Number
(
fitem
.
OtherTeamUseNum
))
+
this
.
$t
(
'objFill.v101.myOrdersAllType.gejiwei'
));
this
.
Error
(
this
.
$t
(
'objFill.v101.myOrdersAllType.zuiduoznbd'
)
+
(
Number
(
fitem
.
TicketNum
)
-
Number
(
fitem
.
OtherTeamUseNum
))
+
this
.
$t
(
'objFill.v101.myOrdersAllType.gejiwei'
));
}
this
.
selectFilghtList
.
forEach
((
x
,
index
)
=>
{
if
(
x
.
IsSelected
)
{
...
...
@@ -1783,7 +1783,7 @@
if
(
type
==
2
)
{
that
.
btnTongBu
=
that
.
$t
(
'objFill.v101.myOrdersAllType.tongbujd'
);
}
else
{
that
.
btnText
=
that
.
$t
(
'pub.saveBtn'
)
+
'...'
;
that
.
btnText
=
that
.
$t
(
'pub.saveBtn'
)
+
'...'
;
}
});
},
...
...
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