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
9482210c
Commit
9482210c
authored
Dec 03, 2023
by
zhoutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交合包装箱后,无法查看合包箱明细
parent
fb194468
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
3 deletions
+29
-3
index.vue
src/views/ecw/box/shippingAir/nodePage/mergePkg/index.vue
+24
-2
pkgPage.vue
src/views/ecw/box/shippingAir/nodePage/mergePkg/pkgPage.vue
+5
-1
No files found.
src/views/ecw/box/shippingAir/nodePage/mergePkg/index.vue
View file @
9482210c
...
...
@@ -38,7 +38,11 @@
<el-row
style=
"margin-top: 5px"
>
<el-table
border
:data=
"pagList"
max-height=
"600px"
>
<el-table-column
align=
"center"
:label=
"$t('序号')"
width=
"50"
type=
"index"
/>
<el-table-column
:label=
"$t('箱号')"
align=
"center"
prop=
"pkgNum"
/>
<el-table-column
:label=
"$t('箱号')"
align=
"center"
prop=
"pkgNum"
>
<template
slot-scope=
"scope"
>
<el-button
type=
"text"
@
click=
"showPageOrder(scope.row)"
>
{{
scope
.
row
.
pkgNum
}}
</el-button>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('尺寸')"
align=
"center"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
pkgLength
}}
*
{{
scope
.
row
.
pkgWidth
}}
*
{{
scope
.
row
.
pkgHight
}}
</
template
>
</el-table-column>
...
...
@@ -118,6 +122,16 @@
<print-tag
v-if=
"printdialogVisible"
:tagData=
"tagData"
/>
</el-dialog>
<!-- 查看已装箱订单 -->
<el-dialog
:title=
"showPageTitle"
:visible.sync=
"showPagedialogVisible"
:fullscreen=
"true"
:modal-append-to-body=
"false"
append-to-body
@
close=
"pkgPageType=0"
>
<div
class=
"flex"
>
<el-radio-group
v-model=
"pkgPageType"
>
<el-radio-button
:label=
"2"
>
{{ $t('已装箱列表') }}
</el-radio-button>
</el-radio-group>
</div>
<pkg-page
:pkgData=
"showPkgData"
:shipmentObj=
"shipmentObj"
flag=
"show"
@
closeDialog=
"closeDialog"
@
reload=
"getList"
/>
</el-dialog>
<el-row
style=
"margin-top: 15px"
class=
"operate-button"
>
<el-button
:disabled=
"shipmentObj.approvaling"
size=
"small"
type=
"primary"
@
click=
"finish"
>
{{ $t('完成') }}
</el-button>
<el-button
size=
"small"
@
click=
"$emit('closeDialog')"
>
{{ $t('取消') }}
</el-button>
...
...
@@ -186,7 +200,10 @@ export default {
printdialogVisible
:
false
,
tagData
:
{},
// 是否显示补单弹层
showPackDialog
:
false
showPackDialog
:
false
,
showPagedialogVisible
:
false
,
showPageTitle
:
''
,
showPkgData
:
{}
}
},
created
()
{
...
...
@@ -260,6 +277,11 @@ export default {
this
.
pkgPageTitle
=
this
.
$t
(
'
合包箱号:
'
)
+
row
.
pkgNum
this
.
pkgData
=
row
},
showPageOrder
(
row
)
{
this
.
showPagedialogVisible
=
true
this
.
showPageTitle
=
this
.
$t
(
'
合包箱号:
'
)
+
row
.
pkgNum
this
.
showPkgData
=
row
},
printTag
(
id
)
{
getMergeTagById
(
id
).
then
(
res
=>
{
this
.
tagData
=
res
.
data
...
...
src/views/ecw/box/shippingAir/nodePage/mergePkg/pkgPage.vue
View file @
9482210c
<
template
>
<div>
<el-row
style=
"margin-top: 25px"
>
<el-row>
<el-row
v-if=
"flag == 'edit'"
>
<el-button
size=
"small"
type=
"primary"
@
click=
"removeBatch"
>
{{
$t
(
'
批量移出合包
'
)
}}
</el-button>
<el-button
size=
"small"
type=
"primary"
@
click=
"sealBox"
>
{{
$t
(
'
封箱
'
)
}}
</el-button>
</el-row>
...
...
@@ -137,6 +137,10 @@ export default {
props
:
{
pkgData
:
Object
,
shipmentObj
:
Object
,
flag
:
{
type
:
String
,
default
:
'
edit
'
}
},
components
:
{
printTag
...
...
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