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
7d592646
Commit
7d592646
authored
Jun 12, 2023
by
Marcus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2.0订单下的入仓影像改成可以看,不能上传吧
https://zentao.test.jdshangmen.com/bug-view-3467.html
parent
75f0bba4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
2 deletions
+18
-2
index.vue
src/components/ImageAndVideoUpload/index.vue
+7
-2
index.vue
src/views/ecw/order/warehousing/index.vue
+11
-0
No files found.
src/components/ImageAndVideoUpload/index.vue
View file @
7d592646
...
...
@@ -5,10 +5,11 @@
<el-image
@
click=
"dialogImageUrl = item.url; dialogVisible = true; "
style=
"height: 148px; width:148px;"
fit=
"fit"
:src=
"item.url"
>
<video
controls
width=
"148px"
height=
"148px"
slot=
"error"
:src=
"item.url"
></video>
</el-image>
<div
@
click=
"handleRemove(index)"
class=
"el-icon-error"
style=
"font-size: 25px;cursor: pointer;position: absolute;right: -10px; top: -10px"
></div>
<div
v-if=
"!readonly"
@
click=
"handleRemove(index)"
class=
"el-icon-error"
style=
"font-size: 25px;cursor: pointer;position: absolute;right: -10px; top: -10px"
></div>
</div>
<div>
<el-upload
v-if=
"!readonly"
multiple
:action=
"uploadImgUrl"
list-type=
"picture-card"
...
...
@@ -23,7 +24,7 @@
<i
class=
"el-icon-plus"
></i>
</el-upload>
<!-- 上传提示 -->
<div
class=
"el-upload__tip"
slot=
"tip"
v-if=
"showTip"
>
<div
class=
"el-upload__tip"
slot=
"tip"
v-if=
"showTip
&& !readonly
"
>
{{
$t
(
'
请上传
'
)
}}
<template
v-if=
"fileSize"
>
{{
$t
(
'
大小不超过
'
)
}}
<b
style=
"color: #f56c6c"
>
{{
fileSize
}}
MB
</b>
</
template
>
<br>
<
template
v-if=
"fileType"
>
{{
$t
(
'
格式为
'
)
}}
<b
style=
"color: #f56c6c"
>
{{
fileType
.
join
(
"
/
"
)
}}
</b>
</
template
>
{{ $t('的文件') }}
</div>
...
...
@@ -63,6 +64,10 @@ export default {
isShowTip
:
{
type
:
Boolean
,
default
:
true
},
readonly
:
{
type
:
Boolean
,
default
:
false
}
},
data
()
{
...
...
src/views/ecw/order/warehousing/index.vue
View file @
7d592646
...
...
@@ -158,6 +158,15 @@
<span
slot=
"append"
>
kg
</span>
</el-input>
</el-form-item>
<el-card
style=
"margin-top: 15px;"
>
<div
slot=
"header"
class=
"clearfix"
>
<span
style=
"font-size: 18px"
>
{{$t('入仓影像')}}
</span>
</div>
<div>
<image-and-video-upload
readonly
:fileSize=
"50"
:isShowTip=
"true"
v-model=
"form.urls"
></image-and-video-upload>
</div>
</el-card>
<div
style=
"text-align: center;margin-top: 15px"
v-if=
"!(order.status !== 3 && isEdit)"
>
<el-button
@
click=
"escapeBol = true;"
type=
"primary"
>
{{$t('转异')}}
</el-button>
<el-button
type=
"primary"
@
click=
"finishVisible = true"
>
{{$t('完成入仓')}}
</el-button>
...
...
@@ -222,6 +231,7 @@ import PrintTag from "@/views/ecw/order/components/PrintTag"
import
PrintWarehouseReceipt
from
"
@/views/ecw/order/components/PrintWarehouseReceipt
"
import
imageUpload
from
"
@/components/ImageUpload
"
;
import
{
parseTime
}
from
"
@/utils/ruoyi
"
import
ImageAndVideoUpload
from
'
@/components/ImageAndVideoUpload
'
import
Warehouse
from
"
@/views/ecw/order/warehousing/components/Warehouse
"
export
default
{
name
:
"
Warehousing
"
,
...
...
@@ -232,6 +242,7 @@ export default {
PrintTag
,
PrintWarehouseReceipt
,
imageUpload
,
ImageAndVideoUpload
,
Warehouse
},
...
...
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