Merge branch 'develop'

src/app/routes/financial-management/components/cost-management/cost-management.component.ts

@@ -84,7 +84,7 @@ export class CostManagementComponent extends BasicTableComponent implements OnIn
 
 
   exportList() {
-    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator);
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_cost_page_export);
   }
 
   routeTo(url: string, params?: any, status?: any) {

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

@@ -48,6 +48,9 @@
         <div></div>
         <div class="mr-sm">
             <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+            <button nz-button nzDanger [disabled]="service.http.loading" acl
+                [acl-ability]="['FINANCIAL-PAYABLE-export']" (click)='exportList()'>
+                导出</button>
         </div>
     </div>
     <st #st [data]="service.$api_get_fico_ph_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"

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

@@ -21,11 +21,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
 
   selectedRows: any[] = [];
   info: any = {};
-  constructor(
+  constructor(public service: FreightAccountService, private router: Router, public searchDrawerService: SearchDrawerService) {
-    public service: FreightAccountService,
-    private router: Router,
-    public searchDrawerService: SearchDrawerService
-  ) {
     super(searchDrawerService);
   }
 
@@ -77,6 +73,9 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
     }
   }
 
+  exportList() {
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_fico_ph_page_export);
+  }
 
   private initSF(): SFSchema {
     return {
@@ -118,7 +117,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
           enum: [{ value: '1', label: '费用款项' }],
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
           }
         },
         cno: {
@@ -128,7 +127,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            asyncData: () => this.service.getCloseAccount(),
+            asyncData: () => this.service.getCloseAccount()
           }
         },
         driver2IdName: {
@@ -136,7 +135,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
           title: '收款人',
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
           }
         },
         sts: {
@@ -148,7 +147,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
           ],
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
           }
         },
         phxdate: {
@@ -156,7 +155,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
           type: 'string',
           ui: {
             widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
           } as SFDateWidgetSchema
         },
         createTime: {
@@ -164,21 +163,21 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
           type: 'string',
           ui: {
             widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
           } as SFDateWidgetSchema
         },
         billHCode: {
           type: 'string',
           title: '订单号',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
           }
         },
         feeHCode: {
           type: 'string',
           title: '费用号',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
           }
         },
         remarks: {
@@ -186,7 +185,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
           title: '核销备注',
           ui: {
             autocomplete: 'off',
-            placeholder: '请选择',
+            placeholder: '请选择'
           }
         }
       }

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

@@ -34,6 +34,9 @@
         <div class="mr-sm">
             <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
                 [acl-ability]="['FINANCIAL-PAYMENT-ORDER-list']">筛选</button>
+            <button nz-button nzDanger [disabled]="service.http.loading" acl
+                [acl-ability]="['FINANCIAL-PAYMENT-ORDER-export']" (click)='exportList()'>
+                导出</button>
         </div>
     </div>
 

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

@@ -77,6 +77,10 @@ export class PaymentOrderComponent extends BasicTableComponent implements OnInit
     });
   }
 
