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
50807948
Commit
50807948
authored
Nov 29, 2023
by
zhoutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
没有到港,也应该可以清关
parent
96a90268
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
15 deletions
+13
-15
arrival.vue
src/views/ecw/box/shippingAir/nodePage/arrival.vue
+1
-1
cusClearance.vue
src/views/ecw/box/shippingAir/nodePage/cusClearance.vue
+1
-1
startUnloading.vue
...ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
+10
-0
seaProcess.vue
src/views/ecw/box/shippingAir/seaProcess.vue
+1
-13
No files found.
src/views/ecw/box/shippingAir/nodePage/arrival.vue
View file @
50807948
...
@@ -160,7 +160,7 @@ export default {
...
@@ -160,7 +160,7 @@ export default {
this
.
$set
(
this
.
airArrivalInfo
,
'
arriveOrderIdList
'
,
[])
this
.
$set
(
this
.
airArrivalInfo
,
'
arriveOrderIdList
'
,
[])
this
.
arrivalOrderList
=
this
.
$attrs
.
shipmentObj
.
airArrivalInfo
?
this
.
$attrs
.
shipmentObj
.
airArrivalInfo
.
arrivalOrderList
:
[]
this
.
arrivalOrderList
=
this
.
$attrs
.
shipmentObj
.
airArrivalInfo
?
this
.
$attrs
.
shipmentObj
.
airArrivalInfo
.
arrivalOrderList
:
[]
shipmentOrderList
(
this
.
$attrs
.
shipmentObj
.
id
).
then
((
r
)
=>
{
shipmentOrderList
(
this
.
$attrs
.
shipmentObj
.
id
).
then
((
r
)
=>
{
this
.
orderList
=
r
.
data
this
.
orderList
=
r
.
data
??
[]
})
})
},
},
computed
:
{
computed
:
{
...
...
src/views/ecw/box/shippingAir/nodePage/cusClearance.vue
View file @
50807948
...
@@ -173,7 +173,7 @@ export default {
...
@@ -173,7 +173,7 @@ export default {
if
(
typeof
this
.
$attrs
.
shipmentObj
.
airArrivalInfo
?.
arrivalOrderList
!=
'
undefined
'
&&
this
.
$attrs
.
shipmentObj
.
airArrivalInfo
.
arrivalOrderList
)
this
.
arrivalOrderList
=
this
.
$attrs
.
shipmentObj
.
airArrivalInfo
.
arrivalOrderList
if
(
typeof
this
.
$attrs
.
shipmentObj
.
airArrivalInfo
?.
arrivalOrderList
!=
'
undefined
'
&&
this
.
$attrs
.
shipmentObj
.
airArrivalInfo
.
arrivalOrderList
)
this
.
arrivalOrderList
=
this
.
$attrs
.
shipmentObj
.
airArrivalInfo
.
arrivalOrderList
if
(
typeof
this
.
$attrs
.
shipmentObj
.
clearanceInfo
?.
clearanceOrderList
!=
'
undefined
'
&&
this
.
$attrs
.
shipmentObj
.
clearanceInfo
.
clearanceOrderList
)
this
.
clearanceOrderList
=
this
.
$attrs
.
shipmentObj
.
clearanceInfo
.
clearanceOrderList
if
(
typeof
this
.
$attrs
.
shipmentObj
.
clearanceInfo
?.
clearanceOrderList
!=
'
undefined
'
&&
this
.
$attrs
.
shipmentObj
.
clearanceInfo
.
clearanceOrderList
)
this
.
clearanceOrderList
=
this
.
$attrs
.
shipmentObj
.
clearanceInfo
.
clearanceOrderList
shipmentOrderList
(
this
.
$attrs
.
shipmentObj
.
id
).
then
((
r
)
=>
{
shipmentOrderList
(
this
.
$attrs
.
shipmentObj
.
id
).
then
((
r
)
=>
{
this
.
orderList
=
r
.
data
this
.
orderList
=
r
.
data
??
[]
})
})
},
},
watch
:
{
watch
:
{
...
...
src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
View file @
50807948
...
@@ -305,6 +305,16 @@ export default {
...
@@ -305,6 +305,16 @@ export default {
},
},
/** 提交 */
/** 提交 */
onSubmit
()
{
onSubmit
()
{
let
flag
=
false
this
.
pageData
.
sectionOrderList
.
forEach
(
item
=>
{
if
(
!
[
118428
,
15
].
includes
(
item
.
status
)){
flag
=
true
}
})
if
(
flag
){
this
.
$message
.
error
(
this
.
$t
(
"
存在未到港或未清关的订单
"
));
return
}
if
(
this
.
getUnLoadNumCount
>
0
){
if
(
this
.
getUnLoadNumCount
>
0
){
approvalCreate
({
approvalCreate
({
shipmentId
:
this
.
$attrs
.
shipmentObj
.
id
,
shipmentId
:
this
.
$attrs
.
shipmentObj
.
id
,
...
...
src/views/ecw/box/shippingAir/seaProcess.vue
View file @
50807948
...
@@ -150,7 +150,7 @@ export default {
...
@@ -150,7 +150,7 @@ export default {
}
}
}
}
console
.
log
(
currIndex
,
this
.
currIndex
)
console
.
log
(
currIndex
,
this
.
currIndex
)
if
(
currIndex
>
this
.
currIndex
)
{
if
(
currIndex
>
this
.
currIndex
&&
!
[
'
cusClearance
'
,
'
unloading
'
].
includes
(
node
.
type
)
)
{
this
.
$message
.
error
(
this
.
errorMsg
);
this
.
$message
.
error
(
this
.
errorMsg
);
return
;
return
;
}
}
...
@@ -186,10 +186,6 @@ export default {
...
@@ -186,10 +186,6 @@ export default {
break
;
break
;
// 清关
// 清关
case
"
cusClearance
"
:
case
"
cusClearance
"
:
if
((
!
this
.
shipmentObj
.
airArrivalInfo
||
this
.
shipmentObj
.
airArrivalInfo
.
arriveType
==
0
)
&&
this
.
shipmentObj
.
sapStatus
!=
152
){
this
.
$message
.
error
(
this
.
$t
(
"
请先完成到港操作
"
));
return
;
}
this
.
$set
(
this
.
dialogConfig
,
"
width
"
,
"
700px
"
);
this
.
$set
(
this
.
dialogConfig
,
"
width
"
,
"
700px
"
);
break
;
break
;
// AGENT
// AGENT
...
@@ -224,10 +220,6 @@ export default {
...
@@ -224,10 +220,6 @@ export default {
break
;
break
;
// 卸柜
// 卸柜
case
"
unloading
"
:
case
"
unloading
"
:
if
((
!
this
.
shipmentObj
.
clearanceInfo
||
this
.
shipmentObj
.
clearanceInfo
.
clearanceType
==
0
)
&&
this
.
shipmentObj
.
clStatus
!=
132
){
this
.
$message
.
error
(
this
.
$t
(
"
请先完成清关操作
"
));
return
;
}
// 卸柜反审
// 卸柜反审
const
unStatus
=
this
.
shipmentObj
[
node
.
keyName
];
const
unStatus
=
this
.
shipmentObj
[
node
.
keyName
];
if
([
186
].
includes
(
unStatus
))
{
if
([
186
].
includes
(
unStatus
))
{
...
@@ -277,10 +269,6 @@ export default {
...
@@ -277,10 +269,6 @@ export default {
if
(
start
.
includes
(
val
[
keyName
])
&&
val
[
voName
])
{
if
(
start
.
includes
(
val
[
keyName
])
&&
val
[
voName
])
{
node
.
currStatus
=
"
wait
"
;
node
.
currStatus
=
"
wait
"
;
if
(
type
===
"
arrival
"
||
type
===
"
cusClearance
"
){
++
nodeIndex
;
continue
;
}
}
}
if
(
wait
.
includes
(
val
[
keyName
]))
{
if
(
wait
.
includes
(
val
[
keyName
]))
{
...
...
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