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

src/app/routes/datatable/components/customtable/driver/driver.component.ts

@@ -19,7 +19,7 @@ export class DatatableDriverComponent implements OnInit {
   mode = 'year';
   date: any = null;
   defineDate = [];
-  queryTime: any = ''
+  queryTime: any = [new Date().getFullYear()]
   dateFormat = 'yyyy';
   today = new Date();
   ui: SFUISchema = {};
@@ -130,11 +130,22 @@ export class DatatableDriverComponent implements OnInit {
     if(result === null) {
       return
     }
-    if (this.mode === 'year') {
+    // if (this.mode === 'year') {
+    //   this.queryTime = this.datePipe.transform(this.date, 'yyyy')
+    // } else if (this.mode === 'month') {
+    //   this.queryTime = this.datePipe.transform(this.date, 'yyyy-MM')
+    // }
+
+    if(this.mode === 'year') {
       this.queryTime = [this.datePipe.transform(this.date, 'yyyy')]
-    } else if (this.mode === 'month') {
+    } else if(this.mode === 'month') {
       this.queryTime = [this.datePipe.transform(this.date, 'yyyy-MM')]
+    } else if(this.mode === 'date') {
+      this.queryTime = [this.datePipe.transform(this.date, 'yyyy-MM-dd')]
+    } else{
+      this.queryTime = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd'), this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd')]
     }
+
     this.st.reload({ ...this.reqParams });
   }
   disabledDate = (current: Date): boolean =>

src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts

@@ -76,7 +76,7 @@ export class DriverAccountDetailComponent implements OnInit {
   stChange(e: STChange): void {}
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value,  pageSize: -1 });
+    this.service.downloadFile(this.service.$api_get_exportAccountBalanceDriverByOperatorPage, { ...this.sf.value,  pageSize: -1 });
   }
 
   goBack() {

src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts

@@ -83,7 +83,7 @@ export class FreightAccountDetailComponent implements OnInit {
   stChange(e: STChange): void {}
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
+    this.service.downloadFile(this.service.$api_get_exportAccountBalanceShipperByOperatorPage, { ...this.sf.value, pageSize: -1 });
   }
 
   goBack() {

src/app/routes/financial-management/components/freight-account/freight-account.component.ts

@@ -80,7 +80,7 @@ export class FreightAccountComponent implements OnInit {
   }
 
   exportList() {
-    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_shipper);
+    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportShipperAccountBalanceByOperator);
   }
 
   private initSF(): SFSchema {

src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts

@@ -66,7 +66,7 @@ export class PlatformAccountDetailComponent implements OnInit {
   stChange(e: STChange): void {}
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
+    this.service.downloadFile(this.service.$api_get_exportAccountBalanceByPage, { ...this.sf.value, pageSize: -1 });
   }
 
   goBack() {

src/app/routes/financial-management/components/platform-account/platform-account.component.html

@@ -46,7 +46,7 @@
         <div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button> 导出</button>
+            <button nz-button (click)="exportList()"> 导出</button>
         </div>
     </div>
 </nz-card>

src/app/routes/financial-management/components/platform-account/platform-account.component.ts

@@ -194,4 +194,7 @@ export class PlatformAccountComponent implements OnInit {
       }
     ];
   }
+  exportList() {
+    this.service.downloadFile(this.service.$api_get_exportPlatformAccountBalanceByOperator, { ...this.sf.value, pageSize: -1 });
+  }
 }

src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts

@@ -79,7 +79,7 @@ export class RechargeRecordComponent implements OnInit {
   }
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
+    this.service.downloadFile(this.service.$api_get_exportPageByOperator, { ...this.sf.value, pageSize: -1 });
   }
 
   private initSF(): SFSchema {

src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html

@@ -11,7 +11,7 @@
       class="text-right">
       <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
-      <button nz-button> 导出</button>
+      <button nz-button (click)='exportList()'> 导出</button>
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
         <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts

@@ -261,4 +261,7 @@ export class TransactionFlowComponent {
       }
     ];
   }
