Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
为 GitLab 提交贡献
登录
切换导航
S
shop-new
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
王天霸
shop-new
Commits
53ddfc71
提交
53ddfc71
authored
9月 27, 2021
作者:
huaxinzhu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
订单批量导入,初始化上传文件,详情地址回显特殊处理
上级
2adddc4c
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
34 行增加
和
10 行删除
+34
-10
orderDetail.vue
src/views/system/order/components/orderDetail.vue
+33
-10
index.vue
src/views/system/order/index.vue
+1
-0
没有找到文件。
src/views/system/order/components/orderDetail.vue
浏览文件 @
53ddfc71
...
@@ -178,11 +178,8 @@
...
@@ -178,11 +178,8 @@
<el-input
size=
"mini"
v-model=
"addressForm.tel"
placeholder=
"请输入联系电话"
></el-input>
<el-input
size=
"mini"
v-model=
"addressForm.tel"
placeholder=
"请输入联系电话"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
label=
"收货地址:"
>
<el-form-item
label=
"收货地址:"
>
<el-cascader
v-model=
"addressForm.areaList"
:props=
'props'
@
change=
"handleChanges"
ref=
"ssqCascader"
placeholder=
"请选择具体的省市区
"
style=
"width:100%"
></el-cascader>
<el-cascader
class=
"only-eidt-placeholder"
v-model=
"addressForm.areaList"
:props=
'props'
@
change=
"handleChanges"
ref=
"ssqCascader"
:placeholder=
"addOrEditPlaceholder
"
style=
"width:100%"
></el-cascader>
</el-form-item>
</el-form-item>
<!-- <el-form-item label="省市区:" prop="address_ids">-->
<!-- <el-cascader v-model="areaList" :props='props' @change="handleChanges" placeholder="请选择具体的省市区" style="width:100%"></el-cascader>-->
<!-- </el-form-item>-->
<el-form-item
label=
"街道:"
>
<el-form-item
label=
"街道:"
>
<el-input
size=
"mini"
v-model=
"addressForm.street"
placeholder=
"请输入街道"
></el-input>
<el-input
size=
"mini"
v-model=
"addressForm.street"
placeholder=
"请输入街道"
></el-input>
</el-form-item>
</el-form-item>
...
@@ -318,6 +315,8 @@ export default {
...
@@ -318,6 +315,8 @@ export default {
label
:
'name'
,
label
:
'name'
,
leaf
:
'leaf'
leaf
:
'leaf'
},
},
addOrEditPlaceholder
:
''
,
onlyEidtPlaceholder
:
false
,
goShippingNum
:
0
,
// 发货类型
goShippingNum
:
0
,
// 发货类型
goods_ids
:
null
,
// 发货的商品订单 id
goods_ids
:
null
,
// 发货的商品订单 id
}
}
...
@@ -587,6 +586,7 @@ export default {
...
@@ -587,6 +586,7 @@ export default {
street
:
''
,
street
:
''
,
areaList
:
[]
areaList
:
[]
}
}
if
(
this
.
orderDetail
.
real_name
)
{
if
(
this
.
orderDetail
.
real_name
)
{
this
.
addressForm
.
shipping_name
=
this
.
orderDetail
.
real_name
;
this
.
addressForm
.
shipping_name
=
this
.
orderDetail
.
real_name
;
}
}
...
@@ -594,12 +594,15 @@ export default {
...
@@ -594,12 +594,15 @@ export default {
this
.
addressForm
.
tel
=
this
.
orderDetail
.
mobile
;
this
.
addressForm
.
tel
=
this
.
orderDetail
.
mobile
;
}
}
// 因为 后台返回的省市区 每个字段都是 汉字,所以这样处理,通过 placeholder 去回显 后台返回的数据,
if
(
this
.
orderDetail
.
provice
&&
this
.
orderDetail
.
city
&&
this
.
orderDetail
.
district
)
{
if
(
this
.
orderDetail
.
provice
&&
this
.
orderDetail
.
city
&&
this
.
orderDetail
.
district
)
{
this
.
addressForm
.
areaList
[
0
]
=
Number
(
this
.
orderDetail
.
provice
)
this
.
addressForm
.
areaList
[
1
]
=
Number
(
this
.
orderDetail
.
city
)
this
.
addressForm
.
areaList
[
2
]
=
Number
(
this
.
orderDetail
.
district
)
//console.log(66,this.addressForm.areaList);
//console.log(66,this.addressForm.areaList);
this
.
addOrEditPlaceholder
=
this
.
orderDetail
.
provice
+
'/'
+
this
.
orderDetail
.
city
+
'/'
+
this
.
orderDetail
.
district
;
this
.
addressForm
.
areaList
[
0
]
=
this
.
orderDetail
.
provice
this
.
addressForm
.
areaList
[
1
]
=
this
.
orderDetail
.
city
this
.
addressForm
.
areaList
[
2
]
=
this
.
orderDetail
.
district
}
else
{
}
else
{
this
.
addOrEditPlaceholder
=
"请选择具体的省市区"
this
.
addressForm
.
areaList
=
[]
this
.
addressForm
.
areaList
=
[]
}
}
...
@@ -663,10 +666,13 @@ export default {
...
@@ -663,10 +666,13 @@ export default {
return
return
}
}
// 省市区 转化
//debugger
// 省市区 转化 onlyEidtPlaceholder
let
ssqLabelList
=
[];
let
ssqLabelList
=
[];
if
(
this
.
addressForm
.
areaList
&&
this
.
addressForm
.
areaList
.
length
>
1
)
{
if
(
this
.
onlyEidtPlaceholder
)
{
ssqLabelList
=
this
.
$refs
[
'ssqCascader'
].
getCheckedNodes
()[
0
].
pathLabels
;
ssqLabelList
=
this
.
$refs
[
'ssqCascader'
].
getCheckedNodes
()[
0
].
pathLabels
;
}
else
{
ssqLabelList
=
this
.
addressForm
.
areaList
;
}
}
let
params
=
{
let
params
=
{
...
@@ -688,6 +694,8 @@ export default {
...
@@ -688,6 +694,8 @@ export default {
})
})
this
.
modifyinfoDialog
=
false
this
.
modifyinfoDialog
=
false
this
.
handleInfo
()
this
.
handleInfo
()
}
else
{
this
.
$message
({
type
:
'error'
,
message
:
res
.
message
?
res
.
message
:
'修改失败'
});
}
}
})
})
},
},
...
@@ -793,7 +801,8 @@ export default {
...
@@ -793,7 +801,8 @@ export default {
},
},
handleChanges
(
value
)
{
handleChanges
(
value
)
{
this
.
addressForm
.
areaList
=
value
;
this
.
addressForm
.
areaList
=
value
;
console
.
log
(
797
,
value
);
//
this
.
onlyEidtPlaceholder
=
true
// 说明操作下拉进行完整的选择值操作了,即 this.addressForm.areaList 是数组,元素为id
},
},
}
}
}
}
...
@@ -885,4 +894,18 @@ export default {
...
@@ -885,4 +894,18 @@ export default {
.remark-con
.remark-text
{
.remark-con
.remark-text
{
}
}
/
deep
/
.only-eidt-placeholder
.el-input
input
::-webkit-input-placeholder
,
/
deep
/
.only-eidt-placeholder
.el-input
textarea
::-webkit-input-placeholder
{
color
:
#666
;
}
/
deep
/
.only-eidt-placeholder
.el-input
input
:-moz-placeholder
,
/
deep
/
.only-eidt-placeholder
.el-input
textarea
:-moz-placeholder
{
color
:
#666
;
opacity
:
1
;
}
/
deep
/
.only-eidt-placeholder
.el-input
input
::-moz-placeholder
,
/
deep
/
.only-eidt-placeholder
.el-input
textarea
::-moz-placeholder
{
color
:
#666
;
opacity
:
1
;
}
/
deep
/
.only-eidt-placeholder
.el-input
input
:-ms-input-placeholder
,
/
deep
/
.only-eidt-placeholder
.el-input
textarea
::-ms-input-placeholder
{
color
:
#666
;
}
</
style
>
</
style
>
src/views/system/order/index.vue
浏览文件 @
53ddfc71
...
@@ -609,6 +609,7 @@
...
@@ -609,6 +609,7 @@
if
(
res
.
code
===
1
)
{
if
(
res
.
code
===
1
)
{
this
.
isDeliveryOpen
=
false
;
this
.
isDeliveryOpen
=
false
;
this
.
excelList
=
[];
this
.
excelList
=
[];
this
.
$refs
.
upload
.
clearFiles
();
this
.
$message
({
type
:
'success'
,
message
:
'批量发货成功'
});
this
.
$message
({
type
:
'success'
,
message
:
'批量发货成功'
});
this
.
getListOrder
();
this
.
getListOrder
();
}
else
{
}
else
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论