diff --git a/src/app/app.config.ts b/src/app/app.config.ts
index ada3192..a8c9593 100644
--- a/src/app/app.config.ts
+++ b/src/app/app.config.ts
@@ -1,5 +1,5 @@
import { ApplicationConfig, importProvidersFrom } from '@angular/core';
-import { provideRouter } from '@angular/router';
+import {provideRouter, RouteReuseStrategy} from '@angular/router';
import { routes } from './app.routes';
import { provideClientHydration } from '@angular/platform-browser';
@@ -11,6 +11,7 @@ import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
import {BrowserAnimationsModule, provideAnimations} from '@angular/platform-browser/animations';
import {InitGuardService} from "./utils/initGuard.service";
import {InterceptorService} from "./utils/Interceptor.service";
+import {AiRouteReuseStrategy} from "./utils/routeReuseStrategy";
registerLocaleData(zh);
@@ -24,6 +25,7 @@ export const appConfig: ApplicationConfig = {
provideAnimations(),
BrowserAnimationsModule,
InitGuardService, // 校验登录
- { provide: HTTP_INTERCEPTORS, useClass: InterceptorService, multi: true}
+ { provide: HTTP_INTERCEPTORS, useClass: InterceptorService, multi: true},
+ { provide: RouteReuseStrategy, useClass: AiRouteReuseStrategy }
]
};
diff --git a/src/app/pages/trade/comp-order/comp-order.component.html b/src/app/pages/trade/comp-order/comp-order.component.html
index 8aca036..e81083f 100644
--- a/src/app/pages/trade/comp-order/comp-order.component.html
+++ b/src/app/pages/trade/comp-order/comp-order.component.html
@@ -85,6 +85,7 @@
+
更多查询条件
@@ -164,7 +165,7 @@
diff --git a/src/app/pages/trade/comp-order/comp-order.component.ts b/src/app/pages/trade/comp-order/comp-order.component.ts
index b761ce7..81fc7e9 100644
--- a/src/app/pages/trade/comp-order/comp-order.component.ts
+++ b/src/app/pages/trade/comp-order/comp-order.component.ts
@@ -32,6 +32,7 @@ import {DateSelectType, DateUtils} from "../../../utils/dateUtils.service";
import {NzTreeComponent} from "ng-zorro-antd/tree";
import {NzDescriptionsModule} from "ng-zorro-antd/descriptions";
import {NzTabComponent, NzTabSetComponent, NzTabsModule} from "ng-zorro-antd/tabs";
+import {environment} from "../../../../environments/environment";
@Component({
selector: 'app-comp-order',
@@ -89,6 +90,7 @@ import {NzTabComponent, NzTabSetComponent, NzTabsModule} from "ng-zorro-antd/tab
styleUrl: './comp-order.component.less'
})
export class CompOrderComponent {
+ imageUrl = environment.imageUrl;
// 表单页数
tablePageNum = 1;
// 表单数据
@@ -209,4 +211,15 @@ export class CompOrderComponent {
this.orderDetail = {};
this.orderDetailVisible = false;
}
+
+ /**
+ * 导出订单
+ */
+ export() {
+ this.orderService.export(this.searchForm.value, (data: any) => {
+ if (data['return_code'] == '000000') {
+ window.location.href = this.imageUrl + 'temporary/' + data['return_data'];
+ }
+ });
+ }
}
diff --git a/src/app/pages/trade/order-after-sales/order-after-sales.component.html b/src/app/pages/trade/order-after-sales/order-after-sales.component.html
index bb19e48..961bf1f 100644
--- a/src/app/pages/trade/order-after-sales/order-after-sales.component.html
+++ b/src/app/pages/trade/order-after-sales/order-after-sales.component.html
@@ -2,27 +2,27 @@