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

src/app/routes/datatable/components/financetable/financetable.component.html

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-06 10:57:56
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-11 15:52:10
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\financetable\\financetable.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <!-- 页头 -->
 <page-header-wrapper [title]="'财务报表'"></page-header-wrapper>
 <nz-card nzTitle="财务报表" [nzExtra]="extraTemplate">
@@ -45,6 +55,15 @@
     <ng-template st-row="dkpje" let-item let-index="index">
       {{item.dkpje | currency}}
     </ng-template>
+    <ng-template st-row="yingsfjf" let-item let-index="index">
+      {{item.yingsfjf | currency}}
+    </ng-template>
+    <ng-template st-row="yisfjf" let-item let-index="index">
+      {{item.yisfjf | currency}}
+    </ng-template>
+    <ng-template st-row="fjfl" let-item let-index="index">
+      {{item.fjfl + '%'}}
+    </ng-template>
   </st>
 </nz-card>
 <nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01">

src/app/routes/datatable/components/financetable/financetable.component.ts

@@ -34,17 +34,17 @@ export class DatatableFinancetableComponent implements OnInit {
   chartData: any = {}
   flag = false;
   columns: STColumn[] = [
-    { title: '运营主体', index: 'networkTransporterName', className: 'text-center' },
+    { title: '运营主体', index: 'networkTransporterName', className: 'text-center' ,width: 200},
-    { title: '客户预存款', index: 'czcgje',render: 'czcgje', className: 'text-center' },
+    { title: '客户预存款', index: 'czcgje',render: 'czcgje', className: 'text-center',width: 200 },
-    { title: '应收金额', index: 'yingsje',render: 'yingsje', className: 'text-center' },
+    { title: '应收金额', index: 'yingsje',render: 'yingsje', className: 'text-center' ,width: 200},
-    { title: '已收金额', index: 'yisje',render: 'yisje', className: 'text-center' },
+    { title: '已收金额', index: 'yisje',render: 'yisje', className: 'text-center',width: 200 },
-    { title: '应付运费', index: 'yingfyf', render: 'yingfyf',className: 'text-center' },
+    { title: '应付运费', index: 'yingfyf', render: 'yingfyf',className: 'text-center' ,width: 200},
-    { title: '已付运费', index: 'yifyf',render: 'yifyf', className: 'text-center' },
+    { title: '已付运费', index: 'yifyf',render: 'yifyf', className: 'text-center' ,width: 200},
-    { title: '已开票金额', index: 'ykpje',render: 'ykpje', className: 'text-center' },
+    { title: '已开票金额', index: 'ykpje',render: 'ykpje', className: 'text-center' ,width: 200},
-    { title: '待开票金额', index: 'dkpje',render: 'dkpje', className: 'text-center' },
+    { title: '待开票金额', index: 'dkpje',render: 'dkpje', className: 'text-center' ,width: 200},
-    { title: '应收附加费', index: 'yingsfjf', className: 'text-center' },
+    { title: '应收附加费', index: 'yingsfjf',render: 'yingsfjf', className: 'text-center' ,width: 200},
-    { title: '已收附加费', index: 'yisfjf', className: 'text-center' },
+    { title: '已收附加费', index: 'yisfjf',render: 'yisfjf', className: 'text-center' ,width: 200},
-    { title: '平均附加费率', index: 'fjfl', className: 'text-center' }
+    { title: '平均附加费率', index: 'fjfl', render: 'fjfl',className: 'text-center',width: 200 }
   ];
   /**
    * 查询参数

src/app/routes/datatable/components/financetable/pillar/pillar.component.ts

@@ -1,3 +1,13 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-01 13:16:39
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-11 16:00:12
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\financetable\\pillar\\pillar.component.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
 import { Chart } from '@antv/g2';
 import { DataService } from 'src/app/routes/datatable/services/data.service';
@@ -50,12 +60,19 @@ export class FinancetablePillarComponent implements OnInit, OnChanges {
 
     this.chart.scale('number', {
       nice: true,
+      // ticks: 
     });
     this.chart.tooltip({
       showMarkers: false,
       shared: true,
     });
-
+    this.chart.axis('number', {
+      label: {
+        formatter: (val: any) => {
+          return  '¥' +  this.toThousands(val) ;
+        },
+      },
+    });
     this.chart
       .interval()
       .position('time*number')
@@ -71,5 +88,8 @@ export class FinancetablePillarComponent implements OnInit, OnChanges {
 
     this.chart.render();
   }
-
+ toThousands(num: string) {
+    const str = num.toString()
+    return str.replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')
+  }
 }

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts

@@ -556,7 +556,7 @@ export class DatatableOrderReportingComponent implements OnInit {
       this.openWainingModal('请选择需要更新的数据');
       return;
     }
-    const ids = this.selectedRows.map(i => i?.id);
+    const ids = this.selectedRows.map(i => i?.orderId);
     this.service.request(this.service.$api_update_order_data, ids).subscribe(res => {
       if (res) {
         this.service.msgSrv.success('更新成功');

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

@@ -20,7 +20,7 @@
     <div nz-row nzGutter="8">
         <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="150" col="1">
             <se label="网络货运人" required>
-                {{headerInfo?.ltdId}}
+                {{headerInfo?.ltdName}}
             </se>
             <se label="结算客户">
                 {{headerInfo?.cnoName}}

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

@@ -227,30 +227,30 @@ export class PayableOrderComponent implements OnInit {
     return [
       { title: '', index: 'key', type: 'checkbox' },
       { title: '核销单号', index: 'phxcode', type: 'link', width: 140 },
-      { title: '网络货运人', index: 'ltdName', width: 160 },
+      { title: '网络货运人', index: 'ltdName', width: 220 },
       { title: '核销日期', index: 'phxdate', type: 'date', width: 160 },
       { title: '付款账户', index: 'shipperaccount', width: 170 },
-      { title: '收款账户', index: 'ltdaccountId', width: 170 },
+      { title: '收款账户', index: 'ltdaccountId', width: 190 },
       {
         title: '核销金额',
         index: 'phxmoney',
-        width: 120,
+        width: 140,
         className: 'text-right',
         format: item => `${this.currencyPipe.transform(item.phxmoney || 0)}`
       },
       {
         title: '应付金额',
         index: 'prmoney',
-        width: 120,
+        width: 140,
         className: 'text-right',
         format: item => `${this.currencyPipe.transform(item.prmoney || 0)}`
       },
       { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 },
       { title: '付款类型', index: 'brmtype', type: 'enum', enum: { '1': '费用款项' }, width: 120 },
       { title: '收款人', index: 'driver2IdName', width: 120 },
-      { title: '结算客户', index: 'cno', width: 120 },
+      { title: '结算客户', index: 'cnoName', width: 180 },
-      { title: '银行水单', index: 'bankreceipt', width: 120 },
+      { title: '银行水单', index: 'bankreceipt', width: 190 },
-      { title: '创建时间', index: 'createTime', width: 160 },
+      { title: '创建时间', index: 'createTime', width: 180 },
       // { title: '创建人', index: 'createUserIdLabel', width: 120 },
       { title: '核销状态', index: 'sts', type: 'enum', enum: { 0: '待核销', 1: '已核销' }, width: 120 },
       { title: '核销备注', index: 'remarks', width: 120 },

src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html

@@ -32,7 +32,7 @@
         <div nz-col [nzXl]="_$expand ? 24 : 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)="exprot()"> 导出</button>
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

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

@@ -200,7 +200,7 @@ export class WithdrawalsRecordComponent {
           type: 'string',
           title: '账户名称',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
           }
         },
         accountType: {
@@ -302,4 +302,8 @@ export class WithdrawalsRecordComponent {
       }
     ];
   }
+  // 导出
+  exprot() {
+    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_asyncExportRefundApplicationList);
+  }
 }

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

@@ -164,6 +164,8 @@ export class FreightAccountService extends ShipperBaseService {
   $api_get_asyncExportBillRefundApplicationList = '/api/fcc/billRefundApplication/asyncExportBillRefundApplicationList';
   // 异步导出运营后台支付记录列表
   $api_get_asyncExportBillPaymentApplicationList = '/api/fcc/billPaymentApplicationOBC/asyncExportBillPaymentApplicationList';
+  // 异步导出运营后台提现记录
+  $api_get_asyncExportRefundApplicationList = '/api/fcc/refundApplicationOBC/asyncExportRefundApplicationList';
 
   constructor(public injector: Injector) {
     super(injector);

src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts

@@ -129,9 +129,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
             widget: 'sl-from-to',
             type: 'date',
             format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
           } as SFDateWidgetSchema
         },
         sbrq: {

src/app/routes/tax-management/components/individual-income/individual-income.component.ts

@@ -246,7 +246,14 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
         width: '250px',
         format: item => `${item.yssdl ? ((item.yssdl as number) * 100).toFixed(2) : 0}%`
       },
-      { title: '计税依据', index: 'jsyj', className: 'text-right', width: '150px' },
+      {
+        title: '计税依据',
+        index: 'jsyj',
+        width: '150px',
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.jsyj }) }
+      },
       {
         title: '税率',
         index: 'sl',

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

@@ -251,7 +251,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
       { title: '运单号', index: 'wayBillCode', className: 'text-center', width: '150px', },
       {
         title: '网络货运人',
-        render: 'shipperName',
+        index: 'networkTransporterName',
         className: 'text-center',
         width: '180px',
       },
@@ -329,7 +329,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
     }
     let params: any[] = [];
     this.selectedRows.forEach(item => {
-      params.push(item.id);
+      params.push(item.billId);
     });
     this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => {
       if (res) {

src/app/routes/ticket-management/services/ticket.service.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-29 13:12:35
- * @LastEditTime : 2022-04-11 14:11:21
+ * @LastEditTime : 2022-04-11 16:41:43
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\services\\ticket.service.ts
@@ -137,9 +137,9 @@ export class TicketService extends ShipperBaseService {
   // ETC开票记录导出
   $api_get_asyncExportEtcApplyRecordList = '/api/sdc/invoiceEtcOperate/asyncExportEtcApplyRecordList';
   // ETC白名单（货主）导出接口
-  $api_get_aficoShipperWhiteList_asyncExport = '/api/fcc/ficoShipperWhiteList/asyncExport';
+  $api_get_aficoShipperWhiteList_asyncExport = '/api/fcc/ficoEtcInvoiceL/asyncExportWhiteList';
   // ETC白名单（车辆）导出接口
-  $api_get_ficoCarWhiteList_asyncExport = '/api/fcc/ficoCarWhiteList/asyncExport';
+  $api_get_ficoCarWhiteList_asyncExport = '/api/fcc/ficoEtcInvoiceL/asyncExportCarWhiteList';
 
   constructor(public injector: Injector) {
     super(injector);