diff --git a/proxy.conf.js b/proxy.conf.js index fe30b24d..da23059d 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,17 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-dev.eascs.com', - protocol: 'https:', - port: 443 - }, - secure: false, - changeOrigin: true, - logLevel: 'debug' - }, - '//sascs': { - target: { - host: 'sascs-tj-tms-dev.obs.cn-south-1.myhuaweicloud.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html index 226a063f..ae51e0e3 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html @@ -21,7 +21,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"> diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts index b413661d..1dbf859b 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts @@ -25,10 +25,9 @@ export class DatatableBusiindexComponent implements OnInit { dateNext: any = null; modeNext = 'year'; timeNext: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); chartData: any = {} - flag = false; columns: STColumn[] = [ { title: '运营主体', index: 'networkTransporterName', className: 'text-center' }, @@ -67,7 +66,7 @@ export class DatatableBusiindexComponent implements OnInit { ngOnInit(): void { this.initData() } - initData(){ + initData(flag?: boolean){ let type = 1 if(this.mode === 'year') { type = 1 @@ -81,7 +80,7 @@ export class DatatableBusiindexComponent implements OnInit { this.service.request(this.service.$api_performanceReportHistogram, params).subscribe(res => { if (res) { this.chartData = res - if(this.flag) { + if(flag) { this.pillar.reRender() this.curve.reRender() } @@ -126,10 +125,7 @@ export class DatatableBusiindexComponent implements OnInit { } else if(this.mode === 'month') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] } - - - this.flag = true - this.initData() + this.initData(true) } disabledDate = (current: Date): boolean => // Can not select days before today and today diff --git a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts index 62220b3d..00d9e8b5 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts @@ -26,16 +26,14 @@ export class BusitableCurveComponent implements OnInit, OnChanges { } reRender() { - setTimeout(() => { this.chart.data(this.chartData); this.chart.render(); - }, 500) } render(el: ElementRef): void { this.el = el.nativeElement - if(!this.service.http.loading){ + setTimeout(() => { this.ngZone.runOutsideAngular(() => this.init(this.el)); - } + }, 500) } private init(el: HTMLElement): void { diff --git a/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts b/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts index 6e847a3d..c1f60ff0 100644 --- a/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts +++ b/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts @@ -20,7 +20,7 @@ export class DatatableMantableComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); dateNext: any = null; modeNext = 'year'; diff --git a/src/app/routes/datatable/components/busitable/pillar/pillar.component.ts b/src/app/routes/datatable/components/busitable/pillar/pillar.component.ts index ad1cef14..ddb0569b 100644 --- a/src/app/routes/datatable/components/busitable/pillar/pillar.component.ts +++ b/src/app/routes/datatable/components/busitable/pillar/pillar.component.ts @@ -26,14 +26,14 @@ export class BusitablePillarComponent implements OnInit, OnChanges { } reRender() { - setTimeout(() => { this.chart.data(this.chartData); this.chart.render(); - }, 500) } render(el: ElementRef): void { this.el = el.nativeElement - this.ngZone.runOutsideAngular(() => this.init(this.el)); + setTimeout(() => { + this.ngZone.runOutsideAngular(() => this.init(this.el)); + }, 500) } private init(el: HTMLElement): void { diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html index 8816fdf1..4583cab7 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html @@ -39,7 +39,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"> diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts index 8c2cccab..e290bb54 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts @@ -20,7 +20,7 @@ export class DatatableCustomindexComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); dateNext: any = null; modeNext = 'year'; diff --git a/src/app/routes/datatable/components/customtable/driver/driver.component.html b/src/app/routes/datatable/components/customtable/driver/driver.component.html index 9deaefbd..383fe343 100644 --- a/src/app/routes/datatable/components/customtable/driver/driver.component.html +++ b/src/app/routes/datatable/components/customtable/driver/driver.component.html @@ -41,6 +41,6 @@ + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"> \ No newline at end of file diff --git a/src/app/routes/datatable/components/customtable/driver/driver.component.ts b/src/app/routes/datatable/components/customtable/driver/driver.component.ts index 330ac567..3050a847 100644 --- a/src/app/routes/datatable/components/customtable/driver/driver.component.ts +++ b/src/app/routes/datatable/components/customtable/driver/driver.component.ts @@ -20,7 +20,7 @@ export class DatatableDriverComponent implements OnInit { date: any = null; defineDate = []; queryTime: any = '' - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); ui: SFUISchema = {}; schema: SFSchema = {}; diff --git a/src/app/routes/datatable/components/customtable/owner/owner.component.html b/src/app/routes/datatable/components/customtable/owner/owner.component.html index 9777a490..e805efd9 100644 --- a/src/app/routes/datatable/components/customtable/owner/owner.component.html +++ b/src/app/routes/datatable/components/customtable/owner/owner.component.html @@ -41,6 +41,6 @@ > + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"> \ No newline at end of file diff --git a/src/app/routes/datatable/components/customtable/owner/owner.component.ts b/src/app/routes/datatable/components/customtable/owner/owner.component.ts index 73833dff..f3a81454 100644 --- a/src/app/routes/datatable/components/customtable/owner/owner.component.ts +++ b/src/app/routes/datatable/components/customtable/owner/owner.component.ts @@ -20,7 +20,7 @@ export class DatatableOwnerComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); ui: SFUISchema = {}; schema: SFSchema = {}; diff --git a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html index 4a9e9f95..4d75b400 100644 --- a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html +++ b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html @@ -37,7 +37,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"> \ No newline at end of file diff --git a/src/app/routes/datatable/components/financetable/financetable.component.ts b/src/app/routes/datatable/components/financetable/financetable.component.ts index a5eb59de..6a109564 100644 --- a/src/app/routes/datatable/components/financetable/financetable.component.ts +++ b/src/app/routes/datatable/components/financetable/financetable.component.ts @@ -24,7 +24,7 @@ export class DatatableFinancetableComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; dateNext: any = null; modeNext = 'year'; timeNext: any = ['2022-01-01 00:00:00'] diff --git a/src/app/routes/datatable/components/operationtable/curve/curve.component.ts b/src/app/routes/datatable/components/operationtable/curve/curve.component.ts index ce105bbc..8f163963 100644 --- a/src/app/routes/datatable/components/operationtable/curve/curve.component.ts +++ b/src/app/routes/datatable/components/operationtable/curve/curve.component.ts @@ -33,9 +33,9 @@ export class OperationCurveComponent implements OnInit, OnChanges { } render(el: ElementRef): void { this.el = el.nativeElement - if(!this.service.http.loading){ + setTimeout(() => { this.ngZone.runOutsideAngular(() => this.init(this.el)); - } + },500) } private init(el: HTMLElement): void { diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.ts b/src/app/routes/datatable/components/operationtable/operationtable.component.ts index bce8f525..891ee8e1 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.ts +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.ts @@ -22,7 +22,7 @@ export class DatatableOperationtableComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; dateNext: any = null; modeNext = 'year'; timeNext: any = ['2022-01-01 00:00:00'] @@ -31,7 +31,6 @@ export class DatatableOperationtableComponent implements OnInit { interManlist: any = [] chartData: any = {} - flag: boolean = false; columns: STColumn[] = [ { title: '运营主体', index: 'networkTransporterName', className: 'text-center' }, { title: '订单数', index: 'zsl', className: 'text-center' }, @@ -84,11 +83,10 @@ export class DatatableOperationtableComponent implements OnInit { type, enterpriseInfoId: this.enterpriseInfoId }; - this.flag = flag ? flag : false this.service.request(this.service.$api_operationalReportHistogram, params).subscribe(res => { if (res) { this.chartData = res - if(this.flag) { + if(flag) { // 除第一次加载外 this.pillar.reRender() this.curve.reRender() } @@ -152,5 +150,6 @@ export class DatatableOperationtableComponent implements OnInit { } else if(this.mode === 'month') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] } + this.initPillarData(true) } } diff --git a/src/app/routes/datatable/components/operationtable/pillar/pillar.component.ts b/src/app/routes/datatable/components/operationtable/pillar/pillar.component.ts index 3f056a81..b78f500f 100644 --- a/src/app/routes/datatable/components/operationtable/pillar/pillar.component.ts +++ b/src/app/routes/datatable/components/operationtable/pillar/pillar.component.ts @@ -33,9 +33,9 @@ export class OperationPillarComponent implements OnInit, OnChanges { } render(el: ElementRef): void { this.el = el.nativeElement - if(!this.service.http.loading){ - this.ngZone.runOutsideAngular(() => this.init(this.el)); - } + setTimeout(() => { + this.ngZone.runOutsideAngular(() => this.init(this.el)); + }, 500) } private init(el: HTMLElement): void { diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts index 8a679d45..a2215935 100644 --- a/src/app/routes/datatable/datatable.module.ts +++ b/src/app/routes/datatable/datatable.module.ts @@ -22,13 +22,13 @@ import { DatatableBusiindexComponent } from './components/busitable/busiindex/bu import { DatatableMantableComponent } from './components/busitable/mantable/mantable.component'; import { BusitablePillarComponent } from './components/busitable/pillar/pillar.component'; import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component'; -import { BusitableCurveComponent } from './components/busitable/busiindex/curve/curve.component'; import { OperationPillarComponent } from './components/operationtable/pillar/pillar.component'; import { OperationCurveComponent } from './components/operationtable/curve/curve.component'; import { FinanceTableCurveComponent } from './components/financetable/curve/curve.component'; import { DatatableDatascreenComponent } from './components/datascreen/datascreen.component'; import { FinancetablePillarComponent } from './components/financetable/pillar/pillar.component'; import { ComplianceCurveComponent } from './components/compliance/index/curve/curve.component'; +import { BusitableCurveComponent } from './components/busitable/busiindex/curve/curve.component'; const COMPONENTS: Type[] = [ DatatableDataindexComponent, @@ -53,14 +53,14 @@ const COMPONENTS: Type[] = [ BusitablePillarComponent, DatatableFundReportingComponent, DatatableReportingFundInfoComponent, - BusitableCurveComponent, OperationPillarComponent, OperationCurveComponent, DatatableReportingFundInfoComponent, FinanceTableCurveComponent, DatatableDatascreenComponent, FinancetablePillarComponent, - ComplianceCurveComponent + ComplianceCurveComponent, + BusitableCurveComponent ] diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 7861fd50..9d0545cc 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -74,7 +74,7 @@ export class DriverAccountComponent implements OnInit { } exportList() { - this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 }); + this.service.asyncExport({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index 99477de7..f9bcbac8 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -39,6 +39,8 @@ export class FreightAccountService extends ShipperBaseService { $api_get_shipper_account_balance_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceShipperIncomeDetailByOperator'; // 运营端端获取司机交易收入与支出金额 $api_get_driver_account_balance_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceDriverIncomeDetailByOperator'; + // 运营端导出司机账户明细信息 + $api_export_driver_account_page = '/api/fcc/accountBalance/exportDriverAccountBalanceByOperator'; // 货主端获取账户余额交易明细 $api_get_balance_by_shipper = '/api/fcc/accountBalanceDetail/getAccountBalanceByShipperPage'; @@ -59,14 +61,14 @@ export class FreightAccountService extends ShipperBaseService { // 拒绝提现 $api_disagree_refund = '/api/fcc/refundApplicationOBC/disagreeRefund'; - // 查询订单退款申请表 - $api_get_refund_record_page = '/api/fcc/billRefundApplication/list/page'; - // 同意退款 - $api_agree_refund_record= '/api/fcc/billRefundApplication/agreeRefund'; - // 不同意退款 - $api_disagree_refund_record = '/api/fcc/billRefundApplication/disagreeRefund'; - // 重新发起 - $api_rebulid_refund_record = '/api/fcc/billRefundApplication/rebulid'; + // 查询订单退款申请表 + $api_get_refund_record_page = '/api/fcc/billRefundApplication/list/page'; + // 同意退款 + $api_agree_refund_record = '/api/fcc/billRefundApplication/agreeRefund'; + // 不同意退款 + $api_disagree_refund_record = '/api/fcc/billRefundApplication/disagreeRefund'; + // 重新发起 + $api_rebulid_refund_record = '/api/fcc/billRefundApplication/rebulid'; // 查询充值信息表 $api_get_recharge_page = '/api/fcc/rechargeInfo/list/getPageByOperator'; @@ -122,6 +124,7 @@ export class FreightAccountService extends ShipperBaseService { // 下载银行回单请求 $api_download_receipt_apply = '/api/fcc/spd/callback/receiptApply'; + $api_download_receipt_apply_byte = '/api/fcc/spd/callback/receiptApplyByte'; // 查询预收款余额 $api_get_advance_collection_page = '/api/fcc/ficoYskBla/list/page'; @@ -137,12 +140,25 @@ export class FreightAccountService extends ShipperBaseService { } getReceiptUrl(url: string, params: any) { + const { bankType, snglFlgCd } = params; if (url) { - this.reviewPDF(url); + if (params?.bankType === '1') { + window.open(params?.receiptUrl); + } else if (params?.bankType === '2') { + this.exportFile({ bankType, receiptUrl: url, bankSerialNumber: snglFlgCd }, this.$api_download_receipt_apply_byte); + } } else { this.request(this.$api_download_receipt_apply, { ...params }).subscribe(res => { if (res?.receiptUrl) { - this.reviewPDF(res.receiptUrl); + if (bankType === '1') { + window.open(res?.receiptUrl); + } else if (bankType === '2') { + this.downloadFile(this.$api_download_receipt_apply_byte, { + bankType, + receiptUrl: res.receiptUrl, + bankSerialNumber: snglFlgCd + }); + } } else { this.msgSrv.warning(res.statusMsg || '获取回单失败'); } @@ -163,7 +179,7 @@ export class FreightAccountService extends ShipperBaseService { const a = document.createElement('a'); document.body.appendChild(a); a.href = objectUrl; - a.download = '回单.pdf'; + a.download = `回单.pdf`; if (isIE) { // 兼容IE11无法触发下载的问题 (navigator as any).msSaveBlob(url, a.download); diff --git a/src/app/routes/logs/components/system-logs/system-logs.component.ts b/src/app/routes/logs/components/system-logs/system-logs.component.ts index 8fef4e7a..90caac95 100644 --- a/src/app/routes/logs/components/system-logs/system-logs.component.ts +++ b/src/app/routes/logs/components/system-logs/system-logs.component.ts @@ -52,7 +52,7 @@ export class SystemLogsComponent implements OnInit { } }, time: { - title: '登录时间', + title: '操作时间', type: 'string', ui: { widget: 'sl-from-to-search', @@ -67,7 +67,7 @@ export class SystemLogsComponent implements OnInit { }; columns: STColumn[] = [ - { title: '操作时间', index: 'operatorTimestamp', type: 'date' }, + { title: '操作时间', index: 'operatorTimestamp' }, { title: '操作人', index: 'operator' }, { title: '操作人手机号码', index: 'telephone' }, { title: '操作页面', index: 'operatePage' }, diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html index d21373dc..0803df06 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html @@ -41,7 +41,7 @@ [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']" >查询 - diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index c6b4e3a1..c6d77830 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -694,4 +694,12 @@ export class OrderManagementComplianceAuditComponent implements OnInit { } } } + // 导出 + exprot() { + this.service.request(this.service.$api_get_asyncExportSpotCheckList, this.reqParams).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('导出成功，请去下载中心下载！'); + } + }); + } } diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html index 00aa235e..cb49f728 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-01 11:00:38 + * @LastEditTime : 2022-04-06 11:06:05 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -35,7 +35,7 @@ - +