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
2770e8f8
Commit
2770e8f8
authored
Oct 06, 2022
by
zhoutong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复出货的一些bug
parent
28a117bc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
65 additions
and
17 deletions
+65
-17
editSeaAirForm.vue
src/views/ecw/box/editSeaAirForm.vue
+2
-4
indexSea.vue
src/views/ecw/box/indexSea.vue
+1
-1
indexSeaAir.vue
src/views/ecw/box/indexSeaAir.vue
+60
-10
seaProcess.vue
src/views/ecw/box/shippingSea/seaProcess.vue
+1
-1
shippingSeaAir.vue
src/views/ecw/box/shippingSeaAir/shippingSeaAir.vue
+1
-1
No files found.
src/views/ecw/box/editSeaAirForm.vue
View file @
2770e8f8
...
@@ -96,16 +96,14 @@ export default {
...
@@ -96,16 +96,14 @@ export default {
if
(
this
.
form
.
id
!=
null
)
{
if
(
this
.
form
.
id
!=
null
)
{
updatebox
(
this
.
form
).
then
((
response
)
=>
{
updatebox
(
this
.
form
).
then
((
response
)
=>
{
this
.
$modal
.
msgSuccess
(
'
修改成功
'
)
this
.
$modal
.
msgSuccess
(
'
修改成功
'
)
this
.
open
=
false
this
.
$emit
(
"
closeDialog
"
,
"
edit
"
);
this
.
getList
()
})
})
return
return
}
}
// 添加的提交
// 添加的提交
createbox
(
this
.
form
).
then
((
response
)
=>
{
createbox
(
this
.
form
).
then
((
response
)
=>
{
this
.
$modal
.
msgSuccess
(
'
新增成功
'
)
this
.
$modal
.
msgSuccess
(
'
新增成功
'
)
this
.
open
=
false
this
.
$emit
(
"
closeDialog
"
,
"
edit
"
);
this
.
getList
()
})
})
})
})
},
},
...
...
src/views/ecw/box/indexSea.vue
View file @
2770e8f8
...
@@ -124,7 +124,7 @@
...
@@ -124,7 +124,7 @@
<el-dropdown-item
command=
"error"
>
异常登记
</el-dropdown-item>
<el-dropdown-item
command=
"error"
>
异常登记
</el-dropdown-item>
<el-dropdown-item
command=
"cost"
>
费用登记
</el-dropdown-item>
<el-dropdown-item
command=
"cost"
>
费用登记
</el-dropdown-item>
<el-dropdown-item
command=
"delete"
>
删除
</el-dropdown-item>
<el-dropdown-item
command=
"delete"
>
删除
</el-dropdown-item>
<el-dropdown-item
v-if=
"scope.row.ldStatus
==47
"
command=
"editLadingBill"
>
编辑提货单
</el-dropdown-item>
<el-dropdown-item
v-if=
"scope.row.ldStatus
>42
"
command=
"editLadingBill"
>
编辑提货单
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown>
<el-dropdown
trigger=
"click"
@
command=
"(command)=>handleCommand(scope.row, command)"
>
<el-dropdown
trigger=
"click"
@
command=
"(command)=>handleCommand(scope.row, command)"
>
...
...
src/views/ecw/box/indexSeaAir.vue
View file @
2770e8f8
...
@@ -149,7 +149,11 @@
...
@@ -149,7 +149,11 @@
<!-- 列表 -->
<!-- 列表 -->
<el-table
v-loading=
"loading"
:data=
"list"
>
<el-table
v-loading=
"loading"
:data=
"list"
>
<el-table-column
label=
"自编号"
align=
"center"
prop=
"selfNo"
/>
<el-table-column
label=
"自编号"
align=
"center"
prop=
"selfNo"
>
<template
slot-scope=
"scope"
>
<a
href=
"javascript:void(0)"
@
click=
"handleCommand(scope.row, 'detail')"
>
{{
scope
.
row
.
selfNo
}}
</a>
</
template
>
</el-table-column>
<el-table-column
label=
"柜号"
align=
"center"
prop=
"cubNo"
/>
<el-table-column
label=
"柜号"
align=
"center"
prop=
"cubNo"
/>
<el-table-column
label=
"柜型"
align=
"center"
prop=
"cabinetId"
>
<el-table-column
label=
"柜型"
align=
"center"
prop=
"cabinetId"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
...
@@ -224,21 +228,21 @@
...
@@ -224,21 +228,21 @@
<el-dropdown-item
command=
"error"
>
异常登记
</el-dropdown-item>
<el-dropdown-item
command=
"error"
>
异常登记
</el-dropdown-item>
<el-dropdown-item
command=
"cost"
>
费用登记
</el-dropdown-item>
<el-dropdown-item
command=
"cost"
>
费用登记
</el-dropdown-item>
<el-dropdown-item
command=
"delete"
>
删除
</el-dropdown-item>
<el-dropdown-item
command=
"delete"
>
删除
</el-dropdown-item>
<el-dropdown-item
command=
"editLadingBill"
>
编辑提货单
</el-dropdown-item>
<el-dropdown-item
v-if=
"scope.row.ldStatus>42"
command=
"editLadingBill"
>
编辑提货单
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown>
<el-dropdown
trigger=
"click"
>
<el-dropdown
trigger=
"click"
@
command=
"(command)=>handleCommand(scope.row, command)"
>
<el-button
type=
"primary"
>
<el-button
type=
"primary"
>
下载
<i
class=
"el-icon-arrow-down el-icon--right"
></i>
下载
<i
class=
"el-icon-arrow-down el-icon--right"
></i>
</el-button>
</el-button>
<el-dropdown-menu
slot=
"dropdown"
>
<el-dropdown-menu
slot=
"dropdown"
>
<el-dropdown-item
command=
""
>
预装单
</el-dropdown-item>
<el-dropdown-item
command=
"
downloadPreloadGoodsList
"
>
预装单
</el-dropdown-item>
<el-dropdown-item
command=
""
>
已装单
</el-dropdown-item>
<el-dropdown-item
command=
"
downloadLoadGoodsList
"
>
已装单
</el-dropdown-item>
<el-dropdown-item
command=
""
>
应收汇总表
</el-dropdown-item>
<el-dropdown-item
command=
"
downloadReceivableList
"
>
应收汇总表
</el-dropdown-item>
<el-dropdown-item
command=
""
>
agent list
</el-dropdown-item>
<el-dropdown-item
command=
"
downloadAgentListFiles
"
>
agent list
</el-dropdown-item>
<el-dropdown-item
command=
"
"
>
son
cap
</el-dropdown-item>
<el-dropdown-item
command=
"
downloadSoncapFiles"
>
son
cap
</el-dropdown-item>
<el-dropdown-item
command=
""
>
提货单
</el-dropdown-item>
<el-dropdown-item
command=
"
zipDownload
"
>
提货单
</el-dropdown-item>
<el-dropdown-item
command=
""
>
提单Copy
</el-dropdown-item>
<el-dropdown-item
command=
"
downloadLadingCopy
"
>
提单Copy
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown>
</
template
>
</
template
>
...
@@ -304,6 +308,11 @@ import {
...
@@ -304,6 +308,11 @@ import {
getboxPage
,
getboxPage
,
exportboxExcel
exportboxExcel
}
from
'
@/api/ecw/box
'
}
from
'
@/api/ecw/box
'
import
{
downloadFile
,
downloadFileByUrl
,
formatDate
,
}
from
"
./shippingSea/utils
"
;
import
{
getCabinetPage
}
from
'
@/api/ecw/cabinet
'
import
{
getCabinetPage
}
from
'
@/api/ecw/cabinet
'
import
{
getChannelList
}
from
'
@/api/ecw/channel
'
import
{
getChannelList
}
from
'
@/api/ecw/channel
'
import
{
getWarehouseList
}
from
'
@/api/ecw/warehouse
'
import
{
getWarehouseList
}
from
'
@/api/ecw/warehouse
'
...
@@ -536,6 +545,10 @@ export default {
...
@@ -536,6 +545,10 @@ export default {
this
.
$router
.
push
(
'
/boxSeaAir/shippingSeaAir/
'
+
row
.
id
)
this
.
$router
.
push
(
'
/boxSeaAir/shippingSeaAir/
'
+
row
.
id
)
break
break
case
"
detail
"
:
this
.
$router
.
push
(
"
/boxSeaAir/query/
"
+
row
.
id
);
break
;
case
'
edit
'
:
case
'
edit
'
:
this
.
handleUpdate
(
row
)
this
.
handleUpdate
(
row
)
break
break
...
@@ -560,6 +573,43 @@ export default {
...
@@ -560,6 +573,43 @@ export default {
case 'error':
case 'error':
this.$set(this.dialogCfg, 'title', '异常登记')
this.$set(this.dialogCfg, 'title', '异常登记')
break
break
case "downloadPreloadGoodsList":
downloadFile(
command,
{ shipmentId: row.id },
`
预装单
(
$
{
row
.
selfNo
}).
xlsx
`,
"xlsx"
);
break;
case "downloadLoadGoodsList":
downloadFile(
command,
{ shipmentId: row.id },
`
已装单
(
$
{
row
.
selfNo
}).
xlsx
`,
"xlsx"
);
break;
case "downloadReceivableList":
downloadFile(
command,
{ shipmentId: row.id },
`
应收汇总表
(
$
{
row
.
selfNo
}).
xlsx
`,
"xlsx"
);
break;
case "zipDownload":
downloadFile(
command,
{ shipmentId: row.id },
`
提货单
(
$
{
row
.
selfNo
}).
zip
`,
"zip"
);
break;
case "downloadAgentListFiles":
case "downloadSoncapFiles":
case "downloadLadingCopy":
downloadFileByUrl(command, { shipmentId: row.id });
break;
}
}
if (["editLadingBill", "cost", "error"].includes(command)) {
if (["editLadingBill", "cost", "error"].includes(command)) {
this.currRow = row;
this.currRow = row;
...
...
src/views/ecw/box/shippingSea/seaProcess.vue
View file @
2770e8f8
...
@@ -286,7 +286,7 @@ export default {
...
@@ -286,7 +286,7 @@ export default {
}
}
}
}
.arrow-area
{
.arrow-area
{
margin
:
0
10
px
;
margin
:
0
6
px
;
}
}
}
}
}
}
...
...
src/views/ecw/box/shippingSeaAir/shippingSeaAir.vue
View file @
2770e8f8
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
</el-card>
</el-card>
<!-- 海运流程图 -->
<!-- 海运流程图 -->
<seaProcess
:seaBaseData=
"seaAirBaseData"
:shipmentObj=
"shipmentObj"
width=
"
66px"
height=
"66
px"
:allSupplier=
"allSupplier"
:allDocks=
"allDocks"
:allUsers=
"allUsers"
:warehouseList=
"warehouseList"
@
getBoxInfo=
"getBoxInfo"
/>
<seaProcess
:seaBaseData=
"seaAirBaseData"
:shipmentObj=
"shipmentObj"
width=
"
50px"
height=
"50
px"
:allSupplier=
"allSupplier"
:allDocks=
"allDocks"
:allUsers=
"allUsers"
:warehouseList=
"warehouseList"
@
getBoxInfo=
"getBoxInfo"
/>
<!-- 海运步骤图 -->
<!-- 海运步骤图 -->
<seaStepDetail
:seaBaseData=
"seaAirBaseData"
:shipmentObj=
"shipmentObj"
:allSupplier=
"allSupplier"
:allDocks=
"allDocks"
:allUsers=
"allUsers"
:warehouseList=
"warehouseList"
/>
<seaStepDetail
:seaBaseData=
"seaAirBaseData"
:shipmentObj=
"shipmentObj"
:allSupplier=
"allSupplier"
:allDocks=
"allDocks"
:allUsers=
"allUsers"
:warehouseList=
"warehouseList"
/>
...
...
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