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

src/app/routes/partner/recorded/components/record/record.component.html

@@ -40,14 +40,24 @@
     </div>
   </ng-template>
 
-  <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
+  <div class="table-content">
-    [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"
+    <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
-    [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
+      [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"
-    [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }" [loading]="service.http.loading">
+      [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
-    <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
+      [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }" [loading]="service.http.loading">
-      {{ item.bankName }} <br> {{ item.bankCardNumber }}
+      <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
-    </ng-template>
+        {{ item.bankName }} <br> {{ item.bankCardNumber }}
-  </st>
+      </ng-template>
+    </st>
+    <div class=" text-md" *ngIf="st?.list?.length !== 0 ">
+      <span class="mr-md">合伙人数：<label class="text-red-dark font-weight-bold">{{totalInfo?.partnerNum}}</label></span>
+      <span class="mr-md">入账笔数：<label class="text-red-dark font-weight-bold">{{totalInfo?.count}}</label></span>
+      <span class="mr-md">开票金额：<label class="text-red-dark font-weight-bold">{{totalInfo?.invoiceAmount}}</label></span>
+      <span class="mr-md">代缴个税：<label class="text-red-dark font-weight-bold">{{totalInfo?.tax}}</label></span>
+      <span class="mr-md">入账金额：<label
+          class="text-red-dark font-weight-bold">{{totalInfo?.recorededAmount}}</label></span>
+    </div>
+  </div>
 </nz-card>
 
 <ng-template #auditModal>

src/app/routes/partner/recorded/components/record/record.component.ts

@@ -19,6 +19,13 @@ export class PartnerRecordedRecordComponent implements OnInit {
   @ViewChild('viewReasonModal', { static: false }) viewReasonModal!: any;
   columns: STColumn[] = this.initST();
   searchSchema: SFSchema = this.initSF();
+  totalInfo: any = {
+    partnerNum: 34,
+    count: 98,
+    invoiceAmount: 978239.98,
+    tax: 9878.00,
+    recorededAmount: 728698.98
+  }
 
   _$expand = false;
 
@@ -113,7 +120,7 @@ export class PartnerRecordedRecordComponent implements OnInit {
       nzContent: this.auditModal,
       nzFooter: [
         {
-          label: '拒绝',
+          label: '备注',
           type: 'default',
           onClick: () => {
             this.service
@@ -276,48 +283,42 @@ export class PartnerRecordedRecordComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox', className: 'text-center' },
-      { title: '提现时间', index: 'createTime', width: 180, className: 'text-center' },
+      { title: '账户名称', index: 'createTime', width: 180, className: 'text-center' },
-      { title: '提现单号', index: 'refundApplyCode', width: 180, className: 'text-center' },
-      { title: '网络货运人', index: 'ltdName', width: 220, className: 'text-center' },
-      { title: '银行类型', index: 'bankTypeLabel', width: 100, className: 'text-center' },
-      { title: '账户类型', index: 'bankTypeLabel', width: 100, className: 'text-center' },
-      { title: '账户名称', index: 'bankAccountName', width: 220, className: 'text-center' },
       { title: '虚拟账户', index: 'virtualAccount', width: 180, className: 'text-center' },
+      { title: '入账单号', index: 'refundApplyCode', width: 180, className: 'text-center' },
+      { title: '网络货运人', index: 'ltdName', width: 220, className: 'text-center' },
       {
-        title: '提现金额',
+        title: '开票金额',
         index: 'amount',
         width: 150,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
       },
-      { title: '提现银行账户', render: 'bankCardNumber', width: 200, className: 'text-center' },
+      {
-      { title: '提现状态', index: 'refundStatusLabel', width: 100, className: 'text-center' },
+        title: '代缴个税',
-      { title: '银行流水号', index: 'bankSerialNumber', width: 160, className: 'text-center' },
+        index: 'amount',
-      { title: '核心交易流水', index: 'coreSerNo', width: 180, className: 'text-center' },
+        width: 150,
-      { title: '失败原因', index: 'rejectionCause', width: 200, format: item => item.failCause, className: 'text-center' },
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
+      },
+      {
+        title: '入账金额',
+        index: 'amount',
+        width: 150,
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) }
+      },
+
+      { title: '提交时间', index: 'bankSerialNumber', width: 160, className: 'text-center' },
+      { title: '入账状态', index: 'refundStatusLabel', width: 100, className: 'text-center' },
       {
         title: '操作',
         fixed: 'right',
         width: '110px',
         buttons: [
-          {
-            text: '查看回单',
-            iif: item => item.refundStatus === '3',
-            click: item =>
-              this.service.getReceiptUrl(item.receiptUrl, {
-                bankType: item.bankType,
-                rmYll: item.userId,
-                snglFlgCd: item.coreSerNo,
-                bussType: '06',
-                ltdId: item.ltdId
-              })
-          },
-          {
-            text: '查看原因',
-            iif: item => item.refundStatus === '4',
-            click: item => this.showReason(item)
-          },
           {
             text: '审核',
             iif: item => item.refundStatus === '1',