Commit 0d8eb8b1 authored by dragondean@qq.com's avatar dragondean@qq.com

对接订单费用汇总接口,未完成

parent 2826dad9
...@@ -780,4 +780,18 @@ export function getDestCountryByOrderId(params){ ...@@ -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'
})
}
<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>
...@@ -424,13 +424,17 @@ ...@@ -424,13 +424,17 @@
<!-- 报关资料 --> <!-- 报关资料 -->
<declaration-documents v-if="showDeclaration" :order-id="order.orderId" :order-no="order.orderNo" @close="showDeclaration=false" /> <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> </div>
</template> </template>
<script> <script>
import { getOrder, operateLogPage } from '@/api/ecw/order' import {getOrder, operateLogPage} from '@/api/ecw/order'
import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict'; import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict';
import PrintWarehouseReceipt from './components/PrintWarehouseReceipt' import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
import PrintLadingBill from './components/PrintLadingBill' import PrintLadingBill from './components/PrintLadingBill'
...@@ -440,7 +444,6 @@ import {getReceivableListByOrderId} from '@/api/ecw/receipt' ...@@ -440,7 +444,6 @@ import {getReceivableListByOrderId} from '@/api/ecw/receipt'
import { getChannel } from '@/api/ecw/channel'; import { getChannel } from '@/api/ecw/channel';
import {listByIds} from '@/api/ecw/region' import {listByIds} from '@/api/ecw/region'
import WarehouseDetail from './components/WarehouseDetail'; import WarehouseDetail from './components/WarehouseDetail';
import {getProductBrank} from '@/api/ecw/productBrank'
import { parseTime } from '@/utils/ruoyi'; import { parseTime } from '@/utils/ruoyi';
import WarehouseAreaSelect from "@/components/WarehouseAreaSelect" import WarehouseAreaSelect from "@/components/WarehouseAreaSelect"
import {checkPermi} from '@/utils/permission' import {checkPermi} from '@/utils/permission'
...@@ -500,7 +503,7 @@ export default { ...@@ -500,7 +503,7 @@ export default {
consigneeText:this.$t('更多'), consigneeText:this.$t('更多'),
showLogDetailId: null, // 显示日志详情的ID, showLogDetailId: null, // 显示日志详情的ID,
showDeclaration:false, //显示报关资料 showDeclaration:false, //显示报关资料
showFeeDetail: false // 是否显示费用汇总 showFeeDetail: false, // 是否显示费用汇总
} }
}, },
computed:{ computed:{
...@@ -556,6 +559,14 @@ export default { ...@@ -556,6 +559,14 @@ export default {
}) })
this.region = region this.region = region
}) })
},
showFeeDetail(){
if(!this.orderSummary){
this.getOrderSummary()
}
if(!this.orderDetailSummary){
this.getOrderDetailSummary()
}
} }
}, },
created() { created() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment