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
841fed3b
Commit
841fed3b
authored
Jun 01, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单详情
parent
cfe99384
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
591 additions
and
150 deletions
+591
-150
travelOrders.vue
src/components/TravelManager/customizedcar/travelOrders.vue
+11
-150
traveorderdetails.vue
...ponents/TravelManager/customizedcar/traveorderdetails.vue
+580
-0
No files found.
src/components/TravelManager/customizedcar/travelOrders.vue
View file @
841fed3b
...
...
@@ -183,17 +183,17 @@
<div
v-if=
'item.OrderType ==1 '
>
<el-table
:data=
"item.HotelList[0].PriceList"
border
style=
"width: 100%"
>
border
style=
"width: 100%
;font-size:12px;
"
>
<el-table-column
prop=
"Date"
label=
"日期"
width=
"1
8
0"
>
width=
"1
2
0"
>
</el-table-column>
<el-table-column
prop=
"B2BPrice"
label=
"b2b价格"
width=
"1
8
0"
>
width=
"1
2
0"
>
</el-table-column>
</el-table>
...
...
@@ -241,11 +241,7 @@
<img
@
click=
"qrEnd(item,2)"
v-if=
"item.OrderStatus==3"
class=
"app-order-icon"
src=
"../../../assets/img/userman/pass.png"
alt=
""
>
</el-tooltip>
<!-- 已收货 -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"确认完成"
placement=
"top"
v-if=
"item.OrderStatus==4"
>
<img
@
click=
"qrEnd(item,3)"
v-if=
"item.OrderStatus==4"
class=
"app-order-icon"
src=
"../../../assets/img/userman/pass.png"
alt=
""
>
</el-tooltip>
<!--待处理-->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"同意"
placement=
"top"
v-if=
"item.OrderStatus==6"
>
<img
@
click=
"pending(item,1)"
v-if=
"item.OrderStatus==6"
class=
"app-order-icon"
...
...
@@ -273,7 +269,7 @@
</el-tooltip>
</
template
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看订单详情"
placement=
"top"
>
<img
@
click=
"CommonJump('
directorOrderD
etails',{OrderId:item.OrderId})"
class=
"app-order-icon"
<img
@
click=
"CommonJump('
traveorderd
etails',{OrderId:item.OrderId})"
class=
"app-order-icon"
src=
"../../../assets/img/userman/detail.png"
alt=
""
>
</el-tooltip>
</div>
...
...
@@ -334,103 +330,7 @@
</span>
</el-dialog>
<!-- 发货 -->
<el-dialog
custom-class=
"app-send"
title=
"发货"
:visible
.
sync=
"fhDig"
width=
"35%"
>
<div
class=
"title-box"
>
<span
class=
"text"
>
选择发货商品
</span>
<span>
(默认全选)
</span>
</div>
<el-table
ref=
"fahuoTable"
:data=
"fahuoList"
@
selection-change=
"TableSelectChange"
style=
"width: 100%"
>
<el-table-column
:selectable=
"selectable"
type=
"selection"
width=
"55"
>
</el-table-column>
<el-table-column
prop=
"id"
label=
"图片"
width=
"60"
>
<
template
slot-scope=
"scope"
>
<img
style=
"width:30px;height:30px"
:src=
"getIconLink(scope.row.CoverImagePath)"
alt=
""
>
</
template
>
</el-table-column>
<el-table-column
prop=
"GoodsName"
label=
"名称"
width=
"314"
>
<
template
slot-scope=
"scope"
>
<el-tag
v-if=
"scope.row.IsBindExpress==1"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
已发货
</el-tag>
<span>
{{
scope
.
row
.
GoodsName
}}
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"Number"
label=
"数量"
width=
"80"
>
</el-table-column>
<el-table-column
prop=
"SpecificationList"
label=
"规格"
>
<
template
slot-scope=
"scope"
>
<span
:key=
"index2"
v-for=
"(msg,index2) in scope.row.SpecificationList"
>
{{
msg
}}{{
scope
.
row
.
SpecificationList
.
length
==
index2
+
1
?
''
:
','
}}
</span>
</
template
>
</el-table-column>
</el-table>
<div
class=
"title-box"
><span
class=
"text"
>
物流信息
</span></div>
<el-form
:model=
"fhMsg"
ref=
"fhMsg"
:rules=
"fhrules"
label-width=
"130px"
>
<el-form-item
label=
"物流快递"
>
<el-radio
v-model=
"fhMsg.Type"
:label=
"1"
>
快递
</el-radio>
<el-radio
v-model=
"fhMsg.Type"
:label=
"2"
>
其他方式
</el-radio>
</el-form-item>
<
template
v-if=
"fhMsg.Type==1"
>
<el-form-item
label=
"快递公司"
prop=
"ExpressId"
>
<el-select
class=
"w200"
size=
"small"
v-model=
"fhMsg.ExpressId"
filterable
placeholder=
"请选择"
>
<el-option
v-for=
"item in ExpressList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"收件人邮编"
>
<el-input
type=
"number"
min=
"1"
size=
"small"
v-model=
"fhMsg.PostCode"
></el-input>
</el-form-item>
<el-form-item
label=
"快递单号"
prop=
"ExpressNumber"
>
<el-input
size=
"small"
v-model=
"fhMsg.ExpressNumber"
>
</el-input>
</el-form-item>
<el-form-item
label=
"商家留言"
>
<el-input
type=
"textarea"
row=
"2"
size=
"small"
v-model=
"fhMsg.Remark"
></el-input>
</el-form-item>
</
template
>
<
template
v-if=
"fhMsg.Type==2"
>
<el-form-item
label=
"物流内容"
>
<el-input
type=
"textarea"
row=
"2"
size=
"small"
v-model=
"fhMsg.Remark"
></el-input>
</el-form-item>
</
template
>
</el-form>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"small"
@
click=
"fhDig = false"
>
取 消
</el-button>
<el-button
size=
"small"
type=
"primary"
@
click=
"FhsubmitForm('fhMsg')"
>
确 定
</el-button>
</span>
</el-dialog>
<!-- 修改收货地址 -->
<el-dialog
title=
"修改收货地址"
:visible
.
sync=
"shDig"
width=
"600px"
>
<el-form
:model=
"shMsg"
:rules=
"shMsgrule"
ref=
"shMsg"
label-width=
"80px"
>
<el-form-item
label=
"收件人"
prop=
"Consignee"
>
<el-input
size=
"small"
v-model=
"shMsg.Consignee"
></el-input>
</el-form-item>
<el-form-item
label=
"电话"
prop=
"Mobile"
>
<el-input
type=
"number"
size=
"small"
v-model=
"shMsg.Mobile"
></el-input>
</el-form-item>
<el-form-item
label=
"所在区域"
prop=
"Province"
>
<el-select
size=
"small"
@
change=
"shMsg.City='',getCity(shMsg.Province)"
v-model=
"shMsg.Province"
style=
"width:144px"
filterable
placeholder=
"请选择"
>
<el-option
v-for=
"item in provinceList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
<el-select
size=
"small"
@
change=
"shMsg.District='',getArea(shMsg.City)"
v-model=
"shMsg.City"
style=
"width:144px"
filterable
placeholder=
"请选择"
>
<el-option
v-for=
"item in cityList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
<el-select
size=
"small"
v-model=
"shMsg.District"
style=
"width:144px"
filterable
placeholder=
"请选择"
>
<el-option
v-for=
"item in areaList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"详细地址"
prop=
"ShoppingAddress"
>
<el-input
size=
"small"
v-model=
"shMsg.ShoppingAddress"
></el-input>
</el-form-item>
</el-form>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
size=
"small"
@
click=
"shDig = false"
>
取 消
</el-button>
<el-button
size=
"small"
type=
"primary"
@
click=
"shsubmitForm('shMsg')"
>
确 定
</el-button>
</span>
</el-dialog>
<!-- 选择导出信息 -->
<el-dialog
title=
"选择导出信息"
:visible
.
sync=
"dialogVisible"
width=
"960px"
>
<el-form
style=
"border: 1px solid #F0F2F7;"
:model=
"addMsg"
ref=
"addMsg"
label-width=
"100px"
>
...
...
@@ -993,49 +893,7 @@
});
},
// 判断是否有多个物流
getOrderSend
(
item
)
{
this
.
lxymallapipost
(
"/api/order/GetOrderSendGoodsExpressIdByOrderId"
,
{
OrderId
:
item
.
OrderId
},
res
=>
{
let
Id
=
res
.
data
.
data
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
lxymallapipost
(
"/api/order/GetOrderSendGoodsInfo"
,
{
OrderExpressId
:
Id
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
;
this
.
fhDig
=
true
;
this
.
fhMsg
=
{
Id
:
Id
,
OrderId
:
item
.
OrderId
,
Type
:
data
.
Type
,
ExpressId
:
data
.
ExpressId
,
PostCode
:
data
.
PostCode
,
ExpressNumber
:
data
.
ExpressNumber
,
Remark
:
data
.
Remark
,
OrderDetailIdList
:
[],
}
this
.
fahuoList
=
data
.
DetailList
;
this
.
$nextTick
(()
=>
{
for
(
let
i
=
0
;
i
<
this
.
fahuoList
.
length
;
i
++
)
{
this
.
$refs
.
fahuoTable
.
toggleRowSelection
(
this
.
fahuoList
[
i
],
true
);
}
});
}
else
{
this
.
moresendDig
=
true
;
this
.
moresendtips
=
res
.
data
.
message
;
}
})
}
else
{
this
.
moresendDig
=
true
;
this
.
moresendtips
=
res
.
data
.
message
;
}
})
},
FhsubmitForm
(
formName
)
{
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
if
(
valid
)
{
...
...
@@ -1788,5 +1646,8 @@
border-radius
:
2px
;
margin-right
:
4px
;
}
.orderList
.el-table
td
,
.el-table
th
{
padding
:
0
;
}
</
style
>
src/components/TravelManager/customizedcar/traveorderdetails.vue
View file @
841fed3b
This diff is collapsed.
Click to expand it.
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