Skip to content

J
jiedao-app-operator-master
Commit 259d9fac authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

自编号报表详情部分数据对接

parent b6d46151
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 58 deletions
src/api/ecw/order.js
View file @ 259d9fac
......@@ -795,3 +795,12 @@ export function orderDetailSummary(orderId){
method: 'get'
})
}
// 自编号的订单费用汇总
export function orderSummaryByContainerNumber(params){
return request({
url: '/ecw/orderCount/containerNumber/orderSummary',
method: 'get',
params
})
}
src/views/ecw/financial/selfNoReportDetail.vue
View file @ 259d9fac
......@@ -10,13 +10,13 @@
class="card"
>
<el-form-item :label="$t('编号')">
<el-input v-model="queryParams.selfNo" clearable placeholder="订单号、唛头、提单号"></el-input>
<el-input v-model="queryParams.numberKey" clearable placeholder="订单号、唛头、提单号"></el-input>
</el-form-item>
<el-form-item :label="$t('发货人')">
<el-input v-model="queryParams.fhr" placeholder="发货人名称、手机号"></el-input>
<el-input v-model="queryParams.consignorKey" placeholder="发货人名称、手机号"></el-input>
</el-form-item>
<el-form-item :label="$t('收货人')">
<el-input v-model="queryParams.fhr" placeholder="收货人名称、手机号"></el-input>
<el-input v-model="queryParams.consigneeKey" placeholder="收货人名称、手机号"></el-input>
</el-form-item>
<el-form-item>
......@@ -29,13 +29,13 @@
>
</el-date-picker>
</el-form-item>
<el-form-item :label="$t('运输方式')" prop="transportId" v-if="!transportId">
<!--<el-form-item :label="$t('运输方式')" prop="transportId">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable @change="handleQuery"/>
</el-form-item>
</el-form-item>-->
<el-form-item :label="$t('始发仓')">
<el-select v-model="queryParams.warehouseId" placeholder="请选择" clearable>
<el-select v-model="queryParams.startWarehouseId" placeholder="请选择" clearable>
<el-option
v-for="item in warehouseList"
v-for="item in exportWarehouseList"
:key="item.id"
:label="$l(item, 'title')"
:value="item.id"
......@@ -43,9 +43,9 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('目的仓')">
<el-select v-model="queryParams.destinationWarehouseId" placeholder="请选择" clearable>
<el-select v-model="queryParams.dstWarehouseId" placeholder="请选择" clearable>
<el-option
v-for="item in warehouseList"
v-for="item in importWarehouseList"
:key="item.id"
:label="$l(item, 'title')"
:value="item.id"
......@@ -76,128 +76,128 @@
{{index + 1}}
</template>
</el-table-column>
<el-table-column :label="$t('订单号')" width="150" prop="orderNo" />
<el-table-column :label="$t('唛头')" width="150" prop="mark" />
<el-table-column :label="$t('始发仓')" width="150" prop="warehouseName" />
<el-table-column :label="$t('运输方式/目的地')" width="150">
<template slot-scope="{row}">
<div>{{row.transportName}}/{{row.destinationCountryName}}</div>
</template>
</el-table-column>
<el-table-column :label="$t('仓库实测')" width="150">
<el-table-column :label="$t('订单号')" prop="orderNo" />
<el-table-column :label="$t('唛头')" prop="marks" />
<el-table-column :label="$t('始发仓')" prop="startWarehouseName" />
<el-table-column :label="$t('运输方式') + '/' + $t('目的地')">
<template slot-scope="{row}">
<div>{{row.warehouseMeasure}}</div>
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag>
/{{row.objectiveName}}
</template>
</el-table-column>
<el-table-column :label="$t('是否重泡货')" width="150">
<el-table-column :label="$t('仓库实测')">
<template slot-scope="{row}">
<div>{{row.isHeavyBubble | dict(DICT_TYPE.YES_NO)}}</div>
{{row.sumNum}}{{$t('箱')}},{{row.sumVolume}}m³,{{row.sumWeight}}kg
</template>
</el-table-column>
<el-table-column :label="$t('收费数据')" width="150">
<el-table-column :label="$t('是否重泡货')">
<template slot-scope="{row}">
<div>{{row.chargeData}}</div>
<!--1 普货 2 重货 3 泡货-->
<dict-tag :type="DICT_TYPE.ECW_YESNO" :value="row.itemType != 1 ? '1' : '0'"></dict-tag>
</template>
</el-table-column>
<el-table-column :label="$t('订单状态')" width="150">
<el-table-column :label="$t('收费数据')">
<template slot-scope="{row}">
<div>{{row.status | dict(DICT_TYPE.ORDER_STATUS)}}</div>
{{row.realityChargeNum}}{{$t('箱')}},{{row.realityChargeVolume}}m³,{{row.realityChargeWeight}}kg
</template>
</el-table-column>
<el-table-column :label="$t('应收总金额')" width="150">
<el-table-column :label="$t('订单状态')" prop="statusMsg"></el-table-column>
<el-table-column :label="$t('应收总金额')">
<template slot-scope="{row}">
<div>{{row.totalAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('订单优惠金额')" width="150">
<template slot-scope="{row}">
<div>{{row.orderDiscountAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('实收总金额')" width="150">
<template slot-scope="{row}">
<div>{{row.actualTotalAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('已收总金额')" width="150">
<template slot-scope="{row}">
<div>{{row.receivedTotalAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('应收运费')" width="150">
<template slot-scope="{row}">
<div>{{row.freightAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('运费优惠金额')" width="150">
<template slot-scope="{row}">
<div>{{row.freightDiscountAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('实收运费')" width="150">
<template slot-scope="{row}">
<div>{{row.actualFreightAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('已收运费')" width="150">
<template slot-scope="{row}">
<div>{{row.receivedFreightAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('应收清关费')" width="150">
<template slot-scope="{row}">
<div>{{row.customsClearanceAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('实收清关费')" width="150">
<template slot-scope="{row}">
<div>{{row.actualCustomsClearanceAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('清关费优惠金额')" width="150">
<template slot-scope="{row}">
<div>{{row.customsClearanceDiscountAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('已收清关费')" width="150">
<template slot-scope="{row}">
<div>{{row.receivedCustomsClearanceAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('应收额外费用')" width="150">
<template slot-scope="{row}">
<div>{{row.storageAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('实收额外费用')" width="150">
<template slot-scope="{row}">
<div>{{row.actualStorageAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('额外费用优惠金额')" width="150">
<template slot-scope="{row}">
<div>{{row.storageDiscountAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('已收额外费用')" width="150">
<template slot-scope="{row}">
<div>{{row.receivedStorageAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('是否全部核销')" width="150">
<template slot-scope="{row}">
<div>{{row.otherAmount}}</div>
<span v-if="row.writeOffRatio >= 100">{{$t('全部核销')}}</span>
<span v-else-if="row.writeOffRatio > 0">{{$t('部分核销')}}</span>
<span v-else>{{$t('未核销')}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('客户经理')" prop="name"></el-table-column>
<el-table-column :label="$t('客户经理')" prop="name">// TODO</el-table-column>
<el-table-column :label="$t('订单入仓时间')" width="150">
<template slot-scope="{row}">
<div>{{row.otherAmount}}</div>
// TODO
</template>
</el-table-column>
<el-table-column :label="$t('订单装柜时间')" width="150">
<template slot-scope="{row}">
<div>{{row.otherAmount}}</div>
// TODO
</template>
</el-table-column>
</el-table>
......@@ -215,12 +215,13 @@
import { getTradeCityList } from "@/api/ecw/region";
import { getCurrencyPage } from "@/api/ecw/currency";
import {getWarehouseList} from '@/api/ecw/warehouse'
import Template from "@/views/cms/template/index.vue";
import store from "@/store";
import UserSelector from "@/components/UserSelector/index.vue";
import {orderSummaryByContainerNumber} from "@/api/ecw/order";
import {DICT_TYPE} from "@/utils/dict";
export default {
components: {UserSelector, Template},
components: {UserSelector},
data() {
return {
loading: false, // 加载中
......@@ -248,6 +249,9 @@ export default {
getWarehouseList().then(res => this.warehouseList = res.data)
},
computed: {
DICT_TYPE() {
return DICT_TYPE
},
permissions(){
return store.getters.permissions
},
......@@ -259,10 +263,10 @@ export default {
},
exportWarehouseList(){
/* tradeType 1 进口，2出口，3进出口 */
return this.warehouseList.filter(item => item.tradeType === 2 || item.tradeType === 3)
return this.warehouseList.filter(item => +item.tradeType === 2 || +item.tradeType === 3)
},
importWarehouseList(){
return this.warehouseList.filter(item => item.tradeType === 1 || item.tradeType === 3)
return this.warehouseList.filter(item => +item.tradeType === 1 || +item.tradeType === 3)
},
},
methods: {
......@@ -273,27 +277,30 @@ export default {
},
/** 查询列表 */
getList() {
return false
this.loading = true;
let params = {...this.queryParams}
this.addBeginAndEndTime(params, this.dateType, "createTime");
let params = {...this.queryParams, containerNumber: this.$route.query.containerNumber}
this.addBeginAndEndTime(params, this.dateFilter, this.dateFilterType, false);
// 执行查询
/* TODO getListApi(params).then((response) => {
orderSummaryByContainerNumber(params).then((response) => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});*/
});
},
/** 搜索按钮操作 */
handleQuery() {
this.$refs['queryForm'].resetFields()
this.queryParams.page = 1;
// TODO 重置结算时间
this.getList();
},
handleReset(){
this.$refs['queryForm'].resetFields()
this.dateFilter = []
this.dateFilterType = ''
this.handleQuery()
},
// 导出搜索
handleExport(){
// TODO 导出搜索
this.$alert('// TODO')
}
},
};
......
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