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

2022-04-19 14:33:34 +08:00
parent a55b2dc7ca 6968085081
commit 32b60b6eb5
4 changed files with 44 additions and 50 deletions
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
@ -65,7 +65,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)="inputST?.load(1)">查询</button>
                    <button nz-button (click)="resetInputSF()">重置</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>
@ -81,11 +81,11 @@
                </ng-template>
                <ng-template st-row="billId" let-item let-index="index" let-column="column">
                    {{item.billCode}}<br>
-                    {{item.billStatus}}<br>
+                    {{item.billStatusLabel}}<br>
                </ng-template>
                <ng-template st-row="wayBillId" let-item let-index="index" let-column="column">
                    {{item.wayBillCode}}<br>
-                    {{item.wayBillStatus}}<br>
+                    {{item.wayBillStatusLabel}}<br>
                </ng-template>
                <ng-template st-row="driverId" let-item let-index="index" let-column="column">
                    {{item.driverName}}<br>
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
@ -123,6 +123,11 @@ export class WithdrawalsDetailComponent implements OnInit {
    history.go(-1);
  }

+    // 导出
+    exprot() {
+      this.service.exportStart({ ...this.inputSF.value, pageSize: -1 }, this.service.$api_export_refund_detail_page);
+    }
+
  private initInputSF(): SFSchema {
    return {
      properties: {
@ -220,11 +225,11 @@ export class WithdrawalsDetailComponent implements OnInit {
        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payAmount }) },
        width: 140
      },
