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

src/app/routes/commom/less/box.less

@@ -23,4 +23,12 @@
     .text-truncate {
         white-space: normal;
     }
+
+    .bold {
+        .ant-statistic-title {
+            font-weight: 600;
+            color      : #000;
+            font-size  : 16px;
+        }
+    }
 }

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

@@ -13,13 +13,8 @@
 <nz-card class="search-box">
   <div nz-row nzGutter="8">
     <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-      <sf
+      <sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
-        #sf
+        [compact]="true" [button]="'none'"></sf>
-        [schema]="searchSchema"
-        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
-        [compact]="true"
-        [button]="'none'"
-      ></sf>
     </div>
     <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>
@@ -37,45 +32,30 @@
 <nz-card class="content-box">
   <div nz-row class="mb-sm">
     <div nz-col nzSpan="24">
-      <button
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading"
-        nz-button
+        (click)="routeTo('/financial-management/cost-management/expenses-receivable/1')">添加应收费用</button>
-        nzType="primary"
+      <button nz-button nzType="primary" [nzLoading]="service.http.loading"
-        [nzLoading]="service.http.loading"
+        (click)="routeTo('/financial-management/cost-management/expenses-payable/1')">添加应付费用</button>
-        (click)="routeTo('/financial-management/cost-management/expenses-receivable/1')"
-        >添加应收费用</button
-      >
-      <button
-        nz-button
-        nzType="primary"
-        [nzLoading]="service.http.loading"
-        (click)="routeTo('/financial-management/cost-management/expenses-payable/1')"
-        >添加应付费用</button
-      >
       <button nz-button nzType="primary" [nzLoading]="service.http.loading">导入费用</button>
     </div>
   </div>
