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

2022-05-09 17:25:48 +08:00
parent cacffe0fd5 083b308103
commit 9d13beb26c
12 changed files with 78 additions and 41 deletions
--- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
+++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
@ -84,7 +84,7 @@ export class CostManagementComponent extends BasicTableComponent implements OnIn


  exportList() {
-    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator);
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_cost_page_export);
  }

  routeTo(url: string, params?: any, status?: any) {
--- a/src/app/routes/financial-management/components/payable-order/payable-order.component.html
+++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.html
@ -48,6 +48,9 @@
        <div></div>
        <div class="mr-sm">
            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+            <button nz-button nzDanger [disabled]="service.http.loading" acl
+                [acl-ability]="['FINANCIAL-PAYABLE-export']" (click)='exportList()'>
+                导出</button>
        </div>
    </div>
    <st #st [data]="service.$api_get_fico_ph_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
--- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
+++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts
@ -21,11 +21,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit

  selectedRows: any[] = [];
  info: any = {};
-  constructor(
-    public service: FreightAccountService,
-    private router: Router,
-    public searchDrawerService: SearchDrawerService
-  ) {
+  constructor(public service: FreightAccountService, private router: Router, public searchDrawerService: SearchDrawerService) {
    super(searchDrawerService);
  }

@ -77,6 +73,9 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
    }
  }

+  exportList() {
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_fico_ph_page_export);
+  }

  private initSF(): SFSchema {
    return {
@ -118,7 +117,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
          enum: [{ value: '1', label: '费用款项' }],
          ui: {
            widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
          }
        },
        cno: {
@ -128,7 +127,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
            widget: 'select',
            placeholder: '请选择',
            allowClear: true,
-            asyncData: () => this.service.getCloseAccount(),
+            asyncData: () => this.service.getCloseAccount()
          }
        },
        driver2IdName: {
@ -136,7 +135,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
          title: '收款人',
          ui: {
            widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
          }
        },
        sts: {
@ -148,7 +147,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
          ],
          ui: {
            widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
          }
        },
        phxdate: {
@ -156,7 +155,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
          type: 'string',
          ui: {
            widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
          } as SFDateWidgetSchema
        },
        createTime: {
@ -164,21 +163,21 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
          type: 'string',
          ui: {
            widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
          } as SFDateWidgetSchema
        },
        billHCode: {
          type: 'string',
          title: '订单号',
          ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
          }
        },
        feeHCode: {
          type: 'string',
          title: '费用号',
          ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
          }
        },
        remarks: {
@ -186,7 +185,7 @@ export class PayableOrderComponent extends BasicTableComponent implements OnInit
          title: '核销备注',
          ui: {
            autocomplete: 'off',
-            placeholder: '请选择',
+            placeholder: '请选择'
          }
        }
      }
--- a/src/app/routes/financial-management/components/payment-order/payment-order.component.html
+++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.html
@ -34,6 +34,9 @@
        <div class="mr-sm">
            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
                [acl-ability]="['FINANCIAL-PAYMENT-ORDER-list']">筛选</button>
+            <button nz-button nzDanger [disabled]="service.http.loading" acl
+                [acl-ability]="['FINANCIAL-PAYMENT-ORDER-export']" (click)='exportList()'>
+                导出</button>
        </div>
    </div>

--- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
+++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts
@ -77,6 +77,10 @@ export class PaymentOrderComponent extends BasicTableComponent implements OnInit
    });
  }

