From cf6d0c5158c414fd32f8c198ec067a150c368c30 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 21 Feb 2022 17:00:23 +0800
Subject: [PATCH] fix bug

---
 .../receipts-audit.component.html             | 158 +++++++++---------
 .../receipts-audit.component.ts               |  30 ++--
 2 files changed, 93 insertions(+), 95 deletions(-)

diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
index 412ccb1b..5f3e3b30 100644
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
@@ -9,14 +9,21 @@
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <!-- 搜索表单 -->
-<page-header-wrapper [title]="''">
-</page-header-wrapper>
+<page-header-wrapper [title]="''"> </page-header-wrapper>
 <nz-card>
   <div nz-row nzGutter="8">
     <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
     <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-      <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
-        (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
+      <sf
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"
+      ></sf>
     </div>
 
     <!-- 查询字段大于3个时，根据展开状态调整布局 -->
@@ -25,10 +32,10 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading"
-          (click)="search()">查询</button>
-        <button nz-button nzType="primary"  [disabled]="service.http.loading"
-         >导出</button>
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['ORDER-RECEIPTS-search']"
+          >查询</button
+        >
+        <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
         <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}
@@ -40,87 +47,78 @@
 </nz-card>
 
 <nz-card>
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" 
-  [nzTabBarExtraContent]="extraTemplate">
-  <nz-tab [nzTitle]="'全部('+tabs?.totalCount+')'"></nz-tab>
-  <nz-tab [nzTitle]="'待审核('+tabs?.receivedQuantity+')'"></nz-tab>
-  <nz-tab [nzTitle]="'已审核('+tabs?.stayQuantity+')'"></nz-tab>
-</nz-tabset>
-  <div style="margin-top: 15px;">
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
+    <nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'待审核(' + tabs?.receivedQuantity + ')'"></nz-tab>
+    <nz-tab [nzTitle]="'已审核(' + tabs?.stayQuantity + ')'"></nz-tab>
+  </nz-tabset>
+  <div style="margin-top: 15px">
     <st
-    #st
-    [bordered]="true"
-    [scroll]="{ x: '2000px' }"
-    [data]="service.$api_get_billExamine_page"
-    [columns]="columns"
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-    [loading]="service.http.loading"
+      #st
+      [bordered]="true"
+      [scroll]="{ x: '2000px' }"
+      [data]="service.$api_get_billExamine_page"
+      [columns]="columns"
+      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+      [loading]="service.http.loading"
     >
-    <ng-template st-row="freightPrice" let-item let-index="index">
-      {{ item.freightPrice | currency}}
-    </ng-template>
-    <ng-template st-row="loadingLadingBillFilePath" let-item let-index="index">
-      <div>
-        <span><img style="height: 60px; padding-right: 5px;" [src]="item.loadingLadingBillFilePath" alt=""></span>
-        <span><img style="height: 60px;" [src]="item.loadingPeopleVehiclesGoodsFilePath" alt=""></span>
-      </div>
-    </ng-template>
-    <ng-template st-row="unloadingLadingBillFilePath" let-item let-index="index">
-      <span><img style="height: 60px; padding-right: 5px;" [src]="item.unloadingLadingBillFilePath" alt=""></span>
-      <span><img  style="height: 60px;" [src]="item.unloadingPeopleVehiclesGoodsFilePath" alt=""></span>
-    </ng-template>
-    <ng-template st-row="loadingTime" let-item let-index="index">
-      <div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>
-      <div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div>
-    </ng-template>
-    <ng-template st-row="driverName" let-item let-index="index">
-      <div>
-        {{item?.driverName}}/{{item?.driverPhone}}/{{item?.carNo}}
-      </div>
+      <ng-template st-row="freightPrice" let-item let-index="index">
+        {{ item.freightPrice | currency }}
+      </ng-template>
+      <ng-template st-row="loadingLadingBillFilePath" let-item let-index="index">
+        <div>
+          <span><img style="height: 60px; padding-right: 5px" [src]="item.loadingLadingBillFilePath" alt="" /></span>
+          <span><img style="height: 60px" [src]="item.loadingPeopleVehiclesGoodsFilePath" alt="" /></span>
+        </div>
+      </ng-template>
+      <ng-template st-row="unloadingLadingBillFilePath" let-item let-index="index">
+        <span><img style="height: 60px; padding-right: 5px" [src]="item.unloadingLadingBillFilePath" alt="" /></span>
+        <span><img style="height: 60px" [src]="item.unloadingPeopleVehiclesGoodsFilePath" alt="" /></span>
+      </ng-template>
+      <ng-template st-row="loadingTime" let-item let-index="index">
+        <div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
+        <div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div>
+      </ng-template>
+      <ng-template st-row="driverName" let-item let-index="index">
+        <div> {{ item?.driverName }}/{{ item?.driverPhone }}/{{ item?.carNo }} </div>
       </ng-template>
       <ng-template st-row="payeeName" let-item let-index="index">
