Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录
切换导航
S
shop-new
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
王天霸
shop-new
Commits
79ec7c1c
提交
79ec7c1c
authored
3月 10, 2023
作者:
王天霸
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1
上级
2ebbcc67
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
1234 行增加
和
879 行删除
+1234
-879
index.vue
src/views/system/order/index.vue
+55
-15
index2.vue
src/views/system/order/index2.vue
+1179
-864
没有找到文件。
src/views/system/order/index.vue
浏览文件 @
79ec7c1c
...
...
@@ -48,7 +48,7 @@
<div
class=
"overMain"
>
<div
class=
"form-box"
>
<el-form
class=
"form-params"
ref=
"form"
:model=
"form"
label-width=
"120px"
:inline=
"true"
size=
"small"
>
<el-form-item
label=
"
总
订单号:"
>
<el-form-item
label=
"
云仓
订单号:"
>
<el-input
style=
"width:220px;"
v-model=
"form.order_sn"
placeholder=
"请输入总订单号"
/>
</el-form-item>
...
...
@@ -126,6 +126,7 @@
<el-table-column
label=
"商品名称"
align=
"center"
></el-table-column>
<el-table-column
label=
"规格/数量/金额"
align=
"center"
></el-table-column>
<el-table-column
label=
"下单/发货/完成时间"
align=
"center"
width=
"180"
></el-table-column>
<el-table-column
label=
"发货类型"
align=
"center"
width=
"120"
></el-table-column>
<el-table-column
label=
"运费"
align=
"center"
width=
"100"
></el-table-column>
<el-table-column
label=
"收货人"
align=
"center"
width=
"200"
></el-table-column>
<!-- <el-table-column label="联系电话" align="center" width="120"></el-table-column> -->
...
...
@@ -142,7 +143,7 @@
<div
style=
"float:left;"
>
<span>
订单状态:
</span>
<span>
{{ orderStatusFormatter(item.order.status) }}
</span>
<span
style=
"margin: 0 0 0 30px;"
>
总
订单号:
</span>
<span
style=
"margin: 0 0 0 30px;"
>
云仓
订单号:
</span>
<span>
{{ item.order.order_sn }}
</span>
</div>
<div
style=
"float:right;"
>
...
...
@@ -177,6 +178,15 @@
<span
:class=
"
{ 'red-text' : updatedTimeFormatter(scope.row.updated_time) == '未完成' }">
{{
updatedTimeFormatter
(
scope
.
row
.
updated_time
,
scope
.
row
.
goods_status
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
"dispatch_price"
width=
"120"
label=
"发货类型"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<div
v-if=
"scope.row.send_time==0"
>
-
</div>
<div
v-else
>
<span
v-if=
"scope.row.type==1"
>
快递
</span>
<span
v-if=
"scope.row.type==2"
>
自行配送
</span>
</div>
</
template
>
</el-table-column>
<el-table-column
prop=
"dispatch_price"
width=
"100"
label=
"运费"
align=
"center"
>
<
template
slot-scope=
"scope"
>
...
...
@@ -198,8 +208,8 @@
<el-table-column
prop=
"refund_status"
label=
"售后状态"
width=
"180"
align=
"center"
:formatter=
"refundStatusFormatter"
>
<
template
slot-scope=
"scope"
>
{{
refundStatusFormatter
(
scope
.
row
.
refund_status
)
}}
{{
item
.
order
.
after_sale_accomplish_time
?
timeFormatter
(
item
.
order
.
after_sale_accomplish_time
):
''
}}
{{
refundStatusFormatter
(
scope
.
row
.
refund_status
)
}}
<br/>
{{
timeFormatter
(
scope
.
row
.
after_sale_accomplish_time
)
}}
</
template
>
</el-table-column>
...
...
@@ -216,7 +226,7 @@
<el-table-column
label=
"操作"
width=
"120"
align=
"center"
fixed=
"right"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"text"
@
click=
"handleInfo(scope.row)"
>
详情
</el-button>
<el-button
:disabled=
"Number(scope.row.goods_status)!==0
&&(Number(scope.row.status)!=0||Number(scope.row.status)!=5
)"
type=
"text"
<el-button
:disabled=
"Number(scope.row.goods_status)!==0
||(Number(scope.row.status)!=0&&Number(scope.row.status)!=-1
)"
type=
"text"
@
click=
"goShipping(scope.row.id,scope.row.goods_order_sn)"
>
去发货
</el-button>
</
template
>
</el-table-column>
...
...
@@ -310,12 +320,21 @@
:close-on-click-modal=
"false"
:append-to-body=
"true"
>
<div
style=
"margin: 0 10%"
>
<el-form
ref=
"form"
label-width=
"100px"
>
<el-form-item
label=
"发货类型:"
>
<el-radio-group
v-model=
"radioshop"
@
change=
"radioshopclick()"
>
<el-radio
:label=
"1"
>
快递发货
</el-radio>
<el-radio
:label=
"2"
>
自行配送
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
label=
"快递公司:"
>
<el-select
size=
"mini"
v-model=
"expressNum"
filterable
placeholder=
"请选择快递公司"
style=
"width: 100%;"
>
<el-option
v-for=
"item in expressLists"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
>
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="快递公司:" v-if="radioshop == 2">
<el-input size="mini" v-model="expressNum1" placeholder="请输入快递公司"></el-input>
</el-form-item> -->
<el-form-item
label=
"快递单号:"
>
<el-input
size=
"mini"
v-model=
"express_sn"
placeholder=
"请输入快递单号"
></el-input>
</el-form-item>
...
...
@@ -365,7 +384,9 @@
data
()
{
return
{
goShippingDialog
:
false
,
radioshop
:
1
,
expressNum
:
''
,
expressNum1
:
''
,
express_sn
:
''
,
goods_ids
:
''
,
// channel_id
...
...
@@ -442,19 +463,27 @@
this
.
getExpressList
()
},
methods
:
{
radioshopclick
(){
this
.
express_sn
=
''
let
data
=
{
type
:
this
.
radioshop
}
expressList
(
data
).
then
(
res
=>
{
if
(
res
.
code
==
1
)
{
this
.
expressLists
=
res
.
data
.
expressLists
}
})
},
goShipping
(
id
,
goods_order_sn
)
{
this
.
goods_ids
=
goods_order_sn
;
this
.
titleInfo
=
'去发货'
this
.
expressNum
=
''
this
.
expressNum1
=
''
this
.
express_sn
=
''
this
.
goShippingDialog
=
true
},
handleGoShipping
()
{
if
(
!
this
.
expressNum
)
{
this
.
$message
({
type
:
'warning'
,
message
:
'请选择快递公司'
})
return
}
if
(
!
this
.
express_sn
)
{
this
.
$message
({
type
:
'warning'
,
...
...
@@ -465,7 +494,14 @@
// 物流公司,名称
let
expressName
=
''
this
.
expressLists
.
map
((
item
)
=>
{
if
(
!
this
.
expressNum
)
{
this
.
$message
({
type
:
'warning'
,
message
:
'请选择快递公司'
})
return
}
this
.
expressLists
.
map
((
item
)
=>
{
if
(
item
.
value
==
this
.
expressNum
)
{
expressName
=
item
.
label
}
...
...
@@ -473,6 +509,7 @@
let
paramsObj
=
{
type
:
this
.
radioshop
,
goods_order_sn
:
[],
//this.goods_ids,
express_company_name
:
expressName
,
// 快递公司 名称
express_sn
:
this
.
express_sn
,
// 快递单号
...
...
@@ -520,7 +557,7 @@
},
/** 表格合并 列单元格 */
arraySpanMethod
({
row
,
column
,
rowIndex
,
columnIndex
})
{
if
(
columnIndex
>
2
&&
columnIndex
!=
7
&&
columnIndex
!=
5
&&
columnIndex
!=
8
)
{
// 用于设置要合并开始的列号
if
(
columnIndex
>
3
&&
columnIndex
!=
6
&&
columnIndex
!=
8
&&
columnIndex
!=
9
)
{
// 用于设置要合并开始的列号
if
(
rowIndex
===
0
)
{
// 用于设置合并开始的行号
return
{
rowspan
:
100
,
// 合并的行数
...
...
@@ -1082,7 +1119,10 @@
},
// 获取物流信息
getExpressList
()
{
expressList
().
then
(
res
=>
{
let
data
=
{
type
:
this
.
radioshop
}
expressList
(
data
).
then
(
res
=>
{
if
(
res
.
code
==
1
)
{
this
.
expressLists
=
res
.
data
.
expressLists
}
...
...
src/views/system/order/index2.vue
浏览文件 @
79ec7c1c
差异被折叠。
点击展开。
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论