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
b2628406
Commit
b2628406
authored
Aug 01, 2025
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
11
parent
cc38ce86
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
73 additions
and
9 deletions
+73
-9
HPTripPlan.vue
src/components/busManagement/HPTripPlan.vue
+0
-1
JourneyTripPlan.vue
src/components/busManagement/JourneyTripPlan.vue
+73
-8
No files found.
src/components/busManagement/HPTripPlan.vue
View file @
b2628406
...
@@ -150,7 +150,6 @@
...
@@ -150,7 +150,6 @@
</
template
>
</
template
>
</font>
</font>
</template>
</template>
</el-tooltip>
</el-tooltip>
</td>
</td>
</template>
</template>
...
...
src/components/busManagement/JourneyTripPlan.vue
View file @
b2628406
...
@@ -49,13 +49,24 @@
...
@@ -49,13 +49,24 @@
</el-select>
</el-select>
</span>
</span>
</li>
</li>
<li>
<span><em>
预定情况
</em>
<el-select
v-model=
"msg.CarIsPush"
filterable
:placeholder=
"$t('pub.pleaseSel')"
clearable
@
clear=
"getList()"
@
change=
"getList()"
>
<el-option
label=
"已预订"
:value=
"1"
:key=
"1"
>
</el-option>
<el-option
label=
"未预定"
:value=
"2"
:key=
"2"
>
</el-option>
</el-select>
</span>
</li>
<li>
<li>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('pub.searchBtn')"
@
click=
"getList()"
/>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('pub.searchBtn')"
@
click=
"getList()"
/>
</li>
</li>
</ul>
</ul>
</div>
</div>
<div
style=
"width: 98%; overflow-x: hidden;padding-bottom: 50px; "
:style=
"
{height: boxHeight + 'px'}"
<div
style=
"width: 98%; overflow-x: hidden;padding-bottom: 50px; "
:style=
"
{height: boxHeight + 'px'}"
class="ownScrollbarStyle" v-loading="loading">
class="ownScrollbarStyle" v-loading="loading"
:element-loading-text="loadingText"
>
<table
class=
"tripPlanTab"
v-if=
"dataList&&dataList.length>0"
>
<table
class=
"tripPlanTab"
v-if=
"dataList&&dataList.length>0"
>
<thead>
<thead>
<tr>
<tr>
...
@@ -104,15 +115,26 @@
...
@@ -104,15 +115,26 @@
<td
v-if=
"subItem.DayNum==1"
:colspan=
"subItem.ColumnNum>1? subItem.ColumnNum:0"
<td
v-if=
"subItem.DayNum==1"
:colspan=
"subItem.ColumnNum>1? subItem.ColumnNum:0"
:key=
"`d2_`+index+`s2_`+subIndex"
>
:key=
"`d2_`+index+`s2_`+subIndex"
>
<el-tooltip
:content=
"subItem.TCNUM+`(`+subItem.TCID+`),用车时间:`+subItem.StartDate+`至`+subItem.EndDate"
>
<el-tooltip
:content=
"subItem.TCNUM+`(`+subItem.TCID+`),用车时间:`+subItem.StartDate+`至`+subItem.EndDate"
>
<font
style=
"cursor:pointer;color:blue;text-decoration: underline"
@
click=
"gotoTeam(subItem)"
>
<!--color:blue;-->
<template
v-if=
"subItem.DMCNum && subItem.DMCNum!=''"
>
<font
style=
"cursor:pointer;text-decoration:underline;"
{{
subItem
.
DMCNum
}}
<br/>
(总机位:
{{
subItem
.
TotalSeat
}}
订单人数:
{{
subItem
.
OrderNum
}}
+
{{
subItem
.
LeaderNum
}}
)
:style=
"
{color:subItem.CarIsPush==1?'blue':''}" @click="gotoTeam(subItem)">
</
template
>
<
template
v-else
>
{{
subItem
.
TCNUM
}}
<br/>
(总机位:
{{
subItem
.
TotalSeat
}}
订单人数:
{{
subItem
.
OrderNum
}}
+
{{
subItem
.
LeaderNum
}}
)
</
template
>
</font>
</font>
</el-tooltip>
</el-tooltip>
<br
/>
<template
v-if=
"subItem.DMCNum && subItem.DMCNum!=''"
>
{{
subItem
.
DMCNum
}}
<br
/>
(总机位:
{{
subItem
.
TotalSeat
}}
订单人数:
{{
subItem
.
OrderNum
}}
+
{{
subItem
.
LeaderNum
}}
)
</
template
>
<
template
v-else
>
{{
subItem
.
TCNUM
}}
<br
/>
(总机位:
{{
subItem
.
TotalSeat
}}
订单人数:
{{
subItem
.
OrderNum
}}
+
{{
subItem
.
LeaderNum
}}
)
</
template
>
<
template
v-if=
"subItem.MainId>0 && (subItem.CarName&&subItem.CarName!='')"
>
<br
/>
{{
subItem
.
CarName
}}
(
{{
subItem
.
CarNo
}}
)
{{
subItem
.
DriverName
}}
(
{{
subItem
.
DriverTel
}}
)
</
template
>
<el-button
v-if=
"subItem.CarIsPush!=1"
type=
"text"
@
click=
"setBusOrder(subItem)"
>
同步
</el-button>
</td>
</td>
</template>
</template>
<
template
v-else
>
<
template
v-else
>
...
@@ -131,9 +153,11 @@
...
@@ -131,9 +153,11 @@
data
()
{
data
()
{
return
{
return
{
loading
:
false
,
loading
:
false
,
loadingText
:
""
,
msg
:
{
msg
:
{
MonthStr
:
""
,
MonthStr
:
""
,
QBranchId
:
""
,
//出团公司
QBranchId
:
""
,
//出团公司
CarIsPush
:
""
,
//预定情况(1-已预订,2-未预定)
},
},
headerList
:
[],
//表头
headerList
:
[],
//表头
dataList
:
[],
dataList
:
[],
...
@@ -143,6 +167,46 @@
...
@@ -143,6 +167,46 @@
},
},
components
:
{},
components
:
{},
methods
:
{
methods
:
{
//同步车订单
setBusOrder
(
item
)
{
var
that
=
this
;
var
tipMsg
=
"是否要同步信息到车系统?"
that
.
Confirm
(
tipMsg
,
function
()
{
var
orderMsg
=
{
TCIDS
:
item
.
TCID
,
NewCombinationNum
:
''
};
if
(
item
.
DMCNum
&&
item
.
DMCNum
!=
''
)
{
orderMsg
.
NewCombinationNum
=
item
.
DMCNum
;
}
else
{
orderMsg
.
NewCombinationNum
=
item
.
TCNUM
;
}
that
.
loading
=
true
;
that
.
loadingText
=
"正在同步数据..."
;
that
.
apipost
(
'dmcstatistics_get_SetBusJapanOrder'
,
orderMsg
,
res
=>
{
that
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
that
.
Success
(
res
.
data
.
message
);
that
.
getList
();
that
.
goToBus
(
res
.
data
.
data
);
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
})
});
},
//跳转到车订单
goToBus
(
mainOrderId
)
{
let
carUrl
=
this
.
domainManager
().
CarUrl
;
var
nPath
=
"CarPlaceOrder/"
+
mainOrderId
+
"/1"
;
var
that
=
this
;
this
.
apipost
(
"travel_temp_token"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
newUrl
=
carUrl
+
"/auth/autologin?tk="
+
res
.
data
.
data
+
"&gpath="
+
nPath
;
window
.
open
(
newUrl
)
}
})
},
//初始化公司
//初始化公司
getCompanyList
()
{
getCompanyList
()
{
let
userInfo
=
this
.
getLocalStorage
();
let
userInfo
=
this
.
getLocalStorage
();
...
@@ -186,6 +250,7 @@
...
@@ -186,6 +250,7 @@
},
},
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
loadingText
=
"数据加载中..."
;
this
.
dataList
=
[];
this
.
dataList
=
[];
this
.
headerList
=
[];
this
.
headerList
=
[];
this
.
apipost
(
'travel_post_GetJourneyCarPlanList'
,
this
.
msg
,
res
=>
{
this
.
apipost
(
'travel_post_GetJourneyCarPlanList'
,
this
.
msg
,
res
=>
{
...
...
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