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
8c02e01b
Commit
8c02e01b
authored
Nov 23, 2024
by
Smile
Committed by
wux
Jan 02, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:空运出货-取消审批
parent
e6b3abc8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
91 additions
and
4 deletions
+91
-4
boxSea.js
src/api/ecw/boxSea.js
+14
-0
en_US.json
src/i18n/languages/en_US.json
+2
-1
zh_CN.json
src/i18n/languages/zh_CN.json
+2
-1
recall.vue
src/views/ecw/box/shippingAir/nodePage/recall.vue
+69
-0
seaProcess.vue
src/views/ecw/box/shippingAir/seaProcess.vue
+4
-2
No files found.
src/api/ecw/boxSea.js
View file @
8c02e01b
...
...
@@ -353,6 +353,20 @@ export function airShipmentCreate(data) {
data
,
});
}
/**
* 空运撤回
*
* @export
* @param {*} data
* @return {*}
*/
export
function
airShipmentRecall
(
data
)
{
return
request
({
url
:
"
/ecw/box-air-shipment/recall
"
,
method
:
"
put
"
,
data
,
});
}
/**
* 空运出仓
...
...
src/i18n/languages/en_US.json
View file @
8c02e01b
...
...
@@ -4720,5 +4720,6 @@
"选择客户"
:
"Select a customer"
,
"运输"
:
"Transportation"
,
"免泡重量"
:
"免泡重量"
,
"请输入免泡重量"
:
"请输入免泡重量"
"请输入免泡重量"
:
"请输入免泡重量"
,
"出货撤回"
:
"出货撤回"
}
src/i18n/languages/zh_CN.json
View file @
8c02e01b
...
...
@@ -326,5 +326,6 @@
"动态"
:
"动态"
,
"增值服务"
:
"增值服务"
,
"免泡重量"
:
"免泡重量"
,
"请输入免泡重量"
:
"请输入免泡重量"
"请输入免泡重量"
:
"请输入免泡重量"
,
"出货撤回"
:
"出货撤回"
}
src/views/ecw/box/shippingAir/nodePage/recall.vue
0 → 100644
View file @
8c02e01b
<
template
>
<div>
<el-form
ref=
"recallForm"
:model=
"recallObj"
label-width=
"100px"
>
<el-form-item
:label=
"$t('备注')"
>
<el-input
v-model=
"recallObj.remark"
type=
"textarea"
rows=
"2"
:placeholder=
"$t('请输入备注')"
></el-input>
</el-form-item>
</el-form>
<el-row
class=
"operate-button"
>
<el-button
type=
"success"
@
click=
"onSubmit()"
>
{{
$t
(
'
提交
'
)
}}
</el-button>
</el-row>
</div>
</
template
>
<
script
>
import
{
airShipmentRecall
}
from
"
@/api/ecw/boxSea
"
;
import
{
formatDateStr
,
formatNumberString
,
serviceMsg
}
from
"
../utils
"
;
/**
* 驳船
*/
export
default
{
name
:
"
recall
"
,
inheritAttrs
:
false
,
data
()
{
return
{
// 空运出货对象
recallObj
:
{},
airShipmentApprovalInfo
:
{}
};
},
created
()
{
const
voName
=
this
.
$attrs
.
currNode
.
voName
;
let
oldData
=
{
...
this
.
$attrs
.
shipmentObj
[
voName
]
};
oldData
=
formatDateStr
(
oldData
,
[
"
deliverTime
"
]);
oldData
=
formatNumberString
(
oldData
,
[
"
deliverType
"
]);
this
.
airShipmentObj
=
oldData
;
this
.
airShipmentApprovalInfo
=
this
.
$attrs
.
shipmentObj
.
airShipmentApprovalInfo
debugger
},
methods
:
{
/** 提交 */
onSubmit
()
{
const
that
=
this
;
this
.
$refs
[
"
recallForm
"
].
validate
((
valid
)
=>
{
if
(
valid
)
{
debugger
airShipmentRecall
({
...
that
.
airShipmentObj
,
...
that
.
recallObj
,
shipmentId
:
that
.
$attrs
.
shipmentObj
.
id
,
}).
then
((
res
)
=>
{
serviceMsg
(
res
,
this
).
then
(()
=>
{
this
.
cancel
(
"
submit
"
);
});
});
}
});
},
/** 取消 */
cancel
(
type
)
{
this
.
$emit
(
"
closeDialog
"
,
type
);
},
},
};
</
script
>
<
style
lang=
"scss"
scoped
>
</
style
>
src/views/ecw/box/shippingAir/seaProcess.vue
View file @
8c02e01b
...
...
@@ -45,6 +45,7 @@ import twoWayArrivalWidget from "./nodePage/twoWayArrival.vue";
import
unloadingWidget
from
"
./nodePage/unloading/startUnloading.vue
"
;
import
settlementWidget
from
"
./nodePage/settlement.vue
"
;
import
reviewWidget
from
"
./nodePage/review.vue
"
;
import
recallWidget
from
"
./nodePage/recall.vue
"
;
import
shipmentWidget
from
"
./nodePage/shipment.vue
"
;
import
checkoutWidget
from
"
./nodePage/checkout.vue
"
;
import
tallyWidget
from
"
./nodePage/tally/index.vue
"
;
...
...
@@ -79,6 +80,7 @@ export default {
shipmentWidget
,
checkoutWidget
,
reviewWidget
,
recallWidget
,
tallyWidget
,
mergePkgWidget
},
...
...
@@ -171,9 +173,9 @@ export default {
// 出货
case
"
shipment
"
:
if
(
this
.
shipmentObj
[
node
.
keyName
]
==
175
)
{
this
.
currentComponent
=
`re
view
Widget`
;
this
.
currentComponent
=
`re
call
Widget`
;
this
.
$set
(
this
.
dialogConfig
,
"
width
"
,
"
700px
"
);
this
.
$set
(
this
.
dialogConfig
,
"
title
"
,
this
.
$t
(
"
出货
反审
"
));
this
.
$set
(
this
.
dialogConfig
,
"
title
"
,
this
.
$t
(
"
出货
撤回
"
));
}
break
;
// 清关文件
...
...
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