This commit is contained in:
wangshiming
2022-05-07 13:49:47 +08:00
parent 0e7a348236
commit 2e3f5d65a5
3 changed files with 22 additions and 9 deletions

View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-18 09:51:21 * @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-05-07 10:35:23 * @LastEditTime : 2022-05-07 11:27:16
* @FilePath : \\tms-obc-web\\proxy.conf.js * @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -30,7 +30,7 @@ module.exports = {
// }, // },
'//api': { '//api': {
target: { target: {
host: 'tms-api-dev.eascs.com', host: 'tms-api-test.eascs.com',
protocol: 'https:', protocol: 'https:',
port: 443 port: 443
}, },

View File

@ -73,9 +73,9 @@ export class DatatableOperationtableComponent implements OnInit {
} }
initPillarData(flag?: boolean){ initPillarData(flag?: boolean){
let type = 1 let type = 1
if(this.mode === 'year') { if(this.modeNext === 'year') {
type = 1 type = 1
} else if(this.mode === 'month') { } else if(this.modeNext === 'month') {
type = 2 type = 2
} }
const params: any = { const params: any = {
@ -126,7 +126,18 @@ export class DatatableOperationtableComponent implements OnInit {
// Can not select days before today and today // Can not select days before today and today
differenceInCalendarDays(current, this.today) > 0; differenceInCalendarDays(current, this.today) > 0;
exportFun() { exportFun() {
let type = 1
if(this.mode === 'year') {
type = 1
} else if(this.mode === 'month') {
type = 2
}
const params: any = {
time: this.time,
type,
enterpriseInfoId: this.enterpriseInfoId
};
this.service.exportStart({ ...params, pageSize: -1 }, this.service.$api_asyncExportOperationalReport);
} }
changeCurve(){ changeCurve(){
@ -135,9 +146,9 @@ export class DatatableOperationtableComponent implements OnInit {
} }
changeDataNext() { changeDataNext() {
if(this.mode === 'year') { if(this.modeNext === 'year') {
this.dateFormat = 'yyyy' this.dateFormat = 'yyyy'
} else if(this.mode === 'month') { } else if(this.modeNext === 'month') {
this.dateFormat = 'yyyy-MM' this.dateFormat = 'yyyy-MM'
} }
} }
@ -145,9 +156,9 @@ export class DatatableOperationtableComponent implements OnInit {
if(result === null) { if(result === null) {
return return
} }
if(this.mode === 'year') { if(this.modeNext === 'year') {
this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy') + '-01-01 00:00:00'] this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy') + '-01-01 00:00:00']
} else if(this.mode === 'month') { } else if(this.modeNext === 'month') {
this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00']
} }
this.initPillarData(true) this.initPillarData(true)

View File

@ -107,6 +107,8 @@ export class DataService extends ShipperBaseService {
$api_total_freight = `/api/sdc/reportData/getTotalFreight`; $api_total_freight = `/api/sdc/reportData/getTotalFreight`;
// 附加费总额 // 附加费总额
$api_total_surcharge = `/api/sdc/reportData/getTotalSurcharge`; $api_total_surcharge = `/api/sdc/reportData/getTotalSurcharge`;
// 运营导出
$api_asyncExportOperationalReport = `/api/sdc/report/asyncExportOperationalReport`;