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

src/app/routes/financial-management/components/payable-order/payable-order.component.html

@@ -11,6 +11,26 @@
 <page-header-wrapper [title]="'应付核销'">
 </page-header-wrapper>
 
+<nz-card>
+    <nz-row [nzGutter]="16">
+        <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
+            <nz-statistic [nzValue]="((info?.prmoneySum || 0) | currency)+'元' " [nzTitle]="'应付金额'"
+                [nzValueStyle]="{'font-size':'16px',color:'red'}">
+            </nz-statistic>
+        </nz-col>
+        <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
+            <nz-statistic [nzValue]="((info?.phxmoneySum || 0) | currency) +'元'" [nzTitle]="'已核销金额'"
+                [nzValueStyle]="{'font-size':'16px',color:'red'}">
+            </nz-statistic>
+        </nz-col>
+        <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
+            <nz-statistic [nzValue]="((info?.unPhxmoneySum || 0)| currency) +'元'" [nzTitle]="'未核销金额'"
+                [nzValueStyle]="{'font-size':'16px',color:'red'}">
+            </nz-statistic>
+        </nz-col>
+    </nz-row>
+</nz-card>
+
 <nz-card class="search-box" nzBordered>
     <div nz-row nzGutter="8">
         <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">

src/app/routes/financial-management/components/payable-order/payable-order.component.ts

@@ -23,6 +23,7 @@ export class PayableOrderComponent implements OnInit {
   _$expand = false;
 
   selectedRows: any[] = [];
+  info: any = {};
   constructor(
     public service: FreightAccountService,
     private nzModalService: NzModalService,
@@ -30,7 +31,16 @@ export class PayableOrderComponent implements OnInit {
     private currencyPipe: CurrencyPipe
   ) {}
 
-  ngOnInit(): void {}
+  ngOnInit(): void {
+  }
+
+  loadInfo() {
+    this.service.request(this.service.$api_get_fico_ph_sum).subscribe(res => {
+      if (res) {
+        this.info = res;
+      }
+    });
+  }
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
@@ -54,6 +64,7 @@ export class PayableOrderComponent implements OnInit {
         });
       }
     }
+    this.loadInfo();
     return requestOptions;
   };
 

src/app/routes/financial-management/components/receivable-order/receivable-order.component.html

@@ -10,6 +10,26 @@
 -->
 <page-header-wrapper [title]="'应收核销'"> </page-header-wrapper>
 
+<nz-card>
+  <nz-row [nzGutter]="16">
+    <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
+      <nz-statistic [nzValue]="((info?.armoneySum || 0) | currency)+'元' " [nzTitle]="'应收金额'"
+        [nzValueStyle]="{'font-size':'16px',color:'red'}">
+      </nz-statistic>
+    </nz-col>
+    <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
+      <nz-statistic [nzValue]="((info?.ahxmoneySum || 0) | currency) +'元'" [nzTitle]="'已核销金额'"
+        [nzValueStyle]="{'font-size':'16px',color:'red'}">
+      </nz-statistic>
+    </nz-col>
+    <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
+      <nz-statistic [nzValue]="((info?.unAhxmoneySum || 0)| currency) +'元'" [nzTitle]="'未核销金额'"
+        [nzValueStyle]="{'font-size':'16px',color:'red'}">
+      </nz-statistic>
+    </nz-col>
+  </nz-row>
+</nz-card>
+
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
     <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">

src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts

@@ -24,6 +24,8 @@ export class ReceivableOrderComponent implements OnInit {
   _$expand = false;
 
   selectedRows: any[] = [];
+
+  info: any = {};
   constructor(
     public service: FreightAccountService,
     private nzModalService: NzModalService,
@@ -31,7 +33,16 @@ export class ReceivableOrderComponent implements OnInit {
     private currencyPipe: CurrencyPipe
   ) {}
 
-  ngOnInit(): void {}
+  ngOnInit(): void {
+  }
+
+  loadInfo() {
+    this.service.request(this.service.$api_get_fico_sum).subscribe(res => {
+      if (res) {
+        this.info = res;
+      }
+    });
+  }
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
@@ -55,6 +66,7 @@ export class ReceivableOrderComponent implements OnInit {
         });
       }
     }
+    this.loadInfo();
     return requestOptions;
   };
 
