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
358ff4c7
Commit
358ff4c7
authored
Sep 02, 2023
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
出货审核
parent
48e82c0d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
48 additions
and
2 deletions
+48
-2
detail.vue
src/views/bpm/processInstance/detail.vue
+3
-1
shippingDetail.vue
src/views/ecw/box/shippingDetail.vue
+45
-1
No files found.
src/views/bpm/processInstance/detail.vue
View file @
358ff4c7
...
@@ -424,7 +424,9 @@ export default {
...
@@ -424,7 +424,9 @@ export default {
},
},
// 出货审核
// 出货审核
air_shipment
:
{
air_shipment
:
{
component
:
"
shippingDetail
"
,
processId
:
this
.
processInstance
.
businessKey
,
type
:
'
shipment
'
}
}
}
}
console
.
log
(
'
formCustomViewPath
'
,
this
.
processInstance
.
processDefinition
.
formCustomViewPath
.
trim
())
console
.
log
(
'
formCustomViewPath
'
,
this
.
processInstance
.
processDefinition
.
formCustomViewPath
.
trim
())
...
...
src/views/ecw/box/shippingDetail.vue
View file @
358ff4c7
...
@@ -20,6 +20,30 @@
...
@@ -20,6 +20,30 @@
</el-descriptions-item>
</el-descriptions-item>
</el-descriptions>
</el-descriptions>
<div
class=
"mt-20"
v-if=
"type === 'shipment'"
>
<el-descriptions
:column=
"1"
v-if=
"boxAirShipmentBackVO"
border
label-style=
"width: 200px"
>
<el-descriptions-item
:label=
"$t('出货方式')"
>
{{
deliverType
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('送货时间') + '/' + $t('自提时间')"
>
{{
boxAirShipmentBackVO
.
deliverTime
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('送货地址') + '/' + $t('自提地址')"
>
{{
boxAirShipmentBackVO
.
deliverAddress
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('车牌')"
>
{{
boxAirShipmentBackVO
.
licensePlate
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('司机')"
>
{{
boxAirShipmentBackVO
.
driver
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('司机联系方式')"
>
{{
boxAirShipmentBackVO
.
driverPhone
}}
</el-descriptions-item>
</el-descriptions>
<template
v-else
>
暂无出货审核信息
</
template
>
</div>
<el-row
style=
"marginTop:15px"
>
<el-row
style=
"marginTop:15px"
>
<el-button
type=
"primary"
@
click=
"showOrder"
>
{{$t('订单列表')}}
</el-button>
<el-button
type=
"primary"
@
click=
"showOrder"
>
{{$t('订单列表')}}
</el-button>
</el-row>
</el-row>
...
@@ -103,12 +127,13 @@
...
@@ -103,12 +127,13 @@
</template>
</template>
<
script
>
<
script
>
import
{
approvalDetail
}
from
"
@/api/ecw/box
"
;
import
{
approvalDetail
,
getbox
}
from
"
@/api/ecw/box
"
;
import
{
getSeaStatus
,
getTotlContent
}
from
"
./shippingSea/utils
"
;
import
{
getSeaStatus
,
getTotlContent
}
from
"
./shippingSea/utils
"
;
import
{
getCabinetPage
}
from
"
@/api/ecw/cabinet
"
;
import
{
getCabinetPage
}
from
"
@/api/ecw/cabinet
"
;
import
{
getChannelList
}
from
"
@/api/ecw/channel
"
;
import
{
getChannelList
}
from
"
@/api/ecw/channel
"
;
import
Decimal
from
"
decimal.js
"
;
import
Decimal
from
"
decimal.js
"
;
import
ImagePreview
from
"
@/components/ImagePreview
"
;
import
ImagePreview
from
"
@/components/ImagePreview
"
;
import
{
constantDict
}
from
"
@/views/ecw/box/shippingAir/utils
"
;
/**
/**
* 出货审核详情
* 出货审核详情
...
@@ -137,6 +162,8 @@ export default {
...
@@ -137,6 +162,8 @@ export default {
visible
:
false
,
visible
:
false
,
},
},
srcStrs
:
[],
srcStrs
:
[],
// 出货审核详情
boxAirShipmentBackVO
:
null
};
};
},
},
created
()
{
created
()
{
...
@@ -161,8 +188,17 @@ export default {
...
@@ -161,8 +188,17 @@ export default {
?
res
.
data
.
cabinetUnloadVO
.
ulImgs
.
split
(
"
,
"
)
?
res
.
data
.
cabinetUnloadVO
.
ulImgs
.
split
(
"
,
"
)
:
[];
:
[];
}
}
// 如果是出货审核则需要调用出货详情获取出货信息
if
(
this
.
type
===
"
shipment
"
)
{
this
.
getShipmentDetail
();
}
});
});
},
},
getShipmentDetail
(){
getbox
(
this
.
boxBackVO
.
id
).
then
(
res
=>
{
this
.
boxAirShipmentBackVO
=
res
.
data
.
boxAirShipmentBackVO
})
},
/* 获取柜型 */
/* 获取柜型 */
getCabinetLabel
(
cabinetId
)
{
getCabinetLabel
(
cabinetId
)
{
getCabinetPage
(
null
).
then
((
response
)
=>
{
getCabinetPage
(
null
).
then
((
response
)
=>
{
...
@@ -210,6 +246,9 @@ export default {
...
@@ -210,6 +246,9 @@ export default {
},
},
},
},
computed
:
{
computed
:
{
constantDict
()
{
return
constantDict
},
/* 渠道 */
/* 渠道 */
getShipChannelName
()
{
getShipChannelName
()
{
return
(
shippingChannelId
)
=>
{
return
(
shippingChannelId
)
=>
{
...
@@ -232,6 +271,11 @@ export default {
...
@@ -232,6 +271,11 @@ export default {
return
getSeaStatus
(
shippingVO
)
>=
182
?
true
:
false
;
return
getSeaStatus
(
shippingVO
)
>=
182
?
true
:
false
;
};
};
},
},
// 出乎方式
deliverType
(){
if
(
!
this
.
boxAirShipmentBackVO
)
return
''
return
constantDict
.
deliverType
.
find
(
item
=>
item
.
value
==
this
.
boxAirShipmentBackVO
.
deliverType
)?.
label
}
},
},
};
};
</
script
>
</
script
>
...
...
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