Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-04-06 11:19:43 +08:00
parent 99cef99cf0 bd08e5978a
commit 1d1331d6db
16 changed files with 41 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html
View File

@ -21,7 +21,7 @@
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listPerformanceReportPage"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"></st>
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"></st>
</nz-card>
<nz-card nzTitle="业绩报表" [nzExtra]="extraTemplate01">
<ng-template #extraTemplate01>

12
src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts
View File

@ -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

6
src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts
View File

@ -26,16 +26,12 @@ export class BusitableCurveComponent implements OnInit, OnChanges {
}
reRender() {
setTimeout(() => {
this.chart.data(this.chartData);
this.chart.render();
}, 500)
}
render(el: ElementRef<HTMLDivElement>): void {
this.el = el.nativeElement
if(!this.service.http.loading){
this.ngZone.runOutsideAngular(() => this.init(this.el));
}
this.ngZone.runOutsideAngular(() => this.init(this.el));
}
private init(el: HTMLElement): void {

2
src/app/routes/datatable/components/busitable/mantable/mantable.component.ts
View File

@ -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';

2
src/app/routes/datatable/components/busitable/pillar/pillar.component.ts
View File

@ -26,10 +26,8 @@ export class BusitablePillarComponent implements OnInit, OnChanges {
}
reRender() {
setTimeout(() => {
this.chart.data(this.chartData);
this.chart.render();
}, 500)
}
render(el: ElementRef<HTMLDivElement>): void {
this.el = el.nativeElement

2
src/app/routes/datatable/components/customtable/customindex/customindex.component.ts
View File

@ -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';

2
src/app/routes/datatable/components/customtable/driver/driver.component.ts
View File

@ -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 = {};

2
src/app/routes/datatable/components/customtable/owner/owner.component.ts
View File

@ -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 = {};

2
src/app/routes/datatable/components/financetable/financetable.component.ts
View File

@ -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']

7
src/app/routes/datatable/components/operationtable/operationtable.component.ts
View File

@ -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)
}
}

6
src/app/routes/datatable/datatable.module.ts
View File

@ -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<void>[] = [
DatatableDataindexComponent,
@ -53,14 +53,14 @@ const COMPONENTS: Type<void>[] = [
BusitablePillarComponent,
DatatableFundReportingComponent,
DatatableReportingFundInfoComponent,
BusitableCurveComponent,
OperationPillarComponent,
OperationCurveComponent,
DatatableReportingFundInfoComponent,
FinanceTableCurveComponent,
DatatableDatascreenComponent,
FinancetablePillarComponent,
ComplianceCurveComponent
ComplianceCurveComponent,
BusitableCurveComponent
]

2
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
View File

@ -41,7 +41,7 @@
[acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']"
>查询</button
>
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']"
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()"
>导出</button
>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>

8
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -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('导出成功，请去下载中心下载！');
}
});
}
}

4
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
View File

@ -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 @@
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['ORDER-RECEIPTS-search']"
>查询</button
>
<button nz-button nzType="primary" [disabled]="false">导出</button>
<button nz-button nzType="primary" [disabled]="false" (click)="exprot()">导出</button>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}

8
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
View File

@ -576,4 +576,12 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
// }
});
}
// 导出
exprot() {
this.service.request(this.service.$api_get_asyncExportExamineBillList, this.reqParams).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('导出成功，请去下载中心下载！');
}
});
}
}

6
src/app/routes/order-management/services/order-management.service.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-03 15:31:52
* @LastEditors : Shiming
* @LastEditTime : 2022-04-02 13:10:13
* @LastEditTime : 2022-04-06 11:03:58
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -193,6 +193,10 @@ export class OrderManagementService extends ShipperBaseService {
$api_get_asyncExportWholeList = `/api/sdc/billOperate/asyncExportWholeList`;
// 异步导出风险单导出
$api_get_asyncExportRiskBillList = `/api/sdc/billRiskOperate/asyncExportRiskBillList`;
// 异步导出合规抽查导出
$api_get_asyncExportSpotCheckList= `/api/sdc/BillComplianceSpotCheck/asyncExportSpotCheckList`;
// 异步导出单据审核导出
$api_get_asyncExportExamineBillList= `/api/sdc/billExamine/asyncExportExamineBillList`;
/**
* 根据企业ID，获取企业历史网络货运人
* @returns