+  exportList() {
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_payment_page_export);
+  }
+
   private initSF(): SFSchema {
     return {
       properties: {

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

@@ -21,17 +21,20 @@
 
 <nz-card class="table-box">
   <div class="header_box">
-      <div>
+    <div>
-          <label class="page_title"> <label class="driver">|</label> 收款单</label>
+      <label class="page_title"> <label class="driver">|</label> 收款单</label>
-          <label class="ml-md">
+      <label class="ml-md">
-              已选择
+        已选择
-              <strong class="text-primary">{{ selectedRows.length }}</strong> 张单
+        <strong class="text-primary">{{ selectedRows.length }}</strong> 张单
-              <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
+        <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
-          </label>
+      </label>
-      </div>
+    </div>
-      <div class="mr-sm">
+    <div class="mr-sm">
-          <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+      <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
-      </div>
+      <button nz-button nzDanger [disabled]="service.http.loading" acl [acl-ability]="['FINANCIAL-RECEIPT-export']"
+        (click)='exportList()'>
+        导出</button>
+    </div>
   </div>
   <!-- <div class="d-flex align-items-center mb-md mt-md">
     <button nz-button (click)="this.addInvoice()" nzType="primary">添加收款</button>

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

@@ -81,6 +81,10 @@ export class ReceiptOrderComponent extends BasicTableComponent implements OnInit
     // });
   }
 
+  exportList() {
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_receipt_page_export);
+  }
+
   private initSF(): SFSchema {
     return {
       properties: {

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

@@ -48,7 +48,9 @@
     <div></div>
     <div class="mr-sm">
       <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
-      <button nz-button nzDanger> 导出</button>
+      <button nz-button nzDanger [disabled]="service.http.loading" acl [acl-ability]="['FINANCIAL-RECEIVABLE-export']"
+        (click)='exportList()'>
+        导出</button>
     </div>
   </div>
 

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

@@ -12,7 +12,7 @@ import { FreightAccountService } from '../../services/freight-account.service';
 @Component({
   selector: 'app-receivable-order',
   templateUrl: './receivable-order.component.html',
-  styleUrls: ['../../../commom/less/commom-table.less','../../../commom/less/common-table-bar.less']
+  styleUrls: ['../../../commom/less/commom-table.less', '../../../commom/less/common-table-bar.less']
 })
 export class ReceivableOrderComponent extends BasicTableComponent implements OnInit {
   @ViewChild('st', { static: true })
@@ -80,6 +80,9 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
     }
   }
 
+  exportList() {
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_fico_page_export);
+  }
 
   private initSF(): SFSchema {
     return {
@@ -121,7 +124,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'driverrecord:receive:type' },
-            placeholder: '请选择',
+            placeholder: '请选择'
           }
         },
         arvattype: {
@@ -130,7 +133,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'pay:type' },
-            placeholder: '请选择',
+            placeholder: '请选择'
           }
         },
         cno: {
@@ -140,7 +143,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            asyncData: () => this.service.getCloseAccount(),
+            asyncData: () => this.service.getCloseAccount()
           }
         },
         arto: {
@@ -152,7 +155,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
             searchDebounceTime: 300,
             searchLoadingText: '搜索中...',
             allowClear: true,
-            onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
+            onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q })
           }
         },
         sts: {
@@ -164,8 +167,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
           ],
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
-           
           }
         },
         banktype: {
@@ -178,8 +180,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
           ],
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
-           
           },
           default: ''
         },
@@ -188,8 +189,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
           type: 'string',
           ui: {
             widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
-            
           } as SFDateWidgetSchema
         },
         createTime: {
@@ -197,14 +197,14 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
           type: 'string',
           ui: {
             widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
           } as SFDateWidgetSchema
         },
         billHCode: {
           type: 'string',
           title: '订单号',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
           }
         },
         // orderS3: {
@@ -222,7 +222,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
           title: '核销备注',
           ui: {
             autocomplete: 'off',
-            placeholder: '请选择',
+            placeholder: '请选择'
           }
         }
       }

src/app/routes/financial-management/components/voucher-management/voucher-management.component.html

@@ -27,6 +27,8 @@
         <div class="mr-sm">
             <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
                 [acl-ability]="['FINANCIAL-VOUCHER-list']">筛选</button>
+            <button nz-button nzDanger [disabled]="service.http.loading" (click)="exprot()" acl
+                [acl-ability]="['FINANCIAL-VOUCHER-export']">导出</button>
         </div>
     </div>
 

src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts

@@ -61,6 +61,11 @@ export class VoucherManagementComponent extends BasicTableComponent {
     }
   }
 
