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
4b34031a
Commit
4b34031a
authored
Oct 13, 2022
by
Marcus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【订单入仓】选择储位,只有区域没有仓位时不能提交,实际上已选择成功了,页面关不掉
http://zentao.jdshangmen.com/bug-view-941.html
parent
0b2db738
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
62 additions
and
35 deletions
+62
-35
index.vue
src/components/WarehouseAreaDialog/index.vue
+62
-35
No files found.
src/components/WarehouseAreaDialog/index.vue
View file @
4b34031a
...
...
@@ -13,7 +13,7 @@
<div
style=
"text-align: center"
>
区域
</div>
<div
style=
"background-color: #efefef;padding: 10px 10px 0;border: #dcdcdc solid 1px;border-radius: 2px"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"12"
v-for=
"
(warehouse, i) in item.children"
:key=
"i
"
>
<el-col
:span=
"12"
v-for=
"
warehouse in item.children"
:key=
"warehouse.id
"
>
<div
class=
"warehouse-block"
:class=
"
{'warehouse-block-selected': warehouse.selected, 'warehouse-block-active': warehouse.id === activeWarehouse.id}"
...
...
@@ -28,14 +28,25 @@
<div>
<div
style=
"text-align: center"
>
仓位
</div>
<div
class=
"position-group"
>
<div
class=
"position"
v-for=
"position in activeWarehouse.positionList"
:key=
"item.id"
>
<div
class=
"position"
v-for=
"position in activeWarehouse.positionList"
:key=
"position.id"
@
click=
"handleSelectPosition(position)"
>
<template
v-if=
"position.children"
>
<div
class=
"position-item"
v-for=
"item in position.children"
@
click=
"handleSelectPosition(item)"
:key=
"item.id"
@
click.stop=
"handleSelectPositionChild(item)"
:class=
"
{'position-item-active': item.selected}">
{{
item
.
code
}}
</div>
</
template
>
<
template
v-else
>
<div
class=
"position-item"
:class=
"
{'position-item-active': position.selected}">
{{
position
.
code
}}
</div>
</
template
>
</div>
</div>
</div>
...
...
@@ -100,6 +111,7 @@ export default {
f
.
selected
=
false
if
(
f
.
positionList
)
f
.
positionList
.
forEach
(
g
=>
{
// 位置
g
.
selected
=
false
g
.
children
?.
forEach
(
k
=>
{
// 子位置
k
.
selected
=
false
...
...
@@ -134,14 +146,15 @@ export default {
warehouse
.
selected
=
true
// 区域被选,清空该区域下的位置
if
(
warehouse
.
positionList
)
warehouse
.
positionList
.
forEach
(
g
=>
{
if
(
warehouse
.
positionList
)
warehouse
.
positionList
?.
forEach
(
g
=>
{
g
.
selected
=
false
g
.
children
?.
forEach
(
k
=>
{
k
.
selected
=
false
})
})
}
},
handleSelectPosition
(
position
)
{
handleSelectPosition
Child
(
position
)
{
if
(
!!
position
.
selected
)
{
position
.
selected
=
false
...
...
@@ -150,7 +163,7 @@ export default {
if
(
!
parentAre
.
selected
)
{
// 检查父区域下是否所有位置被反选
let
hasSelected
=
false
parentAre
.
positionList
.
forEach
(
g
=>
{
parentAre
.
positionList
?
.
forEach
(
g
=>
{
// 位置
g
.
children
?.
forEach
(
k
=>
{
// 子位置
...
...
@@ -166,6 +179,17 @@ export default {
// 选位置时,父区域反选
this
.
area
.
find
(
e
=>
e
.
id
===
position
.
domainId
).
children
.
find
(
f
=>
f
.
id
===
position
.
areaId
).
selected
=
false
}
},
handleSelectPosition
(
position
)
{
if
(
!!
position
.
selected
)
{
position
.
selected
=
false
}
else
{
position
.
selected
=
true
// 选位置时,父区域反选
this
.
area
.
find
(
e
=>
e
.
id
===
position
.
domainId
).
children
.
find
(
f
=>
f
.
id
===
position
.
areaId
).
selected
=
false
}
}
},
...
...
@@ -179,15 +203,15 @@ export default {
selected
()
{
const
result
=
[]
this
.
area
.
forEach
(
e
=>
{
this
.
area
?
.
forEach
(
e
=>
{
// 仓库
e
.
children
.
forEach
(
f
=>
{
e
.
children
?
.
forEach
(
f
=>
{
// 区域
if
(
f
.
selected
)
result
.
push
(
f
.
code
)
else
if
(
f
.
positionList
)
f
.
positionList
.
forEach
(
g
=>
{
else
f
.
positionList
?
.
forEach
(
g
=>
{
// 位置
if
(
g
.
selected
)
result
.
push
(
k
.
code
)
g
.
children
?.
forEach
(
k
=>
{
if
(
g
.
selected
)
result
.
push
(
g
.
code
)
else
if
(
g
.
children
)
g
.
children
?.
forEach
(
k
=>
{
// 子位置
if
(
k
.
selected
)
result
.
push
(
k
.
code
)
})
...
...
@@ -200,16 +224,17 @@ export default {
inputValue
(){
const
result
=
[]
this
.
area
.
forEach
(
e
=>
{
this
.
area
?
.
forEach
(
e
=>
{
// 仓库
e
.
children
.
forEach
(
f
=>
{
e
.
children
?
.
forEach
(
f
=>
{
// 区域
if
(
f
.
selected
)
result
.
push
({
orderId
:
this
.
orderId
,
wareId
:
f
.
pid
,
areaId
:
f
.
id
})
else
if
(
f
.
positionList
)
f
.
positionList
.
forEach
(
g
=>
{
else
{
f
.
positionList
?.
forEach
(
g
=>
{
// 位置
if
(
g
.
selected
)
result
.
push
({
orderId
:
this
.
orderId
,
...
...
@@ -217,7 +242,7 @@ export default {
areaId
:
g
.
areaId
,
locationId
:
g
.
id
})
else
g
.
children
.
forEach
(
k
=>
{
else
g
.
children
?
.
forEach
(
k
=>
{
// 子位置
if
(
k
.
selected
)
result
.
push
({
orderId
:
this
.
orderId
,
...
...
@@ -227,6 +252,7 @@ export default {
})
})
})
}
})
})
...
...
@@ -269,9 +295,10 @@ export default {
border
:
1px
#EFEFEF
solid
;
gap
:
1px
;
min-height
:
64px
;
flex-flow
:
wrap
;
}
.position
{
width
:
20%
;
width
:
calc
(
20%
-
1px
)
;
height
:
64px
;
display
:
flex
;
flex-direction
:
column
;
...
...
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