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
68b7bb0e
Commit
68b7bb0e
authored
Oct 14, 2022
by
huhaiqing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复海运操作缺陷单
parent
234ccbc1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
47 additions
and
19 deletions
+47
-19
box.js
src/api/ecw/box.js
+0
-1
boxSea.js
src/api/ecw/boxSea.js
+15
-0
splitOrder.vue
...views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
+9
-8
cusDeclaration.vue
src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
+2
-7
startUnloading.vue
...ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
+21
-3
No files found.
src/api/ecw/box.js
View file @
68b7bb0e
...
...
@@ -275,7 +275,6 @@ export function downloadSoncapFiles(params) {
export
function
downloadCustomFiles
(
params
)
{
return
request
({
url
:
"
/ecw/box-preload-goods/downloadCustomFiles
"
,
responseType
:
"
arraybuffer
"
,
method
:
"
get
"
,
params
,
});
...
...
src/api/ecw/boxSea.js
View file @
68b7bb0e
...
...
@@ -701,6 +701,21 @@ export function batchUnload(data) {
});
}
/**
* 单个卸柜
*
* @export
* @param {*} data
* @return {*}
*/
export
function
singleUnload
(
data
)
{
return
request
({
url
:
"
/ecw/box-load-info/singleUnload
"
,
method
:
"
post
"
,
data
,
});
}
/**
* 一键卸柜
*
...
...
src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue
View file @
68b7bb0e
...
...
@@ -182,15 +182,15 @@
<el-form
ref=
"shopForm"
:model=
"shopForm"
:rules=
"shopRules"
label-width=
"100px"
>
<el-row>
<el-form-item
label=
"中文品名:"
prop=
"prodTitleZh"
>
<el-select
v-model=
"shopForm.
prodTitleZh
"
placeholder=
"请选择中文品名"
@
change=
"changeProdTitleZh"
>
<el-option
v-for=
"item in orderItems"
:label=
"item.prodTitleZh"
:value=
"i
tem.prodTitleZh"
:key=
"item.prodTitleZh
"
></el-option>
<el-select
v-model=
"shopForm.
zhId
"
placeholder=
"请选择中文品名"
@
change=
"changeProdTitleZh"
>
<el-option
v-for=
"item in orderItems"
:label=
"item.prodTitleZh"
:value=
"i
item.id"
:key=
"item.id
"
></el-option>
</el-select>
</el-form-item>
</el-row>
<el-row>
<el-form-item
label=
"英文品名:"
prop=
"prodTitleEn"
>
<el-select
v-model=
"shopForm.
prodTitleEn
"
placeholder=
"请选择英文品名"
@
change=
"changeProdTitleEn"
>
<el-option
v-for=
"item in orderItems"
:label=
"item.prodTitleEn"
:value=
"item.
prodTitleEn"
:key=
"item.prodTitleEn
"
></el-option>
<el-select
v-model=
"shopForm.
enId
"
placeholder=
"请选择英文品名"
@
change=
"changeProdTitleEn"
>
<el-option
v-for=
"item in orderItems"
:label=
"item.prodTitleEn"
:value=
"item.
id"
:key=
"item.id
"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"剩余箱数:"
>
...
...
@@ -342,6 +342,7 @@ export default {
const
{
orderSplitBackVOList
}
=
res
.
data
;
if
(
orderSplitBackVOList
&&
orderSplitBackVOList
.
length
)
{
this
.
orderItems
=
this
.
currRow
.
goodsList
??
[];
console
.
log
(
this
.
orderItems
)
// 取拆单项
this
.
splitData
=
orderSplitBackVOList
.
filter
(
(
item
)
=>
!
item
.
isMaster
...
...
@@ -385,11 +386,11 @@ export default {
leviteSum
,
column
.
warehouseInInfoVO
?.
cartonsNum
??
0
).
toNumber
();
leviteV
+
=
Decimal
.
add
(
leviteV
=
Decimal
.
add
(
leviteV
,
column
.
warehouseInInfoVO
?.
volume
??
0
).
toFixed
(
2
);
leviteW
+
=
Decimal
.
add
(
leviteW
=
Decimal
.
add
(
leviteW
,
column
.
warehouseInInfoVO
?.
weight
??
0
).
toFixed
(
2
);
...
...
@@ -440,7 +441,7 @@ export default {
changeProdTitleZh
()
{
let
list
=
[];
list
=
this
.
currRow
.
goodsList
.
filter
(
(
item
)
=>
item
.
prodTitleZh
==
this
.
shopForm
.
prodTitleZh
(
item
)
=>
item
.
id
==
this
.
shopForm
.
zhId
);
this
.
shopForm
.
sum
=
this
.
currRow
.
num
-
this
.
currRow
.
installNum
-
this
.
totalSplitNum
();
...
...
@@ -450,7 +451,7 @@ export default {
changeProdTitleEn
()
{
let
list
=
[];
list
=
this
.
orderData
.
orderItemVOList
.
filter
(
(
item
)
=>
item
.
prodTitleEn
==
this
.
shopForm
.
prodTitleEn
(
item
)
=>
item
.
id
==
this
.
shopForm
.
enId
);
this
.
shopForm
.
sum
=
this
.
currRow
.
num
-
this
.
currRow
.
installNum
-
this
.
totalSplitNum
();
...
...
src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue
View file @
68b7bb0e
...
...
@@ -159,7 +159,7 @@ import {
formatDateStr
,
serviceMsg
,
toReviewDetail
,
downloadFile
,
downloadFile
ByUrl
,
}
from
"
../utils
"
;
import
ImageUpload
from
"
@/components/ImageUpload
"
;
import
Decimal
from
"
decimal.js
"
;
...
...
@@ -477,12 +477,7 @@ export default {
},
/* 下载报关单 */
downloadCusFile
()
{
downloadFile
(
"
downloadCustomFiles
"
,
{
shipmentId
:
this
.
shipmentObj
.
id
},
`报关单(
${
this
.
shipmentObj
.
selfNo
}
).xlsx`
,
"
xlsx
"
);
downloadFileByUrl
(
'
downloadCustomFiles
'
,
{
shipmentId
:
this
.
shipmentObj
.
id
});
},
},
watch
:
{
...
...
src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue
View file @
68b7bb0e
...
...
@@ -5,8 +5,9 @@
<el-row
class=
"number-area"
>
<p
class=
"label-font"
>
自编号:
</p>
<p
class=
"label-font"
>
{{
selfNo
}}
</p>
<el-input
v-model=
"labelNo"
placeholder=
"请输入
标签号
"
></el-input>
<el-input
v-model=
"labelNo"
placeholder=
"请输入"
></el-input>
<div>
<el-button
type=
"primary"
@
click=
"modifyUnload"
>
提交
</el-button>
<el-button
type=
"primary"
@
click=
"modifyBatchUnload"
>
批量输入
</el-button>
<el-button
type=
"primary"
@
click=
"modifyAllUnload"
>
一键卸柜
</el-button>
</div>
...
...
@@ -122,6 +123,7 @@ import {
approvalCreate
,
approvalCancel
,
getSectionList
,
singleUnload
,
}
from
"
@/api/ecw/boxSea
"
;
import
{
serviceMsg
,
getTotlContent
,
toReviewDetail
}
from
"
../../utils
"
;
import
WorkFlow
from
"
@/components/WorkFlow
"
;
...
...
@@ -190,14 +192,30 @@ export default {
this
.
loading
=
false
;
});
},
/* 单个卸柜 */
modifyUnload
()
{
if
(
!
this
.
labelNo
)
{
this
.
$message
.
error
(
"
请输入箱号标签
"
);
return
;
}
singleUnload
({
orderNumCode
:
this
.
labelNo
,
shipmentId
:
this
.
$attrs
.
shipmentObj
.
id
,
}).
then
((
res
)
=>
{
serviceMsg
(
res
,
this
).
then
((
res
)
=>
{
this
.
labelNo
=
""
;
this
.
getLoadGoodsList
();
});
});
},
/* 批量输入 */
modifyBatchUnload
()
{
if
(
!
this
.
labelNo
)
{
this
.
$message
.
error
(
"
请输入
标签
号
"
);
this
.
$message
.
error
(
"
请输入
订单
号
"
);
return
;
}
batchUnload
({
orderN
umCode
:
this
.
labelNo
,
orderN
o
:
this
.
labelNo
,
shipmentId
:
this
.
$attrs
.
shipmentObj
.
id
,
}).
then
((
res
)
=>
{
serviceMsg
(
res
,
this
).
then
((
res
)
=>
{
...
...
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