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
2a275dcd
Commit
2a275dcd
authored
Aug 27, 2023
by
zhoutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复一些空运出货的bug
parent
0e7c5761
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
preinstall.vue
src/views/ecw/box/shippingAir/nodePage/preinstall.vue
+2
-2
review.vue
src/views/ecw/box/shippingAir/nodePage/review.vue
+1
-1
twoWayTakeoff.vue
src/views/ecw/box/shippingAir/nodePage/twoWayTakeoff.vue
+5
-1
startUnloading.vue
...ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
+1
-1
No files found.
src/views/ecw/box/shippingAir/nodePage/preinstall.vue
View file @
2a275dcd
...
...
@@ -297,9 +297,9 @@
<
dict
-
tag
:
type
=
"
DICT_TYPE.ECW_PRODUCT_MATERIAL
"
:
value
=
"
scope.row.material
"
/>
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
:
label
=
"
$t('特性')
"
align
=
"
center
"
prop
=
"
a
ttrNameList
"
width
=
"
120
"
>
<
el
-
table
-
column
:
label
=
"
$t('特性')
"
align
=
"
center
"
prop
=
"
warehouseInA
ttrNameList
"
width
=
"
120
"
>
<
template
slot
-
scope
=
"
scope
"
>
{{
scope
.
row
.
attrNameList
?
scope
.
row
.
a
ttrNameList
.
toString
():
""
}}
{{
scope
.
row
.
warehouseInAttrNameList
?
scope
.
row
.
warehouseInA
ttrNameList
.
toString
():
""
}}
<
/template
>
<
/el-table-column
>
<!--
<
el
-
table
-
column
:
label
=
"
$t('操作')
"
align
=
"
center
"
class
-
name
=
"
small-padding fixed-width
"
>
...
...
src/views/ecw/box/shippingAir/nodePage/review.vue
View file @
2a275dcd
...
...
@@ -94,7 +94,7 @@ export default {
const
{
currNode
,
shipmentObj
}
=
this
.
$attrs
;
let
approvalType
=
14
;
// 预装反审
if
(
currNode
.
type
===
"
cabinet
"
)
approvalType
=
9
;
// 装柜反审
if
(
currNode
.
type
===
"
unloading
"
)
approvalType
=
7
;
// 卸柜
反审核
if
(
currNode
.
type
===
"
unloading
"
)
approvalType
=
16
;
// 到仓
反审核
approvalCreate
({
shipmentId
:
shipmentObj
.
id
,
...
...
src/views/ecw/box/shippingAir/nodePage/twoWayTakeoff.vue
View file @
2a275dcd
...
...
@@ -7,7 +7,7 @@
<el-form-item
:label=
"$t('实际起飞时间')"
prop=
"dtRealFlyTime"
>
<el-date-picker
type=
"datetime"
:placeholder=
"$t('请选择日期')"
v-model=
"twoWayTakeoffObj.dtRealFlyTime"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
<el-form-item
:label=
"$t('实际头程时间')"
prop=
"dtRealHeadTime"
>
<el-form-item
v-if=
"dtRealHeadTimeFlag"
:label=
"$t('实际头程时间')"
prop=
"dtRealHeadTime"
>
<el-date-picker
type=
"datetime"
:placeholder=
"$t('请选择日期')"
v-model=
"twoWayTakeoffObj.dtRealHeadTime"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
</el-form>
...
...
@@ -54,6 +54,7 @@ export default {
dialogVisible
:
false
,
// 提示消息
showMsg
:
false
,
dtRealHeadTimeFlag
:
false
};
},
created
()
{
...
...
@@ -62,6 +63,9 @@ export default {
oldData
=
formatDateStr
(
oldData
,
[
"
dtRealFlyTime
"
],
"
YYYY-MM-DD HH:mm:ss
"
);
oldData
=
formatDateStr
(
oldData
,
[
"
dtRealHeadTime
"
],
"
YYYY-MM-DD HH:mm:ss
"
);
this
.
twoWayTakeoffObj
=
oldData
;
if
(
this
.
$attrs
.
shipmentObj
[
'
bookAirInfo
'
].
voyage
&&
this
.
$attrs
.
shipmentObj
[
'
bookAirInfo
'
].
voyage
==
2
){
this
.
dtRealHeadTimeFlag
=
true
}
},
watch
:
{
},
...
...
src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue
View file @
2a275dcd
...
...
@@ -267,7 +267,7 @@ export default {
approvalCreate
({
shipmentId
:
this
.
$attrs
.
shipmentObj
.
id
,
approvalStatus
:
0
,
approvalType
:
3
,
// 卸柜
approvalType
:
15
,
// 卸柜
copyUserId
:
this
.
selectedUsers
,
}).
then
((
res
)
=>
{
serviceMsg
(
res
,
this
).
then
(()
=>
{
...
...
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