Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-app-operator-master
Commits
a1fc65c2
Commit
a1fc65c2
authored
Oct 10, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复几个bug
parent
b0896fe9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
4 deletions
+21
-4
edit.vue
src/views/ecw/order/edit.vue
+15
-3
edit.vue
src/views/ecw/productPrice/edit.vue
+5
-0
index.vue
src/views/ecw/productPrice/index.vue
+1
-1
No files found.
src/views/ecw/order/edit.vue
View file @
a1fc65c2
...
@@ -313,7 +313,7 @@
...
@@ -313,7 +313,7 @@
</el-form-item>
</el-form-item>
</div>
</div>
<div
v-if=
"homeDeliveryService && form.harvestMethod == 2"
>
<div
v-if=
"homeDeliveryService && form.harvestMethod == 2"
>
<el-form-item
:label=
"$t('收货地区')"
>
<el-form-item
:label=
"$t('收货地区')"
prop=
"country"
>
<area-selector
<area-selector
:country=
"form.consigneeVO ? form.consigneeVO.country : undefined"
:country=
"form.consigneeVO ? form.consigneeVO.country : undefined"
:province=
"form.consigneeVO ? form.consigneeVO.province : undefined"
:province=
"form.consigneeVO ? form.consigneeVO.province : undefined"
...
@@ -517,7 +517,8 @@ export default {
...
@@ -517,7 +517,8 @@ export default {
type
:[],
type
:[],
isExternalWarehouse
:
false
,
isExternalWarehouse
:
false
,
externalWarehouseDtoList
:[{}],
externalWarehouseDtoList
:[{}],
orderItemVOList
:[]
orderItemVOList
:[],
drawee
:
2
},
},
ccIdArr
:
[],
ccIdArr
:
[],
// 表单校验
// 表单校验
...
@@ -542,7 +543,8 @@ export default {
...
@@ -542,7 +543,8 @@ export default {
lineId
:
[{
required
:
true
,
message
:
this
.
$t
(
'
请选择路线
'
)}],
lineId
:
[{
required
:
true
,
message
:
this
.
$t
(
'
请选择路线
'
)}],
channelId
:
[{
required
:
true
,
message
:
this
.
$t
(
'
请选择出货渠道
'
)}],
channelId
:
[{
required
:
true
,
message
:
this
.
$t
(
'
请选择出货渠道
'
)}],
deliveryDate
:
[{
required
:
true
,
message
:
this
.
$t
(
'
请选择送货日期
'
)}],
deliveryDate
:
[{
required
:
true
,
message
:
this
.
$t
(
'
请选择送货日期
'
)}],
consigneeAddress
:
[{
required
:
true
,
message
:
this
.
$t
(
'
请填写详细地址
'
)}]
consigneeAddress
:
[{
required
:
true
,
message
:
this
.
$t
(
'
请填写详细地址
'
)}],
country
:
[{
required
:
true
,
message
:
this
.
$t
(
'
收货地区填写不完整
'
)}]
},
},
labelStyle
:
'
width:120px
'
,
labelStyle
:
'
width:120px
'
,
showBatchImportDialog
:
false
,
// 显示批量导入弹窗
showBatchImportDialog
:
false
,
// 显示批量导入弹窗
...
@@ -912,6 +914,16 @@ export default {
...
@@ -912,6 +914,16 @@ export default {
return
this
.
$showFormValidateErrors
(
errors
)
return
this
.
$showFormValidateErrors
(
errors
)
}
}
if
(
this
.
form
.
harvestMethod
==
2
){
if
(
!
this
.
form
.
country
||
!
this
.
form
.
province
||
!
this
.
form
.
city
){
return
this
.
$notify
({
title
:
'
提示
'
,
message
:
"
收货地区填写不完整
"
,
type
:
'
warning
'
});
}
}
this
.
form
.
orderItemVOList
.
map
(
item
=>
{
this
.
form
.
orderItemVOList
.
map
(
item
=>
{
item
.
prodAttrIds
=
item
.
prodAttrArr
.
join
(
'
,
'
)
item
.
prodAttrIds
=
item
.
prodAttrArr
.
join
(
'
,
'
)
})
})
...
...
src/views/ecw/productPrice/edit.vue
View file @
a1fc65c2
...
@@ -270,6 +270,11 @@ export default {
...
@@ -270,6 +270,11 @@ export default {
/* getProductType(this.product.typeId).then(res => {
/* getProductType(this.product.typeId).then(res => {
this.productType = res.data
this.productType = res.data
}
) */
}
) */
this
.
$set
(
this
.
form
,
'
needBook
'
,
this
.
product
.
needBook
)
this
.
$set
(
this
.
form
,
'
square
'
,
this
.
product
.
square
)
this
.
$set
(
this
.
form
,
'
dayLimit
'
,
this
.
product
.
dayLimit
)
this
.
$set
(
this
.
form
,
'
containerLocation
'
,
this
.
product
.
containerLocation
)
}
,
}
,
form
(
val
)
{
form
(
val
)
{
if
(
!
val
)
return
if
(
!
val
)
return
...
...
src/views/ecw/productPrice/index.vue
View file @
a1fc65c2
...
@@ -78,7 +78,7 @@
...
@@ -78,7 +78,7 @@
<el-button
v-if=
"!$route.query.product_id"
type=
"primary"
plain
icon=
"el-icon-setting"
size=
"mini"
@
click=
"batchOff"
:disabled=
"multiple"
>
{{
$t
(
'
批量下架
'
)
}}
</el-button>
<el-button
v-if=
"!$route.query.product_id"
type=
"primary"
plain
icon=
"el-icon-setting"
size=
"mini"
@
click=
"batchOff"
:disabled=
"multiple"
>
{{
$t
(
'
批量下架
'
)
}}
</el-button>
<!--指定商品-->
<!--指定商品-->
<el-button
v-if=
"$route.query.product_id"
type=
"primary"
plain
icon=
"el-icon-setting"
size=
"mini"
@
click=
"batchSetSingleProductPrice"
>
{{
$t
(
'
批量设置单个商品的路线
路线
'
)
}}
</el-button>
<el-button
v-if=
"$route.query.product_id"
type=
"primary"
plain
icon=
"el-icon-setting"
size=
"mini"
@
click=
"batchSetSingleProductPrice"
>
{{
$t
(
'
批量设置单个商品的路线
'
)
}}
</el-button>
</el-col>
</el-col>
<!--
<el-col
:span=
"1.5"
>
<!--
<el-col
:span=
"1.5"
>
<el-button
type=
"warning"
plain
icon=
"el-icon-download"
size=
"mini"
@
click=
"handleExport"
:loading=
"exportLoading"
<el-button
type=
"warning"
plain
icon=
"el-icon-download"
size=
"mini"
@
click=
"handleExport"
:loading=
"exportLoading"
...
...
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