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
7474fa8b
Commit
7474fa8b
authored
Sep 21, 2019
by
hanfeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改旅游订单页面
parent
1fb4b7a9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
285 additions
and
279 deletions
+285
-279
index.vue
src/views/order/tourOrderInfo/index.vue
+285
-279
No files found.
src/views/order/tourOrderInfo/index.vue
View file @
7474fa8b
...
@@ -7,15 +7,16 @@
...
@@ -7,15 +7,16 @@
<el-form-item
label=
"所属地区"
prop=
"zoneId"
>
<el-form-item
label=
"所属地区"
prop=
"zoneId"
>
<el-select
class=
"filter-item"
v-model=
"listQuery.zoneId"
placeholder=
"请选择"
@
change=
"getProvinceRegions"
>
<el-select
class=
"filter-item"
v-model=
"listQuery.zoneId"
placeholder=
"请选择"
@
change=
"getProvinceRegions"
>
<el-option
:key=
"undefined"
label=
"无"
:value=
"undefined"
></el-option>
<el-option
:key=
"undefined"
label=
"无"
:value=
"undefined"
></el-option>
<el-option
v-for=
"val in getAllZoneList"
:key=
"val.id"
:label=
"val.name"
:value=
"val.id"
>
</el-option>
<el-option
v-for=
"val in getAllZoneList"
:key=
"val.id"
:label=
"val.name"
:value=
"val.id"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"5"
>
<el-col
:span=
"5"
>
<el-form-item
label=
"所属公司"
prop=
"startCompanyId"
>
<el-form-item
label=
"所属公司"
prop=
"startCompanyId"
>
<el-select
class=
"filter-item"
v-model=
"listQuery.startCompanyId"
placeholder=
"请选择"
@
change=
"getAllBranchCompanyChange"
>
<el-select
class=
"filter-item"
v-model=
"listQuery.startCompanyId"
placeholder=
"请选择"
@
change=
"getAllBranchCompanyChange"
>
<el-option
:key=
"undefined"
label=
"无"
:value=
"undefined"
></el-option>
<el-option
:key=
"undefined"
label=
"无"
:value=
"undefined"
></el-option>
<el-option
v-for=
"val in allBranchCompany"
:key=
"val.id"
:label=
"val.name"
:value=
"val.id"
>
</el-option>
<el-option
v-for=
"val in allBranchCompany"
:key=
"val.id"
:label=
"val.name"
:value=
"val.id"
>
</el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -25,16 +26,16 @@
...
@@ -25,16 +26,16 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
<el-row>
<el-col
:span=
"5"
>
<el-col
:span=
"5"
>
<el-form-item
label=
"订单号"
>
<el-form-item
label=
"订单号"
>
<el-input
v-model=
"listQuery.no"
type=
"text"
placeholder=
"请输入订单号"
></el-input>
<el-input
v-model=
"listQuery.no"
type=
"text"
placeholder=
"请输入订单号"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"5"
>
<el-col
:span=
"5"
>
<el-form-item
label=
"状态"
>
<el-form-item
label=
"状态"
>
<el-select
class=
"filter-item"
v-model=
"listQuery.status"
placeholder=
"请选择状态"
>
<el-select
class=
"filter-item"
v-model=
"listQuery.status"
placeholder=
"请选择状态"
>
<el-option
:key=
"null"
label=
"无"
:value=
"null"
></el-option>
<el-option
:key=
"null"
label=
"无"
:value=
"null"
></el-option>
<el-option
:key=
"2"
label=
"取消"
:value=
"2"
></el-option>
<el-option
:key=
"2"
label=
"取消"
:value=
"2"
></el-option>
<el-option
:key=
"3"
label=
"待付款"
:value=
"3"
></el-option>
<el-option
:key=
"3"
label=
"待付款"
:value=
"3"
></el-option>
<el-option
:key=
"4"
label=
"待出行"
:value=
"4"
></el-option>
<el-option
:key=
"4"
label=
"待出行"
:value=
"4"
></el-option>
...
@@ -43,7 +44,6 @@
...
@@ -43,7 +44,6 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-row>
</el-row>
</el-row>
</el-form>
</el-form>
...
@@ -121,7 +121,9 @@
...
@@ -121,7 +121,9 @@
layout=
"total, sizes, prev, pager, next, jumper"
:total=
"total"
></el-pagination>
layout=
"total, sizes, prev, pager, next, jumper"
:total=
"total"
></el-pagination>
</div>
</div>
<!--订单详情-->
<!--订单详情-->
<tourOrderDetailModal
:tourRow=
"tourRow"
:insureDetail=
"insureDetail"
v-if=
"tourDialogVisible"
:tourCostDetail=
"tourCostDetail"
v-on:tourOrderDetailDialogEvent=
"tourOrderDetailDialogEvent"
></tourOrderDetailModal>
<tourOrderDetailModal
:tourRow=
"tourRow"
:insureDetail=
"insureDetail"
v-if=
"tourDialogVisible"
:tourCostDetail=
"tourCostDetail"
v-on:tourOrderDetailDialogEvent=
"tourOrderDetailDialogEvent"
></tourOrderDetailModal>
</div>
</div>
</template>
</template>
...
@@ -133,7 +135,7 @@
...
@@ -133,7 +135,7 @@
getAllBranchCompany
,
getAllBranchCompany
,
getAllBranchCompanyByZoneId
getAllBranchCompanyByZoneId
}
from
'api/order/rentVehicle'
;
}
from
'api/order/rentVehicle'
;
import
{
mapGetters
}
from
'vuex'
;
import
{
mapGetters
}
from
'vuex'
;
import
rsCode
from
'../../../utils/rsCode'
;
import
rsCode
from
'../../../utils/rsCode'
;
import
{
import
{
timestamp2Date
timestamp2Date
...
@@ -144,6 +146,7 @@
...
@@ -144,6 +146,7 @@
import
{
import
{
formatDate
formatDate
}
from
'../../../utils/dateFormattor'
;
}
from
'../../../utils/dateFormattor'
;
export
default
{
export
default
{
name
:
'branchCompanyStock'
,
name
:
'branchCompanyStock'
,
components
:
{
components
:
{
...
@@ -203,7 +206,7 @@
...
@@ -203,7 +206,7 @@
refundStatus
:
undefined
,
refundStatus
:
undefined
,
startCompanyName
:
undefined
,
startCompanyName
:
undefined
,
status
:
undefined
,
status
:
undefined
,
ststusName
:
undefined
,
ststusName
:
undefined
,
telephone
:
undefined
,
telephone
:
undefined
,
type
:
undefined
,
type
:
undefined
,
updTime
:
undefined
,
updTime
:
undefined
,
...
@@ -212,7 +215,7 @@
...
@@ -212,7 +215,7 @@
vehicleNumberPlat
:
undefined
,
vehicleNumberPlat
:
undefined
,
version
:
undefined
,
version
:
undefined
,
},
},
detailVisible
:
false
,
detailVisible
:
false
,
bannerDialogVisible
:
false
,
//添加、编辑弹框
bannerDialogVisible
:
false
,
//添加、编辑弹框
modalTitle
:
'订单详情'
,
modalTitle
:
'订单详情'
,
rules
:
{
rules
:
{
...
@@ -245,39 +248,39 @@
...
@@ -245,39 +248,39 @@
page
:
1
,
page
:
1
,
limit
:
20
,
limit
:
20
,
type
:
2
,
type
:
2
,
no
:
null
,
no
:
undefined
,
phone
:
null
,
phone
:
undefined
,
status
:
null
,
status
:
null
,
startTime
:
undefined
,
startTime
:
undefined
,
endTime
:
undefined
,
endTime
:
undefined
,
zoneId
:
undefined
,
zoneId
:
undefined
,
startCompanyId
:
undefined
startCompanyId
:
undefined
},
},
tourRow
:
{},
//旅游订单详情-当前行
tourRow
:
{},
//旅游订单详情-当前行
//"{"key":"费用明细","val":"","children":[{"key":"成人价格","detail":"¥13800.00/人×1人","val":"¥13800.00"}]}"
//"{"key":"费用明细","val":"","children":[{"key":"成人价格","detail":"¥13800.00/人×1人","val":"¥13800.00"}]}"
costDetail
:
{
costDetail
:
{
key
:
undefined
,
key
:
undefined
,
val
:
undefined
,
val
:
undefined
,
children
:
[
children
:
[
{
{
key
:
undefined
,
key
:
undefined
,
detail
:
undefined
,
detail
:
undefined
,
val
:
undefined
val
:
undefined
}
}
]
]
},
},
baranchQuery
:
{
baranchQuery
:
{
zoneId
:
null
zoneId
:
null
},
},
dialogFormVisible
:
false
,
dialogFormVisible
:
false
,
dialogStatus
:
''
,
dialogStatus
:
''
,
btn_del
:
true
,
btn_del
:
true
,
btn_buy
:
true
,
btn_buy
:
true
,
btn_cancel
:
true
,
btn_cancel
:
true
,
allBranchCompany
:
[],
allBranchCompany
:
[],
tourCostDetail
:
''
,
tourCostDetail
:
''
,
insureDetail
:
''
,
//保险
insureDetail
:
''
,
//保险
tableKey
:
0
,
tableKey
:
0
,
tourDialogVisible
:
false
,
//旅游详情
tourDialogVisible
:
false
,
//旅游详情
}
}
...
@@ -294,7 +297,7 @@
...
@@ -294,7 +297,7 @@
return
getSonRegionByCodes
(
1
);
return
getSonRegionByCodes
(
1
);
},
},
//获取大区列表
//获取大区列表
getAllZoneList
()
{
getAllZoneList
()
{
return
getAllZone
();
return
getAllZone
();
},
},
cityRegions
()
{
cityRegions
()
{
...
@@ -308,23 +311,23 @@
...
@@ -308,23 +311,23 @@
/**
/**
* 操作-查看详情按钮,显示详情弹框
* 操作-查看详情按钮,显示详情弹框
*/
*/
detailInquiry
(
row
){
detailInquiry
(
row
)
{
this
.
currentRow
=
row
;
this
.
currentRow
=
row
;
this
.
detailVisible
=
true
;
this
.
detailVisible
=
true
;
},
},
/**
/**
* 关闭违章查询弹框
* 关闭违章查询弹框
* */
* */
detailEvent
(
params
){
detailEvent
(
params
)
{
this
.
detailVisible
=
false
;
this
.
detailVisible
=
false
;
if
(
params
)
{
if
(
params
)
{
console
.
log
(
params
);
console
.
log
(
params
);
}
}
},
},
/**
/**
* 旅游订单详情弹框关闭
* 旅游订单详情弹框关闭
* */
* */
tourOrderDetailDialogEvent
(
e
){
tourOrderDetailDialogEvent
(
e
)
{
this
.
tourDialogVisible
=
false
;
this
.
tourDialogVisible
=
false
;
},
},
/**
/**
...
@@ -397,16 +400,16 @@
...
@@ -397,16 +400,16 @@
});
});
},
},
clearSearch
()
{
clearSearch
()
{
this
.
listQuery
=
{
this
.
listQuery
=
{
page
:
1
,
page
:
1
,
limit
:
20
,
limit
:
20
,
type
:
2
,
type
:
2
,
no
:
null
,
no
:
null
,
phone
:
null
,
phone
:
null
,
status
:
null
,
status
:
null
,
startTime
:
undefined
,
startTime
:
undefined
,
endTime
:
undefined
,
endTime
:
undefined
,
zoneId
:
undefined
,
zoneId
:
undefined
,
startCompanyId
:
undefined
startCompanyId
:
undefined
}
}
...
@@ -444,21 +447,24 @@
...
@@ -444,21 +447,24 @@
}
}
</
script
>
</
script
>
<
style
>
<
style
>
.label-text
{
.label-text
{
margin-left
:
10px
;
margin-left
:
10px
;
margin-right
:
20px
;
margin-right
:
20px
;
}
}
.label-title
{
.label-title
{
margin-top
:
10px
;
margin-top
:
10px
;
}
}
.orderDetail
tr
td
{
.orderDetail
tr
td
{
width
:
500px
;
width
:
500px
;
text-align
:
center
;
text-align
:
center
;
border
:
0.0625rem
solid
;
border
:
0.0625rem
solid
;
margin-left
:
100px
;
margin-left
:
100px
;
margin-right
:
100px
;
margin-right
:
100px
;
}
}
.label-value
{
.label-value
{
margin-left
:
80px
;
margin-left
:
80px
;
margin-right
:
100px
;
margin-right
:
100px
;
}
}
...
...
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