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
a3a87def
Commit
a3a87def
authored
Jun 07, 2023
by
Marcus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
入仓操作增加入仓记录影像上传与查看 / 入仓操作增加入仓记录影像上传与查看-前
https://zentao.test.jdshangmen.com/task-view-2066.html
parent
aed798da
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
13 deletions
+26
-13
Warehouse.vue
src/views/ecw/order/warehousing/components/Warehouse.vue
+26
-2
index.vue
src/views/ecw/order/warehousing/index.vue
+0
-11
No files found.
src/views/ecw/order/warehousing/components/Warehouse.vue
View file @
a3a87def
...
@@ -202,6 +202,16 @@
...
@@ -202,6 +202,16 @@
</el-form>
</el-form>
</el-card>
</el-card>
<el-card
style=
"margin-top: 15px;"
>
<div
slot=
"header"
class=
"clearfix"
>
<span
style=
"font-size: 18px"
>
{{$t('入仓影像')}}
</span>
</div>
<div>
<image-and-video-upload
:fileSize=
"50"
:isShowTip=
"true"
v-model=
"form.pictureUrls"
></image-and-video-upload>
</div>
</el-card>
</el-tab-pane>
</el-tab-pane>
...
@@ -407,6 +417,15 @@
...
@@ -407,6 +417,15 @@
</el-form>
</el-form>
</el-card>
</el-card>
<el-card
style=
"margin-top: 15px;"
>
<div
slot=
"header"
class=
"clearfix"
>
<span
style=
"font-size: 18px"
>
{{$t('入仓影像')}}
</span>
</div>
<div>
<image-and-video-upload
:fileSize=
"50"
:isShowTip=
"true"
v-model=
"form1.pictureUrls"
></image-and-video-upload>
</div>
</el-card>
</el-tab-pane>
</el-tab-pane>
</el-tabs>
</el-tabs>
...
@@ -474,11 +493,13 @@ import {orderWarehouseIn, orderWarehouseInUpdateApply} from "@/api/ecw/order"
...
@@ -474,11 +493,13 @@ import {orderWarehouseIn, orderWarehouseInUpdateApply} from "@/api/ecw/order"
import
{
getProductAttrList
}
from
"
@/api/ecw/productAttr
"
import
{
getProductAttrList
}
from
"
@/api/ecw/productAttr
"
import
{
getProductTypeList
}
from
"
@/api/ecw/productType
"
import
{
getProductTypeList
}
from
"
@/api/ecw/productType
"
import
{
addProduct
}
from
"
@/api/ecw/product
"
import
{
addProduct
}
from
"
@/api/ecw/product
"
import
ImageAndVideoUpload
from
"
@/components/ImageAndVideoUpload/index.vue
"
export
default
{
export
default
{
name
:
"
Warehouse
"
,
name
:
"
Warehouse
"
,
components
:
{
components
:
{
ImageAndVideoUpload
,
ProductSelector
,
ProductSelector
,
WarehouseAreaSelect
,
WarehouseAreaSelect
,
WorkFlow
WorkFlow
...
@@ -624,7 +645,8 @@ export default {
...
@@ -624,7 +645,8 @@ export default {
prodType
:
undefined
,
prodType
:
undefined
,
type
:
undefined
,
type
:
undefined
,
feeType
:
undefined
,
feeType
:
undefined
,
recordMode
:
undefined
recordMode
:
undefined
,
pictureUrls
:
[]
},
},
form1
:
{
form1
:
{
table
:
[],
table
:
[],
...
@@ -642,7 +664,8 @@ export default {
...
@@ -642,7 +664,8 @@ export default {
prodType
:
undefined
,
prodType
:
undefined
,
type
:
1
,
type
:
1
,
feeType
:
undefined
,
feeType
:
undefined
,
recordMode
:
undefined
recordMode
:
undefined
,
pictureUrls
:
[]
},
},
brandList
:
[],
brandList
:
[],
brandList1
:
[],
brandList1
:
[],
...
@@ -712,6 +735,7 @@ export default {
...
@@ -712,6 +735,7 @@ export default {
this
.
form
.
prodType
=
this
.
warehousing
.
prodType
this
.
form
.
prodType
=
this
.
warehousing
.
prodType
this
.
form
.
type
=
this
.
warehousing
.
type
this
.
form
.
type
=
this
.
warehousing
.
type
this
.
form
.
feeType
=
this
.
warehousing
.
feeType
this
.
form
.
feeType
=
this
.
warehousing
.
feeType
this
.
form
.
pictureUrls
=
this
.
warehousing
.
pictureUrls
this
.
warehousing
.
orderWarehouseInBackItemDoList
.
forEach
(
e
=>
{
this
.
warehousing
.
orderWarehouseInBackItemDoList
.
forEach
(
e
=>
{
let
bg
=
{}
let
bg
=
{}
...
...
src/views/ecw/order/warehousing/index.vue
View file @
a3a87def
...
@@ -158,15 +158,6 @@
...
@@ -158,15 +158,6 @@
<span
slot=
"append"
>
kg
</span>
<span
slot=
"append"
>
kg
</span>
</el-input>
</el-input>
</el-form-item>
</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
: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)"
>
<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
@
click=
"escapeBol = true;"
type=
"primary"
>
{{$t('转异')}}
</el-button>
<el-button
type=
"primary"
@
click=
"finishVisible = true"
>
{{$t('完成入仓')}}
</el-button>
<el-button
type=
"primary"
@
click=
"finishVisible = true"
>
{{$t('完成入仓')}}
</el-button>
...
@@ -231,7 +222,6 @@ import PrintTag from "@/views/ecw/order/components/PrintTag"
...
@@ -231,7 +222,6 @@ import PrintTag from "@/views/ecw/order/components/PrintTag"
import
PrintWarehouseReceipt
from
"
@/views/ecw/order/components/PrintWarehouseReceipt
"
import
PrintWarehouseReceipt
from
"
@/views/ecw/order/components/PrintWarehouseReceipt
"
import
imageUpload
from
"
@/components/ImageUpload
"
;
import
imageUpload
from
"
@/components/ImageUpload
"
;
import
{
parseTime
}
from
"
@/utils/ruoyi
"
import
{
parseTime
}
from
"
@/utils/ruoyi
"
import
ImageAndVideoUpload
from
'
@/components/ImageAndVideoUpload
'
import
Warehouse
from
"
@/views/ecw/order/warehousing/components/Warehouse
"
import
Warehouse
from
"
@/views/ecw/order/warehousing/components/Warehouse
"
export
default
{
export
default
{
name
:
"
Warehousing
"
,
name
:
"
Warehousing
"
,
...
@@ -242,7 +232,6 @@ export default {
...
@@ -242,7 +232,6 @@ export default {
PrintTag
,
PrintTag
,
PrintWarehouseReceipt
,
PrintWarehouseReceipt
,
imageUpload
,
imageUpload
,
ImageAndVideoUpload
,
Warehouse
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