Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
youjj
cloud-platform-ui
Commits
2685bdd4
Commit
2685bdd4
authored
Nov 08, 2019
by
guoyou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员订单管理
parent
4f61d342
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
759 additions
and
590 deletions
+759
-590
dev.env.js
config/dev.env.js
+1
-1
rentOrderDetailModal.vue
src/views/order/modal/rentOrderDetailModal.vue
+129
-31
illegalModal.vue
src/views/order/rentVehicleInfo/illegalModal.vue
+244
-253
index.vue
src/views/order/rentVehicleInfo/index.vue
+235
-175
index.vue
src/views/vehicle/bookRecord/index.vue
+150
-128
priceList.vue
src/views/vehicleType/priceList.vue
+0
-2
No files found.
config/dev.env.js
View file @
2685bdd4
module
.
exports
=
{
NODE_ENV
:
'"development"'
,
BASE_API
:
'"https://
xxtest.upyuns.com"'
,
//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://dev.dfangche
.com"',//'"https://xxfcmgmt.upyuns.com"(正)',//http://10.1.37.192:9527(何), //https://xxtest.upyuns.com(测),10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
BASE_API
:
'"https://
dev.dfangche.com"'
,
//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns
.com"',//'"https://xxfcmgmt.upyuns.com"(正)',//http://10.1.37.192:9527(何), //https://xxtest.upyuns.com(测),10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
APP_ORIGIN
:
'"https://wallstreetcn.com"'
}
src/views/order/modal/rentOrderDetailModal.vue
View file @
2685bdd4
<
template
>
<el-dialog
title=
"租车订单详情"
:visible
.
sync=
"dialogVisible"
class=
"order-details"
>
<el-form
:model=
"form"
ref=
"form"
label-width=
"
9
0px"
>
<el-form
:model=
"form"
ref=
"form"
label-width=
"
11
0px"
>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"订单号:"
>
...
...
@@ -8,28 +8,33 @@
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"
支付
时间:"
>
<el-form-item
label=
"
创建订单
时间:"
>
<span>
{{
form
.
crtTime
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"
订单状态
:"
>
<span>
{{
form
.
ststusName
}}
</span>
<el-form-item
label=
"
实际支付时间
:"
>
<span>
{{
!!
form
.
payTime
?
timestamp
(
new
Date
(
form
.
payTime
))
:
'无'
}}
</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"
姓名
:"
>
<span>
{{
form
.
real
Name
}}
</span>
<el-form-item
label=
"
订单状态
:"
>
<span>
{{
form
.
ststus
Name
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"手机号:"
>
<span>
{{
form
.
telephone
}}
</span>
<el-form-item
label=
"
姓名/
手机号:"
>
<span>
{{
form
.
realName
}}
/
{{
form
.
telephone
}}
</span>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
<el-form-item
label=
"会员等级/身份:"
>
<span>
{{
form
.
memberName
}}
/
{{
form
.
jobTitle
}}
</span>
</el-form-item>
</el-col>
<!--
<el-col
:span=
"8"
>
<el-form-item
label=
"配车:"
>
<span
style=
"margin-right: 10px;"
...
...
@@ -42,9 +47,9 @@
@
click=
"resetCar"
>
重新配车
</el-button>
</el-form-item>
</el-col>
</el-col>
-->
</el-row>
<el-row>
<
!--
<
el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"取车:"
>
<span>
{{
form
.
orderRentVehicleDetail
.
startTime
}}
</span>
...
...
@@ -60,8 +65,8 @@
<span>
{{
form
.
startCompanyName
}}
</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
</el-row>
-->
<
!--
<
el-row>
<el-col
:span=
"8"
>
<el-form-item
label=
"还车:"
>
<span>
{{
form
.
orderRentVehicleDetail
.
endTime
}}
</span>
...
...
@@ -75,45 +80,112 @@
<el-col
:span=
"8"
>
<el-form-item
label=
"还车公司:"
>
<span>
{{
form
.
endCompanyName
}}
</span>
<el-button
v-show=
"form.status == 4 || form.status == 5"
size=
"mini"
type=
"primary"
style=
"padding: 7px 9px;"
@
click=
"resetReturn = true"
>
更换
</el-button>
<el-button
v-show=
"form.status == 4 || form.status == 5"
size=
"mini"
type=
"primary"
style=
"padding: 7px 9px;"
@
click=
"resetReturn = true"
>
更换
</el-button>
</el-form-item>
</el-col>
</el-row>
</el-row>
-->
<table
class=
"orderDetail"
>
<tr>
<th>
房车
</th>
<th>
租借天数
</th>
<th>
费用明细
</th>
<th>
取/还时间
</th>
<th>
交车公司
</th>
<th>
还车公司
</th>
<th>
免费天数
</th>
<th>
车辆租赁费
</th>
<th>
优惠券
</th>
<th>
不计免赔
</th>
<th>
租房车押金
</th>
</tr>
<tr>
<td>
{{
form
.
name
}}{{
rentCostDetail
}}
</td>
<td>
{{
form
.
orderRentVehicleDetail
.
dayNum
}}
天
</td>
<td>
{{
rentCostDetail
}}
</td>
<td>
{{
form
.
name
}}
</td>
<td>
<p>
取:
{{
form
.
orderRentVehicleDetail
.
startTime
}}
</p>
<p>
还:
{{
form
.
orderRentVehicleDetail
.
endTime
}}
</p>
</td>
<td>
{{
form
.
startCompanyName
}}
</td>
<td>
{{
form
.
endCompanyName
}}
</td>
<td></td>
<td></td>
<td>
<p
v-if=
"form.couponList"
>
优惠券:
<span
v-for=
"(item,index) in form.couponList"
:key=
"index"
>
{{
item
.
title
}}
-
{{
item
.
usedAmount
}}
元
</span>
</p>
<p
v-else
>
优惠券:无
</p>
</td>
<td></td>
<td>
<!--
{{
form
.
orderRentVehicleDetail
.
costDetail
.
children
}}
-->
<!--
<div
v-show=
"form.orderRentVehicleDetail.costDetail"
>
<p
v-for=
"(item,index) in JSON.parse(form.orderRentVehicleDetail.costDetail).children"
:key=
"index"
>
{{
item
.
key
}}
:
{{
item
.
detail
||
'无'
}}
</p>
</div>
-->
</td>
</tr>
<tr>
<td>
<el-button
size=
"small"
type=
"text"
v-if=
"form.status==4"
@
click=
"resetCar"
>
重新配车
</el-button>
</td>
<td></td>
<td></td>
<td>
共计:¥
{{
form
.
realAmount
}}
</td>
<td>
<el-button
v-show=
"form.status == 4 || form.status == 5"
size=
"mini"
type=
"text"
@
click=
"resetReturn = true"
>
更换
</el-button>
</td>
<td
colspan=
"5"
>
{{
form
.
payWay
==
1
?
'微信公众号支付'
:
form
.
payWay
==
2
?
'支付宝即时支付'
:
form
.
payWay
==
3
?
'银联支付'
:
''
}}
共计:¥
{{
form
.
realAmount
}}
</td>
</tr>
</table>
<div
v-if=
"form.orderVehicleCrosstownDto"
style=
"margin: 20px 0;"
>
<p>
<b>
额外随车物品:
</b>
<span
v-for=
"(item,index) in JSON.parse(this.form.carArticlesJson)"
:key=
"index"
style=
"margin-right:10px"
>
{{
item
.
name
||
'无'
}}
</span>
</p>
<p>
<b>
内部邀请人:
</b>
<span>
{{
form
.
facilitatePhone
||
'无'
}}
</span>
</p>
<p>
<b>
驾驶证:
</b>
<span
v-if=
"form.orderVehicleCrosstownDto"
>
{{
form
.
orderVehicleCrosstownDto
.
licenseName
}}
{{
form
.
orderVehicleCrosstownDto
.
licensePhone
}}
{{
form
.
orderVehicleCrosstownDto
.
licenseIdCard
}}
</span>
<span
v-else
>
无
</span>
</p>
<!--
<div
v-if=
"form.orderVehicleCrosstownDto"
style=
"margin: 20px 0;"
>
<span
style=
"font-size: 18px;font-weight: bold;"
>
驾驶人信息
</span>
</div>
<table
class=
"orderDetail"
v-if=
"form.orderVehicleCrosstownDto"
>
</div>
-->
<
!--
<
table
class=
"orderDetail"
v-if=
"form.orderVehicleCrosstownDto"
>
<tr>
<th>
姓名
</th>
<th>
手机号
</th>
<th>
身份证号
</th>
<!--
<th>
驾照
</th>
-->
</tr>
<tr>
<td>
{{
form
.
orderVehicleCrosstownDto
.
licenseName
}}
</td>
<td>
{{
form
.
orderVehicleCrosstownDto
.
licensePhone
}}
</td>
<td>
{{
form
.
orderVehicleCrosstownDto
.
licenseIdCard
}}
</td>
<!--
<td><img
style=
"width: 140px;height: 140px;"
:src=
"form.orderVehicleCrosstownDto?form.orderVehicleCrosstownDto.licenseImg:'https://xxtest.upyuns.com/image/app/default_%20avatar.png'"
></td>
-->
</tr>
</table>
</table>
-->
</el-form>
<div
class=
"modal_modal"
v-show=
"resetCarVisible"
></div>
<!-- 重新配车 -->
...
...
@@ -171,6 +243,7 @@ export default {
updateNumberPlat
:
false
,
//是否重新配车
dialogVisible
:
false
,
resetCarVisible
:
false
,
goods
:
[],
resetCarForm
:
{
no
:
''
,
numberPlate
:
''
//重新配车车牌号
...
...
@@ -204,7 +277,7 @@ export default {
}
},
mounted
()
{
console
.
log
(
this
.
form
)
this
.
dialogVisible
=
true
if
(
this
.
form
.
status
==
2
)
{
this
.
form
.
ststusName
=
'取消'
...
...
@@ -224,6 +297,32 @@ export default {
this
.
getAllFn
()
},
methods
:
{
timestamp
(
now
)
{
var
year
=
now
.
getFullYear
()
var
month
=
now
.
getMonth
()
+
1
var
date
=
now
.
getDate
()
var
Hours
=
now
.
getHours
()
var
Minutes
=
now
.
getMinutes
()
var
Seconds
=
now
.
getSeconds
()
month
=
month
.
toString
().
length
==
1
?
'0'
+
month
:
month
date
=
date
.
toString
().
length
==
1
?
'0'
+
date
:
date
Hours
=
Hours
.
toString
().
length
==
1
?
'0'
+
Hours
:
Hours
Minutes
=
Minutes
.
toString
().
length
==
1
?
'0'
+
Minutes
:
Minutes
Seconds
=
Seconds
.
toString
().
length
==
1
?
'0'
+
Seconds
:
Seconds
return
(
year
+
'-'
+
month
+
'-'
+
date
+
' '
+
Hours
+
':'
+
Minutes
+
':'
+
Seconds
)
},
getAllFn
()
{
let
_this
=
this
getAll
().
then
(
data
=>
{
...
...
@@ -252,10 +351,9 @@ export default {
type
:
'success'
,
duration
:
3000
})
this
.
resetReturn
=
false
;
this
.
dialogVisible
=
false
;
this
.
resetReturn
=
false
this
.
dialogVisible
=
false
this
.
$emit
(
'rentOrderDetailDialogEvent'
,
true
)
}
else
{
this
.
$notify
({
title
:
'失败'
,
...
...
src/views/order/rentVehicleInfo/illegalModal.vue
View file @
2685bdd4
<
template
>
<el-dialog
title=
"违章查询"
:visible
.
sync=
"isVisible"
>
<el-form>
<el-row>
<!--
<el-row>
<el-col
:span=
"24"
>
<el-form-item
label=
"订单号"
>
<span>
{{
row
.
no
}}
</span>
...
...
@@ -23,7 +23,8 @@
<el-row>
<el-col
:span=
"24"
>
<el-form-item
label=
"用户ID/实名"
>
<span>
{{
row
.
userId
}}
</span>
/
<span>
{{
row
.
username
}}
</span>
<span>
{{
row
.
userId
}}
</span>
/
<span>
{{
row
.
username
}}
</span>
</el-form-item>
</el-col>
</el-row>
...
...
@@ -48,11 +49,13 @@
</el-col>
<el-col
:span=
"16"
>
<el-form-item
label=
"收车公司"
>
<span><span>
{{
row
.
endCompanyName
}}
</span>
<span>
(
{{
row
.
orderRentVehicleDetail
.
endCityName
}}{{
row
.
orderRentVehicleDetail
.
endAddr
}}
)
</span></span>
<span>
<span>
{{
row
.
endCompanyName
}}
</span>
<span>
(
{{
row
.
orderRentVehicleDetail
.
endCityName
}}{{
row
.
orderRentVehicleDetail
.
endAddr
}}
)
</span>
</span>
</el-form-item>
</el-col>
</el-row
>
</el-row>
--
>
<el-row>
<el-col>
<el-form-item
label=
"违章截图"
:style=
"
{display:'block'}">
...
...
@@ -74,7 +77,8 @@
:on-remove=
"handleRemove"
:file-list=
"fileList2"
:on-success=
"handleSuccess"
list-type=
"picture-card"
>
list-type=
"picture-card"
>
<!--
<div
slot=
"tip"
class=
"el-upload__tip"
>
最多上传5张
</div>
-->
<i
class=
"el-icon-plus"
></i>
</el-upload>
...
...
@@ -82,8 +86,8 @@
</el-col>
</el-row>
<el-row>
<el-form-item
label=
"违章罚款"
style=
"display: inline-block;
"
>
<el-input
v-model=
"price"
type=
"number"
placeholder=
"请输入违章罚款金额"
></el-input
>
<el-form-item
label=
"违章罚款"
style=
"display: inline-block;width:100%
"
>
<el-input
style=
"width:300px"
v-model=
"price"
type=
"number"
placeholder=
"请输入违章罚款金额"
></el-input><span
style=
"margin-left:10px"
>
元
</span
>
</el-form-item>
</el-row>
</el-form>
...
...
@@ -95,27 +99,18 @@
</el-dialog>
</
template
>
<
script
>
import
{
page
,
saveOrderViolation
}
from
'api/order/rentVehicle'
;
import
{
mapGetters
}
from
'vuex'
;
import
{
formatDate
}
from
'../../../utils/dateFormattor'
;
import
{
getToken
}
from
'../../../utils/auth'
;
import
{
getOneIllegalRow
}
from
'api/order/rentVehicle'
;
import
ElRow
from
"element-ui/packages/row/src/row"
;
import
ElInput
from
"../../../../node_modules/element-ui/packages/input/src/input.vue"
;
import
ElCol
from
"element-ui/packages/col/src/col"
;
import
ElFormItem
from
"../../../../node_modules/element-ui/packages/form/src/form-item.vue"
;
import
ElForm
from
"../../../../node_modules/element-ui/packages/form/src/form.vue"
;
export
default
{
props
:
[
"row"
],
import
{
page
,
saveOrderViolation
}
from
'api/order/rentVehicle'
import
{
mapGetters
}
from
'vuex'
import
{
formatDate
}
from
'../../../utils/dateFormattor'
import
{
getToken
}
from
'../../../utils/auth'
import
{
getOneIllegalRow
}
from
'api/order/rentVehicle'
import
ElRow
from
'element-ui/packages/row/src/row'
import
ElInput
from
'../../../../node_modules/element-ui/packages/input/src/input.vue'
import
ElCol
from
'element-ui/packages/col/src/col'
import
ElFormItem
from
'../../../../node_modules/element-ui/packages/form/src/form-item.vue'
import
ElForm
from
'../../../../node_modules/element-ui/packages/form/src/form.vue'
export
default
{
props
:
[
'row'
],
name
:
'illegalDialog'
,
components
:
{
ElForm
,
...
...
@@ -127,64 +122,60 @@
data
()
{
return
{
BASE_API
:
process
.
env
.
BASE_API
,
price
:
undefined
,
//违章罚款金额
price
:
undefined
,
//违章罚款金额
isVisible
:
false
,
fileList2
:[],
//违章截图
fileList2
:
[]
//违章截图
}
},
created
()
{
},
created
()
{},
watch
:
{
isVisible
(
newValue
,
oldValue
){
if
(
!
newValue
){
this
.
$emit
(
'illegalEvent'
,
false
);
isVisible
(
newValue
,
oldValue
)
{
if
(
!
newValue
)
{
this
.
$emit
(
'illegalEvent'
,
false
)
}
}
},
},
mounted
()
{
let
that
=
this
;
// if(that.row.refundStatus == 3) {
let
that
=
this
// if(that.row.refundStatus == 3) {
//refundStatus退款状态 0、未退款 1、已退还所有(取消订单时)2、 已退还部分(保留违章预备金)3、已退还所有押金(扣除该扣除的)
that
.
getOne
(
that
.
row
.
detailId
);
// }
this
.
isVisible
=
true
;
that
.
getOne
(
that
.
row
.
detailId
)
// }
this
.
isVisible
=
true
},
computed
:
{
...
mapGetters
([
'elements'
,
]),
...
mapGetters
([
'elements'
]),
getHeaderWithToken
()
{
return
{
Authorization
:
getToken
()};
return
{
Authorization
:
getToken
()
}
}
},
methods
:
{
/**
* 根据id查询一条记录
* */
getOne
(
id
)
{
let
t
=
this
;
getOne
(
id
)
{
let
t
=
this
getOneIllegalRow
(
id
).
then
(
response
=>
{
if
(
response
.
status
==
200
)
{
let
arr
=
response
.
data
.
picture
.
split
(
","
);
let
fileList2
=
[];
let
p
=
{};
arr
.
map
(
function
(
item
)
{
if
(
response
.
status
==
200
)
{
let
arr
=
response
.
data
.
picture
.
split
(
','
)
let
fileList2
=
[]
let
p
=
{}
arr
.
map
(
function
(
item
)
{
p
=
{
url
:
item
};
fileList2
.
push
(
p
);
});
t
.
price
=
parseFloat
(
response
.
data
.
price
);
t
.
fileList2
=
fileList2
;
t
.
id
=
response
.
data
.
id
?
response
.
data
.
id
:
undefined
;
}
fileList2
.
push
(
p
)
})
t
.
price
=
parseFloat
(
response
.
data
.
price
)
t
.
fileList2
=
fileList2
t
.
id
=
response
.
data
.
id
?
response
.
data
.
id
:
undefined
}
else
{
this
.
$notify
({
title
:
'失败'
,
message
:
response
.
menu
,
type
:
'error'
,
duration
:
2000
});
})
}
})
},
...
...
@@ -192,30 +183,30 @@
* 上传成功
* */
handleSuccess
(
res
,
file
)
{
let
c
=
{
url
:
res
.
data
};
this
.
fileList2
.
push
(
c
);
this
.
showLoadingBody
=
false
;
let
c
=
{
url
:
res
.
data
}
this
.
fileList2
.
push
(
c
)
this
.
showLoadingBody
=
false
},
/**
* 删除违章图片
* */
handleRemove
(
file
,
fileList
)
{
this
.
fileList2
=
fileList
;
handleRemove
(
file
,
fileList
)
{
this
.
fileList2
=
fileList
},
/**
* 确定
* */
okHandler
()
{
let
arr
=
[];
this
.
fileList2
.
map
(
function
(
item
)
{
arr
.
push
(
item
.
url
);
});
let
arr
=
[]
this
.
fileList2
.
map
(
function
(
item
)
{
arr
.
push
(
item
.
url
)
})
let
params
=
{
picture
:
arr
.
join
(
","
),
price
:
this
.
price
,
picture
:
arr
.
join
(
','
),
price
:
this
.
price
,
detailId
:
this
.
row
.
detailId
,
id
:
this
.
id
};
}
saveOrderViolation
(
params
).
then
(
response
=>
{
if
(
response
.
status
===
200
)
{
this
.
$notify
({
...
...
@@ -223,23 +214,23 @@
message
:
'创建成功'
,
type
:
'success'
,
duration
:
2000
});
this
.
$emit
(
'illegalEvent'
,
false
);
})
this
.
$emit
(
'illegalEvent'
,
false
)
}
else
{
this
.
$notify
({
title
:
'创建失败'
,
message
:
'操作失败!'
,
type
:
'error'
,
duration
:
2000
});
})
}
});
})
},
/**
* 弹框-取消
* */
cancel
()
{
this
.
$emit
(
'illegalEvent'
,
false
);
this
.
$emit
(
'illegalEvent'
,
false
)
},
/**
* 格式化时间
...
...
@@ -247,14 +238,14 @@
* @returns {*}
*/
dateFormat
(
timestamp
)
{
let
date
=
new
Date
(
timestamp
);
//时间戳为10位需*1000,时间戳为13位的话不需乘1000
return
formatDate
(
date
,
'yyyy-MM-dd hh:mm:ss'
);
},
let
date
=
new
Date
(
timestamp
)
//时间戳为10位需*1000,时间戳为13位的话不需乘1000
return
formatDate
(
date
,
'yyyy-MM-dd hh:mm:ss'
)
}
}
}
</
script
>
<
style
>
.el-form-item__content
{
.el-form-item__content
{
display
:
inline-block
;
}
}
</
style
>
src/views/order/rentVehicleInfo/index.vue
View file @
2685bdd4
This diff is collapsed.
Click to expand it.
src/views/vehicle/bookRecord/index.vue
View file @
2685bdd4
...
...
@@ -38,7 +38,6 @@
</el-col>
</el-row>
<el-row>
</el-col>
<el-col
:span=
"5"
>
<el-form-item
label=
"所属大区"
>
<el-select
...
...
@@ -133,12 +132,16 @@
</el-table-column>
<el-table-column
align=
"center"
label=
"预定取/还时间"
width=
"200"
>
<
template
scope=
"scope"
>
<span>
{{
scope
.
row
.
bookStartDate
}}
</span>
<br/><span>
{{
scope
.
row
.
bookEndDate
}}
</span>
<span>
{{
scope
.
row
.
bookStartDate
}}
</span>
<br
/>
<span>
{{
scope
.
row
.
bookEndDate
}}
</span>
</
template
>
</el-table-column>
<el-table-column
align=
"center"
label=
"实际取/还时间"
width=
"200"
>
<
template
scope=
"scope"
>
<span>
{{
scope
.
row
.
actualStartDate
}}
</span>
<br/><span>
{{
scope
.
row
.
actualEndDate
}}
</span>
<span>
{{
scope
.
row
.
actualStartDate
}}
</span>
<br
/>
<span>
{{
scope
.
row
.
actualEndDate
}}
</span>
</
template
>
</el-table-column>
<!-- <el-table-column align="center" label="预定时间" width="220">
...
...
@@ -421,7 +424,11 @@
</el-col>
</el-row>
<el-row
style=
"margin-left: 20px;"
v-if=
"departurePicList.length>0"
>
<el-col
<viewer
:images=
"departurePicList"
>
<img
v-for=
"src in departurePicList"
:src=
"src"
:key=
"src"
class=
"voucher"
/>
</viewer>
<!-- <el-col
:span="3"
v-for="(item, index) in departurePicList"
:key="index"
...
...
@@ -431,7 +438,7 @@
<el-card>
<img :src="item" class="image" />
</el-card>
</el-col>
</el-col>
-->
</el-row>
<hr
/>
<el-row>
...
...
@@ -470,7 +477,10 @@
</el-col>
</el-row>
<el-row
style=
"margin-left: 20px;"
v-if=
"arrivalPicList.length>0"
>
<el-col
<viewer
:images=
"arrivalPicList"
>
<img
v-for=
"src in arrivalPicList"
:src=
"src"
:key=
"src"
class=
"voucher"
/>
</viewer>
<!-- <el-col
:span="3"
v-for="(item, index) in arrivalPicList"
:key="index"
...
...
@@ -480,7 +490,7 @@
<el-card>
<img :src="item" class="image" />
</el-card>
</el-col>
</el-col>
-->
</el-row>
<hr
/>
<el-row>
...
...
@@ -947,7 +957,7 @@ export default {
flag
:
false
,
zoneId
:
undefined
,
liftCompany
:
undefined
,
liftCompanyName
:
""
,
liftCompanyName
:
''
,
numberPlate
:
undefined
,
selectedMonth
:
undefined
,
status
:
undefined
,
...
...
@@ -1081,56 +1091,56 @@ export default {
}
},
created
()
{
let
t
=
this
;
let
t
=
this
getAll
().
then
(
response
=>
{
this
.
allCompaniesArr
=
response
.
data
;
let
query
=
localStorage
.
getItem
(
"bookRecord"
);
if
(
query
!=
"null"
&&
query
)
{
let
queryJson
=
JSON
.
parse
(
query
);
if
(
queryJson
.
page
)
{
t
.
listQuery
.
page
=
queryJson
.
page
;
this
.
allCompaniesArr
=
response
.
data
let
query
=
localStorage
.
getItem
(
'bookRecord'
)
if
(
query
!=
'null'
&&
query
)
{
let
queryJson
=
JSON
.
parse
(
query
)
if
(
queryJson
.
page
)
{
t
.
listQuery
.
page
=
queryJson
.
page
}
if
(
queryJson
.
limit
)
{
t
.
listQuery
.
limit
=
queryJson
.
limit
;
if
(
queryJson
.
limit
)
{
t
.
listQuery
.
limit
=
queryJson
.
limit
}
if
(
queryJson
.
flag
)
{
t
.
listQuery
.
flag
=
queryJson
.
flag
;
if
(
queryJson
.
flag
)
{
t
.
listQuery
.
flag
=
queryJson
.
flag
}
if
(
queryJson
.
zoneId
)
{
t
.
listQuery
.
zoneId
=
queryJson
.
zoneId
;
if
(
queryJson
.
zoneId
)
{
t
.
listQuery
.
zoneId
=
queryJson
.
zoneId
}
if
(
queryJson
.
liftCompany
)
{
t
.
listQuery
.
liftCompany
=
queryJson
.
liftCompany
;
if
(
queryJson
.
liftCompany
)
{
t
.
listQuery
.
liftCompany
=
queryJson
.
liftCompany
}
if
(
queryJson
.
liftCompanyName
)
{
t
.
listQuery
.
liftCompanyName
=
queryJson
.
liftCompanyName
;
if
(
queryJson
.
liftCompanyName
)
{
t
.
listQuery
.
liftCompanyName
=
queryJson
.
liftCompanyName
}
if
(
queryJson
.
numberPlate
)
{
t
.
listQuery
.
numberPlate
=
queryJson
.
numberPlate
;
if
(
queryJson
.
numberPlate
)
{
t
.
listQuery
.
numberPlate
=
queryJson
.
numberPlate
}
if
(
queryJson
.
selectedMonth
)
{
t
.
listQuery
.
selectedMonth
=
queryJson
.
selectedMonth
;
if
(
queryJson
.
selectedMonth
)
{
t
.
listQuery
.
selectedMonth
=
queryJson
.
selectedMonth
}
if
(
queryJson
.
status
)
{
t
.
listQuery
.
status
=
queryJson
.
status
;
if
(
queryJson
.
status
)
{
t
.
listQuery
.
status
=
queryJson
.
status
}
if
(
queryJson
.
bookType
)
{
t
.
listQuery
.
bookType
=
queryJson
.
bookType
;
if
(
queryJson
.
bookType
)
{
t
.
listQuery
.
bookType
=
queryJson
.
bookType
}
// if(queryJson.liftCompany){
// t.allCompaniesArr.map(function (item) {
// if(item.id == queryJson.liftCompany){
// t.listQuery.liftCompanyName = item.name;
// }
// });
// }
// if(queryJson.liftCompany){
// t.allCompaniesArr.map(function (item) {
// if(item.id == queryJson.liftCompany){
// t.listQuery.liftCompanyName = item.name;
// }
// });
// }
}
this
.
getList
()
})
;
})
getAllCompany
(
codeAndBranchCompany
=>
{
//初始化公司列表
this
.
allCompanies
=
codeAndBranchCompany
})
;
})
this
.
bookRecord_btn_prove
=
this
.
elements
[
'bookRecord:btn_prove'
]
this
.
bookRecord_btn_reject
=
this
.
elements
[
'bookRecord:btn_reject'
]
this
.
bookRecord_btn_unbook
=
this
.
elements
[
'bookRecord:btn_unbook'
]
...
...
@@ -1212,18 +1222,21 @@ export default {
flag
:
false
,
zoneId
:
undefined
,
liftCompany
:
undefined
,
liftCompanyName
:
""
,
liftCompanyName
:
''
,
numberPlate
:
undefined
,
selectedMonth
:
undefined
,
status
:
undefined
,
bookType
:
undefined
,
bookStartDate
:
undefined
,
bookEndDate
:
undefined
};
if
(
this
.
listQuery
){
localStorage
.
setItem
(
"bookRecord"
,
JSON
.
stringify
(
this
.
listQuery
));
}
this
.
getList
();
if
(
this
.
listQuery
)
{
localStorage
.
setItem
(
'bookRecord'
,
JSON
.
stringify
(
this
.
listQuery
)
)
}
this
.
getList
()
},
confirm
()
{
if
(
this
.
returnForm
.
retCompany
==
''
)
{
...
...
@@ -1243,9 +1256,9 @@ export default {
type
:
'success'
,
duration
:
2000
})
this
.
resetReturn
=
false
;
this
.
dialogDetailVisible
=
false
;
this
.
getList
()
;
this
.
resetReturn
=
false
this
.
dialogDetailVisible
=
false
this
.
getList
()
}
else
{
this
.
$notify
({
title
:
'失败'
,
...
...
@@ -1406,10 +1419,10 @@ export default {
getProvinceRegions
(
item
)
{
this
.
listQuery
.
zoneId
=
item
this
.
baranchQuery
.
zoneId
=
item
// this.listQuery.liftCompany = undefined
// getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
// this.allBranchCompany = response.data
// })
// this.listQuery.liftCompany = undefined
// getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
// this.allBranchCompany = response.data
// })
},
getAllBranchCompanyChange
(
item
)
{
this
.
listQuery
.
liftCompany
=
item
...
...
@@ -1441,10 +1454,10 @@ export default {
* 提车分公司
* */
handleSelect
(
item
)
{
if
(
item
.
value
==
"全部"
)
{
this
.
listQuery
.
liftCompany
=
undefined
;
if
(
item
.
value
==
'全部'
)
{
this
.
listQuery
.
liftCompany
=
undefined
}
else
{
this
.
listQuery
.
liftCompany
=
item
.
id
;
this
.
listQuery
.
liftCompany
=
item
.
id
}
},
cancelDialog4Lift
(
formName
)
{
...
...
@@ -1654,8 +1667,11 @@ export default {
this
.
listQuery
.
page
=
1
this
.
$refs
.
queryForm
.
validate
(
valid
=>
{
if
(
valid
)
{
if
(
this
.
listQuery
){
localStorage
.
setItem
(
"bookRecord"
,
JSON
.
stringify
(
this
.
listQuery
));
if
(
this
.
listQuery
)
{
localStorage
.
setItem
(
'bookRecord'
,
JSON
.
stringify
(
this
.
listQuery
)
)
}
this
.
getList
()
}
else
{
...
...
@@ -1932,4 +1948,10 @@ export default {
background
:
#000
;
z-index
:
2001
;
}
.voucher
{
width
:
100px
;
height
:
100px
;
border
:
1px
solid
#d9d9d9
;
margin-right
:
20px
;
}
</
style
>
src/views/vehicleType/priceList.vue
View file @
2685bdd4
...
...
@@ -308,8 +308,6 @@ export default {
:
Number
(
this
.
setForm
.
price
)
defaults
.
freeDays
=
Number
(
this
.
setForm
.
freeDays
)
defaults
.
level
=
this
.
setForm
.
level
console
.
log
(
defaults
);
params
.
push
(
defaults
)
})
}
...
...
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