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
be9a6ff5
Commit
be9a6ff5
authored
May 08, 2025
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PAK航班,票务,平台筛选
parent
a62d5b04
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
27 additions
and
27 deletions
+27
-27
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+2
-3
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+1
-0
TravelControlListSale.vue
...onents/TravelManager/TravelList/TravelControlListSale.vue
+1
-0
CostNewPriceForm.vue
...nts/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
+1
-1
editTeamInfo.vue
src/components/TravelManager/TravelTeam/editTeamInfo.vue
+12
-10
priceGroup.vue
src/components/TravelManager/TravelTeam/priceGroup.vue
+3
-4
travelTeamList.vue
src/components/TravelManager/TravelTeam/travelTeamList.vue
+4
-6
TravelPrice.vue
...nents/newTravelmanager/TravelGroupControl/TravelPrice.vue
+1
-1
TravelPrice2.vue
...ents/newTravelmanager/TravelGroupControl/TravelPrice2.vue
+1
-1
TravelPrice3.vue
...ents/newTravelmanager/TravelGroupControl/TravelPrice3.vue
+1
-1
No files found.
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
be9a6ff5
...
...
@@ -1674,7 +1674,7 @@
<el-form-item
:label=
"$t('salesModule.CustomFrom')"
prop=
"ClientSource"
>
<!--票务修改平台 -->
<el-select
v-model=
"addMsg.ClientSource"
filterable
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"getTotalPrice()"
:disabled=
"addMsg.OutBranchId&&addMsg.OutBranchId!=1245"
>
@
change=
"get
typechange(),get
TotalPrice()"
:disabled=
"addMsg.OutBranchId&&addMsg.OutBranchId!=1245"
>
<el-option
v-for=
"item in ddlyList"
:label=
"item.Name"
:value=
"item.Id"
:key=
"item.Id"
>
</el-option>
</el-select>
...
...
@@ -5518,7 +5518,7 @@
return
;
}
}
var
oldUnitPrice
=
this
.
addMsg
.
TC_Price
;
if
(
this
.
addMsg
.
GroupType
!=
5
)
{
//印象票务
if
(
this
.
addMsg
.
OutBranchId
&&
this
.
addMsg
.
OutBranchId
==
1245
)
{
...
...
@@ -6883,7 +6883,6 @@
this
.
addMsg
.
TC_Price
=
this
.
addObj
.
B2CPrice
;
this
.
addMsg
.
Unit_Price
=
this
.
addObj
.
B2CPrice
;
}
this
.
addMsg
.
CustomerId
=
"0"
;
this
.
addMsg
.
CommissionShareMoney
=
"0"
;
}
...
...
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
be9a6ff5
...
...
@@ -3481,6 +3481,7 @@
"】"
+
this
.
$t
(
"objFill.v101.dictriqiwei"
)
+
this
.
CopyTripAndFeatureMsg
.
StartDate
;
tipMsg
+=
",变更日期,会删除地接酒店。"
;
}
that
.
Confirm
(
tipMsg
,
function
()
{
that
.
saveLoading
=
true
;
...
...
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @
be9a6ff5
...
...
@@ -1869,6 +1869,7 @@
cmdStr
=
"travel_post_SetTCStartDate"
;
tipMsg
=
this
.
$t
(
'objFill.v101.shifouxiiug'
)
+
"【"
+
this
.
CopyTripAndFeatureMsg
.
CurrentTCNUM
+
"】"
+
this
.
$t
(
'objFill.v101.dictriqiwei'
)
+
this
.
CopyTripAndFeatureMsg
.
StartDate
;
tipMsg
+=
",变更日期后,请重新同步酒店信息。"
;
}
that
.
Confirm
(
tipMsg
,
function
()
{
that
.
saveLoading
=
true
;
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @
be9a6ff5
...
...
@@ -700,7 +700,7 @@
@
keyup
.
native=
"checkPrice(subItem,'B2CSalePrice')"
maxlength=
"8"
></el-input>
<!--印象票务-->
<
template
v-if=
"postConfig.OutBranchId==1245"
>
<el-select
v-model=
"changePlat"
@
change=
"getChangePlat(subItem)"
>
<el-select
v-model=
"changePlat"
@
change=
"getChangePlat(subItem)"
filterable
>
<el-option
v-for=
"(pItem,pIndex) in platformList"
:key=
"pIndex"
:value=
"pItem.Id"
:label=
"pItem.Name"
></el-option>
</el-select>
...
...
src/components/TravelManager/TravelTeam/editTeamInfo.vue
View file @
be9a6ff5
...
...
@@ -508,14 +508,23 @@
style=
"border:1px solid #C0C4CC;margin-bottom:2px;border-radius:5px;"
>
<table
class=
"tFlightTab"
>
<tr>
<td>
<el-form-item
:label=
"$t('system.query_type')"
>
<el-select
v-model=
"fItem.FlightType"
>
<el-option
:key=
"1"
:value=
"1"
:label=
"$t('Airticket.Air_go')"
></el-option>
<el-option
:key=
"2"
:value=
"2"
:label=
"$t('Airticket.Air_returnTrip')"
></el-option>
<el-option
:key=
"3"
:value=
"3"
:label=
"$t('Airticket.Air_transit')"
></el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-form-item
:label=
"$t('system.query_airCompanyName')"
>
<el-input
v-model=
"fItem.AlName"
style=
"width:
120
px;"
></el-input>
<el-input
v-model=
"fItem.AlName"
style=
"width:
85
px;"
></el-input>
</el-form-item>
</td>
<td>
<el-form-item
:label=
"$t('system.query_flightNum')"
>
<el-input
v-model=
"fItem.Flight_number"
style=
"width:
85
px;"
></el-input>
<el-input
v-model=
"fItem.Flight_number"
style=
"width:
130
px;"
></el-input>
</el-form-item>
</td>
<td>
...
...
@@ -523,10 +532,6 @@
<el-date-picker
value-format=
"yyyy-MM-dd"
v-model=
"fItem.FlightDate"
type=
"date"
size=
"mini"
:placeholder=
"$t('admin.admin_choDate')"
style=
"width:130px;"
>
</el-date-picker>
</el-form-item>
</td>
<td
style=
"text-align:right;"
>
<el-form-item
style=
"padding-right:10px;"
>
<el-button
type=
"danger"
icon=
"el-icon-delete"
@
click=
"deleteSelfFlight(fIndex)"
circle
size=
"small"
>
</el-button>
</el-form-item>
...
...
@@ -1059,6 +1064,7 @@
//添加自定义航班
addSelfFlight
()
{
var
seleFObj
=
{
FlightType
:
1
,
//1-去程,2-回程
AlName
:
""
,
//航空公司名称
AIATA
:
""
,
//到达机场三码
ArrivalCityName
:
""
,
//到达城市名称
...
...
@@ -1252,10 +1258,6 @@
addAward
()
{
this
.
editForm
.
TravelTeamFlightList
=
this
.
addMsg
.
flightList
;
this
.
editForm
.
TravelTeamPartnerList
=
this
.
friendList
;
// if (!this.editForm.TravelTeamPartnerList.length) {
// this.Warning(this.$t('objFill.v101.qingxzhezhb'));
// return;
// }
this
.
saveLoading
=
true
;
this
.
apipost
(
"post_SetTeavelTeam"
,
...
...
src/components/TravelManager/TravelTeam/priceGroup.vue
View file @
be9a6ff5
...
...
@@ -626,10 +626,9 @@
</tr>
<tr
v-for=
"(fItem,fIndex) in item.SelfFlightList"
:key=
"fIndex"
style=
"text-align:center;"
>
<td
class=
"_d_name _color_666"
>
<span
v-if=
"fIndex==0"
>
{{
$t
(
'Airticket.Air_go'
)
}}
</span>
<span
v-else-if=
"fIndex==item.SelfFlightList.length-1"
>
{{
$t
(
'Airticket.Air_returnTrip'
)
}}
</span>
<span
v-else-if=
"fIndex>0 && fIndex!=item.SelfFlightList.length-1"
>
{{
$t
(
'Airticket.Air_transit'
)
}}
</span>
<span
v-if=
"fItem.FlightType==1"
>
{{
$t
(
'Airticket.Air_go'
)
}}
</span>
<span
v-else-if=
"fItem.FlightType==2"
>
{{
$t
(
'Airticket.Air_returnTrip'
)
}}
</span>
<span
v-else-if=
"fItem.FlightType==3"
>
{{
$t
(
'Airticket.Air_transit'
)
}}
</span>
</td>
<td>
<div>
{{
fItem
.
Flight_number
}}
</div>
...
...
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @
be9a6ff5
...
...
@@ -195,11 +195,9 @@
</tr>
<tr
v-for=
"(fItem,fIndex) in item.SelfFlightList"
:key=
"fIndex"
style=
"text-align:center;"
>
<td
class=
"_d_name _color_666"
>
<span
v-if=
"fIndex==0"
>
{{
$t
(
'Airticket.Air_go'
)
}}
</span>
<span
v-else-if=
"fIndex==item.SelfFlightList.length-1"
>
{{
$t
(
'Airticket.Air_returnTrip'
)
}}
</span>
<span
v-else-if=
"fIndex>0 && fIndex!=item.SelfFlightList.length-1"
>
{{
$t
(
'Airticket.Air_transit'
)
}}
</span>
<span
v-if=
"fItem.FlightType==1"
>
{{
$t
(
'Airticket.Air_go'
)
}}
</span>
<span
v-else-if=
"fItem.FlightType==2"
>
{{
$t
(
'Airticket.Air_returnTrip'
)
}}
</span>
<span
v-else-if=
"fItem.FlightType==3"
>
{{
$t
(
'Airticket.Air_transit'
)
}}
</span>
</td>
<td>
<div>
{{
fItem
.
Flight_number
}}
</div>
...
...
@@ -546,7 +544,7 @@
</el-pagination>
</div>
</div>
<el-dialog
class=
"app-attachment-dialog"
width=
"
9
00"
:title=
"dialogTitle"
:visible
.
sync=
"isShowEditTeamDialog"
<el-dialog
class=
"app-attachment-dialog"
width=
"
10
00"
:title=
"dialogTitle"
:visible
.
sync=
"isShowEditTeamDialog"
:close-on-click-modal=
"false"
>
<editTeamInfo
v-if=
"isShowEditTeamDialog"
:Q_GTeamId=
"GTeamId"
@
success=
"refreshPage"
></editTeamInfo>
</el-dialog>
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @
be9a6ff5
...
...
@@ -542,7 +542,7 @@
</th>
<th>
<el-select
v-model=
"changePlat"
@
change=
"getChangePlat(priceData.ExtPriceInfo)"
class=
"w150"
>
class=
"w150"
filterable
>
<el-option
v-for=
"(pItem,pIndex) in platformList"
:key=
"pIndex"
:value=
"pItem.Id"
:label=
"pItem.Name"
></el-option>
</el-select>
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @
be9a6ff5
...
...
@@ -538,7 +538,7 @@
</th>
<th>
<el-select
v-model=
"changePlat"
@
change=
"getChangePlat(priceData.ExtPriceInfo)"
class=
"w150"
>
class=
"w150"
filterable
>
<el-option
v-for=
"(pItem,pIndex) in platformList"
:key=
"pIndex"
:value=
"pItem.Id"
:label=
"pItem.Name"
></el-option>
</el-select>
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @
be9a6ff5
...
...
@@ -499,7 +499,7 @@
</th>
<th>
<el-select
v-model=
"changePlat"
@
change=
"getChangePlat(priceData.ExtPriceInfo)"
class=
"w150"
>
class=
"w150"
filterable
>
<el-option
v-for=
"(pItem,pIndex) in platformList"
:key=
"pIndex"
:value=
"pItem.Id"
:label=
"pItem.Name"
></el-option>
</el-select>
...
...
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