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

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

@@ -47,7 +47,7 @@
         </div>
         <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
             <se label="服务名称">
-                {{headerInfo?.vatname}}
+                {{headerInfo?.vatnameLabel}}
             </se>
             <se label="销货清单">
                 {{headerInfo?.isdetail?'是':'否'}}

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

@@ -38,17 +38,17 @@
     <nz-tab nzTitle="全部" (nzClick)="selectChange(null)"></nz-tab>
   </nz-tabset>
   <ng-template #extraTemplate>
-    <div class="d-flex align-items-center">
+    <div class="d-flex align-items-center" *ngIf="resourceStatus==='1' || resourceStatus==='3' || !resourceStatus">
       <div class="mr-md">
         已选择
         <strong class="text-red">{{ selectedRows.length }}</strong> 条数据&nbsp;&nbsp; 开票金额总计
         <strong class="text-red">{{ totalCallNo }}</strong>
         <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
       </div>
-      <button nz-button (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 (click)="printOrder(selectedRows)">打印面单</button>
+      <button nz-button *ngIf="resourceStatus==='3' || !resourceStatus" (click)="printOrder(selectedRows)">打印面单</button>
     </div>
   </ng-template>
 

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

@@ -124,6 +124,10 @@ export class InvoiceRequestedComponent implements OnInit {
       this.service.msgSrv.warning('请选择订单');
       return;
     }
+    if (this.selectedRows.find(item => item.sts !== '3')) {
+      this.service.msgSrv.warning('请勿选择非已完成订单');
+      return;
+    }
     const modal = this.nzModalService.create({
       nzTitle: '打印面单',
       nzContent: PrintOrderModalComponent,
@@ -159,6 +163,10 @@ export class InvoiceRequestedComponent implements OnInit {
       this.service.msgSrv.warning('请选择订单');
       return;
     }
+    if (this.selectedRows.find(item => item.sts !== '1')) {
+      this.service.msgSrv.warning('请勿选择非待处理订单');
+      return;
+    }
     const modal = this.nzModalService.create({
       nzTitle: '开票',
       nzContent: '确认对所有申请单进行批量开票？',
@@ -403,7 +411,8 @@ export class InvoiceRequestedComponent implements OnInit {
           { type: 'divider' },
           {
             text: '开票<br/>',
-            click: item => this.requestedInvoiceAction(item)
+            click: item => this.requestedInvoiceAction(item),
+            iif: item => item.sts === '1'
           },
           // {
           //   text: '驳回<br/>',
@@ -415,7 +424,8 @@ export class InvoiceRequestedComponent implements OnInit {
           },
           {
             text: '查看原因<br/>',
-            click: item => this.showReason(item)
+            click: item => this.showReason(item),
+            iif: item => item.sts === '4'
           }
           // {
           //   text: '下载对账单'
@@ -429,8 +439,6 @@ export class InvoiceRequestedComponent implements OnInit {
     this.resourceStatus = e;
     this.initST();
     setTimeout(() => {
-      console.log(this.resourceStatus);
-
       this.st.load();
     }, 500);
   }

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

@@ -9,7 +9,7 @@
 <div nz-row nzGutter="8" class="statistics-box">
     <div nz-col nzSpan="12" se-container [labelWidth]="100" col="1">
         <se label="购买方">
-            {{headerInfo?.projectName}}
+            {{headerInfo?.artoName}}
         </se>
         <se label="纳税号">
             {{headerInfo?.taxNumber}}