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 3050a847..e24a58c5 100644
--- a/src/app/routes/datatable/components/customtable/driver/driver.component.ts
+++ b/src/app/routes/datatable/components/customtable/driver/driver.component.ts
@@ -19,7 +19,7 @@ export class DatatableDriverComponent implements OnInit {
mode = 'year';
date: any = null;
defineDate = [];
- queryTime: any = ''
+ queryTime: any = [new Date().getFullYear()]
dateFormat = 'yyyy';
today = new Date();
ui: SFUISchema = {};
@@ -130,11 +130,22 @@ export class DatatableDriverComponent implements OnInit {
if(result === null) {
return
}
- if (this.mode === 'year') {
+ // if (this.mode === 'year') {
+ // this.queryTime = this.datePipe.transform(this.date, 'yyyy')
+ // } else if (this.mode === 'month') {
+ // this.queryTime = this.datePipe.transform(this.date, 'yyyy-MM')
+ // }
+
+ if(this.mode === 'year') {
this.queryTime = [this.datePipe.transform(this.date, 'yyyy')]
- } else if (this.mode === 'month') {
+ } else if(this.mode === 'month') {
this.queryTime = [this.datePipe.transform(this.date, 'yyyy-MM')]
+ } else if(this.mode === 'date') {
+ this.queryTime = [this.datePipe.transform(this.date, 'yyyy-MM-dd')]
+ } else{
+ this.queryTime = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd'), this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd')]
}
+
this.st.reload({ ...this.reqParams });
}
disabledDate = (current: Date): boolean =>
diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
index 7b27f0bc..f95f59d1 100644
--- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
@@ -76,7 +76,7 @@ export class DriverAccountDetailComponent implements OnInit {
stChange(e: STChange): void {}
exportList() {
- this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
+ this.service.downloadFile(this.service.$api_get_exportAccountBalanceDriverByOperatorPage, { ...this.sf.value, pageSize: -1 });
}
goBack() {
diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
index 410c7fac..bb1b21f9 100644
--- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
@@ -83,7 +83,7 @@ export class FreightAccountDetailComponent implements OnInit {
stChange(e: STChange): void {}
exportList() {
- this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
+ this.service.downloadFile(this.service.$api_get_exportAccountBalanceShipperByOperatorPage, { ...this.sf.value, pageSize: -1 });
}
goBack() {
diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts
index 4fecfd91..5abfbe19 100644
--- a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts
+++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts
@@ -80,7 +80,7 @@ export class FreightAccountComponent implements OnInit {
}
exportList() {
- this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_shipper);
+ this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportShipperAccountBalanceByOperator);
}
private initSF(): SFSchema {
diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
index ed00c9f4..20acc782 100644
--- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
@@ -66,7 +66,7 @@ export class PlatformAccountDetailComponent implements OnInit {
stChange(e: STChange): void {}
exportList() {
- this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
+ this.service.downloadFile(this.service.$api_get_exportAccountBalanceByPage, { ...this.sf.value, pageSize: -1 });
}
goBack() {
diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.html b/src/app/routes/financial-management/components/platform-account/platform-account.component.html
index 0cda0ad8..e1928689 100644
--- a/src/app/routes/financial-management/components/platform-account/platform-account.component.html
+++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.html
@@ -46,7 +46,7 @@
-
+
diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts
index 87b42163..b69a5245 100644
--- a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts
+++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts
@@ -194,4 +194,7 @@ export class PlatformAccountComponent implements OnInit {
}
];
}
+ exportList() {
+ this.service.downloadFile(this.service.$api_get_exportPlatformAccountBalanceByOperator, { ...this.sf.value, pageSize: -1 });
+ }
}
diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
index e45f63bb..01927beb 100644
--- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
+++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
@@ -79,7 +79,7 @@ export class RechargeRecordComponent implements OnInit {
}
exportList() {
- this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
+ this.service.downloadFile(this.service.$api_get_exportPageByOperator, { ...this.sf.value, pageSize: -1 });
}
private initSF(): SFSchema {
diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html
index 77fc9628..bd7fb2aa 100644
--- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html
+++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html
@@ -11,7 +11,7 @@
class="text-right">
-
+