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
1840e736
Commit
1840e736
authored
Feb 12, 2023
by
Marcus
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
3d0d49f0
65d62bea
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
3 deletions
+21
-3
shippingDetail.vue
src/views/ecw/box/shippingDetail.vue
+13
-3
batchSingleApplication.vue
src/views/ecw/order/batchSingleApplication.vue
+4
-0
transferWarehousing.vue
src/views/ecw/order/transferWarehousing.vue
+4
-0
No files found.
src/views/ecw/box/shippingDetail.vue
View file @
1840e736
...
...
@@ -31,9 +31,9 @@
</div>
</div>
<div
v-if=
"(type === 'unload_container' || type === 'close_container') &&
boxBackVO.picture
s"
style=
"marginTop:15px"
>
<div
v-if=
"(type === 'unload_container' || type === 'close_container') &&
srcStr
s"
style=
"marginTop:15px"
>
<h1>
{{
$t
(
'
图片
'
)
}}
</h1>
<ImagePreview
:src=
"
boxBackVO.picture
s"
:width=
"146"
:height=
"146"
/>
<ImagePreview
:src=
"
srcStr
s"
:width=
"146"
:height=
"146"
/>
</div>
<el-dialog
:title=
"dialogConfig.title"
:visible.sync=
"dialogConfig.visible"
fullscreen
:modal-append-to-body=
false
append-to-body
>
...
...
@@ -117,7 +117,7 @@ export default {
data
()
{
return
{
approvalInfo
:
{},
boxBackVO
:
{
pictures
:
""
},
boxBackVO
:
{},
loadDetail
:
{},
// 柜型
cabinetLabel
:
""
,
...
...
@@ -128,6 +128,7 @@ export default {
title
:
""
,
visible
:
false
,
},
srcStrs
:
""
,
};
},
created
()
{
...
...
@@ -141,6 +142,15 @@ export default {
this
.
approvalInfo
=
res
.
data
.
approvalInfo
;
this
.
boxBackVO
=
res
.
data
.
boxBackVO
;
this
.
loadDetail
=
res
.
data
.
loadDetail
;
if
(
this
.
type
===
"
close_container
"
&&
res
.
data
.
cabinetVO
)
{
const
ldPictures
=
res
.
data
.
cabinetVO
.
ldPictures
?
JSON
.
parse
(
res
.
data
.
cabinetVO
.
ldPictures
)
:
[];
this
.
srcStrs
=
ldPictures
.
map
((
item
)
=>
item
.
url
).
join
(
"
,
"
);
}
if
(
this
.
type
===
"
unload_container
"
&&
res
.
data
.
cabinetUnloadVO
)
{
this
.
srcStrs
=
res
.
data
.
cabinetUnloadVO
.
ulImgs
??
''
;
}
});
},
/* 获取柜型 */
...
...
src/views/ecw/order/batchSingleApplication.vue
View file @
1840e736
...
...
@@ -118,6 +118,10 @@
<warehouse-video-list
:modal=
"false"
:status=
"3"
:item =
"row"
></warehouse-video-list>
</
template
>
</el-table-column>
<el-table-column
:label=
"$t('调拨出仓备注')"
prop=
"arrivalRemark"
>
</el-table-column>
<el-table-column
:label=
"$t('调拨到仓备注')"
prop=
"deliveryRemark"
>
</el-table-column>
</el-table>
</el-card>
<el-divider
contentPosition=
"left"
>
{{$t('审批流程')}}
</el-divider>
...
...
src/views/ecw/order/transferWarehousing.vue
View file @
1840e736
...
...
@@ -74,6 +74,10 @@
<
warehouse
-
video
-
list
:
status
=
"
3
"
:
item
=
"
row
"
><
/warehouse-video-list
>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('调拨出仓备注')
"
prop
=
"
arrivalRemark
"
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('调拨到仓备注')
"
prop
=
"
deliveryRemark
"
>
<
/el-table-column
>
<
/el-table
>
<
el
-
descriptions
style
=
"
margin-top: 20px
"
:
column
=
"
4
"
border
>
<
el
-
descriptions
-
item
:
label
=
"
$t('集运仓库')
"
>
{{
warehouseDetails
&&
warehouseDetails
.
warehouseOutName
?
warehouseDetails
.
warehouseOutName
:
''
}}
<
/el-descriptions-item
>
...
...
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