-      <div>
-        {{item?.payeeName}}/{{item?.payeePhone}}
-      </div>
+        <div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div>
+      </ng-template>
+      <ng-template st-row="billCode" let-item let-index="index">
+        <a [routerLink]="'/order-management/bulk-detail/' + item.id">{{ item.billCode }}</a>
+        <div>
+          <span>{{ item?.serviceTypeName }}</span>
+        </div>
+        <div>
+          <span>{{ item?.auditStatusLabel }}</span>
+        </div>
+      </ng-template>
+      <ng-template st-row="goodsName" let-item let-index="index">
+        <div>{{ item?.goodsName }}</div>
+        <div>
+          <span>{{ item?.weight ? item?.weight + '吨/' : '' }}</span>
+          <span>{{ item?.volume ? item?.volume + '方/' : '' }}</span>
+          <span>{{ item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
+        </div>
+      </ng-template>
+      <ng-template st-row="mybidDetailInfo" let-item let-index="index">
+        <div *ngIf="item.mybidDetailInfo.length > 0">
+          <p *ngFor="let data of item.mybidDetailInfo">
+            {{ data.expenseName }}：{{ data.price | currency }}
+            <span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
+          </p>
+        </div>
       </ng-template>
-    <ng-template st-row="billCode" let-item let-index="index">
-      <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.billCode}}</a>
-      <div>
-        <span>{{item?.serviceTypeName}}</span>
-      </div>
-      <div>
-        <span>{{item?.auditStatusLabel}}</span>
-      </div>
-    </ng-template>
-    <ng-template st-row="goodsName" let-item let-index="index">
-      <div>{{item?.goodsName}}</div>
-      <div>
-        <span>{{item?.weight ? item?.weight + '吨/' : '' }}</span>
-        <span>{{item?.volume ? item?.volume + '方/' : '' }}</span>
-        <span>{{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
-      </div>
-    </ng-template>
-    <ng-template st-row="mybidDetailInfo" let-item let-index="index">
-      <div *ngIf="item.mybidDetailInfo.length > 0">
-        <p *ngFor="let data of item.mybidDetailInfo">
-          {{ data.expenseName }}：{{ data.price | currency }}
-          <span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
-        </p>
-      </div>
-    </ng-template>
     </st>
   </div>
 </nz-card>
 
 <ng-template #extraTemplate>
   <div>
-    <button  nz-button nzType="primary" (click)="sign('1')">
-批量签收
-</button> 
-    <button  nz-button nzType="primary" (click)="sign1('1')">
-      批量生成电子单据
-</button> 
+    <button nz-button nzType="primary" (click)="sign('1')"  acl  [acl-ability]="['ORDER-RECEIPTS-billAuditPassBatch']"> 批量签收 </button>
+    <button nz-button nzType="primary" (click)="sign1('1')"  acl  [acl-ability]="['ORDER-RECEIPTS- electronicBilling']"> 批量生成电子单据 </button>
   </div>
-</ng-template>
\ No newline at end of file
+</ng-template>
diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
index cf8a24d4..b2caf424 100644
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
@@ -329,33 +329,33 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
       {
         title: '操作',
         fixed: 'right',
-        width: '120px',
+        width: '136px',
         className: 'text-left',
         buttons: [
           {
-            text: '通过',
+            text: '生成电子单据',
+            click: _record => this.generate(_record, 2),
+            iif: item => item.auditStatus == '1',
+            acl: { ability: ['ORDER-RECEIPTS-electronicBillingOne'] },
+          },
+          {
+            text: '通过　　　　',
             click: _record => this.sign(_record),
             iif: item => item.auditStatus == '1',
             acl: { ability: ['ORDER-RECEIPTS-billAuditPassBatch'] },
           },
           {
-            text: '生成电子单据',
-            click: _record => this.generate(_record, 2),
-            iif: item => item.auditStatus == '1',
-            acl: { ability: ['ORDER-RECEIPTS-generate'] },
-          },
-          {
-            text: '查看凭证',
-            click: _record => this.generate(_record, 3),
-            iif: item => item.auditStatus == '2',
-            acl: { ability: ['ORDER-RECEIPTS-view'] },
-          },
-          {
-            text: '修改',
+            text: '修改　　　　',
             click: _record => this.modification(_record),
             iif: item => item.auditStatus == '1' ,
             acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] },
           },
+          {
+            text: '查看凭证　',
+            click: _record => this.generate(_record, 3),
+            iif: item => item.auditStatus == '2',
+            acl: { ability: ['ORDER-RECEIPTS-view'] },
+          },
         ]
       }
     ];