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
c40bc3c7
Commit
c40bc3c7
authored
Nov 25, 2022
by
Marcus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
http://zentao.jdshangmen.com/bug-view-1538.html
parent
a0e8aa30
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
62 additions
and
25 deletions
+62
-25
order.js
src/api/ecw/order.js
+9
-0
index.vue
src/components/WarehouseAreaDialog/index.vue
+43
-23
batchTally.vue
src/views/ecw/box/shippingSea/nodePage/tally/batchTally.vue
+3
-0
index.vue
src/views/ecw/order/warehousing/index.vue
+7
-2
No files found.
src/api/ecw/order.js
View file @
c40bc3c7
...
@@ -181,6 +181,15 @@ export function orderWarehouseInUpdateLabel(data){
...
@@ -181,6 +181,15 @@ export function orderWarehouseInUpdateLabel(data){
})
})
}
}
// 入仓修改储位
export
function
saveOrUpdateOrderLocation
(
data
){
return
request
({
url
:
'
/order/order-warehouse-in/save-or-update-order-location
'
,
method
:
'
post
'
,
data
})
}
// 获取入仓修改审批单详情-审批使用
// 获取入仓修改审批单详情-审批使用
export
function
getWarehouseUpdateApprovalInfo
(
id
)
{
export
function
getWarehouseUpdateApprovalInfo
(
id
)
{
return
request
({
return
request
({
...
...
src/components/WarehouseAreaDialog/index.vue
View file @
c40bc3c7
...
@@ -64,7 +64,8 @@
...
@@ -64,7 +64,8 @@
</template>
</template>
<
script
>
<
script
>
import
{
getByWarehouseId
}
from
'
@/api/ecw/warehouseArea
'
import
{
getByWarehouseId
}
from
'
@/api/ecw/warehouseArea
'
import
{
saveOrUpdateOrderLocation
}
from
"
@/api/ecw/order
"
export
default
{
export
default
{
name
:
'
WarehouseAreaDialog
'
,
name
:
'
WarehouseAreaDialog
'
,
...
@@ -82,6 +83,11 @@ export default {
...
@@ -82,6 +83,11 @@ export default {
warehouseId
:
{
warehouseId
:
{
type
:
Number
,
type
:
Number
,
default
:
undefined
default
:
undefined
},
// 是否入仓修改
isEditing
:
{
type
:
Boolean
,
default
:
false
}
}
},
},
...
@@ -102,41 +108,57 @@ export default {
...
@@ -102,41 +108,57 @@ export default {
visible
(
val
)
{
visible
(
val
)
{
if
(
val
)
{
if
(
val
)
{
this
.
opened
=
true
this
.
opened
=
true
}
else
{
}
},
opened
(
val
)
{
if
(
val
)
{
}
else
{
this
.
$emit
(
'
update:visible
'
,
false
)
}
}
},
if
(
this
.
area
.
length
===
0
)
getByWarehouseId
({
cityId
:
this
.
cityId
,
warehouseId
:
this
.
warehouseId
}).
then
(
r
=>
{
methods
:
{
updateArea
(){
this
.
initArea
()
},
initArea
(){
return
getByWarehouseId
({
cityId
:
this
.
cityId
,
warehouseId
:
this
.
warehouseId
}).
then
(
r
=>
{
const
area
=
r
.
data
const
area
=
r
.
data
area
.
forEach
(
e
=>
{
area
.
forEach
(
e
=>
{
// 仓库
// 仓库
e
.
children
?.
forEach
(
f
=>
{
e
.
children
?.
forEach
(
f
=>
{
// 区域
// 区域
f
.
selected
=
false
f
.
selected
=
this
.
isSelected
(
e
.
id
,
f
.
id
)
if
(
f
.
positionList
)
f
.
positionList
.
forEach
(
g
=>
{
if
(
f
.
positionList
)
f
.
positionList
.
forEach
(
g
=>
{
// 位置
// 位置
g
.
selected
=
false
g
.
selected
=
this
.
isSelected
(
e
.
id
,
f
.
id
,
g
.
id
)
g
.
children
?.
forEach
(
k
=>
{
g
.
children
?.
forEach
(
k
=>
{
// 子位置
// 子位置
k
.
selected
=
false
k
.
selected
=
this
.
isSelected
(
e
.
id
,
f
.
id
,
k
.
id
)
})
})
})
})
})
})
})
})
this
.
area
=
area
this
.
area
=
area
})
})
}
else
{
}
},
},
opened
(
val
)
{
// 用于储位回显选中
if
(
val
)
{
isSelected
(
warehouse
,
area
,
position
=
0
){
}
else
{
return
!!
this
.
value
.
find
(
e
=>
warehouse
===
e
.
wareId
&&
area
===
e
.
areaId
&&
position
===
e
.
locationId
)
this
.
$emit
(
'
update:visible
'
,
false
)
}
}
},
},
methods
:
{
handleSubmit
()
{
handleSubmit
()
{
this
.
$emit
(
'
input
'
,
this
.
inputValue
)
this
.
$emit
(
'
input
'
,
this
.
inputValue
)
this
.
opened
=
false
this
.
opened
=
false
if
(
this
.
isEditing
)
{
this
.
$nextTick
(()
=>
{
saveOrUpdateOrderLocation
({
"
orderId
"
:
this
.
orderId
,
"
orderLocationCreateReqVOList
"
:
this
.
inputValue
})
})
}
},
},
handleClose
()
{},
handleClose
()
{},
handleSelectWarehouse
(
warehouse
)
{
handleSelectWarehouse
(
warehouse
)
{
...
@@ -146,7 +168,6 @@ export default {
...
@@ -146,7 +168,6 @@ export default {
return
return
}
else
if
(
this
.
activeWarehouseId
!==
warehouse
.
id
)
{
}
else
if
(
this
.
activeWarehouseId
!==
warehouse
.
id
)
{
this
.
activeWarehouseId
=
warehouse
.
id
this
.
activeWarehouseId
=
warehouse
.
id
console
.
log
(
this
.
inputValue
.
find
(
e
=>
e
.
areaId
===
warehouse
.
id
),
warehouse
.
id
)
if
(
this
.
inputValue
.
find
(
e
=>
e
.
areaId
===
warehouse
.
id
)){
if
(
this
.
inputValue
.
find
(
e
=>
e
.
areaId
===
warehouse
.
id
)){
return
return
}
}
...
@@ -202,7 +223,6 @@ export default {
...
@@ -202,7 +223,6 @@ export default {
},
},
mounted
()
{
mounted
()
{
console
.
log
(
'
area dialog mounted
'
)
},
},
computed
:
{
computed
:
{
...
...
src/views/ecw/box/shippingSea/nodePage/tally/batchTally.vue
View file @
c40bc3c7
...
@@ -54,6 +54,9 @@ export default {
...
@@ -54,6 +54,9 @@ export default {
warehouseId
:
this
.
$attrs
.
shipmentObj
.
startWarehouseId
,
warehouseId
:
this
.
$attrs
.
shipmentObj
.
startWarehouseId
,
};
};
},
},
mounted
()
{
this
.
$refs
.
area
.
updateArea
()
},
methods
:
{
methods
:
{
getTotlContent
,
getTotlContent
,
// 打开储位
// 打开储位
...
...
src/views/ecw/order/warehousing/index.vue
View file @
c40bc3c7
...
@@ -147,7 +147,7 @@
...
@@ -147,7 +147,7 @@
</el-form>
</el-form>
<warehouse-area-dialog
ref=
"area"
:visible.sync=
"areaVisible"
v-model=
"form.orderLocationCreateReqVOList"
<warehouse-area-dialog
ref=
"area"
:visible.sync=
"areaVisible"
v-model=
"form.orderLocationCreateReqVOList"
:order-id=
"orderId"
:warehouse-id=
"warehouseId"
></warehouse-area-dialog>
:order-id=
"orderId"
:warehouse-id=
"warehouseId"
:is-editing=
"isEdit"
></warehouse-area-dialog>
<edit-dialog
:title=
"title"
:order-id=
"order.orderId"
:visible.sync=
"warehousingVisible"
:warehousing=
"warehousing"
:edit=
"isEdit"
></edit-dialog>
<edit-dialog
:title=
"title"
:order-id=
"order.orderId"
:visible.sync=
"warehousingVisible"
:warehousing=
"warehousing"
:edit=
"isEdit"
></edit-dialog>
...
@@ -226,7 +226,12 @@ export default {
...
@@ -226,7 +226,12 @@ export default {
this
.
getOrder
()
this
.
getOrder
()
getOrderWarehouseIn
(
this
.
orderId
).
then
(
r
=>
this
.
orderItemList
=
r
.
data
.
reverse
())
getOrderWarehouseIn
(
this
.
orderId
).
then
(
r
=>
this
.
orderItemList
=
r
.
data
.
reverse
())
getSpecialListByOrderId
(
this
.
orderId
).
then
(
r
=>
this
.
specialList
=
r
.
data
)
getSpecialListByOrderId
(
this
.
orderId
).
then
(
r
=>
this
.
specialList
=
r
.
data
)
listByOrderId
({
orderId
:
this
.
orderId
}).
then
(
r
=>
this
.
form
.
orderLocationCreateReqVOList
=
r
.
data
)
listByOrderId
({
orderId
:
this
.
orderId
}).
then
(
r
=>
{
this
.
form
.
orderLocationCreateReqVOList
=
r
.
data
this
.
$nextTick
(()
=>
{
this
.
$refs
.
area
.
updateArea
()
})
})
}
}
getCurrencyList
().
then
(
res
=>
this
.
currencyList
=
res
.
data
)
getCurrencyList
().
then
(
res
=>
this
.
currencyList
=
res
.
data
)
},
},
...
...
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