@@ -260,23 +272,23 @@ export class ReceivableOrderComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox' },
-      { title: '核销单号', index: 'ahxcode', type: 'link', width: 140 },
+      { title: '核销单号', index: 'ahxcode', type: 'link', width: 210 },
-      { title: '订单号', index: 'billHCode', type: 'link', width: 140 },
+      { title: '订单号', index: 'billHCode', type: 'link', width: 180 },
-      { title: '网络货运人', index: 'ltdName', width: 160 },
+      { title: '网络货运人', index: 'ltdName', width: 220 },
       { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 },
-      { title: '收款账户', index: 'ltdaccountId', width: 160 },
+      { title: '收款账户', index: 'ltdaccountId', width: 200 },
       { title: '核销类型', index: 'ahxType', type: 'enum', enum: { '1': '预收款' }, width: 120 },
       {
         title: '核销金额',
         index: 'ahxmoney',
-        width: 120,
+        width: 140,
         className: 'text-right',
         format: item => `${this.currencyPipe.transform(item.ahxmoney)}`
       },
       {
         title: '应收金额',
         index: 'armoney',
-        width: 120,
+        width: 140,
         className: 'text-right',
         format: item => `${this.currencyPipe.transform(item.armoney)}`
       },

src/app/routes/financial-management/services/freight-account.service.ts

