Commit 9a45e04e authored by 我在何方's avatar 我在何方

同步dev1.6

parent a094fd63
...@@ -586,7 +586,7 @@ export function exportAbnormal(params){ ...@@ -586,7 +586,7 @@ export function exportAbnormal(params){
// 参数搜索导出重货单统计 Excel // 参数搜索导出重货单统计 Excel
export function exportHeavyOrder(params){ export function exportHeavyOrder(params){
return request({ return request({
url: '/ecw/order/export-heavyOrder', url: '/ecw/order/export/export-heavyOrder',
method: 'get', method: 'get',
params: params, params: params,
responseType: 'blob' responseType: 'blob'
...@@ -596,7 +596,7 @@ export function exportHeavyOrder(params){ ...@@ -596,7 +596,7 @@ export function exportHeavyOrder(params){
// 参数搜索导出退仓单统计统计 Excel // 参数搜索导出退仓单统计统计 Excel
export function exportReturnOrder(params){ export function exportReturnOrder(params){
return request({ return request({
url: '/ecw/order-exception/export-returnOrder', url: '/ecw/order/export/export-returnOrder',
method: 'get', method: 'get',
params: params, params: params,
responseType: 'blob' responseType: 'blob'
...@@ -606,7 +606,7 @@ export function exportReturnOrder(params){ ...@@ -606,7 +606,7 @@ export function exportReturnOrder(params){
// 参数搜索导出售后赔偿金额统计 Excel // 参数搜索导出售后赔偿金额统计 Excel
export function exportSaleRepay(params){ export function exportSaleRepay(params){
return request({ return request({
url: '/ecw/order-exception/export-saleRepay', url: '/ecw/order/export/export-saleRepay',
method: 'get', method: 'get',
params: params, params: params,
responseType: 'blob' responseType: 'blob'
...@@ -617,7 +617,7 @@ export function exportSaleRepay(params){ ...@@ -617,7 +617,7 @@ export function exportSaleRepay(params){
// 参数搜索导出报关数统计 Excel // 参数搜索导出报关数统计 Excel
export function exportCustomsDatas(params){ export function exportCustomsDatas(params){
return request({ return request({
url: '/ecw/order-exception/export-customDatas', url: '/ecw/order/export/export-customDatas',
method: 'get', method: 'get',
params: params, params: params,
responseType: 'blob' responseType: 'blob'
...@@ -628,7 +628,7 @@ export function exportCustomsDatas(params){ ...@@ -628,7 +628,7 @@ export function exportCustomsDatas(params){
// 参数搜索导出客户出货量统计 Excel // 参数搜索导出客户出货量统计 Excel
export function exportShippingDatas(params){ export function exportShippingDatas(params){
return request({ return request({
url: '/ecw/order-exception/export-shipDatas', url: '/ecw/order/export/export-shipDatas',
method: 'get', method: 'get',
params: params, params: params,
responseType: 'blob' responseType: 'blob'
...@@ -639,7 +639,7 @@ export function exportShippingDatas(params){ ...@@ -639,7 +639,7 @@ export function exportShippingDatas(params){
// 参数搜索导出预付运费统计 Excel // 参数搜索导出预付运费统计 Excel
export function exportShipFee(params){ export function exportShipFee(params){
return request({ return request({
url: '/ecw/order-exception/export-shipFee', url: '/ecw/order/export/export-shipFee',
method: 'get', method: 'get',
params: params, params: params,
responseType: 'blob' responseType: 'blob'
...@@ -650,7 +650,7 @@ export function exportShipFee(params){ ...@@ -650,7 +650,7 @@ export function exportShipFee(params){
// 参数搜索导出卸货费统计 Excel // 参数搜索导出卸货费统计 Excel
export function exportUnload(params){ export function exportUnload(params){
return request({ return request({
url: '/ecw/order-exception/export-excel', url: '/ecw/order/export/export-excel',
method: 'get', method: 'get',
params: params, params: params,
responseType: 'blob' responseType: 'blob'
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('自单代报订单方数')" align="center" prop="orderReportNumber" > <el-table-column :label="$t('自单代报订单方数')" align="center" prop="orderReportNumber" >
<template slot-scope="{row}"> <template slot-scope="{row}">
{{row.warehousingNumber || 0}} {{row.orderReportNumber || 0}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('已装柜方数')" align="center" prop="loadingNumber" > <el-table-column :label="$t('已装柜方数')" align="center" prop="loadingNumber" >
......
...@@ -659,6 +659,10 @@ export default { ...@@ -659,6 +659,10 @@ export default {
exportAbnormal(){ exportAbnormal(){
return this.exportExcel(exportAbnormal, this.combinedQueryParams, this.$t("异常单统计")) return this.exportExcel(exportAbnormal, this.combinedQueryParams, this.$t("异常单统计"))
}, },
// 重货单统计
exportHeavyOrder(){
return this.exportExcel(exportHeavyOrder, this.combinedQueryParams, this.$t("重货单统计"))
},
// 退仓单统计 // 退仓单统计
exportReturnOrder(){ exportReturnOrder(){
return this.exportExcel(exportReturnOrder, this.combinedQueryParams, this.$t("退仓单统计")) return this.exportExcel(exportReturnOrder, this.combinedQueryParams, this.$t("退仓单统计"))
......
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