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

2022-04-09 17:21:21 +08:00
parent 57093aa400 5fe34208af
commit 64492576aa
13 changed files with 107 additions and 66 deletions
--- a/proxy.conf.js
+++ b/proxy.conf.js
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-18 09:51:21
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-09 15:08:08
+ * @LastEditTime : 2022-04-09 16:39:20
 * @FilePath     : \\tms-obc-web\\proxy.conf.js
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -20,7 +20,7 @@ module.exports = {
  // }
  '//api': {
    target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
      protocol: 'https:',
      port: 443
    },
--- a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts
+++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts
@ -47,7 +47,7 @@ export class AdvanceCollectionComponent {
  }

  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_reportYskBla,);
  }

  private initSF(): SFSchema {
--- 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
@ -156,7 +156,11 @@ export class CostManagementComponent implements OnInit {
        feeSubId: {
          type: 'string',
          title: '费用科目',
-          enum: [{ label: '全部', value: '全部' }],
+          enum: [
+            { label: '全部', value: '全部' },
+            { label: '运输费', value: '1475197820443299842' },
+            { label: '附加费', value: '1476197820443299842 ' },
+          ],
          ui: {
            widget: 'select',
            placeholder: '请选择',
--- 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
@ -45,11 +45,11 @@ export class PayableOrderComponent implements OnInit {
          }
        });
      }
-      if (this.sf.value?.ahxdate) {
+      if (this.sf.value?.phxdate) {
        Object.assign(requestOptions.body, {
-          ahxdate: {
-            start: this.sf.value.ahxdate?.[0] || null,
-            end: this.sf.value.ahxdate?.[1] || null
+          phxdate: {
+            start: this.sf.value.phxdate?.[0] || null,
+            end: this.sf.value.phxdate?.[1] || null
          }
        });
      }
@ -210,7 +210,7 @@ export class PayableOrderComponent implements OnInit {
        },
        remarks: {
          type: 'string',
-          title: '付款备注',
+          title: '核销备注',
          ui: {
            autocomplete: 'off',
            placeholder: '请选择',
--- 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
@ -104,7 +104,7 @@ export class ReceiptOrderComponent implements OnInit {
            placeholder: '请输入'
          }
        },
-        ltdid: {
+        ltdId: {
          type: 'string',
          title: '网络货运人',
          ui: {
@ -217,7 +217,7 @@ export class ReceiptOrderComponent implements OnInit {
        // },
        remarks: {
          type: 'string',
-          title: '付款备注',
+          title: '收款备注',
          ui: {
            placeholder: '请输入',
            visibleIf: {
--- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts
+++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts
@ -151,7 +151,7 @@ export class TransactionFlowComponent {
          },
          default: ''
        },
-        enterpriseName: {
+        roleName: {
          type: 'string',
          title: '账户名称',
          ui: {
--- 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
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-18 15:57:44
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 17:18:16
+ * @LastEditTime : 2022-04-09 16:36:42
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-management\\voucher-management.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -172,7 +172,7 @@ export class VoucherManagementComponent implements OnInit {
            }
          } as SFDateWidgetSchema
        },
-        inpinvcosde: {
+        remarks: {
          type: 'string',
          title: '凭证摘要',
          ui: {
@ -195,18 +195,18 @@ export class VoucherManagementComponent implements OnInit {
          },
          default: ''
        },
-        subid: {
-          type: 'string',
-          title: '科目',
-          ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'refund:apply:status' },
-            placeholder: '请选择',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
+        // subid: {
+        //   type: 'string',
+        //   title: '科目',
+        //   ui: {
+        //     widget: 'dict-select',
+        //     params: { dictKey: 'refund:apply:status' },
+        //     placeholder: '请选择',
+        //     visibleIf: {
+        //       expand: (value: boolean) => value
+        //     }
+        //   }
+        // },
        drmoney: {
          type: 'string',
          title: '借方金额',
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-18 15:57:44
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-09 15:33:41
+ * @LastEditTime : 2022-04-09 16:21:52
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\services\\freight-account.service.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -153,6 +153,8 @@ export class FreightAccountService extends ShipperBaseService {
  $api_get_exportShipperAccountBalanceByOperator = '/api/fcc/accountBalance/exportShipperAccountBalanceByOperator';
  // 运营端导出导出平台账户信息
  $api_get_exportPlatformAccountBalanceByOperator = '/api/fcc/accountBalance/exportPlatformAccountBalanceByOperator';
+  // 导出预收款余额
+  $api_get_reportYskBla = '/api/fcc/ficoYskBla/reportYskBla';

  constructor(public injector: Injector) {
    super(injector);
--- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts
+++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts
@ -99,7 +99,7 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
          ui: {
          }
        },
-        wayCode: {
+        wayBillCode: {
          type: 'string',
          title: '运单号',
          ui: {
@ -213,13 +213,6 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
   */
  initST() {
    this.columns = [
-      {
-        title: '运单号',
-        width: '180px',
-        fixed: 'left',
-        className: 'text-left',
-        index: 'wayCode'
-      },
      {
        title: '订单号',
        width: '180px',
@ -227,6 +220,13 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
        className: 'text-left',
        index: 'billCode'
      },
+      {
+        title: '运单号',
+        width: '180px',
+        fixed: 'left',
+        className: 'text-left',
+        index: 'wayCode'
+      },
      { title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left',format: (item) => {
        return item?.resourceTypeLabel + item?.serviceTypeLabel
      } },
@ -285,6 +285,6 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {

    // 导出
    exprot() {
-      this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportSpotCheckList);
+      this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_abnormalWarning_asyncExport);
    }
 }
--- a/src/app/routes/order-management/services/order-management.service.ts
+++ b/src/app/routes/order-management/services/order-management.service.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-03 15:31:52
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 09:49:44
+ * @LastEditTime : 2022-04-09 16:16:09
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -200,6 +200,8 @@ export class OrderManagementService extends ShipperBaseService {
  $api_get_asyncExportSpotCheckList= `/api/sdc/BillComplianceSpotCheck/asyncExportSpotCheckList`;
  //  异步导出单据审核导出
  $api_get_asyncExportExamineBillList= `/api/sdc/billExamine/asyncExportExamineBillList`;
+  //  异步导出单据审核导出
+  $api_abnormalWarning_asyncExport= `/api/sdc/abnormalWarning/asyncExport`;
  /**
   * 根据企业ID，获取企业历史网络货运人
   * @returns
--- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html
+++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.html
@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-06 10:57:56
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-09 17:07:02
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\etc-blacklist\\etc-blacklist.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header-wrapper [title]="'ETC白名单'" [content]="content">
  <ng-template #content>
    <nz-tabset class="tabs-wrap">
@ -9,14 +19,18 @@
 <nz-card class="search-box">
  <div nz-row nzGutter="8">
    <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="searchSchema"
-                [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
-                [button]="'none'"></sf>
+      <sf
+        #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]="6" [nzLg]="24" [nzMd]="24" [nzSm]="24" [nzXs]="24" 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 (click)="exprot()"> 导出</button>
    </div>
  </div>
 </nz-card>
@ -31,6 +45,13 @@
      <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
    </div>
  </div>
-    <st #st [data]="tabType===1?service.$api_get_etc_shipper_list:service.$api_get_etc_cart_page" [columns]="columns"
-        [page]="{}" [req]="{ process: beforeReq }" [loading]="false" (change)="stChange($event)"></st>
+  <st
+    #st
+    [data]="tabType === 1 ? service.$api_get_etc_shipper_list : service.$api_get_etc_cart_page"
+    [columns]="columns"
+    [page]="{}"
+    [req]="{ process: beforeReq }"
+    [loading]="false"
+    (change)="stChange($event)"
+  ></st>
 </nz-card>
--- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
+++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
@ -245,7 +245,7 @@ export class ETCBlacklistComponent implements OnInit {
              tabType: (value: number) => this.tabType === 2
            }
          }
-        },
+        }
        // params6: {
        //   title: '手机号',
        //   type: 'string',
@ -294,4 +294,12 @@ export class ETCBlacklistComponent implements OnInit {
      }
    ];
  }
+  // 导出
+  exprot() {
+    if (this.tabType == 1) {
+      this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_aficoShipperWhiteList_asyncExport);
+    } else {
+      this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_ficoCarWhiteList_asyncExport);
+    }
+  }
 }
--- a/src/app/routes/ticket-management/services/ticket.service.ts
+++ b/src/app/routes/ticket-management/services/ticket.service.ts
@ -1,7 +1,7 @@
 /*
 * @Author: your name
 * @Date: 2021-12-29 13:12:35
- * @LastEditTime : 2022-04-09 15:49:11
+ * @LastEditTime : 2022-04-09 17:08:15
 * @LastEditors  : Shiming
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\services\\ticket.service.ts
@ -136,6 +136,10 @@ export class TicketService extends ShipperBaseService {
  $api_get_asyncExportEtcApplyList = '/api/sdc/invoiceEtcOperate/asyncExportEtcApplyList';
  // ETC开票记录导出
  $api_get_asyncExportEtcApplyRecordList = '/api/sdc/invoiceEtcOperate/asyncExportEtcApplyRecordList';
+  // ETC白名单（货主）导出接口
+  $api_get_aficoShipperWhiteList_asyncExport = '/api/fcc/ficoShipperWhiteList/asyncExport';
+  // ETC白名单（车辆）导出接口
+  $api_get_ficoCarWhiteList_asyncExport = '/api/fcc/ficoCarWhiteList/asyncExport';

  constructor(public injector: Injector) {
    super(injector);