+  exportList() {
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_payment_page_export);
+  }
+
  private initSF(): SFSchema {
    return {
      properties: {
--- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html
+++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html
@ -21,17 +21,20 @@

 <nz-card class="table-box">
  <div class="header_box">
-      <div>
-          <label class="page_title"> <label class="driver">|</label> 收款单</label>
-          <label class="ml-md">
-              已选择
-              <strong class="text-primary">{{ selectedRows.length }}</strong> 张单
-              <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
-          </label>
-      </div>
-      <div class="mr-sm">
-          <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
-      </div>
+    <div>
+      <label class="page_title"> <label class="driver">|</label> 收款单</label>
+      <label class="ml-md">
+        已选择
+        <strong class="text-primary">{{ selectedRows.length }}</strong> 张单
+        <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
+      </label>
+    </div>
+    <div class="mr-sm">
+      <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
+      <button nz-button nzDanger [disabled]="service.http.loading" acl [acl-ability]="['FINANCIAL-RECEIPT-export']"
+        (click)='exportList()'>
+        导出</button>
+    </div>
  </div>
  <!-- <div class="d-flex align-items-center mb-md mt-md">
    <button nz-button (click)="this.addInvoice()" nzType="primary">添加收款</button>
--- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
+++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
@ -81,6 +81,10 @@ export class ReceiptOrderComponent extends BasicTableComponent implements OnInit
    // });
  }

+  exportList() {
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_receipt_page_export);
+  }
+
  private initSF(): SFSchema {
    return {
      properties: {
--- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html
+++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html
@ -48,7 +48,9 @@
    <div></div>
    <div class="mr-sm">
      <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
-      <button nz-button nzDanger> 导出</button>
+      <button nz-button nzDanger [disabled]="service.http.loading" acl [acl-ability]="['FINANCIAL-RECEIVABLE-export']"
+        (click)='exportList()'>
+        导出</button>
    </div>
  </div>

--- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
+++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
@ -12,7 +12,7 @@ import { FreightAccountService } from '../../services/freight-account.service';
@Component({
  selector: 'app-receivable-order',
  templateUrl: './receivable-order.component.html',
-  styleUrls: ['../../../commom/less/commom-table.less','../../../commom/less/common-table-bar.less']
+  styleUrls: ['../../../commom/less/commom-table.less', '../../../commom/less/common-table-bar.less']
 })
 export class ReceivableOrderComponent extends BasicTableComponent implements OnInit {
  @ViewChild('st', { static: true })
@ -80,6 +80,9 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
    }
  }

+  exportList() {
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_fico_page_export);
+  }

  private initSF(): SFSchema {
    return {
@ -121,7 +124,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
          ui: {
            widget: 'dict-select',
            params: { dictKey: 'driverrecord:receive:type' },
-            placeholder: '请选择',
+            placeholder: '请选择'
          }
        },
        arvattype: {
@ -130,7 +133,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
          ui: {
            widget: 'dict-select',
            params: { dictKey: 'pay:type' },
-            placeholder: '请选择',
+            placeholder: '请选择'
          }
        },
        cno: {
@ -140,7 +143,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
            widget: 'select',
            placeholder: '请选择',
            allowClear: true,
-            asyncData: () => this.service.getCloseAccount(),
+            asyncData: () => this.service.getCloseAccount()
          }
        },
        arto: {
@ -152,7 +155,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
            searchDebounceTime: 300,
            searchLoadingText: '搜索中...',
            allowClear: true,
-            onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
+            onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q })
          }
        },
        sts: {
@ -164,8 +167,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
          ],
          ui: {
            widget: 'select',
-            placeholder: '请选择',
-           
+            placeholder: '请选择'
          }
        },
        banktype: {
@ -178,8 +180,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
          ],
          ui: {
            widget: 'select',
-            placeholder: '请选择',
-           
+            placeholder: '请选择'
          },
          default: ''
        },
@ -188,8 +189,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
          type: 'string',
          ui: {
            widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
-            
+            format: 'yyyy-MM-dd'
          } as SFDateWidgetSchema
        },
        createTime: {
@ -197,14 +197,14 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
          type: 'string',
          ui: {
            widget: 'sl-from-to-search',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd'
          } as SFDateWidgetSchema
        },
        billHCode: {
          type: 'string',
          title: '订单号',
          ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
          }
        },
        // orderS3: {
