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
23830c63
Commit
23830c63
authored
Aug 20, 2022
by
Marcus
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
入仓部分细节补充
parent
19322c62
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
13 deletions
+38
-13
index.vue
src/components/OrderBaseInfo/index.vue
+9
-3
editDialog.vue
src/views/ecw/order/warehousing/components/editDialog.vue
+20
-7
index.vue
src/views/ecw/order/warehousing/index.vue
+9
-3
No files found.
src/components/OrderBaseInfo/index.vue
View file @
23830c63
...
...
@@ -3,7 +3,7 @@
<el-descriptions
border
v-if=
"order.orderId"
>
<el-descriptions-item
label=
"唛头"
>
{{
order
.
marks
}}
</el-descriptions-item>
<el-descriptions-item
label=
"已到箱数"
>
{{
order
.
sumNum
}}
</el-descriptions-item>
<el-descriptions-item
label=
"订单状态"
><dict-tag
:type=
"DICT_TYPE.ORDER_STATUS"
:value=
"order.status"
/></el-descriptions-item>
<el-descriptions-item
label=
"订单状态"
><dict-tag
:type=
"DICT_TYPE.ORDER_STATUS"
:value=
"order.status"
:class=
"
{red: order.status === 1, green: order.status === 5 || order.status === 2}"
/>
</el-descriptions-item>
<el-descriptions-item
label=
"送货时间"
>
{{
order
.
consigneeVO
&&
order
.
consigneeVO
.
deliveryDate
||
''
}}
</el-descriptions-item>
<el-descriptions-item
label=
"运输方式"
>
<dict-tag
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
:value=
"order.logisticsInfoDto.transportId"
></dict-tag>
...
...
@@ -41,6 +41,12 @@ export default {
}
</
script
>
<
style
scoped
>
<
style
scoped
lang=
"scss"
>
@import
"src/assets/styles/element-variables"
;
.red
{
color
:
$--color-danger
;
}
.green
{
color
:
$--color-success
;
}
</
style
>
src/views/ecw/order/warehousing/components/editDialog.vue
View file @
23830c63
...
...
@@ -20,7 +20,7 @@
v-for=
"item in brandList"
:key=
"item.id"
:label=
"item.titleZh"
:value=
"item.
titleZh
"
>
:value=
"item.
id
"
>
</el-option>
</el-select>
</el-descriptions-item>
...
...
@@ -61,37 +61,39 @@
<el-table-column
label=
"长(cm)"
>
<
template
v-slot=
"{r,c,$index}"
>
<span
v-if=
"tableData[$index].id"
>
{{
tableData
[
$index
].
boxGauge
?
tableData
[
$index
].
boxGauge
.
split
(
'
*
'
)[
0
]
:
''
}}
</span>
<el-input
v-else
v-model
=
"tableData[$index].boxGauge1"
placeholder=
"
"
></el-input>
<el-input
v-else
v-model
.number=
"tableData[$index].boxGauge1"
placeholder=
""
@
blur=
"handleVolume($index)
"
></el-input>
</
template
>
</el-table-column>
<el-table-column
label=
"宽(cm)"
>
<
template
v-slot=
"{r,c,$index}"
>
<span
v-if=
"tableData[$index].id"
>
{{
tableData
[
$index
].
boxGauge
?
tableData
[
$index
].
boxGauge
.
split
(
'
*
'
)[
1
]
:
''
}}
</span>
<el-input
v-else
v-model
=
"tableData[$index].boxGauge2"
placeholder=
"
"
></el-input>
<el-input
v-else
v-model
.number=
"tableData[$index].boxGauge2"
placeholder=
""
@
blur=
"handleVolume($index)
"
></el-input>
</
template
>
</el-table-column>
<el-table-column
label=
"高(cm)"
>
<
template
v-slot=
"{r,c,$index}"
>
<span
v-if=
"tableData[$index].id"
>
{{
tableData
[
$index
].
boxGauge
?
tableData
[
$index
].
boxGauge
.
split
(
'
*
'
)[
2
]
:
''
}}
</span>
<el-input
v-else
v-model
=
"tableData[$index].boxGauge3"
placeholder=
"
"
></el-input>
<el-input
v-else
v-model
.number=
"tableData[$index].boxGauge3"
placeholder=
""
@
blur=
"handleVolume($index)
"
></el-input>
</
template
>
</el-table-column>
<el-table-column
label=
"体积(m³)"
>
<
template
v-slot=
"{r,c,$index}"
>
<span
v-if=
"tableData[$index].id"
>
{{
tableData
[
$index
].
volume
}}
</span>
<el-input
v-else
v-model=
"tableData[$index].volume"
placeholder=
""
></el-input>
<el-input
v-else
v-model
.number
=
"tableData[$index].volume"
placeholder=
""
></el-input>
</
template
>
</el-table-column>
<el-table-column
label=
"重量(Kg)"
>
<
template
v-slot=
"{r,c,$index}"
>
<span
v-if=
"tableData[$index].id"
>
{{
tableData
[
$index
].
weight
}}
</span>
<el-input
v-else
v-model=
"tableData[$index].weight"
placeholder=
""
></el-input>
<el-input
v-else
v-model
.number
=
"tableData[$index].weight"
placeholder=
""
></el-input>
</
template
>
</el-table-column>
<el-table-column
label=
"数量"
>
<
template
v-slot=
"{r,c,$index}"
>
<span
v-if=
"tableData[$index].id"
>
{{
tableData
[
$index
].
quantityAll
}}
</span>
<el-input
v-else
v-model=
"tableData[$index].quantityAll"
placeholder=
""
></el-input>
<el-input
v-else
v-model.number=
"tableData[$index].quantityAll"
placeholder=
""
>
<template
slot=
"append"
>
个
</
template
>
</el-input>
</template>
</el-table-column>
<el-table-column
label=
"快递单号"
>
...
...
@@ -145,6 +147,9 @@ export default {
mounted
()
{
getProductBrankPage
({
pageSize
:
100000
}).
then
(
r
=>
{
this
.
brandList
=
r
.
data
.
list
.
map
(
e
=>
{
if
(
e
.
id
){
e
.
id
=
e
.
id
.
toString
()
}
const
boxGauge
=
e
.
boxGauge
if
(
boxGauge
&&
boxGauge
.
length
>
0
)
{
const
boxGaugeList
=
boxGauge
.
split
(
'
*
'
)
...
...
@@ -204,6 +209,14 @@ export default {
},
methods
:
{
handleVolume
(
index
){
const
{
boxGauge1
,
boxGauge2
,
boxGauge3
}
=
this
.
tableData
[
index
]
if
(
boxGauge1
&&
boxGauge2
&&
boxGauge3
)
{
this
.
tableData
[
index
].
volume
=
((
boxGauge1
*
boxGauge2
*
boxGauge3
)
/
1000000
).
toFixed
(
2
)
}
else
{
this
.
tableData
[
index
].
volume
=
0
}
},
handleSubmit
()
{
const
orderWarehouseInItemDoList
=
this
.
form
.
orderWarehouseInItemDoList
.
map
(
e
=>
{
return
{
...
...
src/views/ecw/order/warehousing/index.vue
View file @
23830c63
...
...
@@ -57,7 +57,7 @@
prop=
"diffType"
v-slot=
"{row}"
label=
"状态"
>
<dict-tag
:type=
"DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS"
:value=
"row.warehouseInInfoVO && row.warehouseInInfoVO.diffType"
/>
<dict-tag
v-if=
"row.warehouseInInfoVO && row.warehouseInInfoVO.diffType"
:type=
"DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS"
:value=
"row.warehouseInInfoVO.diffType"
class=
"red"
:class=
"{green: row.warehouseInInfoVO.diffType === 4}"
/>
</el-table-column>
<el-table-column
prop=
"address"
...
...
@@ -290,6 +290,12 @@ export default {
}
</
script
>
<
style
scoped
>
<
style
scoped
lang=
"scss"
>
@import
"src/assets/styles/element-variables"
;
.red
{
color
:
$--color-danger
;
}
.green
{
color
:
$--color-success
;
}
</
style
>
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