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

src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html

@@ -45,12 +45,11 @@
     </ng-template>
 
 
-    <st #st [scroll]="{ x: '2000px' }" [data]="service.$api_ficoVatinvHList" [columns]="columns" [page]="{}" 
+    <st #st [scroll]="{ x: '2000px' }" [data]="service.$api_ficoVatinvHList" [columns]="columns" [page]="{}"
-        [req]="{process: beforeReq }" [res]="{process:afterRes }" [loading]="false"
+        [req]="{process: beforeReq }" [res]="{process:afterRes }" [loading]="false" (change)="stChange($event)">
-        (change)="stChange($event)">
         <ng-template st-row="vatinvcode" let-item let-index="index" let-column="column">
             {{ item.vatinvcode }} <br>
-            <label class="text-primary" >{{item.stsLabel}}</label>
+            <label class="text-primary">{{item.stsLabel}}</label>
         </ng-template>
     </st>
 </nz-card>
@@ -58,6 +57,13 @@
 <ng-template #requestedModal>
     <div nz-row nzGutter="8">
         <div nz-col nzSpan="24" se-container [labelWidth]="100">
+            <!-- <se [col]="1" label="开票信息">
+                <p style="margin: 0;">公司名：</p>
+                <p style="margin: 0;">税号：</p>
+                <p style="margin: 0;">注册地址：</p>
+                <p style="margin: 0;">注册电话：</p>
+                <p style="margin: 0;">开户行：</p>
+            </se> -->
             <se [col]="1" label="开票日期" required>
                 <nz-date-picker [(ngModel)]="openInfo.invoicedate" nzPlaceHolder="请选择" style=" width: 100%;">
                 </nz-date-picker>

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

@@ -45,7 +45,7 @@
         <strong class="text-red">{{ totalCallNo }}</strong>
         <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
       </div>
-      <button nz-button *ngIf="resourceStatus==='1' || !resourceStatus" (click)="this.batchRequested()">开票</button>
+      <button nz-button *ngIf="resourceStatus==='1' || !resourceStatus" (click)="this.batchRequested()">开票审核</button>
       <!-- <button nz-button (click)="this.rejectAction(selectedRows)">驳回</button>
             <button nz-button (click)="changePice(selectedRows)">修改地址</button>-->
       <button nz-button *ngIf="resourceStatus==='3' || !resourceStatus" (click)="printOrder(selectedRows)">打印面单</button>

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

@@ -7,6 +7,7 @@
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts
  */
 import { Component, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
 import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
 import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
 
@@ -23,7 +24,7 @@ export class RequestedInvoiceModalComponent {
   columns: STColumn[] = this.initST();
   id: any;
   selectedRows: any[] = [];
-  constructor(public service: TicketService, private nzModalService: NzModalService, private modal: NzModalRef) {}
+  constructor(public service: TicketService, private nzModalService: NzModalService, private modal: NzModalRef, private router: Router) {}
 
   beforeReq = (requestOptions: STRequestOptions) => {
     Object.assign(requestOptions.body, { vatappHId: this.id });
@@ -127,8 +128,17 @@ export class RequestedInvoiceModalComponent {
     };
     this.service.request(this.service.$api_get_applyFicoVatinv, params).subscribe((res: any) => {
       if (res) {
-        this.service.msgSrv.success('开票成功');
+        this.nzModalService.confirm({
-        this.modal.destroy(true);
+          nzTitle: '是否进入销票处理页面完成开票',
+          nzOnOk: () => {
+            this.service.msgSrv.success('开票成功');
+            this.modal.destroy(true);
+            this.router.navigate(['/ticket/cancellation-invoice']);
+          },
+          nzOnCancel: () => {
+            this.modal.destroy(true);
+          }
+        });
       }
     });
   }