From af9f6b1400fe01066c05f4164376e09156301ff4 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Sun, 24 Apr 2022 10:27:44 +0800
Subject: [PATCH] fix bug

---
 .../voucher-view/voucher-view.component.ts    | 41 +++++++++----------
 .../etc-invoiced-logs.component.ts            |  2 +
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
index cb1704bb..62a4719b 100644
--- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
+++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
@@ -525,30 +525,27 @@ export class orderManagementVoucherViewComponent implements OnInit {
       });
         this.service.request(this.service.$api_createBillEsignGoods, [this.datas?.id]).subscribe(res => {
           if (res) {
-            switch (res[0]?.esignFlowStatus) {
-              case 1:
-              case '1':
-                setTimeout(() => {
-                  this.service.request(this.service.$api_getBillGoodsEsignFile, [this.datas?.id]).subscribe(res => {
-                    if (res[0]?.esignFlowStatus == '2') {
-                      this.service.msgSrv.success('生成电子单据成功！');
-                      this.modal.destroy(true);
-                    }
-                  });
+            res.forEach((element:any) => {
+              switch (element?.esignFlowStatus) {
+                case '1':
+                  setTimeout(() => {
+                    this.service.request(this.service.$api_getBillGoodsEsignFile, [this.datas?.id]).subscribe(res => {
+                      if (res[0]?.esignFlowStatus == '2') {
+                        this.service.msgSrv.success('生成电子单据成功！');
+                        this.modal.destroy(true);
+                      }
+                    });
+                  }, 9000);
+                  return;
+                  default:
+                  this.service.msgSrv.error('签署异常!');
                   modal.destroy();
-                }, 9000);
-
-                return;
-                case 2:
-                modal.destroy();
-                return;
-                default:
-                this.service.msgSrv.error('电子卸货单签署异常!');
-                modal.destroy();
-                return;
-            }
+                  return;
+              }
+            });
+           
           } else {
-            this.service.msgSrv.error('电子卸货单签署异常!');
+            this.service.msgSrv.error('签署异常!');
             modal.destroy();
           }
         });
diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
index c3c7c253..c9a2a049 100644
--- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
+++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
@@ -208,6 +208,8 @@ export class ETCInvoicedLogsComponent implements OnInit {
         className: 'text-right font-weight-bold',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.totalAmount }) }
       },
+      { title: '进站时间', index: 'trafficStartTime', type: 'date', width: 150 },
+      { title: '出站时间', index: 'trafficEndTime', type: 'date', width: 150 },
       { title: '交易时间', index: 'exTime', type: 'date', width: 150 },
       { title: '开票日期', index: 'invoiceMakeTime', type: 'date', width: 150 },
       { title: '销售方', index: 'sellerName', width: 150 },