批量审核

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

@@ -1,31 +1,41 @@
-<page-header-wrapper [title]="'交易流水'">
+<page-header-wrapper [title]="'交易流水'"> </page-header-wrapper>
-</page-header-wrapper>
 
 <nz-card class="search-box" nzBordered>
-    <div nz-row nzGutter="8">
+  <div nz-row nzGutter="8">
-        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+    <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="searchSchema"
+      <sf
-                [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24,gutter:15 } }}"
+        #sf
-                [compact]="true" [button]="'none'"></sf>
+        [schema]="searchSchema"
-        </div>
+        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 15 } } }"
-        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
+        [compact]="true"
-            class="text-right">
+        [button]="'none'"
-            <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+      ></sf>
-            <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button> 导出</button>
-            <button nz-button nzType="link" (click)="expandToggle()">
-                {{ !_$expand ? '展开' : '收起' }}
-                <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-            </button>
-        </div>
     </div>
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" 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 nzType="link" (click)="expandToggle()">
+        {{ !_$expand ? '展开' : '收起' }}
+        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+      </button>
+    </div>
+  </div>
 </nz-card>
 
 <nz-card class="content-box pt-xl" nzBordered>
+  <st
+    #st
+    [data]="service.$api_get_account_blance"
+    [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
+    [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"
+    [scroll]="{ x: '1200px', y: '450px' }"
+  >
+  <ng-template st-row="amount">
 
-    <st #st [data]="service.$api_get_account_blance" [columns]="columns"
+  </ng-template>
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
+</st>
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+</nz-card>
-        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '450px' }"></st>
-</nz-card>

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

@@ -4,11 +4,13 @@ import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { FreightAccountService } from '../../services/freight-account.service';
+import { CurrencyPipe } from '@angular/common';
 
 @Component({
   selector: 'app-transaction-flow',
   templateUrl: './transaction-flow.component.html',
-  styleUrls: ['./transaction-flow.component.less']
+  styleUrls: ['./transaction-flow.component.less'],
+  providers: [CurrencyPipe]
 })
 export class TransactionFlowComponent implements OnInit {
   @ViewChild('st', { static: true })
@@ -20,7 +22,12 @@ export class TransactionFlowComponent implements OnInit {
 
   _$expand = false;
 
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
+  constructor(
+    public service: FreightAccountService,
+    private nzModalService: NzModalService,
+    private router: Router,
+    private currencyPipe: CurrencyPipe
+      ) {}
 
   ngOnInit(): void {}
 
@@ -214,8 +221,17 @@ export class TransactionFlowComponent implements OnInit {
       { title: '账户名称', index: 'roleName', width: 100 },
       { title: '所属项目', index: 'projectName', width: 100 },
       { title: '收支类型', index: 'incomeTypeLabel', width: 100 },
-      { title: '交易金额', index: 'amount', width: 100 },
+      { title: '交易金额',
-      { title: '账户余额', index: 'accountBalance', width: 100 },
+        index: 'amount',
+        width: 100,
+        type: 'currency',
+        format: item => `${this.currencyPipe.transform(item.amount)}`
+       },
+      { title: '账户余额',
+        type: 'currency',
+        width: 150,
+        format: item => `${this.currencyPipe.transform(item.accountBalance)}`
+       },
       { title: '网络货运人', index: 'ltdName', width: 120 },
       { title: '银行类型', index: 'bankTypeLabel', width: 100 },
       { title: '银行流水号', index: 'channelPaySn', width: 120 },

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

@@ -1,3 +1,11 @@
+<!--
+ * @Author: your name
+ * @Date: 2022-01-05 20:15:41
+ * @LastEditTime: 2022-01-17 14:41:17
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\financial-management\components\withdrawals-record\withdrawals-detail\withdrawals-detail.component.html
+-->
 <page-header-wrapper [title]="'提现详情'" [logo]="logo">
     <ng-template #logo>
         <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
@@ -39,7 +47,7 @@
         <se label="提现至银行卡">
             {{formData?.bankId}}
         </se>
-        <se label="银行回" col="1">
+        <se label="银行回单" col="1">
             <img [src]="formData?.bankCardNumber" alt="" style="width: 200px;height: 160px;">
         </se>
     </div>

src/app/routes/order-management/components/bulk/bulk.component.html

@@ -156,7 +156,15 @@
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeViewParams }"
     [res]="{ reName: { list: 'data.list', total: 'data.total' } }"
   >
-  
+  <ng-template st-row="amountBeforeChange" let-item let-index="index">
+    {{ item.amountBeforeChange | currency}}
+  </ng-template>
+  <ng-template st-row="amountchangeValue" let-item let-index="index">
+    ￥{{ item.amountchangeValue | number: '0.2-2'}}
+  </ng-template>
+  <ng-template st-row="amountAfterChange" let-item let-index="index">
+    {{ item.amountAfterChange | currency}}
+  </ng-template>
   </st>
   <div><span>变更原因：{{ViewCause?.changeCause}}</span></div>
   <div><span>拒绝原因：{{ViewCause?.refuseCause}}</span></div>

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -588,10 +588,20 @@ tabs = {
         title: '变更前',
         width: '100px',
         className: 'text-center',
-        index: 'amountAfterChange'
+        index: 'amountAfterChange',
+        render: 'amountAfterChange'
       },
-      { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center' },
+      { title: '变更值',
-      { title: '变更后', index: 'amountBeforeChange', width: '120px', className: 'text-center' }
+        index: 'amountchangeValue',
+        width: '120px', 
+        className: 'text-center',
+        render: 'amountchangeValue'
+       },
+      { title: '变更后',
+        index: 'amountBeforeChange',
+        render: 'amountBeforeChange',
+        width: '120px',
+        className: 'text-center' }
     ];
   }
   /**

src/app/routes/order-management/components/vehicle/vehicle.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-14 14:11:40
+ * @LastEditTime: 2022-01-17 14:57:44
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@@ -159,6 +159,15 @@
     [req]="{ method: 'POST', allInBody: true, params: changeViewParams }"
     [res]="{ reName: { list: 'data.list', total: 'data.total' } }"
   >
+  <ng-template st-row="amountBeforeChange" let-item let-index="index">
+    {{ item.amountBeforeChange | currency}}
+  </ng-template>
+  <ng-template st-row="amountchangeValue" let-item let-index="index">
+    ￥{{ item.amountchangeValue | number: '0.2-2'}}
+  </ng-template>
+  <ng-template st-row="amountAfterChange" let-item let-index="index">
+    {{ item.amountAfterChange | currency}}
+  </ng-template>
   </st>
   <div><span>变更原因：{{ViewCause?.changeCause}}</span></div>
   <div><span>拒绝原因：{{ViewCause?.refuseCause}}</span></div>

src/app/routes/order-management/components/vehicle/vehicle.component.ts

@@ -525,10 +525,19 @@ resourceStatus: any;
         title: '变更前',
         width: '100px',
         className: 'text-center',
-        index: 'amountAfterChange'
+        index: 'amountAfterChange',
+        render: 'amountAfterChange'
       },
-      { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center' },
+      { title: '变更值',
-      { title: '变更后', index: 'amountBeforeChange', width: '120px', className: 'text-center' }
+        index: 'amountchangeValue',
+        render: 'amountchangeValue',
+        width: '120px',
+        className: 'text-center' },
+      { title: '变更后',
+        index: 'amountBeforeChange',
+        render: 'amountBeforeChange',
+        width: '120px',
+        className: 'text-center' }
     ];
   }
   /**

src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2021-12-22 20:04:15
+ * @LastEditTime: 2022-01-17 14:53:10
- * @LastEditors: your name
+ * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.html
 -->
@@ -11,7 +11,7 @@
 <nz-divider style="margin-top: 0;"></nz-divider>
 <div>
     <p style="font-size: 16px;">
-        <span style="font-weight: bolder">总运费：<span style="color: #dc112a">￥{{ data.totalFreight }}</span></span>
+        <span style="font-weight: bolder">总运费：<span style="color: #dc112a">{{ data.totalFreight | currency }}</span></span>
     </p>
-    <p style="margin-bottom: 0;"> 运输费：￥{{ data.freight }}，附加费：￥{{ data.surcharge }}</p>
+    <p style="margin-bottom: 0;"> 运输费：{{ data.freight | currency}}，附加费：{{ data.surcharge | currency }}</p>
 </div>

src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-15 13:17:42
- * @LastEditTime: 2022-01-13 13:35:08
+ * @LastEditTime: 2022-01-17 14:52:34
- * @LastEditors: your name
+ * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\vehicle\update-freight\update-freight.component.html
 -->
@@ -11,9 +11,9 @@
 <div>
   <p>
     <span style="font-weight: bolder"
-      >总运费：<span style="color: #dc112a">￥{{ data.totalFreight }}</span></span
+      >总运费：<span style="color: #dc112a">{{ data.totalFreight | currency }}</span></span
     >
-    （运输费：￥{{ data.freight }}，附加费：￥{{ data.surcharge }}）
+    （运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency}}）
   </p>
   <p>
     <label nz-checkbox [(ngModel)]="aggreechecked">确认已阅读并知晓<a>《变更协议》</a></label>