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
6719042f
Commit
6719042f
authored
Sep 15, 2022
by
huhaiqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决缺陷单
parent
aa035483
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
11 deletions
+17
-11
index.vue
src/components/WarehouseAreaDialog/index.vue
+4
-4
indexSea.vue
src/views/ecw/box/indexSea.vue
+10
-6
shippingSea.vue
src/views/ecw/box/shippingSea/shippingSea.vue
+3
-1
No files found.
src/components/WarehouseAreaDialog/index.vue
View file @
6719042f
...
@@ -100,7 +100,7 @@ export default {
...
@@ -100,7 +100,7 @@ export default {
f
.
selected
=
false
f
.
selected
=
false
if
(
f
.
positionList
)
f
.
positionList
.
forEach
(
g
=>
{
if
(
f
.
positionList
)
f
.
positionList
.
forEach
(
g
=>
{
// 位置
// 位置
g
.
children
.
forEach
(
k
=>
{
g
.
children
?
.
forEach
(
k
=>
{
// 子位置
// 子位置
k
.
selected
=
false
k
.
selected
=
false
})
})
...
@@ -135,7 +135,7 @@ export default {
...
@@ -135,7 +135,7 @@ export default {
// 区域被选,清空该区域下的位置
// 区域被选,清空该区域下的位置
if
(
warehouse
.
positionList
)
warehouse
.
positionList
.
forEach
(
g
=>
{
if
(
warehouse
.
positionList
)
warehouse
.
positionList
.
forEach
(
g
=>
{
g
.
children
.
forEach
(
k
=>
{
g
.
children
?
.
forEach
(
k
=>
{
k
.
selected
=
false
k
.
selected
=
false
})
})
})
})
...
@@ -152,7 +152,7 @@ export default {
...
@@ -152,7 +152,7 @@ export default {
let
hasSelected
=
false
let
hasSelected
=
false
parentAre
.
positionList
.
forEach
(
g
=>
{
parentAre
.
positionList
.
forEach
(
g
=>
{
// 位置
// 位置
g
.
children
.
forEach
(
k
=>
{
g
.
children
?
.
forEach
(
k
=>
{
// 子位置
// 子位置
if
(
k
.
selected
)
hasSelected
=
true
if
(
k
.
selected
)
hasSelected
=
true
})
})
...
@@ -187,7 +187,7 @@ export default {
...
@@ -187,7 +187,7 @@ export default {
else
if
(
f
.
positionList
)
f
.
positionList
.
forEach
(
g
=>
{
else
if
(
f
.
positionList
)
f
.
positionList
.
forEach
(
g
=>
{
// 位置
// 位置
if
(
g
.
selected
)
result
.
push
(
k
.
code
)
if
(
g
.
selected
)
result
.
push
(
k
.
code
)
g
.
children
.
forEach
(
k
=>
{
g
.
children
?
.
forEach
(
k
=>
{
// 子位置
// 子位置
if
(
k
.
selected
)
result
.
push
(
k
.
code
)
if
(
k
.
selected
)
result
.
push
(
k
.
code
)
})
})
...
...
src/views/ecw/box/indexSea.vue
View file @
6719042f
...
@@ -94,14 +94,18 @@
...
@@ -94,14 +94,18 @@
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"方数(预装/已装)"
align=
"center"
prop=
"squareNumber"
/>
<el-table-column
label=
"方数(预装/已装)"
align=
"center"
prop=
""
>
<el-table-column
label=
"重量(预装/已装)"
align=
"center"
prop=
"weight"
/>
<
template
slot-scope=
"{row}"
>
{{
row
.
boxStatistics
.
volume
}}
/
{{
row
.
boxStatistics
.
loadVolume
}}
<el-table-column
label=
"状态"
align=
"center"
prop=
"boxStatus"
>
<
template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.BOX_SHIPMENT_STATUS"
:value=
"scope.row.boxStatus"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
label=
"重量(预装/已装)"
align=
"center"
prop=
"weight"
>
<
template
slot-scope=
"{row}"
>
{{
row
.
boxStatistics
.
weight
}}
/
{{
row
.
boxStatistics
.
loadWeight
}}
</
template
>
</el-table-column>
<el-table-column
label=
"状态"
align=
"center"
prop=
"shipmentStatusText"
/>
<el-table-column
label=
"日期"
align=
"center"
prop=
"createTime"
width=
"180"
>
<el-table-column
label=
"日期"
align=
"center"
prop=
"createTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
...
...
src/views/ecw/box/shippingSea/shippingSea.vue
View file @
6719042f
...
@@ -74,7 +74,6 @@ export default {
...
@@ -74,7 +74,6 @@ export default {
};
};
},
},
created
()
{
created
()
{
this
.
getBoxInfo
();
// 仓库
// 仓库
getWarehouseList
().
then
((
r
)
=>
{
getWarehouseList
().
then
((
r
)
=>
{
this
.
warehouseList
=
r
.
data
;
this
.
warehouseList
=
r
.
data
;
...
@@ -100,6 +99,9 @@ export default {
...
@@ -100,6 +99,9 @@ export default {
this
.
allUsers
=
data
.
list
??
[];
this
.
allUsers
=
data
.
list
??
[];
});
});
},
},
activated
()
{
this
.
getBoxInfo
();
},
methods
:
{
methods
:
{
/* 获取仓库 */
/* 获取仓库 */
importCityName
(
id
)
{
importCityName
(
id
)
{
...
...
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