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
f458c7ff
Commit
f458c7ff
authored
Aug 17, 2022
by
dcy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单是数据
parent
84f45303
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
23 deletions
+53
-23
batchSingleApplication.vue
src/views/ecw/order/batchSingleApplication.vue
+6
-2
index.vue
src/views/ecw/order/index.vue
+2
-2
transferWarehousing.vue
src/views/ecw/order/transferWarehousing.vue
+45
-19
No files found.
src/views/ecw/order/batchSingleApplication.vue
View file @
f458c7ff
...
...
@@ -72,7 +72,7 @@
<el-table-column>
<
template
v-slot=
"{row}"
>
<el-button
type=
"text"
v-if=
"row.inWarehouseState === 10"
>
取消
审核
取消
调仓
</el-button>
</
template
>
</el-table-column>
...
...
@@ -95,7 +95,8 @@
<work-flow
xmlkey=
"warehouse_transfer"
v-model=
"params.copyUserId"
/>
</div>
<div
style=
"text-align: center"
>
<el-button
style=
"margin-right: 50px"
@
click=
"submit"
:disabled=
"isSubmit"
>
提交申请
</el-button>
<el-button
style=
"margin-right: 50px"
v-if=
"adjustmentBol"
>
审核中
</el-button>
<el-button
v-else
style=
"margin-right: 50px"
@
click=
"submit"
:disabled=
"isSubmit"
>
提交申请
</el-button>
<el-button
@
click=
"$emit('update:dialogVisible',false)"
>
取消
</el-button>
</div>
<!-- <warehouseDetails></warehouseDetails>-->
...
...
@@ -149,6 +150,9 @@ export default {
if
(
this
.
list
.
every
(
e
=>
e
.
status
===
5
)
&&
[...
new
Set
(
l
)].
length
===
1
)
flag
=
false
}
return
flag
;
},
adjustmentBol
(){
return
this
.
list
.
some
(
e
=>
e
.
inWarehouseState
===
10
)
}
},
data
(){
...
...
src/views/ecw/order/index.vue
View file @
f458c7ff
...
...
@@ -201,8 +201,8 @@
v-hasPermi=
"['ecw:order:update']"
>
入仓
</el-button>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"show = true;orderId = scope.row.orderId; "
v-hasPermi=
"['ecw:order:update']"
>
退仓
</el-button>
<el-button
type=
"text"
v-if=
"scope.row.status === 5 && [11,13,18].indexOf(scope.row.inWarehouseState) > -1"
size=
"mini"
@
click=
"orderId = scope.row.orderId;warehouseBol=true;"
>
调仓
</el-button>
<el-button
type=
"text"
v-if=
"scope.row.status === 5 && scope.row.inWarehouseState === 13"
size=
"mini"
@
click=
"$router.push(
{path:'/order/transfer-warehousing/' + scope.row.orderId + '/' + 1 })" >调拨出仓
</el-button>
<el-button
type=
"text"
size=
"mini"
@
click=
"orderId = scope.row.orderId;warehouseBol=true;"
>
调仓
</el-button>
<el-button
type=
"text"
size=
"mini"
@
click=
"$router.push(
{path:'/order/transfer-warehousing/' + scope.row.orderId + '/' + 1 })" >调拨出仓
</el-button>
<el-button
type=
"text"
size=
"mini"
@
click=
"$router.push(
{path:'/order/transfer-to-warehouse/' + scope.row.orderId + '/' + 2 })" >调拨到仓
</el-button>
</div>
...
...
src/views/ecw/order/transferWarehousing.vue
View file @
f458c7ff
...
...
@@ -8,7 +8,7 @@
<el-divider
content-position=
"left"
>
货物信息
</el-divider>
<el-table
:data=
"
orderDetails.orderItemVOList
? orderDetails.orderItemVOList : [] "
>
<el-table
:data=
"
orderDetails.orderItemVOList && orderDetails.orderItemVOList.length > 0
? orderDetails.orderItemVOList : [] "
>
<el-table-column
type=
"index"
label=
"序号"
></el-table-column>
<el-table-column
label=
"品名"
>
<template
v-slot=
"
{row}">
...
...
@@ -31,16 +31,20 @@
<
template
v-slot=
"{row}"
>
<el-descriptions
size=
"mini"
:column=
"4"
>
<el-descriptions-item
label=
"品牌"
>
{{
row
.
brand
}}
</el-descriptions-item>
<el-descriptions-item
label=
"箱数"
>
{{
row
.
warehouseInInfoVO
.
cartonsNum
}}
</el-descriptions-item>
<el-descriptions-item
label=
"体积"
>
{{
row
.
warehouseInInfoVO
.
volume
}}
</el-descriptions-item>
<el-descriptions-item
label=
"重量"
>
{{
row
.
warehouseInInfoVO
.
weight
}}
</el-descriptions-item>
<el-descriptions-item
label=
"箱数"
>
{{
row
.
warehouseInInfoVO
?
row
.
warehouseInInfoVO
.
cartonsNum
:
''
}}
</el-descriptions-item>
<el-descriptions-item
label=
"体积"
>
{{
row
.
warehouseInInfoVO
?
row
.
warehouseInInfoVO
.
volume
:
''
}}
</el-descriptions-item>
<el-descriptions-item
label=
"重量"
>
{{
row
.
warehouseInInfoVO
?
row
.
warehouseInInfoVO
.
weight
:
''
}}
</el-descriptions-item>
</el-descriptions>
</
template
>
</el-table-column>
<el-table-column
label=
"最后操作时间"
></el-table-column>
<el-table-column
label=
"最后操作时间"
>
<
template
v-slot=
"{row}"
>
{{
parseTime
(
row
.
createTime
)
}}
</
template
>
</el-table-column>
<el-table-column
label=
"状态"
>
<
template
v-slot=
"{row}"
>
<dict-tag
:value=
"
row.warehouseInInfoVO.diffType
"
:type=
"DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS"
/>
<dict-tag
:value=
"
row.warehouseInInfoVO ? row.warehouseInInfoVO.diffType :''
"
:type=
"DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS"
/>
</
template
>
</el-table-column>
</el-table>
...
...
@@ -49,12 +53,12 @@
</el-divider>
<el-table
:data=
"warehouseList"
v-if=
"type == 2"
>
<el-table-column
label=
"调仓编号"
prop=
"id"
></el-table-column>
<el-table-column
label=
"调出仓库"
prop=
"warehouseOut
Id
"
></el-table-column>
<el-table-column
label=
"调入仓库"
prop=
"warehouseIn
Id
"
></el-table-column>
<el-table-column
label=
"申请人"
></el-table-column>
<el-table-column
label=
"调出仓库"
prop=
"warehouseOut
Name
"
></el-table-column>
<el-table-column
label=
"调入仓库"
prop=
"warehouseIn
Name
"
></el-table-column>
<el-table-column
label=
"申请人"
prop=
"creator"
></el-table-column>
<el-table-column
label=
"申请时间"
>
<
template
v-slot=
"{row}"
>
{{
parseTime
(
row
.
createTime
)
}}
</
template
>
</el-table-column>
<el-table-column
label=
"状态"
>
...
...
@@ -72,7 +76,9 @@
</el-table>
<el-descriptions
style=
"margin-top: 20px"
:column=
"4"
border
>
<el-descriptions-item
label=
"集运仓库"
>
{{ warehouseDetails.warehouseOutName }}
</el-descriptions-item>
<el-descriptions-item
label=
"储位"
>
{{}}
</el-descriptions-item>
<el-descriptions-item
label=
"储位"
>
<div
v-for=
"item in storageSpaceList"
style=
"display: flex;"
><div>
{{item.warehouseName}}
</div><div>
{{item.regionName}} 区
</div></div>
</el-descriptions-item>
<el-descriptions-item
label=
"调拨目标仓"
>
{{ warehouseDetails.warehouseInName }}
</el-descriptions-item>
<el-descriptions-item
label=
"物流公司"
>
<el-select
v-model=
"params.logisticsCompany"
>
...
...
@@ -110,7 +116,7 @@
</el-form-item>
</el-form>
<div>
<el-button
v-if=
"type ==
=
1"
@
click=
"submit"
>
确认出仓
</el-button>
<el-button
v-if=
"type == 1"
@
click=
"submit"
>
确认出仓
</el-button>
<el-button
v-else
@
click=
"submit2"
>
确认到仓
</el-button>
<el-button
@
click=
"$router.back()"
>
返回
</el-button>
</div>
...
...
@@ -120,6 +126,7 @@
<
script
>
import
ordeDetailsForm
from
"
@/views/ecw/order/components/ordeDetailsForm
"
;
import
{
getAdjustInfo
,
getOrder
,
listByOrderId
,
orderWarehouseInGetAdjustInfo
,
orderWarehousePicturePage
,
warehouseAdjustArrived
,
warehouseAdjustPage
,
...
...
@@ -129,6 +136,7 @@ import Template from "@/views/cms/template";
import
{
DICT_TYPE
}
from
'
@/utils/dict
'
;
import
ImageAndVideoUpload
from
"
@/components/ImageAndVideoUpload/index
"
;
import
{
getSupplierPage
}
from
"
@/api/ecw/supplier
"
;
import
{
getByWarehouseId
}
from
"
@/api/ecw/warehouseArea
"
;
let
STATUS
=
{
1
:
'
审核中
'
,
2
:
'
已通过
'
,
3
:
'
已拒绝
'
,
4
:
'
已出仓
'
,
5
:
'
已到仓
'
}
export
default
{
name
:
"
transferWarehousing
"
,
...
...
@@ -157,7 +165,8 @@ export default {
phone
:
""
,
urls
:
[]
},
expressList
:[]
expressList
:[],
storageSpaceList
:[],
}
},
created
()
{
...
...
@@ -171,14 +180,33 @@ export default {
}
})
if
(
this
.
type
==
2
){
warehouseAdjustPage
({
rows
:
100
,
orderId
:
this
.
orderId
}).
then
(
r
=>
{
this
.
warehouseList
=
r
.
data
.
list
getAdjustInfo
({
orderId
:
this
.
orderId
,
lang
:
0
}).
then
(
r
=>
{
this
.
warehouseList
=
r
.
data
})
}
orderWarehouseInGetAdjustInfo
({
orderId
:
this
.
orderId
,
lang
:
0
}).
then
(
r
=>
{
this
.
warehouseDetails
=
r
.
data
[
0
]
listByOrderId
({
orderId
:
this
.
orderId
}).
then
(
r
=>
{
console
.
log
(
r
,
'
r
'
)
listByOrderId
({
orderId
:
this
.
orderId
}).
then
(
res
=>
{
if
(
res
.
code
===
0
){
getByWarehouseId
().
then
(
r
=>
{
let
obj
=
[];
res
.
data
.
forEach
(
item
=>
{
r
.
data
.
forEach
(
itemm
=>
{
if
(
item
.
wareId
===
itemm
.
id
){
itemm
.
children
.
forEach
(
itemmm
=>
{
if
(
itemmm
.
id
===
item
.
areaId
){
obj
.
push
({
warehouseName
:
itemm
.
name
,
regionName
:
itemmm
.
name
})
}
})
}
})
})
this
.
storageSpaceList
=
obj
;
})
}
})
this
.
params
.
phone
=
this
.
warehouseDetails
.
phone
;
this
.
params
.
logisticsNo
=
this
.
warehouseDetails
.
logisticsNo
;
...
...
@@ -205,12 +233,10 @@ export default {
},
submit2
(){
warehouseAdjustArrived
(
this
.
params
).
then
(
r
=>
{
{
if
(
r
.
code
===
0
){
this
.
$message
.
success
(
'
调到仓成功
'
);
this
.
$router
.
back
();
}
}
})
}
},
...
...
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