Skip to content

J
jiedao-app-operator-master
Commit 134488eb authored by 我在何方's avatar 我在何方
Browse files
Options

Merge branch 'release2.2' of... 

Merge branch 'release2.2' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release2.2
parents a1dd0449 c66da327
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 93 deletions
src/App.vue
View file @ 134488eb
...@@ -59,7 +59,7 @@ export default { ...@@ -59,7 +59,7 @@ export default {
padding-right: 30px; padding-right: 30px;
padding-left: 5px; padding-left: 5px;
} }
$sizes: 0, 10,20,30,50,75,100,150,200,300,500,800,1000; $sizes: 0, 5, 10,20,30,50,75,100,150,200,300,500,800,1000;
@for $i from 1 through length($sizes){ @for $i from 1 through length($sizes){
$item: nth($sizes, $i); $item: nth($sizes, $i);
.ml-#{$item}{ .ml-#{$item}{
......
src/api/ecw/box.js
View file @ 134488eb
...@@ -350,3 +350,12 @@ export function dealCustomsSplitNotify(notifyId){ ...@@ -350,3 +350,12 @@ export function dealCustomsSplitNotify(notifyId){
method: "get", method: "get",
}) })
} }
// 自编号报表分页
export function boxSettlementPage(params) {
return request({
url: "/shipment/box/pageSettlement",
method: "get",
params,
});
}
src/utils/dict.js
View file @ 134488eb
...@@ -218,6 +218,7 @@ export const DICT_TYPE = { ...@@ -218,6 +218,7 @@ export const DICT_TYPE = {
BOX_CUSTOMS_ERROR_TYPE: "customs_error_type",// 报关异常状态 BOX_CUSTOMS_ERROR_TYPE: "customs_error_type",// 报关异常状态
BOX_SHIPPING_ERROR_TYPE: "shipping_error_type",// 起运异常状态 BOX_SHIPPING_ERROR_TYPE: "shipping_error_type",// 起运异常状态
BOX_ARRIVAL_ERROR_TYPE: "arrival_error_type",// 到港异常状态 BOX_ARRIVAL_ERROR_TYPE: "arrival_error_type",// 到港异常状态
SETTLEMENT_STATUS: 'settlement_status', // 结算状态
APP_TYPE:"app_type", //系统类型 APP_TYPE:"app_type", //系统类型
AIR_SHIPMENT_PROCESS:'air_shipment_process' AIR_SHIPMENT_PROCESS:'air_shipment_process'
......
src/views/ecw/financial/selfNoReport.vue
View file @ 134488eb
This diff is collapsed.
src/views/ecw/order/components/FeeDetail.vue
View file @ 134488eb
<template> <template>
<el-dialog visible width="1500px" title="NG23022222L费用汇总" :before-close="close"> <el-dialog visible width="1500px" :title="title" :before-close="close">
<el-card v-if="orderSummary"> <el-card v-if="orderSummary">
<span slot="header" class="header-title">{{$t('订单收费汇总')}}</span> <span slot="header" class="header-title">{{$t('订单收费汇总')}}</span>
<el-descriptions :column="4"> <el-descriptions :column="4">
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
{{orderSummary.writeOffAmount}}{{currencyMap[orderSummary.writeOffCurrencyId]}} {{orderSummary.writeOffAmount}}{{currencyMap[orderSummary.writeOffCurrencyId]}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('已核销比例')"> <el-descriptions-item :label="$t('已核销比例')">
{{orderSummary.writeOffRatio}}% {{orderSummary.writeOffRatio}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('是否重货')"> <el-descriptions-item :label="$t('是否重货')">
<!--1 普货 2 重货 3 泡货--> <!--1 普货 2 重货 3 泡货-->
<dict-tag :type="DICT_TYPE.ECW_YESNO" :value="orderSummary.itemType != 1 ? '1' : '0'"></dict-tag> <dict-tag :type="DICT_TYPE.ECW_YESNO" :value="orderSummary.orderType != 1 ? '1' : '0'"></dict-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('原重货标准')" v-if="[1,2].indexOf(orderSummary.transportId) > -1"> <el-descriptions-item :label="$t('原重货标准')" v-if="[1,2].indexOf(orderSummary.transportId) > -1">
{{orderSummary.orgWeightUnit}}KG/m³ {{orderSummary.orgWeightUnit}}KG/m³
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<el-card class="mt-10" v-if="orderDetailSummary"> <el-card class="mt-10" v-if="orderDetailSummary">
<span slot="header">{{$t('运费')}} & {{$t('清关费')}}</span> <span slot="header">{{$t('运费')}} & {{$t('清关费')}}</span>
<!--序号，中文品名，英文品名，品牌，入仓数据，是否重货，入仓数据，实收数据，应收单价，优惠单价金额，成交单价，应收运费&清关费，收款单优惠金额，总优惠金额，实收运费&清关费--> <!--序号，中文品名，英文品名，品牌，入仓数据，是否重货，入仓数据，实收数据，应收单价，优惠单价金额，成交单价，应收运费&清关费，收款单优惠金额，总优惠金额，实收运费&清关费-->
<el-table :data="orderDetailSummary.orderItemCostDtoList"> <el-table :data="orderItemCostDtoList" show-summary :summary-method="getOrderItemSummary">
<el-table-column :label="$t('序号')" width="80"> <el-table-column :label="$t('序号')" width="80">
<template slot-scope="scope">{{scope.$index+1}}</template> <template slot-scope="scope">{{scope.$index+1}}</template>
</el-table-column> </el-table-column>
...@@ -103,15 +103,15 @@ ...@@ -103,15 +103,15 @@
<el-table-column :label="$t('品牌')" prop="brandName"> <el-table-column :label="$t('品牌')" prop="brandName">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span v-if="row.brandName">{{row.brandName}}</span> <span v-if="row.brandName">{{row.brandName}}</span>
<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType"></dict-tag> <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('入仓实测')"> <el-table-column :label="$t('入仓实测')">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span>{{row.warehouseInNum}}{{$t('箱')}}</span> <div>{{row.warehouseInNum}}{{$t('箱')}}</div>
<span class="ml-5">{{row.warehouseInVolume}}m³</span> <div>{{row.warehouseInVolume}}m³</div>
<span class="ml-5">{{row.warehouseInWeight}}kg</span> <div>{{row.warehouseInWeight}}kg</div>
<span class="ml-5" v-if="row.warehouseInQuantity">{{row.warehouseInQuantity}}{{$t('个')}}</span> <div v-if="row.warehouseInQuantity">{{row.warehouseInQuantity}}{{$t('个')}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('是否重货/泡货')"> <el-table-column :label="$t('是否重货/泡货')">
...@@ -122,21 +122,21 @@ ...@@ -122,21 +122,21 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('应收数据')"> <el-table-column :label="$t('应收数据')">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span>{{row.orgChargeNum}}{{$t('箱')}}</span> <div>{{row.orgChargeNum}}{{$t('箱')}}</div>
<span class="ml-5">{{row.orgChargeVolume}}m³</span> <div>{{row.orgChargeVolume}}m³</div>
<span class="ml-5">{{row.orgChargeWeight}}kg</span> <div>{{row.orgChargeWeight}}kg</div>
<span class="ml-5" v-if="row.orgChargeQuantity">{{row.orgChargeQuantity}}{{$t('个')}}</span> <div v-if="row.orgChargeQuantity">{{row.orgChargeQuantity}}{{$t('个')}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('实收数据')"> <el-table-column :label="$t('实收数据')">
<template slot-scope="{row}"> <template slot-scope="{row}">
<span>{{row.realityChargeNum}}{{$t('箱')}}</span> <div>{{row.realityChargeNum}}{{$t('箱')}}</div>
<span class="ml-5">{{row.realityChargeVolume}}m³</span> <div>{{row.realityChargeVolume}}m³</div>
<span class="ml-5">{{row.realityChargeWeight}}kg</span> <div>{{row.realityChargeWeight}}kg</div>
<span class="ml-5" v-if="row.realityChargeQuantity">{{row.realityChargeQuantity}}{{$t('个')}}</span> <div v-if="row.realityChargeQuantity">{{row.realityChargeQuantity}}{{$t('个')}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('应收单价')"> <el-table-column :label="$t('应收单价')" width="180px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<!--全包价--> <!--全包价-->
<!--<template v-if="row.charging"> <!--<template v-if="row.charging">
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
></price> ></price>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('优惠单价金额')"> <el-table-column :label="$t('优惠单价金额')" width="180px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<price <price
:charging="row.charging == 1" :charging="row.charging == 1"
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
></price> ></price>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('成交单价')"> <el-table-column :label="$t('成交单价')" width="180px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<price <price
:charging="row.charging == 1" :charging="row.charging == 1"
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
></price> ></price>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('应收运费') + '&' + $t('清关费')"> <el-table-column :label="$t('应收运费') + '&' + $t('清关费')" width="180px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<price <price
:charging="row.charging == 1" :charging="row.charging == 1"
...@@ -192,7 +192,19 @@ ...@@ -192,7 +192,19 @@
></price> ></price>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('收款单优惠金额')" width="120" prop="discountFee"> <el-table-column :label="$t('优惠运费') + '&' + $t('清关费')" width="180px">
<template slot-scope="{row}">
<price
:charging="row.charging == 1"
:freight="row.discountFreightTotalPrice"
:freight-currency="row.seaFreightCurrency"
:clearance="row.discountClearanceFeeTotalPrice"
:clearance-currency="row.clearanceFreightCurrency"
:currency-map="currencyMap"
></price>
</template>
</el-table-column>
<el-table-column :label="$t('收款单优惠金额')" width="180px" prop="discountFee">
<template slot-scope="{row}"> <template slot-scope="{row}">
<price <price
:charging="row.charging == 1" :charging="row.charging == 1"
...@@ -204,7 +216,7 @@ ...@@ -204,7 +216,7 @@
></price> ></price>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('总优惠金额')"> <el-table-column :label="$t('总优惠金额')" width="180px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<price <price
:charging="row.charging == 1" :charging="row.charging == 1"
...@@ -216,7 +228,7 @@ ...@@ -216,7 +228,7 @@
></price> ></price>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('实收运费') + '&' + $t('清关费')"> <el-table-column :label="$t('实收运费') + '&' + $t('清关费')" width="180px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<price <price
:charging="row.charging == 1" :charging="row.charging == 1"
...@@ -336,7 +348,7 @@ ...@@ -336,7 +348,7 @@
</el-card> </el-card>
<el-card class="mt-10"> <el-card class="mt-10">
<span slot="header">{{$t('优惠活动')}}</span> <span slot="header">{{$t('优惠活动')}}</span>
<el-table :data="[]"> <el-table :data="couponInfoVOList">
<el-table-column :label="$t('优惠ID')" width="100" prop="couponId"></el-table-column> <el-table-column :label="$t('优惠ID')" width="100" prop="couponId"></el-table-column>
<el-table-column :label="$t('优惠名称')" width="120"> <el-table-column :label="$t('优惠名称')" width="120">
<template slot-scope="{row}">{{$l(row, 'title')}}</template> <template slot-scope="{row}">{{$l(row, 'title')}}</template>
...@@ -429,6 +441,9 @@ export default { ...@@ -429,6 +441,9 @@ export default {
} }
}, },
computed:{ computed:{
title(){
return this.orderSummary?.orderNo + this.$t('费用汇总')
},
// 保费 // 保费
insuranceFeeDto(){ insuranceFeeDto(){
return this.orderDetailSummary?.insuranceFeeDto return this.orderDetailSummary?.insuranceFeeDto
...@@ -440,6 +455,14 @@ export default { ...@@ -440,6 +455,14 @@ export default {
// 费用申请 // 费用申请
feeApplicationList(){ feeApplicationList(){
return this.orderDetailSummary?.feeApplicationList || [] return this.orderDetailSummary?.feeApplicationList || []
},
// 运费清关费
orderItemCostDtoList(){
return this.orderDetailSummary?.orderItemCostDtoList || []
},
// 优惠活动
couponInfoVOList(){
return this.orderDetailSummary?.couponInfoVOList || []
} }
}, },
mounted() { mounted() {
...@@ -487,6 +510,28 @@ export default { ...@@ -487,6 +510,28 @@ export default {
arr[6] = this.calcTotalByCurrency(this.feeApplicationList, 'realityTotalAmount', 'currencyId') arr[6] = this.calcTotalByCurrency(this.feeApplicationList, 'realityTotalAmount', 'currencyId')
return arr return arr
}, },
// 运费&清关费汇总
getOrderItemSummary(){
let arr = []
arr[10] = this.$t('合计')
// 运费和清关费要合计起来
let feeList = this.orderItemCostDtoList.map(item => {
return {
amount: item.receivableSeaFreight,
currency: item.seaFreightCurrency
}
})
feeList = feeList.concat(this.orderItemCostDtoList.map(item => {
return {
amount: item.receivableClearanceFreight,
currency: item.clearanceFreightCurrency
}
}))
// 应收金额
arr[11] = this.calcTotalByCurrency(feeList, 'amount', 'currency')
console.log('运费清关费汇总',feeList, arr)
return arr
},
close(){ close(){
this.$emit('close') this.$emit('close')
}, },
......
src/views/ecw/order/detail.vue
View file @ 134488eb
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
<el-button v-hasPermi="['ecw:order:show_customs']" type="text" @click="showDeclaration=true">{{$t('查看报关资料')}}</el-button> <el-button v-hasPermi="['ecw:order:show_customs']" type="text" @click="showDeclaration=true">{{$t('查看报关资料')}}</el-button>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('费用明细')" name="four"> <el-tab-pane :label="$t('费用明细')" name="four">
<el-button type="primary" @click="showFeeSummary=true">{{$t('费用汇总')}}</el-button> <el-button v-has-permi="['order:detail:fee-detail']" type="primary" @click="showFeeSummary=true">{{$t('费用汇总')}}</el-button>
<el-table :data="feeList"> <el-table :data="feeList">
<el-table-column :label="$t('订单号')" prop="orderNo"> <el-table-column :label="$t('订单号')" prop="orderNo">
<template slot-scope="{row}"> <template slot-scope="{row}">
...@@ -271,7 +271,6 @@ ...@@ -271,7 +271,6 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('目的地')"> <el-table-column :label="$t('目的地')">
{{$l(objective, 'title') || '-'}} {{$l(objective, 'title') || '-'}}
{{$l(objective, 'title') || '-'}}
</el-table-column> </el-table-column>
<el-table-column :label="$t('品名')" prop="titleZh"> <el-table-column :label="$t('品名')" prop="titleZh">
<template slot-scope="{row}"> <template slot-scope="{row}">
......
src/views/ecw/order/edit.vue
View file @ 134488eb
...@@ -324,9 +324,6 @@ ...@@ -324,9 +324,6 @@
/> />
</el-form-item> </el-form-item>
</div> </div>
<div class="form-section" v-if="form.customsType==2">
<span style="color:red;font-size:14px">{{$t('报关退税，请备齐资料。')}}</span>
</div>
<div class="form-section" v-if="collectionProxy"> <div class="form-section" v-if="collectionProxy">
<el-form-item :label="$t('是否代收货款')" prop="isCollection"> <el-form-item :label="$t('是否代收货款')" prop="isCollection">
<dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCollection" form-type="radio" :disabled="false" /> <dict-selector :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" v-model="form.isCollection" form-type="radio" :disabled="false" />
...@@ -342,7 +339,7 @@ ...@@ -342,7 +339,7 @@
<el-form-item :label="$t('单证报关')" :span="2" prop="customsType"> <el-form-item :label="$t('单证报关')" :span="2" prop="customsType">
<dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.customsType" form-type="radio" defaultable :disabled="false" /> <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.customsType" form-type="radio" defaultable :disabled="false" />
<!--自单代报显示提示--> <!--自单代报显示提示-->
<div v-if="+form.customsType === 2">{{$t('报关退税，请备齐资料。')}}</div> <div v-if="+form.customsType === 2" style="color:red;font-size:14px">{{$t('报关退税，请备齐资料。')}}</div>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
......
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