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
37bcb983
Commit
37bcb983
authored
Nov 14, 2024
by
zhengyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单编无收货人订单bug修复
parent
9b6f4874
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
18 deletions
+26
-18
edit.vue
src/views/ecw/order/edit.vue
+26
-18
No files found.
src/views/ecw/order/edit.vue
View file @
37bcb983
...
@@ -862,6 +862,8 @@ export default {
...
@@ -862,6 +862,8 @@ export default {
{ label: "自提", value: 1 },
{ label: "自提", value: 1 },
{ label: "送货上门", value: 2 },
{ label: "送货上门", value: 2 },
], */
], */
// 发货人客户最新信息
consignorCustomer
:
{},
// 发货人是否允许控货无收货人
// 发货人是否允许控货无收货人
noConsignee
:
false
,
noConsignee
:
false
,
// 是否有收货人
// 是否有收货人
...
@@ -1330,7 +1332,29 @@ export default {
...
@@ -1330,7 +1332,29 @@ export default {
onTableMounted
(
e
)
{
onTableMounted
(
e
)
{
// console.warn('onTableMounted', e)
// console.warn('onTableMounted', e)
},
},
getCustomer
(
id
)
{
getCustomer
(
id
).
then
((
response
)
=>
{
console
.
log
(
response
.
data
,
"
response
"
)
this
.
consignorCustomer
=
{
...
this
.
consignorCustomer
,
...
response
.
data
}
if
(
this
.
consignorCustomer
)
{
// 最新的客户设置信息,是否允许控货无收货人
this
.
noConsignee
=
this
.
consignorCustomer
.
noConsignee
}
else
{
// 默认不允许控货无收货人
this
.
noConsignee
=
false
}
// 如果订单无收货人,但是最新的发货人不允许无收货人则重置状态
if
(
this
.
noConsignee
&&
!
this
.
hasConsignee
)
{
// 最新的发货人不允许无收货人,则重置为有收货人
this
.
hasConsignee
=
true
}
})
},
async
getOrder
()
{
async
getOrder
()
{
console
.
log
(
'
是否加载编辑订单数据
'
)
if
(
this
.
form
.
orderId
==
this
.
$route
.
query
.
id
)
{
if
(
this
.
form
.
orderId
==
this
.
$route
.
query
.
id
)
{
console
.
log
(
'
加载中或者已加载此订单数据,不重复加载
'
,
this
.
initing
,
this
.
form
.
orderId
,
this
.
$route
.
query
.
id
)
console
.
log
(
'
加载中或者已加载此订单数据,不重复加载
'
,
this
.
initing
,
this
.
form
.
orderId
,
this
.
$route
.
query
.
id
)
return
return
...
@@ -1360,7 +1384,6 @@ export default {
...
@@ -1360,7 +1384,6 @@ export default {
this
.
form
.
type
=
this
.
form
.
type
?
this
.
form
.
type
.
split
(
'
,
'
).
filter
(
item
=>
item
!=
''
)
:
[]
this
.
form
.
type
=
this
.
form
.
type
?
this
.
form
.
type
.
split
(
'
,
'
).
filter
(
item
=>
item
!=
''
)
:
[]
this
.
form
.
packageTypeArr
=
this
.
form
.
packageType
?
this
.
form
.
packageType
.
split
(
'
,
'
).
filter
(
item
=>
item
!=
''
)
:
[]
this
.
form
.
packageTypeArr
=
this
.
form
.
packageType
?
this
.
form
.
packageType
.
split
(
'
,
'
).
filter
(
item
=>
item
!=
''
)
:
[]
// 每次编辑订单详情需要实时获取发货人当前信息
// 每次编辑订单详情需要实时获取发货人当前信息
let
customer
=
null
if
(
res
.
data
.
consignorVO
)
{
if
(
res
.
data
.
consignorVO
)
{
this
.
$set
(
this
.
form
,
'
consignorCompany
'
,
res
.
data
.
consignorVO
.
company
)
this
.
$set
(
this
.
form
,
'
consignorCompany
'
,
res
.
data
.
consignorVO
.
company
)
this
.
$set
(
this
.
form
,
'
consignorCompanyEn
'
,
res
.
data
.
consignorVO
.
companyEn
)
this
.
$set
(
this
.
form
,
'
consignorCompanyEn
'
,
res
.
data
.
consignorVO
.
companyEn
)
...
@@ -1371,7 +1394,7 @@ export default {
...
@@ -1371,7 +1394,7 @@ export default {
this
.
$set
(
this
.
form
,
'
consignorName
'
,
res
.
data
.
consignorVO
.
name
)
this
.
$set
(
this
.
form
,
'
consignorName
'
,
res
.
data
.
consignorVO
.
name
)
this
.
$set
(
this
.
form
,
'
consignorNameEn
'
,
res
.
data
.
consignorVO
.
nameEn
)
this
.
$set
(
this
.
form
,
'
consignorNameEn
'
,
res
.
data
.
consignorVO
.
nameEn
)
this
.
$set
(
this
.
form
,
'
consignorPhone
'
,
res
.
data
.
consignorVO
.
phone
)
this
.
$set
(
this
.
form
,
'
consignorPhone
'
,
res
.
data
.
consignorVO
.
phone
)
customer
=
getCustomer
(
res
.
data
.
consignorVO
.
customerId
)
this
.
getCustomer
(
res
.
data
.
consignorVO
.
customerId
)
}
}
if
(
res
.
data
.
consigneeVO
)
{
if
(
res
.
data
.
consigneeVO
)
{
...
@@ -1388,25 +1411,10 @@ export default {
...
@@ -1388,25 +1411,10 @@ export default {
// res.data.hasConsignee 订单冗余的发货人是否允许无收货人
// res.data.hasConsignee 订单冗余的发货人是否允许无收货人
// res.data.noConsignee 当前订单发货人是否允许无收货
// res.data.noConsignee 当前订单发货人是否允许无收货
//
if
(
customer
)
{
// 最新的客户设置信息,是否允许控货无收货人
this
.
noConsignee
=
customer
.
noConsignee
}
else
{
// 默认不允许控货无收货人
this
.
noConsignee
=
false
}
// 是否有收货人
// 是否有收货人
this
.
hasConsignee
=
!!
res
.
data
.
consigneeVO
this
.
hasConsignee
=
!!
res
.
data
.
consigneeVO
// 如果订单无收货人,但是最新的发货人不允许无收货人则重置状态
if
(
this
.
noConsignee
&&
!
this
.
hasConsignee
)
{
// 最新的发货人不允许无收货人,则重置为有收货人
this
.
hasConsignee
=
true
// 如果发货人不允许无收货人,则更新是否允许无收货人状态
this
.
noConsignee
=
false
}
if
(
this
.
form
.
channelId
==
0
)
{
if
(
this
.
form
.
channelId
==
0
)
{
delete
this
.
form
.
channelId
delete
this
.
form
.
channelId
}
}
...
...
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