-  <st
+  <st #st [data]="service.$api_get_cost_page" [columns]="columns"
-    #st
-    [data]="service.$api_get_cost_page"
-    [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"
+    [loading]="service.http.loading" [scroll]="{ x: '2000px',y:'450px' }">
-    [scroll]="{ x: '2000px' }"
+    <ng-template st-row="armoeny" let-item let-index="index">
-  >
+      {{ item.armoeny | currency}}
-  <ng-template st-row="armoeny" let-item let-index="index">
+    </ng-template>
-    {{ item.armoeny | currency}}
+    <ng-template st-row="hrmoney" let-item let-index="index">
-  </ng-template>
+      {{ item.hrmoney | currency}}
-  <ng-template st-row="hrmoney" let-item let-index="index">
+    </ng-template>
-    {{ item.hrmoney | currency}}
+    <ng-template st-row="hrpaymoney" let-item let-index="index">
-  </ng-template>
+      {{ item.hrpaymoney | currency}}
-  <ng-template st-row="hrpaymoney" let-item let-index="index">
+    </ng-template>
-    {{ item.hrpaymoney | currency}}
+    <ng-template st-row="hrvatmoney" let-item let-index="index">
-  </ng-template>
+      {{ item.hrvatmoney | currency}}
-  <ng-template st-row="hrvatmoney" let-item let-index="index">
+    </ng-template>
-    {{ item.hrvatmoney | currency}}
-  </ng-template>
   </st>
 </nz-card>
 
@@ -83,13 +63,9 @@
   <div nz-row nzGutter="8">
     <div nz-col nzSpan="24" se-container [labelWidth]="80">
       <se [col]="1" label="备注">
-        <textarea
+        <textarea nz-input rows="3" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
-          nz-input
+          style="width: 325px; margin-left: 14px"></textarea>
-          rows="3"
-          placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
-          style="width: 325px; margin-left: 14px"
-        ></textarea>
       </se>
     </div>
   </div>
-</ng-template>
+</ng-template>

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

@@ -1,21 +0,0 @@
-:host::ng-deep {
-    .search-box {
-        .ant-card-body {
-            padding-bottom: 18px;
-        }
-    }
-
-    .content-box {
-        .ant-card-body {
-            padding-top: 14px;
-        }
-    }
-
-    nz-range-picker {
-        width: 100%;
-    }
-
-    .text-truncate {
-        white-space: normal;
-    }
-}

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

@@ -8,7 +8,7 @@ import { FreightAccountService } from '../../services/freight-account.service';
 @Component({
   selector: 'app-cost-management',
   templateUrl: './cost-management.component.html',
-  styleUrls: ['./cost-management.component.less']
+  styleUrls: ['../../../commom/less/box.less']
 })
 export class CostManagementComponent implements OnInit {
   @ViewChild('st', { static: true })

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

@@ -52,7 +52,7 @@
     </div>
 </nz-card>
 
-<nz-card class="content-box" nzBordered>
+<nz-card nzBordered>
     <st #st [data]="service.$api_get_driver_account_detail" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"

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

@@ -1,40 +0,0 @@
-:host::ng-deep {
-    .search-box {
-        .ant-card-body {
-            padding-bottom: 18px;
-        }
-    }
-
-    .content-box {
-        .ant-card-body {
-            padding-top: 16px;
-        }
-    }
-
-    nz-range-picker {
-        width: 100%;
-    }
-
-    .bold {
-        .ant-statistic-title {
-            font-weight: 600;
-            color      : #000;
-            font-size  : 16px;
-        }
-    }
-}
-
-.expend-options {
-    margin-top: 0px;
-}
-
-@media (min-width: 990px) {
-    .expend-options {
-        margin-top: -40px;
-        max-width : 400px;
-        position  : absolute;
-        right     : 0;
-        bottom    : 25px;
-    }
-
-}

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

@@ -8,7 +8,7 @@ import { FreightAccountService } from '../../../services/freight-account.service
 @Component({
   selector: 'app-driver-account-detail',
   templateUrl: './driver-account-detail.component.html',
-  styleUrls: ['./driver-account-detail.component.less']
+  styleUrls: ['../../../../commom/less/box.less', '../../../../commom/less/expend-but.less']
 })
 export class DriverAccountDetailComponent implements OnInit {
   @ViewChild('st', { static: true })
@@ -41,8 +41,8 @@ export class DriverAccountDetailComponent implements OnInit {
       Object.assign(requestOptions.body, {
         ...this.sf.value,
         createTime: {
-          start: this.sf.value?.createTime?.[0] || null,
+          start: this.sf.value?.createTime?.[0] || '',
-          end: this.sf.value?.createTime?.[1] || null
+          end: this.sf.value?.createTime?.[1] || ''
         }
       });
     }
@@ -60,8 +60,8 @@ export class DriverAccountDetailComponent implements OnInit {
         pageIndex: this.st.pi,
         pageSize: this.st.ps,
         createTime: {
-          start: this.sf?.value?.createTime?.[0] || null,
+          start: this.sf?.value?.createTime?.[0] || '',
-          end: this.sf?.value?.createTime?.[1] || null
+          end: this.sf?.value?.createTime?.[1] || ''
         }
       })
       .subscribe(res => {
@@ -71,8 +71,7 @@ export class DriverAccountDetailComponent implements OnInit {
       });
   }
 
-  stChange(e: STChange): void {
+  stChange(e: STChange): void {}
-  }
 
   exportList() {
     this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
@@ -165,11 +164,25 @@ export class DriverAccountDetailComponent implements OnInit {
     return [
       { title: '交易时间', index: 'createTime', type: 'date' },
       { title: '流水号', index: 'channelPaySn' },
-      { title: '交易类型', index: 'tradeTypeLabel' },
+      { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' },
       { title: '关联单号', index: 'businessNumber' },
-      { title: '收支类型', index: 'incomeTypeLabel' },
+      { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' },
-      { title: '交易金额', index: 'amount' },
+      {
-      { title: '账户余额', index: 'accountBalance' }
+        title: '交易金额',
+        index: 'amount',
+        width: 150,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
+      },
+      {
+        title: '账户余额',
+        index: 'accountBalance',
+        width: 150,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
+      }
     ];
   }
 }

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

@@ -27,5 +27,8 @@
         [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]="{ y: '370px' }">
+        <ng-template st-row="availableBalance" let-item let-index="index">
+            <a (click)="showAccountDetail(item)">{{ item.availableBalance | currency}}</a>
+        </ng-template>
     </st>
 </nz-card>

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

@@ -1,32 +0,0 @@
-:host::ng-deep {
-    .search-box {
-        .ant-card-body {
-            padding-bottom: 18px;
-        }
-    }
-
-    .content-box {
-        .ant-card-body {
-            padding-top: 14px;
-        }
-    }
-
-    nz-range-picker {
-        width: 100%;
-    }
-}
-
-.expend-options {
-    margin-top: 0px;
-}
-
-
-@media (min-width: 1200px) {
-    .expend-options {
-        max-width : 400px;
-        position  : absolute;
-        right     : 0;
-        bottom    : 25px;
-      }
-
-}

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

@@ -11,8 +11,7 @@ import { FreightAccountService } from '../../services/freight-account.service';
 @Component({
   selector: 'app-driver-account',
   templateUrl: './driver-account.component.html',
-  styleUrls: ['./driver-account.component.less'],
+  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
-  providers: [CurrencyPipe]
 })
 export class DriverAccountComponent implements OnInit {
   @ViewChild('st', { static: true })
@@ -24,12 +23,7 @@ export class DriverAccountComponent implements OnInit {
   columns: STColumn[] = this.initST();
   _$expand = false;
 
-  constructor(
+  constructor(public service: FreightAccountService, private router: Router, private modal: NzModalService) {}
-    public service: FreightAccountService,
-    private router: Router,
-    private modal: NzModalService,
-    private currencyPipe: CurrencyPipe
-  ) {}
 
   ngOnInit(): void {}
 
@@ -172,30 +166,28 @@ export class DriverAccountComponent implements OnInit {
       {
         title: '可用余额',
         index: 'availableBalance',
-        type: 'currency',
+        width: 140,
-        format: item => `${this.currencyPipe.transform(item.availableBalance)}`
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.availableBalance }) }
       },
       {
         title: '冻结余额',
         index: 'freezeBalance',
-        type: 'currency',
+        width: 140,
-        format: item => `${this.currencyPipe.transform(item.availableBalance)}`
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.freezeBalance }) }
       },
       {
         title: '本月累计提现金额',
         index: 'withdrawBalance',
         width: 150,
-        type: 'currency',
+        type: 'widget',
-        format: item => `${this.currencyPipe.transform(item.availableBalance)}`
-      },
-      {
-        title: '账户总余额',
-        index: 'availableBalance',
         className: 'text-right',
-        type: 'link',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.withdrawBalance }) }
-        format: item => `${this.currencyPipe.transform(item.availableBalance)}`,
-        click: item => this.showAccountDetail(item)
       },