+  // 导出
+  exprot() {
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_asyncExportBillPaymentApplicationList);
+  }
+
   private initSF(): SFSchema {
     return {
       properties: {

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

@@ -83,6 +83,8 @@ export class FreightAccountService extends ShipperBaseService {
 
   // 查询费用单抬头
   $api_get_cost_page = '/api/fcc/ficoFeeH/list/page';
+  // 导出费用单列表数据
+  $api_get_cost_page_export = '/api/fcc/ficoFeeH/asyncExport';
   // 根据费用头ID查询费用单及开票明细
   $api_get_cost_detail = '/api/fcc/ficoFeeL/detail';
   // 费用关联的应收核销明细
@@ -90,6 +92,8 @@ export class FreightAccountService extends ShipperBaseService {
 
   // 查询应收核销抬头
   $api_get_fico_page = '/api/fcc/ficoAhxH/list/page';
+  // 应收核销列表数据导出
+  $api_get_fico_page_export = '/api/fcc/ficoAhxH/asyncExport';
   // 应收核销汇总
   $api_get_fico_sum = '/api/fcc/ficoAhxH/getSum';
   // 获取应收核销抬头
@@ -99,6 +103,8 @@ export class FreightAccountService extends ShipperBaseService {
 
   // 查询应付核销抬头
   $api_get_fico_ph_page = '/api/fcc/ficoPhxH/list/page';
+  // 应付核销列表数据导出
+  $api_get_fico_ph_page_export = '/api/fcc/ficoPhxH/asyncExport';
   // 应付核销汇总
   $api_get_fico_ph_sum = '/api/fcc/ficoPhxH/getSum';
   // 获取应付核销抬头
@@ -108,6 +114,8 @@ export class FreightAccountService extends ShipperBaseService {
 
   // 查询总账凭证表
   $api_get_fico_vch_page = '/api/fcc/ficoVcH/list/page';
+  // 导出总账凭证列表数据
+  $api_get_fico_vch_export = '/api/fcc/ficoVcH/asyncExport';
   // 导出总账凭证表
   $api_export_fico_vch_page = '/api/fcc/ficoVcH/reportVchListPage';
   // 获取总账凭证表详情信息
@@ -115,6 +123,8 @@ export class FreightAccountService extends ShipperBaseService {
 
   // 查询付款单抬头
   $api_get_payment_page = '/api/fcc/ficoPayH/listFicoPayHPage';
+  // 付款单列表数据导出
+  $api_get_payment_page_export = '/api/fcc/ficoPayH/asyncExport';
   // 查询付款单明细
   $api_get_payment_detail = '/api/fcc/ficoPayL/list/page';
   // 付款单抬头信息
@@ -122,6 +132,8 @@ export class FreightAccountService extends ShipperBaseService {
 
   // 查询收款单抬头
   $api_get_receipt_page = '/api/fcc/ficoBrmH/list/page';
+  // 收款单列表数据导出
+  $api_get_receipt_page_export = '/api/fcc/ficoBrmH/asyncExport';
   // 收款单抬头信息
   $api_get_receipt_header = '/api/fcc/ficoBrmH/get';
   // 获取收款单抬头

src/app/routes/usercenter/components/driver/detail/detail.component.html

@@ -42,15 +42,25 @@
 <nz-card [nzLoading]="service.http.loading" [nzBorderless]="true">
   <div class="mb-md">
     <div class="font-weight-blod text-md detail-title" style="justify-content: space-between;">
-      <div>
+      <div style="display: flex; justify-content: center;align-items: center;">
         <a class="sign"></a>
-        <span>个人信息</span>
+        <p style="margin-bottom: 0">
-        <label *ngIf="userIdentityDetail?.certificationStatus===1" style="color: #52c41a;" class="ml-md"><i nz-icon
+          个人信息
-            nzType="check-circle" nzTheme="fill" class="mr-xs"></i>审核通过
+          <label *ngIf="userIdentityDetail?.certificationStatus===2"  style="color: #ff4d4f"><i nz-icon nzType="info-circle"
-        </label>
+              nzTheme="fill" class="mr-xs"></i>驳回：<span nz-popover [nzPopoverTitle]="titleTemplate1" [nzPopoverContent]="contentTemplate2">
-        <label *ngIf="userIdentityDetail?.certificationStatus===2" style="color: #ff4d4f;" class="ml-md"><i nz-icon
+                驳回原因
-            nzType="close-circle" nzTheme="fill" class="mr-xs"></i>驳回 驳回原因：{{userIdentityDetail?.certificationOpinions}}
+                <ng-template #titleTemplate1>
+                  原因
+                </ng-template>
+                <ng-template #contentTemplate2>
+                  {{userIdentityDetail?.tips}}
+                </ng-template>
+              </span>
+          </label>
+          <label *ngIf="userIdentityDetail?.certificationStatus===1" style="color: #52c41a"><i nz-icon nzType="check-circle"
+            nzTheme="fill" class="mr-xs"></i>审核通过
         </label>
+        </p>
         <label *ngIf="faceStatus == 1" style="color: #bec8c8; position: relative;
   bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已发起</i>
         </label>
@@ -179,15 +189,25 @@
 
   <div class="mb-md">
     <div class="font-weight-blod text-md detail-title" style="justify-content: space-between;">
-      <div>
+      <div  style="display: flex; justify-content: center;align-items: center;">
         <a class="sign"></a>
-        <span>驾驶证信息</span>
+        <p style="margin-bottom: 0">
-        <label *ngIf="driverDetail?.approvalStatus===20" style="color: #52c41a;" class="ml-md"><i nz-icon
+          驾驶证信息
-            nzType="check-circle" nzTheme="fill" class="mr-xs"></i>审核通过
+          <label *ngIf="driverDetail?.approvalStatus===30" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
-        </label>
+              nzTheme="fill" class="mr-xs"></i>驳回：<span nz-popover [nzPopoverTitle]="titleTemplate1" [nzPopoverContent]="contentTemplate1">
-        <label *ngIf="driverDetail?.approvalStatus===30" style="color: #ff4d4f;" class="ml-md"><i nz-icon
+                驳回原因
-            nzType="close-circle" nzTheme="fill" class="mr-xs"></i>驳回
+                <ng-template #titleTemplate1>
+                  原因
+                </ng-template>
+                <ng-template #contentTemplate1>
+                  {{driverDetail?.tips}}
+                </ng-template>
+              </span>
+          </label>
+          <label *ngIf="driverDetail?.approvalStatus===20" style="color: #52c41a"><i nz-icon nzType="check-circle"
+            nzTheme="fill" class="mr-xs"></i>审核通过
         </label>
+        </p>
       </div>
       <div>
         <ng-container *ngIf="isEditDriver;else editDriverButton">

src/app/routes/usercenter/components/driver/detail/detail.component.ts

@@ -2,16 +2,11 @@ import { DatePipe } from '@angular/common';
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { apiConf } from '@conf/api.conf';
-import { STColumn, STComponent } from '@delon/abc/st';
+import { STColumn } from '@delon/abc/st';
-import { SFComponent, SFDateWidgetSchema, SFSchema, SFTagWidgetSchema, SFTextWidgetSchema, SFUISchema } from '@delon/form';
+import { _HttpClient } from '@delon/theme';
-import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzImageService } from 'ng-zorro-antd/image';
-import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { Subject } from 'rxjs';
-import { ImageViewComponent } from 'src/app/shared/components/imagelist';
 import { UsermanageService } from '../../../services/usercenter.service';
-import { debounceTime } from 'rxjs/operators';
 
 @Component({
   selector: 'app-usercenter-components-driver-detail',
@@ -73,6 +68,8 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   ) {}
 
   ngOnInit() {
+    console.log(this.route.snapshot.queryParams);
+    
     this.initData();
     this.initDetailByCode();
   }

src/app/routes/usercenter/components/driver/driver.component.ts

@@ -62,8 +62,7 @@ export class UserCenterComponentsDriverComponent extends BasicTableComponent imp
     return params;
   }
 
-  ngOnInit() {
+  ngOnInit() {}
-  }
 
   selectChange(e: any) {
     this.resourceStatus = e;
@@ -306,7 +305,12 @@ export class UserCenterComponentsDriverComponent extends BasicTableComponent imp
           {
             text: '查看<br/>',
             click: item => {
-              this.router.navigate(['./detail', item.appUserId], { relativeTo: this.ar });
+              this.router.navigate(['./detail', item.appUserId], {
+                relativeTo: this.ar,
+                queryParams: {
+                  status: item.driverLicenseStatus
+                }
+              });
             },
             acl: { ability: ['USERCENTER-DRIVER-LIST-view'] }
           },