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
74406993
Commit
74406993
authored
Mar 01, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
070d32e5
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
14 additions
and
63 deletions
+14
-63
index.html
index.html
+2
-2
SaleTripList.vue
src/components/TravelManager/TravelList/SaleTripList.vue
+1
-0
TravelControlListSale.vue
...onents/TravelManager/TravelList/TravelControlListSale.vue
+1
-0
oneDayTrip.vue
src/components/TravelManager/TravelList/oneDayTrip.vue
+4
-4
oneDayTripList.vue
src/components/TravelManager/TravelList/oneDayTripList.vue
+1
-1
LocaltourMan.vue
src/components/activity/LocaltourMan.vue
+1
-54
TravelFeature.vue
...nts/newTravelmanager/TravelGroupControl/TravelFeature.vue
+1
-1
TravelManager2.vue
...ts/newTravelmanager/TravelGroupControl/TravelManager2.vue
+1
-1
TravelDaysTrip_Direct.vue
...elmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue
+2
-0
No files found.
index.html
View file @
74406993
...
...
@@ -25,8 +25,8 @@
return
_load
},
set
:
function
set
(
v
)
{
console
.
log
(
v
.
toString
()),
eval
(
"_load = "
+
v
.
toString
().
replace
(
"maps.google.cn"
,
"www.google.cn"
))
//
console.log(v.toString()),
eval
(
"_load = "
+
v
.
toString
().
replace
(
"maps.google.cn"
,
"www.google.cn"
))
}
});
</script>
...
...
src/components/TravelManager/TravelList/SaleTripList.vue
View file @
74406993
...
...
@@ -198,6 +198,7 @@
handleCurrentChange
(
val
)
{
this
.
queryMsg
.
pageIndex
=
val
;
this
.
getControlList
();
console
.
log
(
"asdf"
)
},
//重新查询
resetPageIndex
()
{
...
...
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @
74406993
...
...
@@ -931,6 +931,7 @@
"travel_get_GetTravelPrciePageList"
,
msg
,
res
=>
{
console
.
log
(
"123"
)
this
.
queryCommonData
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
queryCommonData
.
dataList
=
res
.
data
.
data
.
pageData
;
...
...
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @
74406993
...
...
@@ -343,7 +343,7 @@
</li>
<li>
<button
class=
"hollowFixedBtn"
@
click=
"resetPageIndex(),getControlList()"
>
{{
$t
(
'pub.searchBtn'
)
}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
'goToOpenTravel("TravelManager
4
")'
>
{{
$t
(
'sm.kaituan'
)
}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
'goToOpenTravel("TravelManager
5
")'
>
{{
$t
(
'sm.kaituan'
)
}}
</button>
</li>
</ul>
</div>
...
...
@@ -477,9 +477,9 @@
<i
class=
"el-icon-arrow-down el-icon--right"
></i>
</span>
<el-dropdown-menu
slot=
"dropdown"
class=
"TC-dropdown"
>
<el-dropdown-item
@
click
.
native=
"goToOpenTravel('TravelManager
4
',item.ID,0)"
>
{{
$t
(
'Operation.Op_xilieModyfi'
)
}}
<el-dropdown-item
@
click
.
native=
"goToOpenTravel('TravelManager
5
',item.ID,0)"
>
{{
$t
(
'Operation.Op_xilieModyfi'
)
}}
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goTonowTeam('TravelManager
4
',item.ID,item.TCID,item.TCNUM)"
>
<el-dropdown-item
@
click
.
native=
"goTonowTeam('TravelManager
5
',item.ID,item.TCID,item.TCNUM)"
>
{{
$t
(
'Operation.Op_dangtuanModify'
)
}}
</el-dropdown-item>
</el-dropdown-menu>
...
...
@@ -497,7 +497,7 @@
<el-dropdown-menu
slot=
"dropdown"
class=
"TC-dropdown"
>
<el-dropdown-item
@
click
.
native=
"goTeamBalance(item.TCID,item.OutBranchId)"
>
{{
$t
(
'Operation.Op_shouzhiDetail'
)
}}
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goUrlR('
confirmationOrderDownLoad
',item)"
>
{{
$t
(
'Operation.Op_tripDownLoad'
)
}}
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goUrlR('
SalesconfirmationOrder
',item)"
>
{{
$t
(
'Operation.Op_tripDownLoad'
)
}}
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"removeTeamInfo(item.TCID)"
>
{{
$t
(
'system.table_delete'
)
}}
</el-dropdown-item>
<el-dropdown-item
v-if=
"item.TCState==2||item.TCState==0||item.TCState==1"
@
click
.
native=
"setUpPlat(item)"
>
{{
$t
(
'Operation.Op_shangjia'
)
}}
...
...
src/components/TravelManager/TravelList/oneDayTripList.vue
View file @
74406993
...
...
@@ -101,7 +101,7 @@
</div>
<div
class=
"el-col"
>
<div
class=
"d7"
>
<el-button
@
click=
"goToOpenTravel('TravelManager
4
',item.ID)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripUpdate'
)
}}
</el-button>
<el-button
@
click=
"goToOpenTravel('TravelManager
5
',item.ID)"
type=
"primary"
>
{{
$t
(
'Operation.Op_tripUpdate'
)
}}
</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"
>
{{
$t
(
'system.ph_shanchu'
)
}}
</el-button>
</div>
...
...
src/components/activity/LocaltourMan.vue
View file @
74406993
...
...
@@ -357,7 +357,7 @@
</li>
<li>
<button
class=
"hollowFixedBtn"
@
click=
"resetPageIndex(),getControlList()"
>
{{
$t
(
'pub.searchBtn'
)
}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
'goToOpenTravel("TravelManager
4
")'
>
开团
</button>
<button
class=
"hollowFixedBtn"
@
click=
'goToOpenTravel("TravelManager
5
")'
>
开团
</button>
</li>
</ul>
</div>
...
...
@@ -512,59 +512,6 @@
<el-button
@
click
.
native=
"SetupState(item,0)"
type=
"primary"
style=
"background:#67c23a; border-color:#67c23a"
>
取消设置
</el-button>
<!--
<el-dropdown
trigger=
"click"
style=
"margin-bottom:5px;"
>
<span
class=
"el-dropdown-link"
>
修改
<i
class=
"el-icon-arrow-down el-icon--right"
></i>
</span>
<el-dropdown-menu
slot=
"dropdown"
class=
"TC-dropdown"
>
<el-dropdown-item
@
click
.
native=
"goToOpenTravel('TravelManager4',item.ID,0)"
>
系列团修改
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goTonowTeam('TravelManager4',item.ID,item.TCID,item.TCNUM)"
>
当团修改
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button
@
click=
'goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")'
type=
"primary"
style=
"background:#67c23a; border-color:#67c23a"
>
广告
{{
item
.
AdvertCount
}}
</el-button>
<el-button
@
click=
"ckOPremark(item)"
type=
"primary"
style=
"background:#F16C3C; border-color:#F16C3C"
>
OP备注
</el-button>
<el-dropdown
trigger=
"click"
>
<span
class=
"el-dropdown-link"
>
更多操作
<i
class=
"el-icon-arrow-down el-icon--right"
></i>
</span>
<el-dropdown-menu
slot=
"dropdown"
class=
"TC-dropdown"
>
<el-dropdown-item
@
click
.
native=
"SetupState(item,1)"
>
设为推荐
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"SetupState(item,2)"
>
设为热门
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goTeamBalance(item.TCID,item.OutBranchId)"
>
团队收支明细
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"goUrlR('confirmationOrderDownLoad',item)"
>
行程下载
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
"removeTeamInfo(item.TCID)"
>
删除
</el-dropdown-item>
<el-dropdown-item
v-if=
"item.TCState==2||item.TCState==0||item.TCState==1"
@
click
.
native=
"setUpPlat(item)"
>
上架
</el-dropdown-item>
<el-dropdown-item
v-if=
"item.TCState==3"
@
click
.
native=
"Setshelves(item.TCID)"
>
下架
</el-dropdown-item>
<el-dropdown-item
v-if=
"item.Status==1"
@
click
.
native=
"OutGroup(item.TCID,2)"
>
结团
</el-dropdown-item>
<el-dropdown-item
v-if=
"item.Status==2"
@
click
.
native=
"OutGroup(item.TCID,1)"
>
销售
</el-dropdown-item>
<el-dropdown-item
v-if=
"item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
@
click
.
native=
"goSureOrder('priceIncomeConfirmInfo',item.TCID)"
>
收入确认单
</el-dropdown-item>
<el-dropdown-item
v-if=
"CurrentUserInfo.B2BDomain!=''"
@
click
.
native=
"goB2B(item.ConfigId, item.TCID)"
>
B2B预览
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
'goUrl("DistributionTransport",item.ID,"分销联运")'
>
分销联运
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
'ckSellPoint(item)'
>
本团卖点
</el-dropdown-item>
<el-dropdown-item
@
click
.
native=
'ShowUploadWord(item)'
>
WORD行程
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
-->
</div>
</div>
</div>
...
...
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @
74406993
...
...
@@ -352,7 +352,7 @@
}
else
if
(
TeamType
==
1
)
{
path
=
"TravelManager3"
;
}
else
if
(
TeamType
==
2
)
{
path
=
"TravelManager
4
"
;
path
=
"TravelManager
5
"
;
}
else
if
(
TeamType
==
3
)
{
path
=
"TravelManager6"
;
}
...
...
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @
74406993
...
...
@@ -624,7 +624,7 @@
if
(
routeName
==
'TravelManager3'
)
{
this
.
TeamType
=
1
;
}
if
(
routeName
==
'TravelManager
4
'
)
{
if
(
routeName
==
'TravelManager
5
'
)
{
this
.
TeamType
=
2
;
}
if
(
routeName
==
'TravelManager6'
)
{
...
...
src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue
View file @
74406993
...
...
@@ -343,6 +343,7 @@ export default {
//点击往后追加
addChildItem
(
index
,
type
)
{
switch
(
type
.
toString
())
{
//交通
case
this
.
$tripUtils
.
TypeKey
.
traffic
:
...
...
@@ -485,6 +486,7 @@ export default {
this
.
subConfig
.
DayList
[
index
].
dayArray
.
push
(
daysArrayItem
);
break
;
}
console
.
log
(
" this.subConfig.DayList"
,
this
.
subConfig
.
DayList
);
},
//获取相似线路行程
...
...
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