+  exportList() {
+    this.service.downloadFile(this.service.$api_get_exportAccountBalanceDetailPage, { ...this.sf.value, pageSize: -1 });
+  }
 }

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 15:57:44
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-26 16:53:11
+ * @LastEditTime : 2022-04-08 17:30:12
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\services\\freight-account.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -137,6 +137,23 @@ export class FreightAccountService extends ShipperBaseService {
   // 根据预收款ID获取核销信息明细
   $api_get_advance_collection_hrxiao = '/api/fcc/ficoAhxH/getAhxHByYskblaId';
 
+
+
+  // 运营导出充值信息 充值记录导出
+  $api_get_exportPageByOperator = '/api/fcc/rechargeInfo/exportPageByOperator';
+  // 运营端导出交易流水明细
+  $api_get_exportAccountBalanceDetailPage = '/api/fcc/accountBalanceDetail/exportAccountBalanceDetailPage';
+  // 运营端导出平台账户余额交易明细
+  $api_get_exportAccountBalanceByPage = '/api/fcc/accountBalanceDetail/exportAccountBalanceByPage';
+  // 运营端导出司机账户余额交易明细
+  $api_get_exportAccountBalanceDriverByOperatorPage = '/api/fcc/accountBalanceDetail/exportAccountBalanceDriverByOperatorPage';
+  // 运营端导出货主账户余额交易明细
+  $api_get_exportAccountBalanceShipperByOperatorPage = '/api/fcc/accountBalanceDetail/exportAccountBalanceShipperByOperatorPage';
+  // 运营端导出导出货主账户
+  $api_get_exportShipperAccountBalanceByOperator = '/api/fcc/accountBalance/exportShipperAccountBalanceByOperator';
+  // 运营端导出导出平台账户信息
+  $api_get_exportPlatformAccountBalanceByOperator = '/api/fcc/accountBalance/exportPlatformAccountBalanceByOperator';
+
   constructor(public injector: Injector) {
     super(injector);
   }

src/app/routes/tax-management/components/order-reporting/order-reporting.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-30 14:00:43
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-08 15:27:15
+ * @LastEditTime : 2022-04-09 14:11:01
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\order-reporting.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -49,7 +49,7 @@
     </ng-template>
     <ng-template st-row="checkStatus" let-item let-index="index">
       <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
-      <span *ngIf="item?.checkStatus == '0'" (click)="viewResult(item)">校验中</span>
+      <span *ngIf="item?.checkStatus == '0'">校验中</span>
       <span *ngIf="item?.checkStatus == '1'">通过</span>
       <!-- <span  *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="unnormal(item)">不通过</span> -->
       <span  *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="viewResult(item)">不通过</span>

src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html

@@ -4,24 +4,31 @@
  * @Author       : Shiming
  * @Date         : 2022-03-31 11:10:10
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-08 15:28:46
+ * @LastEditTime : 2022-04-09 14:02:23
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\verify-result\\verify-result.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <div nz-row>
-  <div style="width: 10%;">
+  <div style="width: 10%">
-    <nz-tabset [nzTabPosition]="'left'" style="height: 100%;">
+    <nz-tabset [nzTabPosition]="'left'" style="height: 100%">
       <nz-tab [nzTitle]="item?.name" *ngFor="let item of tabs" (nzSelect)="selectTab(item)"></nz-tab>
     </nz-tabset>
   </div>
-  <div style="width: 90%;">
+  <div style="width: 90%">
-    <st #st [scroll]="{x:'1000px'}" [data]="service.$api_get_getTaxFieldCheckList" [columns]="columns"
+    <st
-      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      #st
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false"
+      [scroll]="{ x: '1000px', y: '600px' }"
-      [bordered]="true">
+      [data]="service.$api_get_getTaxFieldCheckList"
+      [columns]="columns"
+      [req]="{  process: beforeReq }"
+      [res]="{ reName: { list: 'data', total: 'data' } , process: afterRes}"
+      [page]="{ show: false }"
+      [loading]="false"
+      [bordered]="true"
+    >
       <ng-template st-row="freightDetails" let-item>
         <div *ngFor="let item of item.freightDetails">
-          <div>{{item.expenseName}}:{{item.price | currency}} </div>
+          <div>{{ item.expenseName }}:{{ item.price | currency }} </div>
         </div>
       </ng-template>
     </st>

src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts

@@ -4,13 +4,13 @@
  * @Author       : Shiming
  * @Date         : 2022-03-30 14:26:01
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-08 15:48:58
+ * @LastEditTime : 2022-04-09 14:10:37
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\verify-result\\verify-result.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
-import { STColumn, STComponent } from '@delon/abc/st';
+import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
 import { SFSchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzModalRef } from 'ng-zorro-antd/modal';
@@ -21,7 +21,6 @@ import { TaxManagementService } from '../../../services/tax-management.service';
   templateUrl: './verify-result.component.html',
 })
 export class TaxManagementOrderVerifyResultComponent implements OnInit {
-  url = `/user`;
   searchSchema: SFSchema = {
     properties: {
       no: {
@@ -41,13 +40,41 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit {
     { name: '订单信息', value: '3' },
   ];
 
-  get reqParams() {
+  // get reqParams() {
-    const params ={
+  //   console.log(this.subjectType);
-      subjectId: this.record?.shipperId,
+  //   const params ={
-      subjectType: this.subjectType || '0'
+  //     subjectId: this.record?.shipperId,
+  //     subjectType: this.subjectType,
+  //   }
+  //   return params;
+  // }
+  beforeReq = (requestOptions: STRequestOptions) => {let a: string = '';
+    switch (this.subjectType) {
+      case '0':
+      a = this.record?.networkTransporter;
+      break
+      case '1':
+      a = this.record?.shipperId;
+      break
+      case '2':
+      a = this.record?.driverId;
+      break
+      case '3':
+      a = this.record?.billId;
+      break
     }
-    return params;
+      Object.assign(requestOptions.body, {
-  }
+            subjectId: a ,
+            subjectType: this.subjectType,
+      });
+    return requestOptions;
+  };
+  afterRes = (data: any[], rawData?: any) => {
+    console.log(data)
+    return data.map(item => ({
+      ...item,
+    }));
+  };
   constructor(public service: TaxManagementService, private modalRef: NzModalRef, public router: Router) {
   }
 
@@ -98,7 +125,10 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit {
 
   selectTab(e: any) {
     setTimeout(() => {
+      console.log(e?.value);
+      
       this.subjectType = e?.value;
+      console.log(this.subjectType);
       this.st.load(1);
     })
   }
@@ -110,8 +140,6 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit {
     } else if (this.record.billType === '2') {
       window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`);
     }
-
-
   }
   close(): void {
     this.modalRef.destroy();