From ffaf43a9ee30285cdc1b7bf63f749ab4c0688fd9 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 14 Apr 2022 17:43:55 +0800
Subject: [PATCH] edit

---
 .../invoice-detail/invoice-detail.component.html     |  6 +++---
 .../requested-invoice-modal.component.ts             | 12 ++++++++----
 .../ticket-management/services/ticket.service.ts     |  3 ++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
index 8710a7c7..15cd0983 100644
--- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
+++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
@@ -8,7 +8,7 @@
 
 <nz-card class="statistics-box">
   <div nz-row nzGutter="8">
-    <div nz-col [nzXl]="12" [nzLg]="12" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
+    <div nz-col [nzXl]="10" [nzLg]="10" [nzSm]="12" [nzXs]="12" se-container [labelWidth]="100" col="1">
       <se label="销售方">
         {{ headerInfo?.ltdName }}
       </se>
@@ -34,7 +34,7 @@
         {{ headerInfo?.remarks }}
       </se>
     </div>
-    <div nz-col [nzXl]="12" [nzLg]="12" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
+    <div nz-col [nzXl]="10" [nzLg]="10" [nzSm]="12" [nzXs]="12" se-container [labelWidth]="100" col="1">
       <se label="购买方">
         {{ headerInfo?.artoname }}
       </se>
@@ -57,7 +57,7 @@
         {{headerInfo?.otherremarks || '-'}}
       </se>
     </div>
-    <div *ngIf="isCanEdit && selectedIndex===2" nz-col [nzXl]="12" [nzLg]="12" [nzSm]="8" [nzXs]="8" class="text-right">
+    <div *ngIf="isCanEdit && selectedIndex===2" nz-col [nzXl]="4" [nzLg]="4" [nzSm]="12" [nzXs]="12" class="text-right">
       <ng-container *ngIf="isEdit; else elseTemplate">
         <button nz-button (click)="isEdit = false; invoiceST?.load(1)">取消</button>
         <button nz-button nzType="primary" (click)="saveInvoices()">保 存</button>
diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts
index 6c411bc0..2a64cece 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts
@@ -37,13 +37,16 @@ export class RequestedInvoiceModalComponent {
    * @returns
    */
   removeOrder(item: any[]) {
-    console.log(item);
+    if (this.st1._data?.length <= 1) {
+      this.service.msgSrv.warning('开票申请记录不能少于一个订单');
+      return;
+    }
     this.nzModalService.warning({
       nzTitle: '确定从当前批次中移除所选订单？',
       nzContent: '移除后相关订单可以重新提交开票申请',
       nzOnOk: () => {
-        const ids = item.map(order => order.billHId);
-        this.service.request(this.service.$api_remove_bill, { billHIds: ids }).subscribe(res => {
+        const ids = item.map(order => order.billHCode);
+        this.service.request(this.service.$api_remove_bill, { billHcodes: ids }).subscribe(res => {
           if (res) {
             this.service.msgSrv.success('移除成功');
             this.modal.destroy(true);
@@ -107,7 +110,8 @@ export class RequestedInvoiceModalComponent {
         buttons: [
           {
             text: '移除',
-            click: (item: any) => this.removeOrder([item])
+            click: (item: any) => this.removeOrder([item]),
+            iif: _ => this.st1._data?.length > 1
           }
         ]
       }
diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts
index df5dd9d9..657091e2 100644
--- a/src/app/routes/ticket-management/services/ticket.service.ts
+++ b/src/app/routes/ticket-management/services/ticket.service.ts
@@ -25,7 +25,8 @@ export class TicketService extends ShipperBaseService {
   $api_get_invoice_requested_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatapp';
   // 删除开票申请订单明细
   // $api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch';
-  $api_remove_bill = '/api/fcc/ficoVatappH/remove';
+  // $api_remove_bill = '/api/fcc/ficoVatappH/remove';
+  $api_remove_bill = '/api/fcc/ficoVatappBill/removeVatappBill';
   // 运营端单个/批量驳回
   $api_reject_invoice = '/api/fcc/ficoVatappH/rejectInvoiceApple';
   // 运营端修改开票地址