Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts

@@ -525,8 +525,8 @@ 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:
+            res.forEach((element:any) => {
+              switch (element?.esignFlowStatus) {
                 case '1':
                   setTimeout(() => {
                     this.service.request(this.service.$api_getBillGoodsEsignFile, [this.datas?.id]).subscribe(res => {
@@ -535,20 +535,17 @@ export class orderManagementVoucherViewComponent implements OnInit {
                         this.modal.destroy(true);
                       }
                     });
-                  modal.destroy();
                   }, 9000);
-
-                return;
-                case 2:
-                modal.destroy();
                   return;
                   default:
-                this.service.msgSrv.error('电子卸货单签署异常!');
+                  this.service.msgSrv.error('签署异常!');
                   modal.destroy();
                   return;
               }
+            });
+           
           } else {
-            this.service.msgSrv.error('电子卸货单签署异常!');
+            this.service.msgSrv.error('签署异常!');
             modal.destroy();
           }
         });

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 },

src/app/routes/usercenter/components/freight/list/list.component.ts

@@ -409,7 +409,7 @@ export class FreightComponentsListComponent implements OnInit {
       },
       { title: '业务员', className: 'text-center', render: 'promotersTelephone', width: 150 },
       { title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 },
-      { title: '客服人员', className: 'text-center', render: 'customerServiceId', width: 150 },
+      { title: '客服人员', className: 'text-center', index: 'customerServiceIdLabel', width: 150 },
       { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
       {
         title: '注册渠道',