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
e29604f0
Commit
e29604f0
authored
Apr 17, 2025
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
包机团跳转调整
parent
3ce25ea8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
389 additions
and
255 deletions
+389
-255
enrollTotal.vue
src/components/SalesModule/enrollTotal.vue
+17
-9
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+180
-131
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+133
-101
todayOrderTotal.vue
src/components/TravelManager/TravelList/todayOrderTotal.vue
+12
-2
priceGroup.vue
src/components/TravelManager/TravelTeam/priceGroup.vue
+13
-6
travelTeamList.vue
src/components/TravelManager/TravelTeam/travelTeamList.vue
+34
-6
No files found.
src/components/SalesModule/enrollTotal.vue
View file @
e29604f0
...
@@ -349,14 +349,7 @@
...
@@ -349,14 +349,7 @@
<i
class=
"iconfont icon-tiaozheng"
style=
"font-size: 22px; color: #297bef"
></i></el-tooltip>
<i
class=
"iconfont icon-tiaozheng"
style=
"font-size: 22px; color: #297bef"
></i></el-tooltip>
</p>
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%; text-decoration: underline; cursor: pointer"
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%; text-decoration: underline; cursor: pointer"
:title=
"item.alName"
@
click=
"
:title=
"item.alName"
@
click=
"gotoProduct(item)"
>
goUrlX(
'产品查询',
item.isOneDay === 1 ? 'productQueryOne' : 'productQuery',
item.tcid,
item.tcnum
)
"
>
{{ item.tcnum }}
{{ item.tcnum }}
</p>
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%"
>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%"
>
...
@@ -1125,6 +1118,21 @@
...
@@ -1125,6 +1118,21 @@
(
err
)
=>
{}
(
err
)
=>
{}
);
);
},
},
gotoProduct
(
item
)
{
var
path
=
"productQuery"
;
if
(
item
.
teamType
==
2
)
{
path
=
"productQueryOne"
;
}
else
if
(
item
.
teamType
==
4
)
{
path
=
"priceGroup"
;
}
else
{
path
=
"productQuery"
;
}
var
ntcnum
=
item
.
tcnum
;
if
(
ntcnum
&&
ntcnum
.
indexOf
(
'('
)
>
-
1
)
{
ntcnum
=
ntcnum
.
substring
(
0
,
ntcnum
.
indexOf
(
'('
));
}
this
.
goUrlX
(
'产品查询'
,
path
,
item
.
tcid
,
ntcnum
)
},
goUrlX
(
name
,
path
,
id
,
tcmun
)
{
goUrlX
(
name
,
path
,
id
,
tcmun
)
{
this
.
$router
.
push
({
this
.
$router
.
push
({
name
:
path
,
name
:
path
,
...
@@ -1349,7 +1357,7 @@
...
@@ -1349,7 +1357,7 @@
this
.
msg
.
CEndDate
=
this
.
$route
.
query
.
CEndDate
this
.
msg
.
CEndDate
=
this
.
$route
.
query
.
CEndDate
if
(
this
.
$route
.
query
.
discount
)
this
.
msg
.
IsUseCoupon
=
this
.
$route
.
query
.
discount
if
(
this
.
$route
.
query
.
discount
)
this
.
msg
.
IsUseCoupon
=
this
.
$route
.
query
.
discount
}
}
if
(
this
.
$route
.
query
.
BranchId
&&
this
.
$route
.
query
.
BranchId
>=
-
1
)
{
if
(
this
.
$route
.
query
.
BranchId
&&
this
.
$route
.
query
.
BranchId
>=
-
1
)
{
this
.
msg
.
BranchId
=
Number
(
this
.
$route
.
query
.
BranchId
);
this
.
msg
.
BranchId
=
Number
(
this
.
$route
.
query
.
BranchId
);
}
}
if
(
this
.
$route
.
query
.
isNormal
)
this
.
msg
.
isNormal
=
this
.
$route
.
query
.
isNormal
if
(
this
.
$route
.
query
.
isNormal
)
this
.
msg
.
isNormal
=
this
.
$route
.
query
.
isNormal
...
...
src/components/SalesModule/groupTourOrder.vue
View file @
e29604f0
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
e29604f0
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @
e29604f0
...
@@ -749,11 +749,21 @@
...
@@ -749,11 +749,21 @@
},
},
//跳转到团控列表
//跳转到团控列表
goToTravelList
(
item
)
{
goToTravelList
(
item
)
{
var
path
=
"TravelControlList"
;
if
(
item
.
teamType
==
1
)
{
if
(
item
.
teamType
==
1
)
{
this
.
goUrlX
(
'团控列表'
,
'TravelControlListSale'
,
item
.
tcid
,
item
.
tcnum
);
path
=
"TravelControlListSale"
;
}
else
if
(
item
.
teamType
==
2
)
{
path
=
"oneDayTrip"
;
}
else
if
(
item
.
teamType
==
4
)
{
path
=
"TravelTeam"
;
}
else
{
}
else
{
this
.
goUrlX
(
'团控列表'
,
'TravelControlList'
,
item
.
tcid
,
item
.
tcnum
)
;
path
=
"TravelControlList"
;
}
}
var
ntcnum
=
item
.
tcnum
;
if
(
ntcnum
&&
ntcnum
.
indexOf
(
'('
)
>
-
1
)
{
ntcnum
=
ntcnum
.
substring
(
0
,
ntcnum
.
indexOf
(
'('
));
}
this
.
goUrlX
(
'团控列表'
,
path
,
item
.
tcid
,
ntcnum
);
},
},
goUrlHappy
(
item
)
{
goUrlHappy
(
item
)
{
this
.
$router
.
push
({
this
.
$router
.
push
({
...
...
src/components/TravelManager/TravelTeam/priceGroup.vue
View file @
e29604f0
...
@@ -562,7 +562,7 @@
...
@@ -562,7 +562,7 @@
<li>
<li>
<span>
<span>
<em>
{{
$t
(
"visa.v_tuanhao"
)
}}
</em>
<em>
{{
$t
(
"visa.v_tuanhao"
)
}}
</em>
<el-input
v-model=
"msg.TC
ID
"
class=
"w150"
clearable
></el-input>
<el-input
v-model=
"msg.TC
NUM
"
class=
"w150"
clearable
></el-input>
</span>
</span>
</li>
</li>
<li>
<li>
...
@@ -694,8 +694,8 @@
...
@@ -694,8 +694,8 @@
<div
class=
"p20"
>
<div
class=
"p20"
>
<div
class=
"mb title"
><i
class=
"iconfont icon-jiage"
></i><span>
{{$t('visa.v_tuanweiinfo')}}
</span></div>
<div
class=
"mb title"
><i
class=
"iconfont icon-jiage"
></i><span>
{{$t('visa.v_tuanweiinfo')}}
</span></div>
<div
class=
"mb bold"
><span
class=
"item-title"
>
{{$t('visa.v_currentseat')}}:
</span>
<div
class=
"mb bold"
><span
class=
"item-title"
>
{{$t('visa.v_currentseat')}}:
</span>
<
template
v-if=
"item.SurplusSeat>0"
>
{{
item
.
SurplusSeat
}}
</
template
>
<
template
v-if=
"item.SurplusSeat>0"
>
{{
item
.
SurplusSeat
}}
</
template
>
<
template
v-else
>
0
</
template
>
<
template
v-else
>
0
</
template
>
</div>
</div>
<div
class=
"mb bold"
><span
class=
"item-title"
>
{{$t('visa.v_yibaoru')}}:
</span>
{{item.JoinNum}}
<div
class=
"mb bold"
><span
class=
"item-title"
>
{{$t('visa.v_yibaoru')}}:
</span>
{{item.JoinNum}}
<span
class=
"TCL-redType"
<span
class=
"TCL-redType"
...
@@ -704,8 +704,8 @@
...
@@ -704,8 +704,8 @@
<div
class=
"mb bold"
><span
class=
"item-title"
>
{{$t('Operation.Op_takeSeat')}}:
</span>
{{item.Occupied}}
<div
class=
"mb bold"
><span
class=
"item-title"
>
{{$t('Operation.Op_takeSeat')}}:
</span>
{{item.Occupied}}
</div>
</div>
<div
class=
"mb bold"
><span
class=
"item-title"
>
{{$t('visa.v_houbu')}}:
<div
class=
"mb bold"
><span
class=
"item-title"
>
{{$t('visa.v_houbu')}}:
<
template
v-if=
"item.SurplusSeat<0"
>
{{
item
.
SurplusSeat
*-
1
}}
</
template
>
<
template
v-if=
"item.SurplusSeat<0"
>
{{
item
.
SurplusSeat
*-
1
}}
</
template
>
<
template
v-else
>
0
</
template
>
<
template
v-else
>
0
</
template
>
</span>
</div>
</span>
</div>
</div>
</div>
...
@@ -1006,7 +1006,7 @@
...
@@ -1006,7 +1006,7 @@
msg
:
{
msg
:
{
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
10
,
pageSize
:
10
,
TC
ID
:
""
,
TC
NUM
:
""
,
StartTime
:
""
,
StartTime
:
""
,
EndTime
:
""
,
EndTime
:
""
,
},
},
...
@@ -1099,6 +1099,13 @@
...
@@ -1099,6 +1099,13 @@
this
.
currentPage
=
1
;
this
.
currentPage
=
1
;
},
},
},
},
created
()
{
if
(
this
.
$route
.
query
)
{
if
(
this
.
$route
.
query
.
tcmun
)
{
this
.
msg
.
TCNUM
=
this
.
$route
.
query
.
tcmun
;
}
}
},
mounted
()
{
mounted
()
{
let
StartDate
=
this
.
getBeforeDate
(
0
,
new
Date
().
Format
(
"yyyy-MM-dd"
))
let
StartDate
=
this
.
getBeforeDate
(
0
,
new
Date
().
Format
(
"yyyy-MM-dd"
))
this
.
msg
.
StartTime
=
StartDate
this
.
msg
.
StartTime
=
StartDate
...
...
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @
e29604f0
...
@@ -100,6 +100,13 @@
...
@@ -100,6 +100,13 @@
@
keyup
.
native
.
enter=
"resetQuery"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
@
keyup
.
native
.
enter=
"resetQuery"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</span>
</li>
</li>
<li>
<span>
<em>
{{
$t
(
"visa.v_tuanhao"
)
}}
</em>
<el-input
maxlength=
"50"
v-model=
"queryMsg.TCNUM"
class=
"permiss-input w150"
@
keyup
.
native
.
enter=
"resetQuery"
:placeholder=
"$t('pub.pleaseImport')"
clearable
></el-input>
</span>
</li>
<li>
<li>
<span>
<span>
<em>
{{
$t
(
'scen.sc_ftTime'
)
}}
</em>
<em>
{{
$t
(
'scen.sc_ftTime'
)
}}
</em>
...
@@ -123,16 +130,16 @@
...
@@ -123,16 +130,16 @@
@
keyup
.
native
.
enter=
"resetQuery"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
@
keyup
.
native
.
enter=
"resetQuery"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</span>
</li>
-->
</li>
-->
<li>
<
!--
<
li>
<span>
<span>
<em>
{{
$t
(
'objFill.v101.hezuohuoban'
)
}}
:
</em>
<em>
{{
$t
(
'objFill.v101.hezuohuoban'
)
}}
:
</em>
<el-input
maxlength=
"50"
v-model=
"queryMsg.QCustomerName"
class=
"permiss-input w150"
clearable
<el-input
maxlength=
"50"
v-model=
"queryMsg.QCustomerName"
class=
"permiss-input w150"
clearable
@
keyup
.
native
.
enter=
"resetQuery"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
@
keyup
.
native
.
enter=
"resetQuery"
:placeholder=
"$t('pub.pleaseImport')"
></el-input>
</span>
</span>
</li>
</li>
-->
<li>
<li>
<span>
<span>
<em>
{{
$t
(
'sm.chufadi'
)
}}
:
</em>
<em>
{{
$t
(
'sm.chufadi'
)
}}
</em>
<el-input
v-model=
"queryMsg.StartAddress"
class=
"permiss-input w150"
clearable
<el-input
v-model=
"queryMsg.StartAddress"
class=
"permiss-input w150"
clearable
@
keyup
.
native
.
enter=
"resetQuery"
:placeholder=
"$t('objFill.qingshurcfddian')"
></el-input>
@
keyup
.
native
.
enter=
"resetQuery"
:placeholder=
"$t('objFill.qingshurcfddian')"
></el-input>
</span>
</span>
...
@@ -246,9 +253,9 @@
...
@@ -246,9 +253,9 @@
<div
class=
"mb bold"
>
<div
class=
"mb bold"
>
<span
class=
"item-title"
>
{{$t('Airticket.Air_EconomyClass')}}:
</span>
<span
class=
"item-title"
>
{{$t('Airticket.Air_EconomyClass')}}:
</span>
<span>
{{item.YSeat}}
<span
class=
"item-title ml"
>
<span>
{{item.YSeat}}
<span
class=
"item-title ml"
>
{{$t('hotel.hotel_remainList')}}:
</span>
{{item.SurplusYSeatNum}}
{{$t('hotel.hotel_remainList')}}:
</span>
{{item.SurplusYSeatNum}}
<font>
{{$t("visa.v_houbu")}}:{{item.WatingNum}}
</font>
<font>
{{$t("visa.v_houbu")}}:{{item.WatingNum}}
</font>
</span>
</span>
</div>
</div>
<div
class=
"mb bold"
><span
class=
"item-title"
>
{{$t('Airticket.Air_businessClass')}}:
</span><span>
<div
class=
"mb bold"
><span
class=
"item-title"
>
{{$t('Airticket.Air_businessClass')}}:
</span><span>
{{item.CSeat}}
<span
{{item.CSeat}}
<span
...
@@ -517,6 +524,9 @@
...
@@ -517,6 +524,9 @@
<el-dropdown-item
@
click
.
native=
"gotoPay(item)"
>
<el-dropdown-item
@
click
.
native=
"gotoPay(item)"
>
{{$t('objFill.v101.baojijiesuan')}}
{{$t('objFill.v101.baojijiesuan')}}
</el-dropdown-item>
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goTeamBalance(item.TCID, item.OutBranchId)"
>
{{ $t("Operation.Op_shouzhiDetail") }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown>
</div>
</div>
...
@@ -571,6 +581,7 @@
...
@@ -571,6 +581,7 @@
QFlightNum
:
""
,
//航班号
QFlightNum
:
""
,
//航班号
QCustomerName
:
""
,
//合作伙伴名称
QCustomerName
:
""
,
//合作伙伴名称
StartAddress
:
""
,
//出发地
StartAddress
:
""
,
//出发地
TCNUM
:
""
,
//团队编号
},
},
queryDataObj
:
{
queryDataObj
:
{
LineList
:
[],
//线路列表
LineList
:
[],
//线路列表
...
@@ -663,6 +674,18 @@
...
@@ -663,6 +674,18 @@
);
);
})
})
},
},
goTeamBalance
(
id
,
OutBranchId
)
{
this
.
$router
.
push
({
name
:
"TeamBalancePayment"
,
query
:
{
id
:
id
,
OutBranchId
:
OutBranchId
,
IsHaveAuth
:
true
,
blank
:
"y"
,
tab
:
"团队收支明细"
,
},
});
},
//跳转到报名清单
//跳转到报名清单
gotoPay
(
item
)
{
gotoPay
(
item
)
{
this
.
OpenNewPage
(
'/TravelPay'
,
{
this
.
OpenNewPage
(
'/TravelPay'
,
{
...
@@ -753,6 +776,11 @@
...
@@ -753,6 +776,11 @@
created
()
{
created
()
{
this
.
CurrentUserInfo
=
this
.
getLocalStorage
();
this
.
CurrentUserInfo
=
this
.
getLocalStorage
();
this
.
getLineList
();
this
.
getLineList
();
if
(
this
.
$route
.
query
)
{
if
(
this
.
$route
.
query
.
tcmun
)
{
this
.
queryMsg
.
TCNUM
=
this
.
$route
.
query
.
tcmun
;
}
}
}
}
};
};
...
...
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