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
9b1b4e59
Commit
9b1b4e59
authored
Feb 21, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
4d0e4a23
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1602 additions
and
161 deletions
+1602
-161
addEditVehicle.vue
src/components/busManagement/BookAcar/addEditVehicle.vue
+83
-65
tripBusOrderList.vue
...ts/busManagement/BookAcar/components/tripBusOrderList.vue
+1475
-0
tripBusOrder.vue
src/components/busManagement/tripBusOrder.vue
+44
-96
No files found.
src/components/busManagement/BookAcar/addEditVehicle.vue
View file @
9b1b4e59
This diff is collapsed.
Click to expand it.
src/components/busManagement/BookAcar/components/tripBusOrderList.vue
0 → 100644
View file @
9b1b4e59
This diff is collapsed.
Click to expand it.
src/components/busManagement/tripBusOrder.vue
View file @
9b1b4e59
...
...
@@ -5,12 +5,23 @@
<li><span><em>
状态
</em></span>
<el-select
v-model=
'msg.OfferState'
clearable
>
<el-option
label=
'不限'
value=
'-1'
key=
'-1'
></el-option>
<el-option
label=
'等待报价'
value=
'2'
key=
'2'
></el-option>
<el-option
label=
'已报价'
value=
'3'
key=
'3'
></el-option>
<el-option
label=
'确认报价'
value=
'4'
key=
'4'
></el-option>
<el-option
label=
'取消报价'
value=
'5'
key=
'5'
></el-option>
<el-option
label=
'待确认'
value=
'1'
key=
'1'
></el-option>
<el-option
label=
'已确认'
value=
'2'
key=
'2'
></el-option>
<el-option
label=
'已取消'
value=
'3'
key=
'3'
></el-option>
</el-select>
</li>
<li>
<span>
<em>
订单编号
</em>
<el-input
v-model=
'msg.OrderNo'
class=
"w200"
></el-input>
</span>
</li>
<li>
<span>
<em>
订单流水号
</em>
<el-input
v-model=
'msg.OrderId'
class=
"w200"
></el-input>
</span>
</li>
<li>
<span>
<em>
订车公司
</em>
...
...
@@ -45,7 +56,7 @@
</li>
<li>
<input
type=
"button"
class=
"normalBtn"
value=
"查询"
@
click=
"getList(); resetPageIndex()"
/>
<button
class=
"hollowFixedBtn"
type=
"primary"
@
click=
"goUrl"
>
<button
class=
"hollowFixedBtn"
type=
"primary"
@
click=
"goUrl
(0)
"
>
添加
</button>
</li>
...
...
@@ -58,86 +69,7 @@
<span
class=
"groupTourOrderByTuan_ico"
><i
style=
"background-color:#ff9800"
></i><span>
{{
$t
(
'fnc.ytongguo'
)
}}
</span></span></p>
</div>
</
template
>
<div
style=
"width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; "
class=
"ownScrollbarStyle"
:style=
"{ height: boxHeight + 'px' }"
>
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"busStatisticsTalbe"
v-loading=
'loading'
>
<tr>
<th
class=
"w100"
>
订单ID
</th>
<th
width=
"130"
>
订车公司
</th>
<th
width=
"110"
>
订车人
</th>
<th
width=
"110"
>
团体名称
</th>
<th
width=
"110"
>
开始日期
</th>
<th
width=
"110"
>
行程天数
</th>
<th
width=
"110"
>
人数
</th>
<th
width=
"110"
>
用车类型
</th>
<th
width=
"110"
>
总价
</th>
<th
width=
"110"
>
申请人
</th>
<th
width=
"130"
>
下单时间
</th>
<th
width=
"110"
>
报价状态
</th>
<!-- <th width="110">确认状态</th> -->
<th>
操作
</th>
</tr>
<tbody
v-for=
"(item, index) in DataList"
:key=
"index"
>
<tr>
<td>
{{ item.Id }}
</td>
<td>
{{ item.UseCompName }}
</td>
<td>
{{ item.UseName }}
</td>
<td>
{{ item.TeamName }}
</td>
<td>
{{ item.StartDate }}
</td>
<td>
{{ item.UseDayNum }}
</td>
<td>
{{ item.PeopleNum }}
</td>
<td>
{{ item.BusTypeName }}
</td>
<td>
{{ item.TotalPrice }}
</td>
<td>
{{ item.CustomerName }}
</td>
<td>
{{ item.CreateDate }}
</td>
<td>
{{ item.OfferStateName }}
</td>
<!-- <td>
<template v-if="item.SureId == 0">
<span style="color:red">待确认</span>
</template>
<template v-else>
<span style="color:red">已确认</span><br />
<span style="color:red">确认人:{{ item.SureByName }}</span><br />
<span style="color:red">确认时间:{{ item.SureTime }}</span>
</template>
</td> -->
<td>
<div
class=
"link"
style=
"display: flex;flex-flow: nowrap;"
>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"clickCancel(item)"
>
取消用车
</button>
<button
class=
"hollowFixedBtn"
type=
"primary"
@
click=
"goUrl(item.Id)"
>
编辑
</button>
<button
class=
"hollowFixedBtn"
type=
"primary"
@
click=
"SetTripBusPrice(item, 2)"
>
详情
</button>
<button
class=
"normalBtn"
type=
"primary"
v-if=
"item.OfferState == 1 && item.Status == 0"
@
click=
"SetTripBusPrice(item, 1)"
>
报价
</button>
<button
class=
"normalBtn"
type=
"primary"
v-if=
"item.OfferState==4"
@
click=
"driver(item.Id)"
>
添加司机车牌号
</button>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<OrderList
:pagesTitle=
"Title"
:OrderList=
"DataList"
v-loading=
"loading"
@
success=
"msg.pageIndex=1,getList()"
>
</OrderList>
<!-- 详情 -->
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
"msg.pageSize"
:total=
"total"
></el-pagination>
...
...
@@ -375,6 +307,7 @@
</template>
<
script
>
import
OrderList
from
'./BookAcar/components/tripBusOrderList.vue'
;
export
default
{
props
:[
'pagesTitle'
],
data
()
{
...
...
@@ -406,6 +339,8 @@
StartTime
:
""
,
//开始时间
EndTime
:
""
,
//结束时间
OfferState
:
"-1"
,
//报价状态
OrderNo
:
''
,
OrderId
:
''
,
},
boxHeight
:
0
,
offsetwidth
:
0
,
...
...
@@ -455,7 +390,7 @@
}
},
components
:
{
OrderList
},
watch
:
{
pagesTitle
(
val
,
oldval
){
...
...
@@ -494,7 +429,7 @@
this
.
$router
.
push
({
name
:
'CharterAddEditVehicle'
,
query
:
{
Id
:
Id
,
Id
:
Id
?
Id
:
0
,
blank
:
"y"
,
tab
:
text
}
...
...
@@ -519,11 +454,26 @@
},
getList
()
{
this
.
loading
=
true
// tripbus_GetErpTripBusPage
this
.
apipost
(
'tripbus_GetTripBusPage'
,
this
.
msg
,
res
=>
{
let
url
// 销售 OP
if
(
this
.
pagesTitle
==
'销售'
){
url
=
"tripbus_GetSellTripBusPage"
}
else
{
url
=
"tripbus_GetErpTripBusPage"
}
this
.
apipost
(
url
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
total
=
res
.
data
.
data
.
count
;
res
.
data
.
data
.
pageData
.
forEach
(
x
=>
{
x
.
Money
=
0
x
.
totalMoney
=
0
x
.
DetailList
.
forEach
(
y
=>
{
y
.
Money
=
y
.
UnitPrice
+
y
.
StopBusPrice
+
y
.
RoomPrice
x
.
Money
+=
y
.
Money
})
x
.
totalMoney
+=
x
.
Money
})
this
.
DataList
=
res
.
data
.
data
.
pageData
;
this
.
$forceUpdate
();
}
else
{
...
...
@@ -653,14 +603,12 @@
this
.
Title
=
this
.
pagesTitle
this
.
userInfo
=
this
.
getLocalStorage
();
let
myDate
=
new
Date
();
let
nowDate
=
myDate
.
getFullYear
()
+
"-"
+
parseInt
(
myDate
.
getMonth
()
+
1
)
+
"-"
+
myDate
.
getDate
();
let
nowDate
=
myDate
.
getFullYear
()
+
"-"
+
parseInt
(
myDate
.
getMonth
()
+
1
)
+
"-"
+
myDate
.
getDate
();
let
today
=
new
Date
(
myDate
.
getFullYear
(),
parseInt
(
myDate
.
getMonth
()),
myDate
.
getDate
()
+
2
)
let
nowDate2
=
this
.
$calendarUtils
.
formatDate
(
myDate
.
getFullYear
(),
parseInt
(
myDate
.
getMonth
())
+
1
,
myDate
.
getDate
()
+
1
)
this
.
msg
.
StartTime
=
nowDate
;
this
.
DataList
=
[
nowDate
]
this
.
msg
.
EndTime
=
nowDate2
;
this
.
Datelist
=
[
nowDate
,
nowDate2
]
let
width
=
window
.
innerWidth
-
50
;
let
height
=
window
.
innerHeight
-
65
-
300
;
this
.
boxHeight
=
height
;
...
...
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