-      { title: '运费明细', render: 'amountDetails', className: 'text-center', width: 150 },
-      { title: '货主', index: 'ltdName', className: 'text-center', width: 200 },
-      { title: '订单号', render: 'billId', className: 'text-center', width: 150 },
-      { title: '运单号', render: 'wayBillId', className: 'text-center', width: 150 },
-      { title: '货源编号', index: 'resourceCode', className: 'text-center', width: 150 },
+      { title: '运费明细', render: 'amountDetails', className: 'text-right', width: 150 },
+      { title: '货主', index: 'ltdName', className: 'text-left', width: 200 },
+      { title: '订单号', render: 'billId', width: 200 },
+      { title: '运单号', render: 'wayBillId',  width: 200 },
+      { title: '货源编号', index: 'resourceCode', width: 200 },
      {
        title: '服务类型',
        index: 'serviceType',
@ -233,9 +238,9 @@ export class WithdrawalsDetailComponent implements OnInit {
        type: 'enum',
        enum: { '1': '抢单', '2': '指派', '3': '二维码', '4': '手工单' }
      },
-      { title: '承运司机', render: 'driverId', className: 'text-center', width: 150 },
-      { title: '收款人', render: 'captainName', className: 'text-center', width: 150 },
-      { title: '银行类型', index: 'bankType', className: 'text-center', width: 150 }
+      { title: '承运司机', render: 'driverId', width: 150 },
+      { title: '收款人', render: 'captainName', className: 'text-left', width: 150 },
+      { title: '银行类型', index: 'bankTypeLabel', className: 'text-center', width: 150 }
    ];
  }
 }
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@ -55,7 +55,9 @@ export class FreightAccountService extends ShipperBaseService {
  // 获取提现申请表详情
  $api_get_refund_detail = '/api/fcc/refundApplicationOBC/get';
  // 获取提现支付详情
-  $api_get_refund_detail_page = '/api/fcc/refundApplicationOBC/get/payList';
+  $api_get_refund_detail_page = '/api/fcc/refundApplicationOBC/get/getPayList';
+  // 提现支付详情导出
+  $api_export_refund_detail_page = '/api/fcc/refundApplicationOBC/asyncExportPayList';
  // 同意提现
  $api_agree_refund = '/api/fcc/refundApplicationOBC/agreeRefund';
  // 拒绝提现
--- a/src/app/routes/vehicle/components/audit/audit.component.html
+++ b/src/app/routes/vehicle/components/audit/audit.component.html
@ -7,23 +7,16 @@
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\vehicle\\components\\audit\\audit.component.html
 -->
 <!-- 页头 -->
-<page-header-wrapper ></page-header-wrapper>
+<page-header-wrapper></page-header-wrapper>
 <nz-card>
  <!-- 搜索区 -->
  <!-- 搜索表单 -->
  <div nz-row nzGutter="8">
    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-      <sf
-        #sf
-        [schema]="schema"
-        [ui]="ui"
-        [mode]="'search'"
-        [disabled]="!sf?.valid"
-        (formSubmit)="st?.load(1)"
-        (formReset)="resetSF()"
-      ></sf>
-    
+      <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"></sf>
+
    </div>
    <!-- [loading]="false" -->

@ -33,9 +26,10 @@
        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
      </div>
      <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
-        <button nz-button nzType="primary" acl  [acl-ability]="['VEHICLE-AUDIT-search']"  [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button nzType="primary" acl [acl-ability]="['VEHICLE-AUDIT-search']"
+          [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
        <button nz-button nzType="primary" [disabled]="false" (click)="exportFire()">导出</button>
-        <button nz-button  [disabled]="false"(click)="resetSF()">重置</button>
+        <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -47,34 +41,27 @@
 <nz-card>
  <!-- 数据列表 -->
  <!-- [data]="service.$api_get_supplier_page" -->
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzSelectedIndex]='defaultTabs' [nzTabBarExtraContent]="extraTemplate">
-  <nz-tab [nzTitle]="'全部'"></nz-tab>
-  <nz-tab [nzTitle]="'待审核'"></nz-tab>
-  <nz-tab [nzTitle]="'审核通过'"></nz-tab>
-  <nz-tab [nzTitle]="'驳回'"></nz-tab>
-</nz-tabset>
-  <st
-    #st
-    [bordered]="true"
-    [scroll]="{ x: '1200px' }"
-    [columns]="columns"
-    [data]='service.$api_get_userCarLicense_list'
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzSelectedIndex]='defaultTabs'
+    [nzTabBarExtraContent]="extraTemplate">
+    <nz-tab [nzTitle]="'全部'"></nz-tab>
+    <nz-tab [nzTitle]="'待审核'"></nz-tab>
+    <nz-tab [nzTitle]="'审核通过'"></nz-tab>
+    <nz-tab [nzTitle]="'驳回'"></nz-tab>
+  </nz-tabset>
+  <st #st [bordered]="true" [scroll]="{ x: '1200px' }" [columns]="columns" [data]='service.$api_get_userCarLicense_list'
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
    [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
-    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-    [loading]="false"
-  >
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
    <ng-template st-row="carLength" let-item let-index="index">
-    <div>{{item?.carModelLabel}}-{{item?.carLength?  item?.carLength + '米' : ''}}-{{ item?.carLoad? item?.carLoad + '吨' : ''}}</div>
+      <div>{{item?.carModelLabel}}-{{item?.carLengthLabel? item?.carLengthLabel + '米' : ''}}-{{ item?.carLoad?
+        item?.carLoad + '吨' : ''}}</div>
    </ng-template>
    <ng-template st-row="isSelf" let-item let-index="index">
-    <div >{{item?.isSelf ? '是' : '否'}}</div>
+      <div>{{item?.isSelf ? '是' : '否'}}</div>
    </ng-template>
    <ng-template st-row="contactsPhone" let-item let-index="index">
-        <div
-          style="color: #52c41a;" (click)="daoyun(item)"
-        >
-          {{ item.contactsPhone }}
+      <div style="color: #52c41a;" (click)="daoyun(item)">
+        {{ item.contactsPhone }}
      </div>
    </ng-template>
    <ng-template st-row="stateCol" let-item let-index="index">
@ -84,9 +71,9 @@
  </st>
 </nz-card>
 <ng-template #extraTemplate>
-    <!-- 工具栏 -->
-    <div class="toolbar" style="float: right;
+  <!-- 工具栏 -->
+  <div class="toolbar" style="float: right;
    padding-bottom: 15px;">
-      <button nz-button nzType="primary" (click)="addModal()">添加车辆</button>
-    </div>
+    <button nz-button nzType="primary" (click)="addModal()">添加车辆</button>
+  </div>
 </ng-template>