From 4aadbec7cc7f45e4039507a386fa9a53d81fdae6 Mon Sep 17 00:00:00 2001
From: TaricXin <583259872@qq.com>
Date: Tue, 15 Mar 2022 11:21:57 +0800
Subject: [PATCH] edit

---
 .../advance-collection-detail.component.html       |  6 +++---
 .../advance-collection.component.ts                | 14 ++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html
index b596784a..584da352 100644
--- a/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html
+++ b/src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html
@@ -21,7 +21,7 @@
                     {{ costInfo?.artoname }}
                 </se>
                 <se label="结算客户" required>
-                    {{ costInfo?.shipperId }}
+                    {{ costInfo?.cnoName }}
                 </se>
                 <se label="收款账户">
                     {{ costInfo?.ltdaccountId }}
@@ -75,8 +75,8 @@
             </div> -->
             <st #infoST [scroll]="{ x: '2000px' }" [data]="service.$api_get_advance_collection_hrxiao"
                 [columns]="columns.info" [page]="{ show: false }" [req]="{  process: beforeReq }"
-                [res]="{ reName: { list: 'data' } }" [loading]="false"
-                [scroll]="{ x: '1200px', y: '370px' }" class="mt-md">
+                [res]="{ reName: { list: 'data' } }" [loading]="false" [scroll]="{ x: '1200px', y: '370px' }"
+                class="mt-md">
                 <ng-template st-row="no" let-item let-index="index" let-column="column">
                     {{index+1}}
                 </ng-template>
diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts
index 95c6ce06..3556e2d5 100644
--- a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts
+++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts
@@ -1,9 +1,9 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
+
 import { FreightAccountService } from '../../services/freight-account.service';
 
 @Component({
@@ -11,7 +11,7 @@ import { FreightAccountService } from '../../services/freight-account.service';
   templateUrl: './advance-collection.component.html',
   styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
 })
-export class AdvanceCollectionComponent implements OnInit {
+export class AdvanceCollectionComponent {
   @ViewChild('st', { static: true })
   st!: STComponent;
   @ViewChild('sf', { static: false })
@@ -23,8 +23,6 @@ export class AdvanceCollectionComponent implements OnInit {
 
   constructor(public service: FreightAccountService, private router: Router, private modal: NzModalService) {}
 
-  ngOnInit(): void {}
-
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, { ...this.sf.value });
@@ -49,7 +47,7 @@ export class AdvanceCollectionComponent implements OnInit {
   }
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value,  pageSize: -1 });
+    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
   }
 
   private initSF(): SFSchema {
@@ -149,8 +147,8 @@ export class AdvanceCollectionComponent implements OnInit {
         buttons: [
           {
             text: '浏览',
-            click: item => this.router.navigate(['/financial-management/advance-collection/detail/' + item.id])
-          },
+            click: item => this.router.navigate([`/financial-management/advance-collection/detail/${item.id}`])
+          }
           // {
           //   text: '核销'
           // },