Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ElectricitySheep
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
黄媛媛
ElectricitySheep
Commits
54a142e9
Commit
54a142e9
authored
May 14, 2020
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
817440e2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
554 additions
and
162 deletions
+554
-162
orderDetails.vue
src/components/orderMan/orderDetails.vue
+142
-72
orderList.vue
src/components/orderMan/orderList.vue
+412
-90
No files found.
src/components/orderMan/orderDetails.vue
View file @
54a142e9
...
@@ -7,16 +7,22 @@
...
@@ -7,16 +7,22 @@
<div
class=
"content app-order-detail"
>
<div
class=
"content app-order-detail"
>
<el-card
class=
"app-order-status"
shadow=
"never"
>
<el-card
class=
"app-order-status"
shadow=
"never"
>
<el-steps
:active=
"activeStep"
align-center
>
<el-steps
:active=
"activeStep"
align-center
>
<el-step
title=
"已下单"
icon=
"el-icon-edit"
description=
"2020-05-13 16:36:11
"
>
<el-step
title=
"已下单"
icon=
"el-icon-edit"
:description=
"dataInfo.CreateDate
"
>
<i
:class=
"activeStep==1?'step01Active':'step01'"
slot=
"icon"
></i>
<i
:class=
"activeStep==1?'step01Active':'step01'"
slot=
"icon"
></i>
</el-step>
</el-step>
<el-step
title=
"已付款"
icon=
"el-icon-edit"
description=
"2020-05-13 16:36:11"
>
<template>
<el-step
v-if=
"dataInfo.PaymentTime==''"
title=
"未付款"
icon=
"el-icon-edit"
description=
"2020-05-13 16:36:11"
>
<i
:class=
"activeStep==2?'step02Active':'step02'"
slot=
"icon"
></i>
<i
:class=
"activeStep==2?'step02Active':'step02'"
slot=
"icon"
></i>
</el-step>
</el-step>
<el-step
v-else
title=
"已付款"
icon=
"el-icon-edit"
:description=
"dataInfo.PaymentTime"
>
<i
:class=
"activeStep==2?'step02Active':'step02'"
slot=
"icon"
></i>
</el-step>
</
template
>
<el-step
title=
"未发货"
icon=
"el-icon-edit"
description=
"2020-05-13 16:36:11"
>
<el-step
title=
"未发货"
icon=
"el-icon-edit"
description=
"2020-05-13 16:36:11"
>
<i
:class=
"activeStep==3?'step03Active':'step03'"
slot=
"icon"
></i>
<i
:class=
"activeStep==3?'step03Active':'step03'"
slot=
"icon"
></i>
</el-step>
</el-step>
<el-step
title=
"已收货"
icon=
"el-icon-edit"
description=
"2020-05-13 16:36:11"
>
<el-step
v-if=
"activeStep!=2 && activeStep!=3"
title=
"已收货"
icon=
"el-icon-edit"
description=
"2020-05-13 16:36:11"
>
<i
:class=
"activeStep==4?'step04Active':'step04'"
slot=
"icon"
></i>
<i
:class=
"activeStep==4?'step04Active':'step04'"
slot=
"icon"
></i>
</el-step>
</el-step>
<el-step
title=
"未结束"
icon=
"el-icon-edit"
description=
"2020-05-13 16:36:11"
>
<el-step
title=
"未结束"
icon=
"el-icon-edit"
description=
"2020-05-13 16:36:11"
>
...
@@ -28,60 +34,97 @@
...
@@ -28,60 +34,97 @@
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<div
class=
"card-box"
>
<div
class=
"card-box"
>
<h3>
订单信息
</h3>
<h3>
订单信息
</h3>
<
template
v-if=
"dataInfo.OrderInfo"
>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<span
class=
"label"
>
订单号:
</span>
<span
class=
"label"
>
订单号:
</span>
<div>
20200513163611394177
</div>
<div>
{{
dataInfo
.
OrderInfo
.
OrderNo
}}
</div>
</div>
</div>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<span
class=
"label"
>
商户单号:
</span>
<span
class=
"label"
>
商户单号:
</span>
<div>
HMca0d3f54c0d1f400d78e398486ba1c
</div>
<div>
{{
dataInfo
.
OrderInfo
.
MerchantsNo
}}
</div>
</div>
</div>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<span
class=
"label"
>
支付方式:
</span>
<span
class=
"label"
>
支付方式:
</span>
<span
class=
"el-tag el-tag--success el-tag--small el-tag--light is-hit"
>
线上支付
</span>
<span
class=
"el-tag el-tag--success el-tag--small el-tag--light is-hit"
>
{{
dataInfo
.
OrderInfo
.
PaymentWayName
}}
</span>
</div>
</div>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<span
class=
"label"
>
配送方式:
</span>
<span
class=
"label"
>
配送方式:
</span>
<span
class=
"el-tag el-tag--primary el-tag--small el-tag--light is-hit"
>
快递发送
</span>
<span
class=
"el-tag el-tag--primary el-tag--small el-tag--light is-hit"
>
{{
dataInfo
.
OrderInfo
.
DeliveryMethodName
}}
</span>
</div>
</div>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<span
class=
"label"
>
用户:
</span>
<span
class=
"label"
>
用户:
</span>
<div>
🌸井澤💐
</div>
<div>
{{
dataInfo
.
OrderInfo
.
UserName
}}
</div>
</div>
</div>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<span
class=
"label"
>
收货人:
</span>
<span
class=
"label"
>
收货人:
</span>
<div>
李凤君
</div>
<div>
{{
dataInfo
.
OrderInfo
.
Consignee
}}
</div>
</div>
</div>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<span
class=
"label"
>
电话:
</span>
<span
class=
"label"
>
电话:
</span>
<div>
15134634264
</div>
<div>
{{
dataInfo
.
OrderInfo
.
Mobile
}}
</div>
</div>
</div>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<span
class=
"label"
>
收货地址:
</span>
<span
class=
"label"
>
收货地址:
</span>
<div
class=
"express-address"
>
黑龙江省 哈尔滨市 道外区 哈尔滨市道外区陶瓷小区E2栋3单元1902室。15134634264李凤君
<div
class=
"express-address"
>
{{
dataInfo
.
OrderInfo
.
ShippingAddress
}}
<button
type=
"button"
class=
"el-button el-button--text el-button--small is-circle"
>
<button
type=
"button"
class=
"el-button el-button--text el-button--small is-circle"
>
<i
class=
"el-icon-edit"
></i>
<i
class=
"el-icon-edit"
></i>
</button>
</button>
</div>
</div>
</div>
</div>
<div
flex=
"dir:top"
class=
"item-box"
>
<div
v-if=
"OrderInfo.OrderExpressList && OrderInfo.OrderExpressList.length==1"
flex=
"dir:top"
class=
"item-box"
>
<div
flex=
"dir:left cross:center"
>
<div
flex=
"dir:left cross:center"
>
<span
class=
"label"
>
物流信息:
</span>
<span
class=
"label"
>
物流信息:
</span>
<span
class=
"el-tag el-tag--info el-tag--small el-tag--light is-hit"
style=
"margin-right: 5px;"
>
<template
v-if=
"OrderInfo.OrderExpressList && OrderInfo.OrderExpressList.length==1"
>
中通快递
<el-tag
type=
"info"
size=
"small"
>
{{
OrderInfo
.
OrderExpressList
[
0
].
ExpressName
}}
</el-tag>
</span>
<a
:href=
"'https://www.baidu.com/s?wd='+OrderInfo.OrderExpressList[0].ExpressName+OrderInfo.OrderExpressList[0].ExpressNumber"
target=
"_blank"
title=
"点击搜索运单号"
>
<a
href=
"https://www.baidu.com/s?wd=中通快递640213339544"
target=
"_blank"
title=
"点击搜索运单号"
>
640213339544
</a>
{{
OrderInfo
.
OrderExpressList
[
0
].
ExpressNumber
}}
</a>
</
template
>
</div>
<div
flex=
"dir:left"
style=
"margin-top:10px"
>
<span
class=
"label"
>
商家留言:
</span>
<span></span>
</div>
</div>
<div
v-if=
"OrderInfo.OrderExpressList.length>1"
v-for=
"(item,index) in OrderInfo.OrderExpressList"
:key=
"index"
flex=
"dir:top"
class=
"item-box"
>
<el-row>
<el-col
:span=
"4"
>
<div>
<div
class=
"label"
style=
"background: rgb(255, 250, 239); color: rgb(230, 162, 60); padding: 3px 0px;"
>
收货信息:{{index+1}}
</div>
</div>
</el-col>
<el-col
:span=
"18"
>
<div
style=
"display:inline-flex;width:80%"
flex=
"dir:top"
>
<div
flex=
"cross:center"
>
<el-tag
type=
"info"
size=
"small"
>
{{item.ExpressName}}
</el-tag>
<a
style=
"margin-left:5px"
:href=
"'https://www.baidu.com/s?wd='+item.ExpressName+item.ExpressNumber"
target=
"_blank"
title=
"点击搜索运单号"
>
{{item.ExpressNumber}}
</a>
<button
type=
"button"
class=
"el-button el-button--text is-circle"
style=
"padding: 2px 12px;"
>
<i
class=
"el-icon-edit"
></i>
</button>
</div>
</div>
<div
flex=
"dir:left
"
>
<div
flex=
"dir:left"
style=
"margin-top: 10px;
"
>
<span
class=
"label"
>
商家留言:
</span>
<span
class=
"label"
>
商家留言:
</span>
<span></span>
<span></span>
</div>
</div>
<div
v-for=
"(good,index2) in item.GoodsList"
:key=
"index2"
flex=
"dir:left"
style=
"margin-top: 10px;"
>
<span
class=
"label"
>
配送商品:
</span>
<img
:src=
"domainManager().ImageUrl+good.CoverImagePath"
class=
"goods-pic"
>
</div>
</div>
</div>
</div>
</el-col>
</el-col>
</el-row>
</div>
</template>
</div>
</el-col>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<div
class=
"card-box"
>
<div
class=
"card-box"
>
<h3>
订
单信息
</h3>
<h3>
表
单信息
</h3>
<div
flex=
"dir:left cross:center"
class=
"item-box"
style=
"flex-shrink: 0;"
>
<div
flex=
"dir:left cross:center"
class=
"item-box"
style=
"flex-shrink: 0;"
>
<span
class=
"label"
>
商家备注:
</span>
<span
class=
"label"
>
商家备注:
</span>
<div>
库存-1
<div>
库存-1
...
@@ -93,19 +136,23 @@
...
@@ -93,19 +136,23 @@
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<div
flex=
"dir:top"
class=
"card-box"
>
<div
flex=
"dir:top"
class=
"card-box"
>
<h3>
分销信息
</h3>
<h3>
分销信息
</h3>
<div>
<div
v-for=
"(item,index) in dataInfo.DistributionInfo"
:key=
"index"
>
<div
class=
"share-title"
>
一级分销商
</div>
<div
class=
"share-title"
>
<span
v-if=
"item.Grade==0"
>
自购返佣
</span>
<span
v-if=
"item.Grade==1"
>
一级分销商
</span>
<span
v-if=
"item.Grade==2"
>
二级分销商
</span>
</div>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<span
class=
"label"
>
姓名:
</span>
<span
class=
"label"
>
姓名:
</span>
<div>
印象日本地接~谢军
</div>
<div>
{{item.UserName}}
</div>
</div>
</div>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<div
flex=
"dir:left cross:center"
class=
"item-box"
>
<span
class=
"label"
>
手机号:
</span>
<span
class=
"label"
>
手机号:
</span>
<div></div>
<div>
{{item.Mobile}}
</div>
</div>
</div>
<div
flex=
"dir:left cross:center"
class=
"item-box share-price"
>
<div
flex=
"dir:left cross:center"
class=
"item-box share-price"
>
<span
class=
"label orange-label"
>
佣金:
</span>
<span
class=
"label orange-label"
>
佣金:
</span>
<div>
¥
7.00
</div>
<div>
¥
{{item.Commission}}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -114,7 +161,7 @@
...
@@ -114,7 +161,7 @@
<el-card
shadow=
"never"
>
<el-card
shadow=
"never"
>
<el-table
<el-table
border
border
:data=
"
tableData
"
:data=
"
dataInfo.DetailList
"
style=
"width: 100%"
>
style=
"width: 100%"
>
<el-table-column
<el-table-column
prop=
"Id"
prop=
"Id"
...
@@ -122,10 +169,10 @@
...
@@ -122,10 +169,10 @@
>
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<div
flex=
"dir:left cross:center"
>
<div
flex=
"dir:left cross:center"
>
<img
src=
"https://cdnimg.iotweixin.com/uploads/mall1285/20200430/ba10bdeb05c86815ae711460c9de5d2c.jpg
"
alt=
""
style=
"height: 60px; width: 60px; margin-right: 5px;"
>
<img
:src=
"domainManager().ImageUrl+scope.row.CoverImagePath
"
alt=
""
style=
"height: 60px; width: 60px; margin-right: 5px;"
>
<div
class=
"app-ellipsis"
>
<div
class=
"app-ellipsis"
>
<div
class=
"vue-line-clamp"
style=
"word-break: break-all; -webkit-line-clamp: 1;"
>
<div
class=
"vue-line-clamp"
style=
"word-break: break-all; -webkit-line-clamp: 1;"
>
精选!土枇杷新鲜水果5斤装 四川精品野生超大甜枇杷果 四川省内包邮
{{
scope
.
row
.
GoodsName
}}
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -137,41 +184,41 @@
...
@@ -137,41 +184,41 @@
width=
"200"
>
width=
"200"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<span
class=
"el-tag el-tag--mini el-tag--light"
style=
"margin-right: 5px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 95%;"
>
<span
class=
"el-tag el-tag--mini el-tag--light"
style=
"margin-right: 5px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 95%;"
>
重量:5斤装
{{
scope
.
row
.
Specification
}}
</span>
</span>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"
address
"
prop=
"
Unit_Price
"
label=
"单价"
label=
"单价"
width=
"120"
>
width=
"120"
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"
address
"
prop=
"
Number
"
label=
"数量"
label=
"数量"
width=
"80"
>
width=
"80"
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"
address
"
prop=
"
Original_Price
"
label=
"原价"
label=
"原价"
width=
"120"
>
width=
"120"
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"
address
"
prop=
"
Final_Price
"
label=
"折扣后"
label=
"折扣后"
width=
"120"
>
width=
"120"
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<el-form
label-width=
"200px"
class=
"app-order-count-price"
>
<el-form
label-width=
"200px"
class=
"app-order-count-price"
>
<el-form-item
label=
"商品小计"
>
<el-form-item
label=
"商品小计"
>
¥
90.00
¥
{{dataInfo.PreferPrice}}
</el-form-item>
</el-form-item>
<el-form-item
label=
"运费"
>
<el-form-item
label=
"运费"
>
¥
90.00
¥
{{dataInfo.FreightMoney}}
</el-form-item>
</el-form-item>
<el-form-item
label=
"实付款"
>
<el-form-item
label=
"实付款"
>
<span
style=
"color: rgb(255, 69, 68);"
>
¥
<b>
148.00
</b></span>
<span
style=
"color: rgb(255, 69, 68);"
>
¥
<b>
{{dataInfo.Income}}
</b></span>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
</el-card>
</el-card>
...
@@ -192,12 +239,14 @@
...
@@ -192,12 +239,14 @@
tableData
:[
tableData
:[
{
Id
:
1
}
{
Id
:
1
}
],
],
OrderId
:
0
,
dataInfo
:{},
OrderInfo
:{},
};
};
},
},
created
()
{
created
()
{
if
(
this
.
$route
.
query
.
Us
erId
){
if
(
this
.
$route
.
query
.
Ord
erId
){
this
.
UserId
=
this
.
$route
.
query
.
Us
erId
;
this
.
OrderId
=
this
.
$route
.
query
.
Ord
erId
;
this
.
getData
()
this
.
getData
()
}
}
...
@@ -206,8 +255,24 @@
...
@@ -206,8 +255,24 @@
getData
(){
getData
(){
this
.
apipost
(
"/api/user/GetMemberUserInfo"
,{
UserId
:
this
.
UserId
},
res
=>
{
this
.
apipost
(
"/api/order/GetGoodsOrderInfo"
,{
OrderId
:
this
.
OrderId
},
res
=>
{
this
.
userInfo
=
res
.
data
.
data
;
this
.
dataInfo
=
res
.
data
.
data
;
console
.
log
(
"this.dataInfo"
,
this
.
dataInfo
);
let
data
=
res
.
data
.
data
;
// 未付款
if
(
data
.
PaymentTime
==
''
&&
data
.
DeliveryTime
==
''
){
this
.
activeStep
=
2
;
}
// 已付款 待发货
if
(
data
.
PaymentTime
!=
''
&&
data
.
DeliveryTime
==
''
&&
data
.
ReceivingTime
==
''
){
this
.
activeStep
=
3
;
}
if
(
data
.
OrderInfo
){
this
.
OrderInfo
=
data
.
OrderInfo
;
}
console
.
log
(
"this.activeStep"
,
this
.
activeStep
)
})
})
},
},
...
@@ -219,6 +284,11 @@
...
@@ -219,6 +284,11 @@
</
script
>
</
script
>
<
style
>
<
style
>
.app-order-detail
.goods-pic
{
width
:
35px
;
height
:
35px
;
margin
:
0
4px
;
}
.app-order-detail
.express-address
{
.app-order-detail
.express-address
{
width
:
80%
;
width
:
80%
;
}
}
...
...
src/components/orderMan/orderList.vue
View file @
54a142e9
...
@@ -29,20 +29,20 @@
...
@@ -29,20 +29,20 @@
</el-option>
</el-option>
</el-select>
</el-select>
<span
style=
"margin-left:15px"
>
订单类型:
</span>
<span
style=
"margin-left:15px"
>
订单类型:
</span>
<el-select
class=
"w120"
@
change=
"getList"
style=
"margin-right: 10px;"
v-model=
"msg.Order
Sourc
e"
size=
"small"
placeholder=
"请选择"
>
<el-select
class=
"w120"
@
change=
"getList"
style=
"margin-right: 10px;"
v-model=
"msg.Order
Typ
e"
size=
"small"
placeholder=
"请选择"
>
<el-option
label=
"全部
平台
"
:value=
"0"
></el-option>
<el-option
label=
"全部
订单
"
:value=
"0"
></el-option>
<el-option
<el-option
v-for=
"item in
plat
List"
v-for=
"item in
orderType
List"
:key=
"item.Id"
:key=
"item.Id"
:label=
"item.Name"
:label=
"item.Name"
:value=
"item.Id"
>
:value=
"item.Id"
>
</el-option>
</el-option>
</el-select>
</el-select>
<span
style=
"margin-left:15px"
>
配送方式:
</span>
<span
style=
"margin-left:15px"
>
配送方式:
</span>
<el-select
class=
"w120"
@
change=
"getList"
style=
"margin-right: 10px;"
v-model=
"msg.
OrderSource
"
size=
"small"
placeholder=
"请选择"
>
<el-select
class=
"w120"
@
change=
"getList"
style=
"margin-right: 10px;"
v-model=
"msg.
DeliveryMethod
"
size=
"small"
placeholder=
"请选择"
>
<el-option
label=
"全部
平台
"
:value=
"0"
></el-option>
<el-option
label=
"全部
订单
"
:value=
"0"
></el-option>
<el-option
<el-option
v-for=
"item in
plat
List"
v-for=
"item in
delivery
List"
:key=
"item.Id"
:key=
"item.Id"
:label=
"item.Name"
:label=
"item.Name"
:value=
"item.Id"
>
:value=
"item.Id"
>
...
@@ -60,53 +60,66 @@
...
@@ -60,53 +60,66 @@
</el-input>
</el-input>
</div>
</div>
<div>
<div>
<el-tabs
v-model=
"activeName"
@
tab-click=
"handleClick"
>
<el-tabs
style=
"margin-top:20px"
v-model=
"activeName"
@
tab-click=
"handleClick"
>
<el-tab-pane
:dataId=
"0"
label=
"全部"
name=
"first"
></el-tab-pane>
<el-tab-pane
:dataId=
"0"
label=
"全部"
name=
"first"
></el-tab-pane>
<el-tab-pane
:dataId=
"1"
label=
"上架中"
name=
"second"
></el-tab-pane>
<el-tab-pane
v-for=
"item in orderStatusList"
:key=
"item.Id"
:dataId=
"item.Id"
:label=
"item.Name"
></el-tab-pane>
<el-tab-pane
:dataId=
"2"
label=
"下架中"
name=
"third"
></el-tab-pane>
<el-tab-pane
:dataId=
"8"
label=
"回收站"
></el-tab-pane>
<el-tab-pane
:dataId=
"3"
label=
"售罄"
name=
"fourth"
></el-tab-pane>
</el-tabs>
</el-tabs>
<div
class=
"app-order-title"
>
<div
class=
"app-order-title"
>
<div
style=
"width: 55%;"
>
订单信息
</div>
<div
style=
"width: 55%;"
>
订单信息
</div>
<div
style=
"width: 20%;"
>
实付金额
</div>
<div
style=
"width: 20%;"
>
实付金额
</div>
<div
style=
"width: 20%;"
>
操作
</div>
<div
style=
"width: 20%;"
>
操作
</div>
</div>
</div>
<div
class=
"app-order-list"
>
<div
v-loading=
"loading"
class=
"app-order-list"
>
<el-card
class=
"app-order-item"
shadow=
"never"
>
<el-card
v-for=
"(item,index) in tableData"
:key=
"index"
class=
"app-order-item"
shadow=
"never"
>
<div
slot=
"header"
class=
"clearfix"
>
<div
slot=
"header"
class=
"clearfix"
>
<div
flex=
"cross:center"
class=
"app-order-head"
>
<div
flex=
"cross:center"
class=
"app-order-head"
>
<div
class=
"app-order-time"
>
2020-05-13 11:27:04
</div>
<div
class=
"app-order-time"
>
{{
item
.
PaymentTime
}}
</div>
<div
class=
"app-order-user"
>
<div
class=
"app-order-user"
>
<span
class=
"app-order-time"
>
订单号:
</span>
20200513112704781609
<span
class=
"app-order-time"
>
订单号:
</span>
{{
item
.
OrderNo
}}
</div>
<div
flex=
"cross:center"
class=
"app-order-user"
>
<img
v-if=
"item.OrderSource==1"
src=
"../../assets/img/userman/wx.png"
alt=
""
>
<span>
{{
item
.
UserName
}}
</span>
</div>
</div>
<div
flex=
"cross:center"
class=
"app-order-user"
><img
src=
"../../assets/img/userman/wx.png"
alt=
""
>
<span>
Lesleyyp(84021)
</span></div>
<div
flex=
"dir:left wrap:wrap"
class=
"app-order-offline"
>
<div
flex=
"dir:left wrap:wrap"
class=
"app-order-offline"
>
<div
class=
"express-send-box"
>
<div
class=
"express-send-box"
>
<span
class=
"el-tag el-tag--small el-tag--light"
>
快递发送
</span>
<span
class=
"el-tag el-tag--small el-tag--light"
>
{{
item
.
DeliveryMethodName
}}
</span>
</div>
</div>
<span
style=
"margin-left:5px"
class=
"el-tag el-tag--warning el-tag--small el-tag--light"
>
未付款
</span>
<el-tag
v-if=
"item.PaymentTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"warning"
>
未付款
</el-tag>
<el-tag
v-else
style=
"margin-left:5px"
size=
"small"
type=
"warning"
>
已付款
</el-tag>
<el-tag
v-if=
"item.DeliveryTime=='' && item.ReceivingTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
未发货
</el-tag>
<el-tag
v-if=
"item.DeliveryTime!='' && item.ReceivingTime==''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
待发货
</el-tag>
<el-tag
v-if=
"item.ReceivingTime!=''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
已收货
</el-tag>
<el-tag
v-if=
"item.ReceivingTime!=''"
style=
"margin-left:5px"
size=
"small"
type=
"success"
>
已完成
</el-tag>
<el-tag
v-if=
"item.OrderStatus==7"
style=
"margin-left:5px"
size=
"small"
type=
"danger"
>
已取消
</el-tag>
</div>
</div>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"强制取消"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"强制取消"
placement=
"top-start"
>
<img
@
click=
"OrderExit(
3)"
style=
"right:60px"
class=
"app-order-btnimg"
src=
"../../assets/img/userman/force.png"
alt=
""
>
<img
v-if=
"item.OrderStatus!=7 && msg.Recycled!=1"
@
click=
"OrderExit(item,
3)"
style=
"right:60px"
class=
"app-order-btnimg"
src=
"../../assets/img/userman/force.png"
alt=
""
>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"加入回收站"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"加入回收站"
placement=
"top-start"
>
<img
class=
"app-order-btnimg"
src=
"../../assets/img/userman/del1.png"
alt=
""
>
<img
v-if=
"msg.Recycled!=1"
@
click=
"fRhsz(item,4)"
class=
"app-order-btnimg"
src=
"../../assets/img/userman/del1.png"
alt=
""
>
</el-tooltip>
</el-tooltip>
</div>
</div>
</div>
</div>
<div
class=
"app-order-body"
>
<div
class=
"app-order-body"
>
<div
class=
"goods-item"
style=
"width: 55%;"
>
<div
class=
"goods-item"
style=
"width: 55%;"
>
<div
class=
"goods"
>
<div
v-for=
"(list,index2) in item.DetailList"
:key=
"index2"
class=
"goods"
>
<img
src=
"https://cdnimg.iotweixin.com/uploads/mall1285/20200427/b0e6c3d4b43747302f143c2c45cafc02.jpg
"
class=
"goods-image"
>
<img
:src=
"domainManager().ImageUrl+list.CoverImagePath
"
class=
"goods-image"
>
<div
flex=
"dir:left"
>
<div
flex=
"dir:left"
>
<div
class=
"goods-info"
>
<div
class=
"goods-info"
>
<div
class=
"goods-name"
>
<div
class=
"goods-name"
>
<div
class=
"app-ellipsis"
>
<div
class=
"app-ellipsis"
>
<div
class=
"vue-line-clamp"
style=
"word-break: break-all; -webkit-line-clamp: 2;"
>
<div
class=
"vue-line-clamp"
style=
"word-break: break-all; -webkit-line-clamp: 2;"
>
<span
class=
"el-tag el-tag--warning el-tag--mini el-tag--light is-hit"
style=
"margin-right: 5px;"
>
<span
class=
"el-tag el-tag--warning el-tag--mini el-tag--light is-hit"
style=
"margin-right: 5px;"
>
商城
{{
list
.
OrderTypeName
}}
</span>
</span>
日本Horse Oil熊野油脂马油无硅油滋润洗发水护发素(2瓶洗发水600ml+1瓶护发素600ml)全国包邮
{{
list
.
GoodsName
}}
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -114,19 +127,22 @@
...
@@ -114,19 +127,22 @@
<span
style=
"margin-right: 10px;"
>
<span
style=
"margin-right: 10px;"
>
规格:
规格:
<span
class=
"el-tag el-tag--mini el-tag--light"
style=
"margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
>
<span
class=
"el-tag el-tag--mini el-tag--light"
style=
"margin-right: 5px; max-width: 300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;"
>
套装:2瓶洗发水+1瓶护发素
{{
list
.
Specification
}}
</span>
</span>
</span>
</span>
</div>
</div>
<div
class=
"app-order-goods-price"
>
<div
class=
"app-order-goods-price"
>
<span>
货号:
日本严选
</span>
<span>
货号:
{{
list
.
ProductCode
}}
</span>
</div>
</div>
</div>
</div>
<div
flex=
"dir:left box:mean"
style=
"width: 250px;"
>
<div
flex=
"dir:left box:mean"
style=
"width: 250px;"
>
<div
flex=
"cross:center main:center"
>
<div
flex=
"cross:center main:center"
>
<span>
小计:¥128.00
</span>
<span>
小计:¥
{{
list
.
Final_Price
}}
<!-- v-if="item.PaymentTime==''" -->
<img
@
click=
"OrderExit(item,2,1)"
src=
"../../assets/img/userman/edit1.png"
alt=
""
>
</span>
</div>
</div>
<div
flex=
"cross:center main:center"
>
数量:x
1
</div>
<div
flex=
"cross:center main:center"
>
数量:x
{{
list
.
Number
}}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -134,29 +150,50 @@
...
@@ -134,29 +150,50 @@
<div
flex=
"cross:center"
class=
"app-order-info"
style=
"width: 20%;"
>
<div
flex=
"cross:center"
class=
"app-order-info"
style=
"width: 20%;"
>
<div
flex=
"dir:top"
>
<div
flex=
"dir:top"
>
<div>
<div>
<span
style=
"font-size: 16px;"
>
¥
128.00
</span>
<span
style=
"font-size: 16px;"
>
¥
{{
item
.
Income
}}
</span>
<el-popover
<el-popover
placement=
"top-start"
placement=
"top-start"
title=
"标题"
title=
"标题"
width=
"200"
width=
"200"
trigger=
"hover"
trigger=
"hover"
content=
"这是一段内容,这是一段内容,这是一段内容,这是一段内容。
"
>
:content=
"'商品小计 '+ item.Income
"
>
<img
slot=
"reference"
src=
"../../assets/img/userman/price.png"
alt=
""
>
<img
slot=
"reference"
src=
"../../assets/img/userman/price.png"
alt=
""
>
</el-popover>
</el-popover>
</div>
</div>
<div
class=
"express-price"
><span>
<div
class=
"express-price"
><span>
<span
style=
"color: rgb(144, 147, 153);"
>
(含运费¥0.00)
<span
style=
"color: rgb(144, 147, 153);"
>
(含运费¥
{{
item
.
FreightMoney
}}
)
<img
@
click=
"OrderExit(2)"
src=
"../../assets/img/userman/edit1.png"
alt=
""
>
<!-- v-if="item.PaymentTime==''" -->
<img
@
click=
"OrderExit(item,2,2)"
src=
"../../assets/img/userman/edit1.png"
alt=
""
>
</span>
</span>
</span></div>
</span></div>
<div><el-tag
effect=
"dark"
type=
"warning"
size=
"mini"
>
在线支付
</el-tag></div>
<div><el-tag
effect=
"dark"
type=
"warning"
size=
"mini"
>
{{
item
.
PaymentWayName
}}
</el-tag></div>
</div>
</div>
</div>
</div>
<div
class=
"app-order-info"
style=
"padding: 10px; border-right: 0px; width: 20%;"
>
<div
class=
"app-order-info"
style=
"padding: 10px; border-right: 0px; width: 20%;"
>
<div
flex=
"wrap:wrap cross:center"
>
<div
flex=
"wrap:wrap cross:center"
>
<template
v-if=
"msg.Recycled==2"
>
<!-- 未发货 -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"发货"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"发货"
placement=
"top"
>
<img
@
click=
"fhBtn"
class=
"app-order-icon"
src=
"../../assets/img/userman/send.png"
alt=
""
>
<img
v-if=
"item.OrderStatus==2"
@
click=
"fhBtn(item)"
class=
"app-order-icon"
src=
"../../assets/img/userman/send.png"
alt=
""
>
</el-tooltip>
<!-- 待收货 -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"确认收货"
placement=
"top"
>
<img
@
click=
"ConfirmSh(item)"
v-if=
"item.OrderStatus==3"
class=
"app-order-icon"
src=
"../../assets/img/userman/confirm.png"
alt=
""
>
</el-tooltip>
<!-- 已收货 -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"结束订单"
placement=
"top"
>
<img
v-if=
"item.OrderStatus==4"
class=
"app-order-icon"
src=
"../../assets/img/userman/sale.png"
alt=
""
>
</el-tooltip>
</
template
>
<!-- 回收站 -->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"恢复订单"
placement=
"top"
>
<img
@
click=
"fRhsz(item,7)"
v-if=
"msg.Recycled==1"
class=
"app-order-icon"
src=
"../../assets/img/userman/renew.png"
alt=
""
>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除订单"
placement=
"top"
>
<img
@
click=
"DeleteOrder(item)"
v-if=
"msg.Recycled==1"
class=
"app-order-icon"
src=
"../../assets/img/userman/del.png"
alt=
""
>
</el-tooltip>
</el-tooltip>
<
template
v-if=
"msg.Recycled==2"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"打印小票"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"打印小票"
placement=
"top"
>
<img
class=
"app-order-icon"
src=
"../../assets/img/userman/print.png"
alt=
""
>
<img
class=
"app-order-icon"
src=
"../../assets/img/userman/print.png"
alt=
""
>
</el-tooltip>
</el-tooltip>
...
@@ -164,10 +201,15 @@
...
@@ -164,10 +201,15 @@
<img
class=
"app-order-icon"
src=
"../../assets/img/userman/invoice.png"
alt=
""
>
<img
class=
"app-order-icon"
src=
"../../assets/img/userman/invoice.png"
alt=
""
>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"添加备注"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"添加备注"
placement=
"top"
>
<img
@
click=
"OrderExit(
1)"
class=
"app-order-icon"
src=
"../../assets/img/userman/add_remark.png"
alt=
""
>
<img
@
click=
"OrderExit(item,
1)"
class=
"app-order-icon"
src=
"../../assets/img/userman/add_remark.png"
alt=
""
>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"修改快递单号"
placement=
"top"
>
<img
@
click=
"getOrderSend(item)"
v-if=
"item.OrderStatus==3"
class=
"app-order-icon"
src=
"../../assets/img/userman/change.png"
alt=
""
>
</el-tooltip>
</
template
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看订单详情"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"查看订单详情"
placement=
"top"
>
<img
@
click=
"CommonJump('orderDetails')"
class=
"app-order-icon"
src=
"../../assets/img/userman/detail.png"
alt=
""
>
<img
@
click=
"CommonJump('orderDetails'
,{OrderId:item.OrderId}
)"
class=
"app-order-icon"
src=
"../../assets/img/userman/detail.png"
alt=
""
>
</el-tooltip>
</el-tooltip>
</div>
</div>
</div>
</div>
...
@@ -175,13 +217,26 @@
...
@@ -175,13 +217,26 @@
<div
class=
"card-footer"
>
<div
class=
"card-footer"
>
<div>
<div>
<div
flex=
"dir:left"
>
<div
flex=
"dir:left"
>
<div
class=
"address-box"
>
收货人: 陈冰 电话:13606097366 地址:福建省 厦门市 思明区 寿彭路鸿山新村4号2102室
</div>
<div
class=
"address-box"
>
收货人: {{item.Consignee}} 电话:{{item.Mobile}} 地址:{{item.ShippingAddress}}
</div>
<button
@
click=
"ExitshAdress"
type=
"button"
class=
"el-button el-button--text is-circle"
><i
class=
"el-icon-edit"
></i></button>
<button
v-if=
"item.OrderStatus==2"
@
click=
"ExitshAdress(item)"
type=
"button"
class=
"el-button el-button--text is-circle"
><i
class=
"el-icon-edit"
></i></button>
</div>
</div>
</div>
<div
v-if=
"item.Remark!=''"
class=
"seller-remark"
>
商家备注:{{item.Remark}}
</div>
</div>
</div>
</el-card>
<el-card
v-if=
"tableData.length==0"
class=
"app-order-item"
shadow=
"never"
>
<div
style=
"height:100px;line-height:100px;text-align:center"
>
暂无订单信息
</div>
</div>
</el-card>
</el-card>
</div>
</div>
<el-pagination
style=
"text-align:right"
background
@
current-change=
"handleCurrentChange"
:page-size=
"msg.pageSize"
layout=
"prev, pager, next"
:total=
"total"
>
</el-pagination>
</div>
</div>
</div>
</div>
<!-- 订单取消 -->
<!-- 订单取消 -->
...
@@ -190,14 +245,14 @@
...
@@ -190,14 +245,14 @@
<p
style=
"padding:10px 0"
v-if=
"exitMsg.Type==3"
>
填写取消理由:
</p>
<p
style=
"padding:10px 0"
v-if=
"exitMsg.Type==3"
>
填写取消理由:
</p>
<p
style=
"padding:10px 0"
v-if=
"exitMsg.Type==1"
>
添加备注:
</p>
<p
style=
"padding:10px 0"
v-if=
"exitMsg.Type==1"
>
添加备注:
</p>
<
template
v-if=
"exitMsg.Type==2"
>
<
template
v-if=
"exitMsg.Type==2"
>
<el-form-item
label=
"商品总价"
>
<el-form-item
label
-width=
"80px"
label
=
"商品总价"
>
<el-input
size=
"small"
v-model=
"exitMsg.
Remark
"
></el-input>
<el-input
size=
"small"
v-model=
"exitMsg.
Income
"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"运费"
>
<el-form-item
v-if=
"exitMsg.moneyType==2"
label-width=
"80px"
label=
"运费"
>
<el-input
size=
"small"
v-model=
"exitMsg.Remark"
></el-input>
<el-input
size=
"small"
v-model=
"exitMsg.Remark"
></el-input>
</el-form-item>
</el-form-item>
</
template
>
</
template
>
<el-form-item>
<el-form-item
v-if=
"exitMsg.Type!=2"
>
<el-input
type=
"textarea"
row=
"2"
size=
"small"
v-model=
"exitMsg.Remark"
></el-input>
<el-input
type=
"textarea"
row=
"2"
size=
"small"
v-model=
"exitMsg.Remark"
></el-input>
</el-form-item>
</el-form-item>
...
@@ -214,10 +269,12 @@
...
@@ -214,10 +269,12 @@
<span>
(默认全选)
</span>
<span>
(默认全选)
</span>
</div>
</div>
<el-table
<el-table
ref=
"fahuoTable"
:data=
"fahuoList"
:data=
"fahuoList"
@
selection-change=
"TableSelectChange"
@
selection-change=
"TableSelectChange"
style=
"width: 100%"
>
style=
"width: 100%"
>
<el-table-column
<el-table-column
:selectable=
"selectable"
type=
"selection"
type=
"selection"
width=
"55"
>
width=
"55"
>
</el-table-column>
</el-table-column>
...
@@ -226,21 +283,25 @@
...
@@ -226,21 +283,25 @@
label=
"图片"
label=
"图片"
width=
"60"
>
width=
"60"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<img
style=
"width:30px;height:30px"
src=
"../../assets/img/business.png
"
alt=
""
>
<img
style=
"width:30px;height:30px"
:src=
"domainManager().ImageUrl+scope.row.CoverImagePath
"
alt=
""
>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"
n
ame"
prop=
"
GoodsN
ame"
label=
"名称"
label=
"名称"
width=
"314"
>
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>
<el-table-column
<el-table-column
prop=
"
name
"
prop=
"
Number
"
label=
"数量"
label=
"数量"
width=
"80"
>
width=
"80"
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
prop=
"
address
"
prop=
"
Specification
"
label=
"规格"
>
label=
"规格"
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
@@ -262,20 +323,20 @@
...
@@ -262,20 +323,20 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item
label=
"收件人邮编"
>
<el-form-item
label=
"收件人邮编"
>
<el-input
type=
"number"
min=
"1"
size=
"small"
v-model=
"
exit
Msg.PostCode"
></el-input>
<el-input
type=
"number"
min=
"1"
size=
"small"
v-model=
"
fh
Msg.PostCode"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"快递单号"
prop=
"ExpressNumber"
>
<el-form-item
label=
"快递单号"
prop=
"ExpressNumber"
>
<el-input
size=
"small"
v-model=
"
exit
Msg.ExpressNumber"
>
<el-input
size=
"small"
v-model=
"
fh
Msg.ExpressNumber"
>
<
el-button
slot=
"append"
>
获取面单
</el-button
>
<
!--
<el-button
slot=
"append"
>
获取面单
</el-button>
--
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"商家留言"
>
<el-form-item
label=
"商家留言"
>
<el-input
type=
"textarea"
row=
"2"
size=
"small"
v-model=
"
exit
Msg.Remark"
></el-input>
<el-input
type=
"textarea"
row=
"2"
size=
"small"
v-model=
"
fh
Msg.Remark"
></el-input>
</el-form-item>
</el-form-item>
</
template
>
</
template
>
<
template
v-if=
"fhMsg.Type==2"
>
<
template
v-if=
"fhMsg.Type==2"
>
<el-form-item
label=
"物流内容"
>
<el-form-item
label=
"物流内容"
>
<el-input
type=
"textarea"
row=
"2"
size=
"small"
v-model=
"
exit
Msg.Remark"
></el-input>
<el-input
type=
"textarea"
row=
"2"
size=
"small"
v-model=
"
fh
Msg.Remark"
></el-input>
</el-form-item>
</el-form-item>
</
template
>
</
template
>
...
@@ -287,7 +348,7 @@
...
@@ -287,7 +348,7 @@
</el-dialog>
</el-dialog>
<!-- 修改收货地址 -->
<!-- 修改收货地址 -->
<el-dialog
title=
"修改收货地址"
:visible
.
sync=
"shDig"
width=
"600px"
>
<el-dialog
title=
"修改收货地址"
:visible
.
sync=
"shDig"
width=
"600px"
>
<el-form
:model=
"shMsg"
:rules=
"shMsgrule"
ref=
"
exit
Msg"
label-width=
"80px"
>
<el-form
:model=
"shMsg"
:rules=
"shMsgrule"
ref=
"
sh
Msg"
label-width=
"80px"
>
<el-form-item
label=
"收件人"
prop=
"Consignee"
>
<el-form-item
label=
"收件人"
prop=
"Consignee"
>
<el-input
size=
"small"
v-model=
"shMsg.Consignee"
></el-input>
<el-input
size=
"small"
v-model=
"shMsg.Consignee"
></el-input>
</el-form-item>
</el-form-item>
...
@@ -295,7 +356,7 @@
...
@@ -295,7 +356,7 @@
<el-input
type=
"number"
size=
"small"
v-model=
"shMsg.Mobile"
></el-input>
<el-input
type=
"number"
size=
"small"
v-model=
"shMsg.Mobile"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"所在区域"
prop=
"Province"
>
<el-form-item
label=
"所在区域"
prop=
"Province"
>
<el-select
size=
"small"
@
change=
"
getCity
"
v-model=
"shMsg.Province"
style=
"width:144px"
filterable
placeholder=
"请选择"
>
<el-select
size=
"small"
@
change=
"
shMsg.City='',getCity(shMsg.Province)
"
v-model=
"shMsg.Province"
style=
"width:144px"
filterable
placeholder=
"请选择"
>
<el-option
<el-option
v-for=
"item in provinceList"
v-for=
"item in provinceList"
:key=
"item.ID"
:key=
"item.ID"
...
@@ -303,7 +364,7 @@
...
@@ -303,7 +364,7 @@
:value=
"item.ID"
>
:value=
"item.ID"
>
</el-option>
</el-option>
</el-select>
</el-select>
<el-select
size=
"small"
@
change=
"
getArea
"
v-model=
"shMsg.City"
style=
"width:144px"
filterable
placeholder=
"请选择"
>
<el-select
size=
"small"
@
change=
"
shMsg.District='',getArea(shMsg.City)
"
v-model=
"shMsg.City"
style=
"width:144px"
filterable
placeholder=
"请选择"
>
<el-option
<el-option
v-for=
"item in cityList"
v-for=
"item in cityList"
:key=
"item.ID"
:key=
"item.ID"
...
@@ -350,6 +411,30 @@
...
@@ -350,6 +411,30 @@
<el-button
size=
"small"
type=
"primary"
@
click=
"Export"
>
导出
</el-button>
<el-button
size=
"small"
type=
"primary"
@
click=
"Export"
>
导出
</el-button>
</div>
</div>
</el-dialog>
</el-dialog>
<!-- 多个物流信息 -->
<el-dialog
custom-class=
"sendDigClass"
title=
"提示"
:visible
.
sync=
"moresendDig"
width=
"420px"
>
<p
style=
"padding: 10px 15px;"
>
{{moresendtips}}
</p>
<div
style=
"text-align:right;margin-top:20px"
>
<el-button
size=
"small"
type=
"primary"
@
click=
"moresendDig=fasle"
>
确定
</el-button>
</div>
</el-dialog>
<!-- 放入回收站 -->
<el-dialog
custom-class=
"hszDigClass"
:visible
.
sync=
"hszDig"
width=
"420px"
>
<p
style=
"padding: 10px 15px;"
class=
"center"
>
<i
class=
"el-icon-warning"
style=
"color:#E6A23C;font-size:24px"
></i>
<span
style=
"font-size:20px"
>
提示
</span>
</p>
<p
class=
"center"
style=
"padding: 10px 15px;"
>
{{hstips}}
</p>
<div
style=
"text-align:center;margin-top:20px"
>
<el-button
size=
"small"
@
click=
"hszDig=fasle"
>
取消
</el-button>
<el-button
size=
"small"
type=
"primary"
@
click=
"hszOk"
>
确定
</el-button>
</div>
</el-dialog>
</div>
</div>
</template>
</template>
...
@@ -358,6 +443,8 @@ export default {
...
@@ -358,6 +443,8 @@ export default {
name
:
"orderList"
,
name
:
"orderList"
,
data
(){
data
(){
return
{
return
{
hstips
:
'是否放入回收站(可在回收站中恢复)?'
,
orderStatusList
:[],
checkAll
:
false
,
checkAll
:
false
,
checkedCities
:
[],
checkedCities
:
[],
cities
:
[],
cities
:
[],
...
@@ -398,16 +485,16 @@ export default {
...
@@ -398,16 +485,16 @@ export default {
],
],
},
},
fhMsg
:{
fhMsg
:{
Id
:
0
,
OrderId
:
''
,
Type
:
1
,
Type
:
1
,
ExpressId
:
''
,
PostCode
:
''
,
PostCode
:
''
,
PostCode
:
0
,
ExpressNumber
:
''
,
ExpressNumber
:
''
,
Remark
:
''
,
Remark
:
''
,
OrderDetailIdList
:[],
OrderDetailIdList
:[],
},
},
fahuoList
:[
fahuoList
:[],
{
id
:
1
},
],
fhDig
:
false
,
fhDig
:
false
,
exitMsg
:{
exitMsg
:{
OrderId
:
0
,
OrderId
:
0
,
...
@@ -438,7 +525,7 @@ export default {
...
@@ -438,7 +525,7 @@ export default {
Consignee
:
''
,
Consignee
:
''
,
Mobile
:
''
,
Mobile
:
''
,
ProductCode
:
''
,
ProductCode
:
''
,
Recycled
:
1
,
Recycled
:
2
,
},
},
platList
:[],
platList
:[],
option
:[
option
:[
...
@@ -457,6 +544,16 @@ export default {
...
@@ -457,6 +544,16 @@ export default {
provinceList
:[],
provinceList
:[],
cityList
:[],
cityList
:[],
areaList
:[],
areaList
:[],
tableData
:[],
total
:
0
,
deliveryList
:[],
orderTypeList
:[],
loading
:
false
,
checkfhList
:[],
moresendDig
:
false
,
moresendtips
:
''
,
hszDig
:
false
,
hszMsg
:{},
}
}
},
},
created
(){
created
(){
...
@@ -465,13 +562,207 @@ export default {
...
@@ -465,13 +562,207 @@ export default {
this
.
getExpressInfo
();
this
.
getExpressInfo
();
this
.
getProvince
();
this
.
getProvince
();
this
.
getDown
();
this
.
getDown
();
this
.
getOrderStatus
();
this
.
getDelivery
();
this
.
getOrderType
();
},
},
mounted
(){},
mounted
(){},
methods
:{
methods
:{
hszOk
(){
this
.
apipost
(
'/api/order/SetOrderOperation'
,
this
.
hszMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
getList
();
this
.
Success
(
res
.
data
.
message
)
this
.
hszDig
=
false
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
},
// 放入回收站
fRhsz
(
item
,
num
){
if
(
num
==
4
){
this
.
hstips
=
"是否放入回收站(可在回收站中恢复)?"
}
if
(
num
==
7
){
this
.
hstips
=
"是否移出回收站?"
}
this
.
hszMsg
=
{
OrderId
:
item
.
OrderId
,
Type
:
num
};
this
.
hszDig
=
true
;
},
DeleteOrder
(
item
){
let
msg
=
{
OrderId
:
item
.
OrderId
,
Type
:
8
};
let
that
=
this
;
that
.
$confirm
(
'是否删除订单?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(()
=>
{
this
.
apipost
(
'/api/order/SetOrderOperation'
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
getList
();
this
.
Success
(
res
.
data
.
message
)
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
}).
catch
(()
=>
{
});
},
// 修改收货地址
ExitshAdress
(
item
){
this
.
shDig
=
true
;
this
.
shMsg
=
{
OrderId
:
item
.
OrderId
,
Consignee
:
item
.
Consignee
,
Mobile
:
item
.
Mobile
,
Province
:
item
.
Province
,
City
:
item
.
City
,
District
:
item
.
District
,
ShippingAddress
:
item
.
ShippingAddress
,
}
this
.
getCity
(
item
.
Province
);
this
.
getArea
(
item
.
City
);
},
// 确认收货
ConfirmSh
(
item
){
let
msg
=
{
OrderId
:
item
.
OrderId
,
Type
:
5
};
let
that
=
this
;
that
.
$confirm
(
'是否确认收货?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(()
=>
{
this
.
apipost
(
'/api/order/SetOrderOperation'
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
getList
();
this
.
Success
(
res
.
data
.
message
)
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
}).
catch
(()
=>
{
});
},
// 判断是否有多个物流
getOrderSend
(
item
){
console
.
log
(
"item"
,
item
)
this
.
apipost
(
"/api/order/GetOrderSendGoodsExpressIdByOrderId"
,{
OrderId
:
item
.
OrderId
},
res
=>
{
let
Id
=
res
.
data
.
data
;
if
(
res
.
data
.
resultCode
==
1
){
this
.
apipost
(
"/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
)
{
this
.
fhMsg
.
OrderDetailIdList
=
[];
if
(
this
.
checkfhList
.
length
==
0
){
this
.
Error
(
"至少选择一项!"
);
return
;
}
this
.
checkfhList
.
forEach
(
item
=>
{
this
.
fhMsg
.
OrderDetailIdList
.
push
(
item
.
Id
);
})
if
(
this
.
fhMsg
.
Type
==
2
){
this
.
fhMsg
.
ExpressId
=
""
;
this
.
fhMsg
.
PostCode
=
""
;
this
.
fhMsg
.
ExpressNumber
=
""
;
}
this
.
apipost
(
'/api/order/SetOrderSendGoods'
,
this
.
fhMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
getList
();
this
.
fhDig
=
false
;
this
.
Success
(
res
.
data
.
message
)
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
}
else
{
return
false
;
}
});
},
TableSelectChange
(
val
){
this
.
checkfhList
=
val
;
},
selectable
(
row
,
index
)
{
return
row
.
IsBindExpress
===
2
},
// 发货
// 发货
fhBtn
(){
fhBtn
(
item
){
this
.
fhDig
=
true
;
this
.
fhDig
=
true
;
this
.
fhMsg
=
{
Id
:
0
,
OrderId
:
item
.
OrderId
,
Type
:
1
,
ExpressId
:
''
,
PostCode
:
''
,
ExpressNumber
:
''
,
Remark
:
''
,
OrderDetailIdList
:[],
}
this
.
fahuoList
=
item
.
DetailList
;
},
},
// 修改收货地址
// 修改收货地址
shsubmitForm
(
formName
){
shsubmitForm
(
formName
){
...
@@ -482,6 +773,7 @@ export default {
...
@@ -482,6 +773,7 @@ export default {
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
getList
();
this
.
getList
();
this
.
Success
(
res
.
data
.
message
)
this
.
Success
(
res
.
data
.
message
)
this
.
shDig
=
false
;
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
...
@@ -547,17 +839,16 @@ export default {
...
@@ -547,17 +839,16 @@ export default {
this
.
checkAll
=
checkedCount
===
this
.
cities
.
length
;
this
.
checkAll
=
checkedCount
===
this
.
cities
.
length
;
this
.
isIndeterminate
=
checkedCount
>
0
&&
checkedCount
<
this
.
cities
.
length
;
this
.
isIndeterminate
=
checkedCount
>
0
&&
checkedCount
<
this
.
cities
.
length
;
},
},
ExitshAdress
(){
// 订单操作
this
.
shDig
=
true
;
submitForm
(
formName
){
},
FhsubmitForm
(
formName
){
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
this
.
$refs
[
formName
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
valid
)
{
this
.
apipost
(
'/api/order/SetOrder
SendGoods'
,
this
.
fh
Msg
,
this
.
apipost
(
'/api/order/SetOrder
Operation'
,
this
.
exit
Msg
,
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
getList
();
this
.
getList
();
this
.
Success
(
res
.
data
.
message
)
this
.
Success
(
res
.
data
.
message
)
this
.
exitDig
=
false
;
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
...
@@ -570,30 +861,30 @@ export default {
...
@@ -570,30 +861,30 @@ export default {
}
}
});
});
},
},
TableSelectChange
(
val
){},
// 强制取消
// 强制取消
OrderExit
(
type
){
OrderExit
(
item
,
type
,
moneyType
){
this
.
exitMsg
.
OrderId
=
item
.
OrderId
;
this
.
exitMsg
.
Type
=
type
;
this
.
exitMsg
.
Type
=
type
;
this
.
exitMsg
.
Remark
=
item
.
Remark
;
if
(
type
==
3
){
this
.
exitMsg
.
Remark
=
''
;
}
if
(
type
==
2
){
this
.
exitMsg
.
moneyType
=
moneyType
;
}
this
.
exitDig
=
true
;
this
.
exitDig
=
true
;
},
},
handleClick
(
val
){
handleClick
(
val
){
let
dataId
=
val
.
$attrs
.
dataId
;
let
dataId
=
val
.
$attrs
.
dataId
;
if
(
dataId
==
0
){
this
.
msg
.
OrderStatus
=
dataId
;
this
.
msg
.
GoodsStatus
=
0
;
this
.
msg
.
Recycled
=
2
;
this
.
msg
.
IsSelectSellOut
=
0
;
if
(
dataId
==
8
){
}
this
.
msg
.
OrderStatus
=
0
;
if
(
dataId
==
1
){
this
.
msg
.
Recycled
=
1
;
this
.
msg
.
GoodsStatus
=
1
;
this
.
msg
.
IsSelectSellOut
=
0
;
}
if
(
dataId
==
2
){
this
.
msg
.
GoodsStatus
=
2
;
this
.
msg
.
IsSelectSellOut
=
0
;
}
if
(
dataId
==
3
){
this
.
msg
.
GoodsStatus
=
0
;
this
.
msg
.
IsSelectSellOut
=
1
;
}
}
this
.
getList
();
this
.
getList
();
},
},
ChangeId
(
val
){
ChangeId
(
val
){
...
@@ -618,6 +909,27 @@ export default {
...
@@ -618,6 +909,27 @@ export default {
})
})
},
},
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
},
getOrderStatus
(){
this
.
apipost
(
"/api/order/GetOrderStatusEnumList"
,{},
res
=>
{
this
.
orderStatusList
=
res
.
data
.
data
;
console
.
log
(
"this.orderStatusList"
,
this
.
orderStatusList
)
})
},
getDelivery
(){
this
.
apipost
(
"/api/order/GetOrderDeliveryMethodEnumList"
,{},
res
=>
{
this
.
deliveryList
=
res
.
data
.
data
;
})
},
getOrderType
(){
this
.
apipost
(
"/api/order/GetOrderTypeEnumList"
,{},
res
=>
{
this
.
orderTypeList
=
res
.
data
.
data
;
})
},
getplat
(){
getplat
(){
this
.
apipost
(
"/api/user/GetMemberUserSourceEnumList"
,{},
res
=>
{
this
.
apipost
(
"/api/user/GetMemberUserSourceEnumList"
,{},
res
=>
{
this
.
platList
=
res
.
data
.
data
;
this
.
platList
=
res
.
data
.
data
;
...
@@ -659,6 +971,16 @@ export default {
...
@@ -659,6 +971,16 @@ export default {
</
script
>
</
script
>
<
style
>
<
style
>
.hszDigClass
.el-dialog__body
{
padding
:
0
10px
20px
0
;
}
.sendDigClass
.el-dialog__body
{
padding
:
0
10px
10px
0
;
}
.app-order-list
.card-footer
.seller-remark
{
margin-top
:
10px
;
color
:
#E6A23C
;
}
.app-send
.el-table__header-wrapper
th
{
.app-send
.el-table__header-wrapper
th
{
background-color
:
#f5f7fa
;
background-color
:
#f5f7fa
;
}
}
...
...
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