@ -222,7 +222,7 @@ export class ReceivableOrderComponent extends BasicTableComponent implements OnI
          title: '核销备注',
          ui: {
            autocomplete: 'off',
-            placeholder: '请选择',
+            placeholder: '请选择'
          }
        }
      }
--- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html
+++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html
@ -27,6 +27,8 @@
        <div class="mr-sm">
            <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
                [acl-ability]="['FINANCIAL-VOUCHER-list']">筛选</button>
+            <button nz-button nzDanger [disabled]="service.http.loading" (click)="exprot()" acl
+                [acl-ability]="['FINANCIAL-VOUCHER-export']">导出</button>
        </div>
    </div>

--- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
+++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
@ -61,6 +61,11 @@ export class VoucherManagementComponent extends BasicTableComponent {
    }
  }

+  // 导出
+  exprot() {
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_asyncExportBillPaymentApplicationList);
+  }
+
  private initSF(): SFSchema {
    return {
      properties: {
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@ -83,6 +83,8 @@ export class FreightAccountService extends ShipperBaseService {

  // 查询费用单抬头
  $api_get_cost_page = '/api/fcc/ficoFeeH/list/page';
+  // 导出费用单列表数据
+  $api_get_cost_page_export = '/api/fcc/ficoFeeH/asyncExport';
  // 根据费用头ID查询费用单及开票明细
  $api_get_cost_detail = '/api/fcc/ficoFeeL/detail';
  // 费用关联的应收核销明细
@ -90,6 +92,8 @@ export class FreightAccountService extends ShipperBaseService {

  // 查询应收核销抬头
  $api_get_fico_page = '/api/fcc/ficoAhxH/list/page';
+  // 应收核销列表数据导出
+  $api_get_fico_page_export = '/api/fcc/ficoAhxH/asyncExport';
  // 应收核销汇总
  $api_get_fico_sum = '/api/fcc/ficoAhxH/getSum';
  // 获取应收核销抬头
@ -99,6 +103,8 @@ export class FreightAccountService extends ShipperBaseService {

  // 查询应付核销抬头
  $api_get_fico_ph_page = '/api/fcc/ficoPhxH/list/page';
+  // 应付核销列表数据导出
+  $api_get_fico_ph_page_export = '/api/fcc/ficoPhxH/asyncExport';
  // 应付核销汇总
  $api_get_fico_ph_sum = '/api/fcc/ficoPhxH/getSum';
  // 获取应付核销抬头
@ -108,6 +114,8 @@ export class FreightAccountService extends ShipperBaseService {

  // 查询总账凭证表
  $api_get_fico_vch_page = '/api/fcc/ficoVcH/list/page';
+  // 导出总账凭证列表数据
+  $api_get_fico_vch_export = '/api/fcc/ficoVcH/asyncExport';
  // 导出总账凭证表
  $api_export_fico_vch_page = '/api/fcc/ficoVcH/reportVchListPage';
  // 获取总账凭证表详情信息
@ -115,6 +123,8 @@ export class FreightAccountService extends ShipperBaseService {

  // 查询付款单抬头
  $api_get_payment_page = '/api/fcc/ficoPayH/listFicoPayHPage';
+  // 付款单列表数据导出
+  $api_get_payment_page_export = '/api/fcc/ficoPayH/asyncExport';
  // 查询付款单明细
  $api_get_payment_detail = '/api/fcc/ficoPayL/list/page';
  // 付款单抬头信息
@ -122,6 +132,8 @@ export class FreightAccountService extends ShipperBaseService {

  // 查询收款单抬头
  $api_get_receipt_page = '/api/fcc/ficoBrmH/list/page';
+  // 收款单列表数据导出
+  $api_get_receipt_page_export = '/api/fcc/ficoBrmH/asyncExport';
  // 收款单抬头信息
  $api_get_receipt_header = '/api/fcc/ficoBrmH/get';
  // 获取收款单抬头