+      { title: '账户总余额', render: 'availableBalance', className: 'text-right' },
       { title: '创建时间', index: 'createTime', type: 'date', width: 150 },
       {
         title: '操作',

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

@@ -31,7 +31,7 @@
     </nz-row>
 </nz-card>
 
-<nz-card class="search-box" nzBordered>
+<nz-card  nzBordered>
     <div nz-row nzGutter="8">
         <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
             <sf #sf [schema]="searchSchema"

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

@@ -1,25 +0,0 @@
-:host::ng-deep {
-    .search-box {
-        .ant-card-body {
-            padding-bottom: 18px;
-        }
-    }
-
-    .content-box {
-        .ant-card-body {
-            padding-top: 16px;
-        }
-    }
-
-    nz-range-picker {
-        width: 100%;
-    }
-
-    .bold {
-        .ant-statistic-title {
-            font-weight: 600;
-            color      : #000;
-            font-size  : 16px;
-        }
-    }
-}

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

@@ -8,7 +8,7 @@ import { FreightAccountService } from '../../../services/freight-account.service
 @Component({
   selector: 'app-freight-account-detail',
   templateUrl: './freight-account-detail.component.html',
-  styleUrls: ['./freight-account-detail.component.less']
+  styleUrls: ['../../../../commom/less/box.less']
 })
 export class FreightAccountDetailComponent implements OnInit {
   @ViewChild('st', { static: true })
@@ -41,8 +41,8 @@ export class FreightAccountDetailComponent implements OnInit {
       Object.assign(requestOptions.body, {
         ...this.sf.value,
         createTime: {
-          start: this.sf?.value.createTime?.[0] || null,
+          start: this.sf?.value.createTime?.[0] || '',
-          end: this.sf?.value.createTime?.[1] || null
+          end: this.sf?.value.createTime?.[1] || ''
         }
       });
     }
@@ -60,8 +60,8 @@ export class FreightAccountDetailComponent implements OnInit {
         pageIndex: this.st.pi,
         pageSize: this.st.ps,
         createTime: {
-          start: this.sf?.value.createTime?.[0] || null,
+          start: this.sf?.value.createTime?.[0] || '',
-          end: this.sf?.value.createTime?.[1] || null
+          end: this.sf?.value.createTime?.[1] || ''
         }
       })
       .subscribe(res => {
@@ -71,8 +71,7 @@ export class FreightAccountDetailComponent implements OnInit {
       });
   }
 
-  stChange(e: STChange): void {
+  stChange(e: STChange): void {}
-  }
 
   exportList() {
     this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
@@ -189,12 +188,26 @@ export class FreightAccountDetailComponent implements OnInit {
     return [
       { title: '交易时间', index: 'createTime', type: 'date' },
       { title: '流水号', index: 'transactionNumber' },
-      { title: '交易类型', index: 'tradeTypeLabel' },
+      { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' },
       { title: '关联单号', index: 'businessNumber' },
       { title: '所属项目', index: 'projectId' },
-      { title: '收支类型', index: 'incomeTypeLabel' },
+      { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' },
-      { title: '交易金额', index: 'amount' },
+      {
-      { title: '账户余额', index: 'accountBalance' }
+        title: '交易金额',
+        index: 'amount',
+        width: 150,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
+      },
+      {
+        title: '账户余额',
+        index: 'accountBalance',
+        width: 150,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
+      }
     ];
   }
 }

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

@@ -27,5 +27,8 @@
         [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]="{ y: '370px' }">
+        <ng-template st-row="description" let-item let-index="index">
+            <a (click)="showAccountDetail(item)">{{ item.availableBalance | currency}}</a>
+        </ng-template>
     </st>
 </nz-card>

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

@@ -1,32 +0,0 @@
-:host::ng-deep {
-    .search-box {
-        .ant-card-body {
-            padding-bottom: 18px;
-        }
-    }
-
-    .content-box {
-        .ant-card-body {
-            padding-top: 14px;
-        }
-    }
-
-    nz-range-picker {
-        width: 100%;
-    }
-}
-
-.expend-options {
-    margin-top: 0px;
-}
-
-
-@media (min-width: 1200px) {
-    .expend-options {
-        max-width : 400px;
-        position  : absolute;
-        right     : 0;
-        bottom    : 25px;
-    }
-
-}

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

@@ -14,8 +14,7 @@ import { FreightAccountService } from '../../services/freight-account.service';
 @Component({
   selector: 'app-freight-account',
   templateUrl: './freight-account.component.html',
-  styleUrls: ['./freight-account.component.less'],
+  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
-  providers: [CurrencyPipe]
 })
 export class FreightAccountComponent implements OnInit {
   @ViewChild('st', { static: true })
@@ -29,12 +28,7 @@ export class FreightAccountComponent implements OnInit {
 
   _$expand = false;
 
-  constructor(
+  constructor(public service: FreightAccountService, private router: Router, private modal: NzModalService) {}
-    public service: FreightAccountService,
-    private router: Router,
-    private modal: NzModalService,
-    private currencyPipe: CurrencyPipe
-  ) {}
 
   ngOnInit(): void {}
 
@@ -173,22 +167,23 @@ export class FreightAccountComponent implements OnInit {
       {
         title: '可用余额',
         index: 'availableBalance',
-        type: 'currency',
+        width: 150,
-        format: item => `${this.currencyPipe.transform(item.availableBalance)}`
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.availableBalance }) }
       },
       {
         title: '冻结余额',
         index: 'freezeBalance',
-        type: 'currency',
+        width: 150,
-        format: item => `${this.currencyPipe.transform(item.availableBalance)}`
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.freezeBalance }) }
       },
       {
         title: '账户总余额',
-        index: 'description',
+        render: 'description',
-        className: 'text-right',
+        className: 'text-right'
-        type: 'link',
-        format: item => `${this.currencyPipe.transform(item.availableBalance)}`,
-        click: item => this.showAccountDetail(item)
       },
       { title: '创建时间', index: 'createTime', type: 'date', width: 150 },
       {

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

@@ -12,46 +12,45 @@
       <se-container col="3" labelWidth="100">
         <se-title class="mb-md" style="font-size: 18px">基本信息</se-title>
         <se label="网络货运人" required>
-          {{ costInfo?.ltdid }}
+          {{ costInfo?.ltdId }}
         </se>
         <se label="到账日期" required>
-          {{ costInfo?.feetype }}
+          {{ costInfo?.brmdate }}
         </se>
         <se label="收款方式" required>
-          {{ costInfo?.arremarks }}
+          {{ costInfo?.brmmode }}
         </se>
         <se label="银行类型">
-          {{ costInfo?.artoname }}
+          {{ costInfo?.banktype }}
         </se>
         <se label="付款人" required>
-          {{ costInfo?.arvattype }}
+          {{ costInfo?.artoname }}
         </se>
         <se label="收款类型" required>
-          {{ costInfo?.armoeny }}
+          {{ costInfo?.brmtype }}
         </se>
         <se label="收款账户" required>
-          {{ costInfo?.arkpmoney }}
+          {{ costInfo?.ltdaccountId }}
         </se>
         <se label="尾差">
-          {{ costInfo?.arbrmmoney }}
+          {{ costInfo?.recnopay |currency }}
         </se>
         <se label="手续费">
           {{ costInfo?.ltdid }}
         </se>
         <se label="到账金额" required>
-          {{ costInfo?.feetype }}
+          {{ costInfo?.brmmoney |currency }}
         </se>
         <se label="核销金额">
-          {{ costInfo?.hrremarks }}
         </se>
         <se label="银行水单">
-          {{ costInfo?.hrtoname }}
+          {{ costInfo?.bankreceipt }}
         </se>
         <se label="预收金额">
-          {{ costInfo?.hrvattype }}
+          {{ costInfo?.yskmoney  |currency}}
         </se>
         <se label="收款备注">
-          {{ costInfo?.hrmoney }}
+          {{ costInfo?.remarks }}
         </se>
       </se-container>
     </div>
@@ -78,9 +77,8 @@
     </nz-tab>
     <nz-tab nzTitle="预收信息">
       <st #st [scroll]="{ x: '2000px' }" [data]="service.$api_get_receipt_detail" [columns]="columns.requested"
-        [req]="{ method: 'POST', allInBody: true, process: beforeReq }"
+        [req]="{ method: 'POST', allInBody: true, process: beforeReq }" [res]="{ reName: { list: 'data' } }"
-        [res]="{ reName: { list: 'data' } }" [page]="{ show: false }"
+        [page]="{ show: false }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
-        [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
         <ng-template st-row="vatnotax" let-item let-index="index">
           {{ item.vatnotax | currency}}
         </ng-template>