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
0d8eb8b1
Commit
0d8eb8b1
authored
Jul 18, 2023
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
对接订单费用汇总接口,未完成
parent
2826dad9
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
294 additions
and
44 deletions
+294
-44
order.js
src/api/ecw/order.js
+14
-0
FeeDetail.vue
src/views/ecw/order/components/FeeDetail.vue
+230
-40
price.vue
src/views/ecw/order/components/price.vue
+35
-0
detail.vue
src/views/ecw/order/detail.vue
+15
-4
No files found.
src/api/ecw/order.js
View file @
0d8eb8b1
...
...
@@ -780,4 +780,18 @@ export function getDestCountryByOrderId(params){
})
}
// 订单费用汇总
export
function
orderSummary
(
orderId
){
return
request
({
url
:
'
/ecw/orderCount/orderSummary/
'
+
orderId
,
method
:
'
get
'
})
}
// 订单明细汇总
export
function
orderDetailSummary
(
orderId
){
return
request
({
url
:
'
/ecw/orderCount/orderDetailSummary/
'
+
orderId
,
method
:
'
get
'
})
}
src/views/ecw/order/components/FeeDetail.vue
View file @
0d8eb8b1
This diff is collapsed.
Click to expand it.
src/views/ecw/order/components/price.vue
0 → 100644
View file @
0d8eb8b1
<
template
>
<div>
<template
v-if=
"charging"
>
{{
$t
(
'
全包价
'
)
}}
:
{{
freight
}}{{
currencyMap
[
freightCurrency
]
}}
</
template
>
<
template
v-else
>
<div>
{{
$t
(
'
运费
'
)
}}
:
{{
freight
}}{{
currencyMap
[
freightCurrency
]
}}
</div>
<div>
{{
$t
(
'
清关费
'
)
}}
:
{{
clearance
}}{{
currencyMap
[
clearanceCurrency
]
}}
</div>
</
template
>
</div>
</template>
<
script
>
export
default
{
props
:{
// 货币映射
currencyMap
:{
type
:
Object
,
default
(){
return
{}
}
},
// 运费
freight
:
[
String
,
Number
],
// 运费货币
freightCurrency
:
Number
,
// 清关费
clearance
:
[
String
,
Number
],
// 运费货币
clearanceCurrency
:
Number
,
// 是否全包价
charging
:
Boolean
}
}
</
script
>
src/views/ecw/order/detail.vue
View file @
0d8eb8b1
...
...
@@ -424,13 +424,17 @@
<!--
报关资料
-->
<
declaration
-
documents
v
-
if
=
"
showDeclaration
"
:
order
-
id
=
"
order.orderId
"
:
order
-
no
=
"
order.orderNo
"
@
close
=
"
showDeclaration=false
"
/>
<!--
费用汇总
-->
<
fee
-
detail
v
-
if
=
"
showFeeDetail
"
:
order
-
id
=
"
order.orderId
"
@
close
=
"
showFeeDetail=false
"
/>
<
fee
-
detail
v
-
if
=
"
showFeeDetail
"
:
order
-
id
=
"
order.orderId
"
:
currency
-
map
=
"
currencyMap
"
@
close
=
"
showFeeDetail=false
"
/>
<
/div
>
<
/template
>
<
script
>
import
{
getOrder
,
operateLogPage
}
from
'
@/api/ecw/order
'
import
{
getOrder
,
operateLogPage
}
from
'
@/api/ecw/order
'
import
{
getDictDatas
,
DICT_TYPE
,
getDictData
}
from
'
@/utils/dict
'
;
import
PrintWarehouseReceipt
from
'
./components/PrintWarehouseReceipt
'
import
PrintLadingBill
from
'
./components/PrintLadingBill
'
...
...
@@ -440,7 +444,6 @@ import {getReceivableListByOrderId} from '@/api/ecw/receipt'
import
{
getChannel
}
from
'
@/api/ecw/channel
'
;
import
{
listByIds
}
from
'
@/api/ecw/region
'
import
WarehouseDetail
from
'
./components/WarehouseDetail
'
;
import
{
getProductBrank
}
from
'
@/api/ecw/productBrank
'
import
{
parseTime
}
from
'
@/utils/ruoyi
'
;
import
WarehouseAreaSelect
from
"
@/components/WarehouseAreaSelect
"
import
{
checkPermi
}
from
'
@/utils/permission
'
...
...
@@ -500,7 +503,7 @@ export default {
consigneeText
:
this
.
$t
(
'
更多
'
),
showLogDetailId
:
null
,
// 显示日志详情的ID,
showDeclaration
:
false
,
//显示报关资料
showFeeDetail
:
false
// 是否显示费用汇总
showFeeDetail
:
false
,
// 是否显示费用汇总
}
}
,
computed
:{
...
...
@@ -556,6 +559,14 @@ export default {
}
)
this
.
region
=
region
}
)
}
,
showFeeDetail
(){
if
(
!
this
.
orderSummary
){
this
.
getOrderSummary
()
}
if
(
!
this
.
orderDetailSummary
){
this
.
getOrderDetailSummary
()
}
}
}
,
created
()
{
...
...
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