From 4af2374189357c46a86b9104770586c25457c0cc Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Mon, 28 Feb 2022 20:43:59 +0800
Subject: [PATCH 1/3] edit

---
 .../components/refund-record/refund-record.component.ts       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts
index 667de869..787616cf 100644
--- a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts
+++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts
@@ -250,9 +250,9 @@ export class RefundRecordComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '退款单号', render: 'orderRefundCode', width: 190 },
-      { title: '退款类型', index: 'refundTypeLabel', width: 130 },
+      { title: '退款类型', index: 'refundTypeLabel', width: 140 },
       { title: '退款金额', render: 'refundAmount', className: 'text-right', width: 180 },
-      { title: '退款时间', index: 'applyTime', width: 170 },
+      { title: '退款时间', index: 'refundExecuteTime', width: 170 },
       { title: '货主', index: 'shipperId', width: 150 },
       { title: '所属项目', index: 'enterpriseProjectName', width: 140 },
       { title: '支付单', render: 'billRefundPaymentVOS', width: 150 },

From 84d7cf5658c6386578ad3330f9228b71412eb5a5 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Mon, 28 Feb 2022 20:45:33 +0800
Subject: [PATCH 2/3] edit

---
 .../cancellation-invoice/cancellation-invoice.component.ts      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
index b2c8021c..d5ff6af0 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
@@ -115,7 +115,7 @@ export class CancellationInvoiceComponent implements OnInit {
    */
   batchPush() {
     if (this.selectedRows?.length <= 0) {
-      this.service.msgSrv.warning('请选择开票申请');
+      this.service.msgSrv.warning('请选择推送开票单');
       return;
     }
     if (this.selectedRows.find(item => item.sts !== '1')) {

From 1253266e23c6b081942e2ddc5ceae48a05827794 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Mon, 28 Feb 2022 20:49:20 +0800
Subject: [PATCH 3/3] edit

---
 .../invoice-requested-detail.component.html                     | 2 +-
 .../invoice-requested-detail.component.ts                       | 2 ++
 .../components/invoice-requested/invoice-requested.component.ts | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
index 82501843..554c312b 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
@@ -87,7 +87,7 @@
 </nz-card>
 
 <nz-card class="content-box" nzBordered>
-    <div class="d-flex align-items-center mb-md mt-sm">
+    <div class="d-flex align-items-center mb-md mt-sm" *ngIf="sts==='1'">
         <button nz-button (click)="openRequestedModal('1')">全部开票</button>
         <button nz-button (click)="openRequestedModal('2')">开票</button>
         <button nz-button (click)="removeOrder()">移除</button>
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
index 52a829cf..5939afd6 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
@@ -26,6 +26,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
   _$expand = false;
 
   id = null;
+  sts = null;
   headerInfo: any = {};
   constructor(
     public service: TicketService,
@@ -34,6 +35,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
     private router: Router
   ) {
     this.id = route.snapshot.params.id;
+    this.sts = route.snapshot.queryParams.sts;
     this.loadHeadInfo();
   }
 
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
index fbe7accb..75e880d8 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
@@ -420,7 +420,7 @@ export class InvoiceRequestedComponent implements OnInit {
           // },
           {
             text: '订单明细<br/>',
-            click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id])
+            click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id], { queryParams: { sts: item.sts } })
           },
           {
             text: '查看原因<br/>',