@@ -88,6 +88,8 @@ export class FreightAccountService extends ShipperBaseService {
 
   // 查询应收核销抬头
   $api_get_fico_page = '/api/fcc/ficoAhxH/list/page';
+  // 应收核销汇总
+  $api_get_fico_sum = '/api/fcc/ficoAhxH/getSum';
   // 获取应收核销抬头
   $api_get_fico_header = '/api/fcc/ficoAhxH/get';
   // 查询应收核销明细
@@ -95,6 +97,8 @@ export class FreightAccountService extends ShipperBaseService {
 
   // 查询应付核销抬头
   $api_get_fico_ph_page = '/api/fcc/ficoPhxH/list/page';
+  // 应付核销汇总
+  $api_get_fico_ph_sum = '/api/fcc/ficoPhxH/getSum';
   // 获取应付核销抬头
   $api_get_fico_ph_header = '/api/fcc/ficoPhxH/get';
   // 查询应付核销明细

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

@@ -342,7 +342,9 @@ export class InvoiceRequestedDetailComponent implements OnInit {
         title: '税率',
         index: 'billvatrate',
         width: 90,
-        format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%`
+        format: item => `9.00%`
+        // bugfix 6976
+        // format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%`
       },
       { title: '发票号码', index: 'vatinvcode', width: 100 },
       { title: '开票日期', index: 'vatinvtime', type: 'date', width: 150 }

src/app/routes/vehicle/components/audit/detail/detail.component.html

@@ -15,11 +15,15 @@
         <span *ngIf="detailData?.approvalStatus === 20 || detailData?.approvalStatus === '20'">已审核</span>
         <span *ngIf="detailData?.approvalStatus === 30 || detailData?.approvalStatus === '30'">已驳回</span>
         <span *ngIf="detailData?.approvalStatus === 40 || detailData?.approvalStatus === '40'">证件过期</span>
-        <div style="float: right;" *ngIf="detailData?.approvalStatus === 10 || detailData?.approvalStatus === '10'">
+        <div style="float: right;" *ngIf="detailData?.approvalStatus !== 20 && detailData?.approvalStatus !== '20'">
           <ng-container *ngIf="!isEdit ">
-            <button nz-button nzType="default" nzDanger (click)="approveDriver()" acl acl-ability="VEHICLE-AUDIT-DETAIL-pass">通过</button>
+            <button nz-button nzType="default" nzDanger (click)="approveDriver()" acl
-            <button nz-button nzType="default" nzDanger (click)="rejectedDriver()" acl acl-ability="VEHICLE-AUDIT-DETAIL-reject">驳回</button>
+              acl-ability="VEHICLE-AUDIT-DETAIL-pass">通过</button>
-            <button nz-button nzType="default" nzDanger (click)="ratify()" acl acl-ability="VEHICLE-AUDIT-DETAIL-save">修改</button>
+            <button nz-button nzType="default" nzDanger (click)="rejectedDriver()" acl
+              acl-ability="VEHICLE-AUDIT-DETAIL-reject"
+              *ngIf="detailData?.approvalStatus === 10 || detailData?.approvalStatus === '10'">驳回</button>
+            <button nz-button nzType="default" nzDanger (click)="ratify()" acl
+              acl-ability="VEHICLE-AUDIT-DETAIL-save">修改</button>
           </ng-container>
           <ng-container *ngIf="isEdit">
             <button nz-button nzType="default" (click)="reset()">取消</button>
@@ -45,31 +49,19 @@
     <sv label="车牌颜色">
       <nz-select [(ngModel)]="detailData.carNoColor" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
         [nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
-        <nz-option
+        <nz-option *ngFor="let i of contenCarNoColor" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
-          *ngFor="let i of contenCarNoColor"
-          [nzLabel]="i.label"
-          [nzValue]="i.value"
-        ></nz-option>
       </nz-select>
     </sv>
     <sv label="车型">
       <nz-select [(ngModel)]="detailData.carModel" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
         [nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
-        <nz-option
+        <nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
-          *ngFor="let i of contencarModel"
-          [nzLabel]="i.label"
-          [nzValue]="i.value"
-        ></nz-option>
       </nz-select>
     </sv>
     <sv label="车长">
       <nz-select [(ngModel)]="detailData.carLength" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
         [nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
-              <nz-option
+        <nz-option *ngFor="let i of contenCarLength" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
-                *ngFor="let i of contenCarLength"
-                [nzLabel]="i.label"
-                [nzValue]="i.value"
-              ></nz-option>
       </nz-select>
     </sv>
     <sv label="是否为挂车">
@@ -118,8 +110,8 @@
         [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
     </sv>
     <sv label="行驶证签发机关">
-      <input nz-input style="width: '300px'" type="text" [(ngModel)]="detailData.driverLicenseSigningOrg" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+      <input nz-input style="width: '300px'" type="text" [(ngModel)]="detailData.driverLicenseSigningOrg"
-      [placeholder]="isEdit?'':'-'">
+        [readonly]="!isEdit" [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
   </sv-container>
 
@@ -131,8 +123,8 @@
         [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
     </sv>
     <sv label="车辆识别代码">
-      <input nz-input type="text" [(ngModel)]="detailData.carDistinguishCode" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+      <input nz-input type="text" [(ngModel)]="detailData.carDistinguishCode" [readonly]="!isEdit"
-      [placeholder]="isEdit?'':'-'">
+        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="使用性质">
       <nz-select [(ngModel)]="detailData.useNature" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
@@ -153,8 +145,8 @@
         [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="所有人">
-      <input nz-input style="width: '300px'" type="text" [(ngModel)]="detailData.carOwner" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+      <input nz-input style="width: '300px'" type="text" [(ngModel)]="detailData.carOwner" [readonly]="!isEdit"
-      [placeholder]="isEdit?'':'-'">
+        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
   </sv-container>
   <sv-container col="1">
@@ -175,8 +167,8 @@
         [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="经营许可证号">
-      <input nz-input type="text" [(ngModel)]="detailData.roadTransportLicenceNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+      <input nz-input type="text" [(ngModel)]="detailData.roadTransportLicenceNo" [readonly]="!isEdit"
-      [placeholder]="isEdit?'':'-'">
+        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="发证日期">
       <!-- <input nz-input type="text" [(ngModel)]="detailData.roadTransportStartTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@@ -192,7 +184,7 @@
     </sv>
     <sv label="道路运输证照片">
       <ng-container
-      *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.roadTransportPhotoWatermark,key:'roadTransportPhotoWatermark', hover: 'Watermark'}" >
+        *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.roadTransportPhotoWatermark,key:'roadTransportPhotoWatermark', hover: 'Watermark'}">
       </ng-container>
     </sv>
   </sv-container>
@@ -201,8 +193,7 @@
     <sv-title style="font-weight: 700;">认证司机</sv-title>
   </sv-container>
   <st #st [bordered]="true" [columns]="columns" [data]="service.$api_get_queryDriverByCarId"
-  [req]="{  method: 'POST', allInBody: true, params: reqParams }"
+    [req]="{  method: 'POST', allInBody: true, params: reqParams }" [res]="{ reName: { list: 'data', total: 'data' } }"
-    [res]="{ reName: { list: 'data', total: 'data' } }"
     [ngStyle]="{ margin: '1rem 0' }" multiSort size="small" [page]="{ show: false }">
     <ng-template st-row="auditStatusEnum" let-item let-index="index">
       <div>