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
a310f2f1
Commit
a310f2f1
authored
Oct 20, 2023
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
撤销清关审核
parent
1c7a418b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
78 additions
and
2 deletions
+78
-2
order.js
src/api/ecw/order.js
+2
-2
detail.vue
src/views/bpm/processInstance/detail.vue
+4
-0
RevokeClear.vue
src/views/ecw/box/components/RevokeClear.vue
+72
-0
No files found.
src/api/ecw/order.js
View file @
a310f2f1
...
...
@@ -814,7 +814,7 @@ export function splitItemUpdate(data){
// 待备货(可出)订单列表
export
function
canShipmentPage
(
params
){
return
request
({
url
:
'
/air/order/can/shipment/page
'
,
url
:
'
/air/order/
data/scope/
can/shipment/page
'
,
method
:
'
get
'
,
params
})
...
...
@@ -822,7 +822,7 @@ export function canShipmentPage(params){
// 待出订单列表
export
function
waitingShipmentPage
(
params
){
return
request
({
url
:
'
/air/order/waiting/shipment/page
'
,
url
:
'
/air/order/
data/scope/
waiting/shipment/page
'
,
method
:
'
get
'
,
params
})
...
...
src/views/bpm/processInstance/detail.vue
View file @
a310f2f1
...
...
@@ -455,6 +455,10 @@ export default {
component
:
"
shippingDetail
"
,
processId
:
this
.
processInstance
.
businessKey
,
type
:
'
air_warehouse
'
},
revoke_clear
:{
component
:()
=>
import
(
"
@/views/ecw/box/components/RevokeClear
"
),
id
:
this
.
processInstance
.
businessKey
}
}
console
.
log
(
'
formCustomViewPath
'
,
this
.
processInstance
.
processDefinition
.
formCustomViewPath
.
trim
())
...
...
src/views/ecw/box/components/RevokeClear.vue
0 → 100644
View file @
a310f2f1
<
template
>
<div
v-if=
"order"
>
<el-descriptions
:column=
"4"
v-if=
"order"
:colon=
"false"
>
<el-descriptions-item
:label=
"$t('订单号')"
>
{{
order
.
orderNo
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('运输方式')"
>
<dict-tag
class=
"mr-10"
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
:value=
"order.transportId"
/>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('出货渠道')"
>
{{
order
.
channelName
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('订单状态')"
>
{{
order
.
statusMsg
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('唛头')"
>
{{
order
.
marks
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('始发仓')"
>
{{
order
.
logisticsInfoDto
.
startTitleZh
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('目的仓')"
:span=
"2"
>
{{
order
.
logisticsInfoDto
.
destAddressZh
}}
</el-descriptions-item>
<!-- 优惠申请 -->
<el-descriptions-item
:label=
"$t('申请理由')"
:span=
"4"
>
<div
class=
"bold"
>
{{
applyReason
}}
</div>
</el-descriptions-item>
</el-descriptions>
</div>
</
template
>
<
script
>
import
{
getOrder
}
from
'
@/api/ecw/order
'
import
{
getBoxApproval
}
from
"
@/api/ecw/box
"
;
/*
撤销清关审核
*/
export
default
{
name
:
'
RevokeClear
'
,
props
:{
id
:
[
String
,
Number
]
},
data
(){
return
{
order
:
null
,
applyReason
:
null
}
},
created
(){
if
(
this
.
id
){
// id是出货审核ID
getBoxApproval
({
id
:
this
.
id
}).
then
(
res
=>
{
this
.
applyReason
=
res
.
data
.
applyReason
getOrder
(
res
.
data
.
orderId
).
then
(
res
=>
{
this
.
order
=
res
.
data
})
})
}
}
}
</
script
>
<
style
scoped
lang=
"scss"
>
.title
{
padding
:
10px
0
;
span
{
font-size
:
14px
;
font-weight
:
bold
;
}
}
.bold
{
font-weight
:
bold
;
}
</
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