merge 1.0.0

proxy.conf.js

@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts

@@ -8,8 +8,8 @@ import { ShipperBaseService } from '@shared';
 import { isTemplateRef } from 'ng-zorro-antd/core/util';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { delay } from 'q';
 import { pipe } from 'rxjs';
+import { delay } from 'rxjs/operators';
 
 import { TicketService } from '../../services/ticket.service';
 import { PrintOrderModalComponent } from './print-order-modal/print-order-modal.component';
@@ -283,21 +283,24 @@ export class InvoiceRequestedComponent {
     if (item?.reconciliationUrl) {
       this.service.reviewPDF(item.reconciliationUrl);
     } else {
-      this.service.request(this.service.$api_downloadPdf, { vatappHId: item.id }).subscribe(res => {
+      this.service
-        if (res?.esignFlowId) {
+        .request(this.service.$api_downloadPdf, { vatappHId: item.id })
-          delay(3000);
+        .pipe(delay(3000))
-          this.service
+        .subscribe(res => {
-            .request(this.service.$api_download_Reconciliatio_pdf, { vatappHId: item.id, esignFlowId: res.esignFlowId })
+          if (res?.esignFlowId) {
-            .subscribe(rs => {
+            this.service
-              if (rs?.reconciliationUrl) {
+              .request(this.service.$api_download_Reconciliatio_pdf, { vatappHId: item.id, esignFlowId: res.esignFlowId })
-                this.service.reviewPDF(rs.reconciliationUrl);
+              .subscribe(rs => {
-              } else {
+                if (rs?.reconciliationUrl) {
-                // this.service.msgSrv.warning('获取对账单失败');
+                  this.service.reviewPDF(rs.reconciliationUrl);
-              }
+                } else {
-            });
+                  // this.service.msgSrv.warning('获取对账单失败');
-        }
+                }
-        // this.service.msgSrv.warning('获取对账单失败');
+                this.st.load(1);
-      });
+              });
+          }
+          // this.service.msgSrv.warning('获取对账单失败');
+        });
     }
   }