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
eb5407e4
Commit
eb5407e4
authored
Nov 28, 2023
by
zhoutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复撤销清关申请
parent
7fdb7134
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
cancelClear.vue
src/views/ecw/box/cancelClear.vue
+9
-5
queryAir.vue
src/views/ecw/box/queryAir.vue
+1
-1
No files found.
src/views/ecw/box/cancelClear.vue
View file @
eb5407e4
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<div
class=
"message-title"
>
{{
$t
(
`您确定撤销${cancelClearInfo.orderNo
}
已清关状态吗?`
)
}}
<
/div
>
<div
class=
"message-title"
>
{{
$t
(
`您确定撤销${cancelClearInfo.orderNo
}
已清关状态吗?`
)
}}
<
/div
>
<
el
-
form
ref
=
"
arrivalForm
"
:
rules
=
"
rules
"
:
model
=
"
cusClearanceObj
"
label
-
width
=
"
120px
"
>
<
el
-
form
ref
=
"
arrivalForm
"
:
rules
=
"
rules
"
:
model
=
"
cusClearanceObj
"
label
-
width
=
"
120px
"
>
<
el
-
form
-
item
:
label
=
"
$t('撤销理由')
"
prop
=
"
clEstTime
"
>
<
el
-
form
-
item
:
label
=
"
$t('撤销理由')
"
prop
=
"
clEstTime
"
>
<
el
-
input
v
-
if
=
"
[0,3,4].includes(apply.approvalStatus)
"
v
-
model
=
"
cusClearanceObj.applyReason
"
type
=
"
textarea
"
:
rows
=
"
4
"
><
/el-input
>
<
el
-
input
v
-
if
=
"
!flag
"
v
-
model
=
"
cusClearanceObj.applyReason
"
type
=
"
textarea
"
:
rows
=
"
4
"
><
/el-input
>
<
template
v
-
else
>
<
template
v
-
else
>
{{
apply
.
applyReason
}}
{{
apply
.
applyReason
}}
<
/template
>
<
/template
>
...
@@ -11,9 +11,9 @@
...
@@ -11,9 +11,9 @@
<
/el-form
>
<
/el-form
>
<
el
-
row
class
=
"
operate-button
"
>
<
el
-
row
class
=
"
operate-button
"
>
<
el
-
button
v
-
if
=
"
[0,3,4].includes(apply.approvalStatus)
"
type
=
"
primary
"
@
click
=
"
onSubmit
"
>
{{
$t
(
'
确定
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
!flag
"
type
=
"
primary
"
@
click
=
"
onSubmit
"
>
{{
$t
(
'
确定
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
apply.approvalStatus == 1
"
type
=
"
primary
"
@
click
=
"
$router.push({path: '/bpm/process-instance/detail', query: {id: apply.bpmProcessId
}}
)
"
>
{{
$t
(
'
审核中
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
flag
"
type
=
"
primary
"
@
click
=
"
$router.push({path: '/bpm/process-instance/detail', query: {id: apply.bpmProcessId
}}
)
"
>
{{
$t
(
'
审核中
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
apply.approvalStatus == 1
"
plain
type
=
"
primary
"
@
click
=
"
canclAudit
"
>
{{
$t
(
'
取消审核
'
)
}}
<
/el-button
>
<
el
-
button
v
-
if
=
"
flag
"
plain
type
=
"
primary
"
@
click
=
"
canclAudit
"
>
{{
$t
(
'
取消审核
'
)
}}
<
/el-button
>
<
el
-
button
@
click
=
"
cancel
"
>
{{
$t
(
'
取消
'
)
}}
<
/el-button
>
<
el
-
button
@
click
=
"
cancel
"
>
{{
$t
(
'
取消
'
)
}}
<
/el-button
>
<
/el-row
>
<
/el-row
>
<
/div
>
<
/div
>
...
@@ -41,7 +41,8 @@ export default {
...
@@ -41,7 +41,8 @@ export default {
{
required
:
true
,
message
:
this
.
$t
(
"
必填
"
),
trigger
:
"
change
"
}
,
{
required
:
true
,
message
:
this
.
$t
(
"
必填
"
),
trigger
:
"
change
"
}
,
]
]
}
,
}
,
apply
:
{
}
apply
:
{
}
,
flag
:
false
}
;
}
;
}
,
}
,
created
()
{
created
()
{
...
@@ -50,6 +51,9 @@ export default {
...
@@ -50,6 +51,9 @@ export default {
console
.
log
(
order
,
11
,
this
.
cancelClearInfo
.
orderId
,
orders
);
console
.
log
(
order
,
11
,
this
.
cancelClearInfo
.
orderId
,
orders
);
if
(
order
){
if
(
order
){
this
.
apply
=
order
this
.
apply
=
order
if
(
this
.
apply
.
approvalStatus
==
1
){
this
.
flag
=
true
}
}
}
}
,
}
,
methods
:
{
methods
:
{
...
...
src/views/ecw/box/queryAir.vue
View file @
eb5407e4
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
<el-table-column
prop=
""
:label=
"$t('操作')"
align=
"center"
width=
"120px"
>
<el-table-column
prop=
""
:label=
"$t('操作')"
align=
"center"
width=
"120px"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"primary"
size=
"small"
:disabled=
"scope.row.abnormalDealStatus === 1"
@
click=
"()=>updateStatus('single', scope.row)"
>
{{
$t
(
'
更新状态
'
)
}}
</el-button>
<el-button
type=
"primary"
size=
"small"
:disabled=
"scope.row.abnormalDealStatus === 1"
@
click=
"()=>updateStatus('single', scope.row)"
>
{{
$t
(
'
更新状态
'
)
}}
</el-button>
<el-button
type=
"primary"
size=
"small"
:disabled=
"shipmentObj.clStatus==132|| (shipmentObj.clearanceInfo == null) || (shipmentObj.clearanceInfo&&shipmentObj.clearanceInfo.clearanceOrder
Back
List.findIndex(ff=>ff.orderId == scope.row.orderId) == -1)"
@
click=
"()=>cancleClear(scope.row)"
>
{{
$t
(
'
撤销清关申请
'
)
}}
</el-button>
<el-button
type=
"primary"
size=
"small"
:disabled=
"shipmentObj.clStatus==132|| (shipmentObj.clearanceInfo == null) || (shipmentObj.clearanceInfo&&shipmentObj.clearanceInfo.clearanceOrderList.findIndex(ff=>ff.orderId == scope.row.orderId) == -1)"
@
click=
"()=>cancleClear(scope.row)"
>
{{
$t
(
'
撤销清关申请
'
)
}}
</el-button>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
...
...
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