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
5b84e217
Commit
5b84e217
authored
Mar 28, 2023
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单详情储位的bug
parent
24b72e12
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
6 deletions
+25
-6
WarehouseDetail.vue
src/views/ecw/order/components/WarehouseDetail.vue
+10
-4
detail.vue
src/views/ecw/order/detail.vue
+15
-2
No files found.
src/views/ecw/order/components/WarehouseDetail.vue
View file @
5b84e217
...
@@ -38,10 +38,7 @@
...
@@ -38,10 +38,7 @@
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('储位')"
prop=
"orderLocationBackVOList"
>
<el-table-column
:label=
"$t('储位')"
prop=
"orderLocationBackVOList"
>
<
template
slot-scope=
"{row}"
>
<
template
slot-scope=
"{row}"
>
<warehouse-area-select
{{
getLocationName
(
row
.
orderLocationBackVOList
)
}}
v-model=
"row.orderLocationBackVOList"
readonly
:order-id=
"orderId"
></warehouse-area-select>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
@@ -96,6 +93,15 @@ export default {
...
@@ -96,6 +93,15 @@ export default {
this
.
getOrderWarehouseIn
()
this
.
getOrderWarehouseIn
()
},
},
methods
:{
methods
:{
// 获取储位名称
getLocationName
(
locationArr
){
if
(
!
locationArr
||
!
locationArr
.
length
)
return
''
let
arr
=
[]
locationArr
.
forEach
(
item
=>
{
arr
.
push
(
`
${
item
.
areaName
}${
item
.
locationName
||
''
}
`
)
})
return
Array
.
from
(
new
Set
(
arr
)).
join
(
"
,
"
)
},
closeDialog
(){
closeDialog
(){
this
.
show
=
false
this
.
show
=
false
this
.
$emit
(
'
close
'
);
this
.
$emit
(
'
close
'
);
...
...
src/views/ecw/order/detail.vue
View file @
5b84e217
...
@@ -202,10 +202,14 @@
...
@@ -202,10 +202,14 @@
</el-table-column>
</el-table-column>
<el-table-column
prop=
""
:label=
"$t('储位')"
>
<el-table-column
prop=
""
:label=
"$t('储位')"
>
<
template
slot-scope=
"{row}"
>
<
template
slot-scope=
"{row}"
>
<warehouse-area-select
<!--
<warehouse-area-select
v-if=
"row.warehouseInInfoVO"
v-model=
"row.warehouseInInfoVO.orderLocationBackVOList"
v-model=
"row.warehouseInInfoVO.orderLocationBackVOList"
readonly
readonly
:order-id=
"orderId"
></warehouse-area-select>
:order-id=
"orderId"
></warehouse-area-select>
-->
<template
v-if=
"row.warehouseInInfoVO"
>
{{
getLocationName
(
row
.
warehouseInInfoVO
.
orderLocationMergeVOSet
)
}}
</
template
>
</template>
</template>
</el-table-column>
</el-table-column>
<el-table-column
prop=
""
:label=
"$t('快递单号')"
>
<el-table-column
prop=
""
:label=
"$t('快递单号')"
>
...
@@ -488,6 +492,15 @@ export default {
...
@@ -488,6 +492,15 @@ export default {
console
.
log
(
'
2023-01-14 23:23 看到此消息则表示代码最新
'
)
console
.
log
(
'
2023-01-14 23:23 看到此消息则表示代码最新
'
)
},
},
methods
:
{
methods
:
{
// 获取储位名称
getLocationName
(
locationArr
){
if
(
!
locationArr
||
!
locationArr
.
length
)
return
''
let
arr
=
[]
locationArr
.
forEach
(
item
=>
{
arr
.
push
(
`
${
item
.
areaName
}${
item
.
locationName
||
''
}
`
)
})
return
Array
.
from
(
new
Set
(
arr
)).
join
(
"
,
"
)
},
// 显示费用详情
// 显示费用详情
showFeeDetail
(
row
,
type
){
showFeeDetail
(
row
,
type
){
this
.
showFeeDetailDialog
=
true
this
.
showFeeDetailDialog
=
true
...
...
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