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

2022-04-11 14:04:52 +08:00
parent ebd8fc816f a5165f390d
commit d544667510
9 changed files with 75 additions and 36 deletions
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
@ -306,7 +306,7 @@ export class DatatableOrderReportingComponent implements OnInit {
      { title: '装货地址', index: 'loadingAddress', className: 'text-center', width: '200px' },
      { title: '收货方名称', index: 'receivingName', className: 'text-center', width: '150px' },
      { title: '收货地址', index: 'consigneeAddress', className: 'text-center', width: '150px' },
-      { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '100px' },
+      { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '130px' },
      { title: '车牌号', index: 'carNo', className: 'text-center', width: '150px' },
      {
        title: '车牌颜色',
--- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html
+++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html
@ -1,19 +1,30 @@
-<page-header-wrapper [title]="'异常入金'">
-</page-header-wrapper>
-
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-06 10:57:56
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-11 11:17:19
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\abnormal-gold\\abnormal-gold.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+<page-header-wrapper [title]="'异常入金'"> </page-header-wrapper>

 <nz-card class="search-box" nzBordered>
  <div nz-row nzGutter="8">
    <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="searchSchema"
-                [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
-                [button]="'none'"></sf>
+      <sf
+        #sf
+        [schema]="searchSchema"
+        [ui]="{ '*': { spanLabelFixed: 90, 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.expend-options]="_$expand"
-            class="text-right">
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" 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>
      <button nz-button nzType="link" (click)="expandToggle()">
        {{ !_$expand ? '展开' : '收起' }}
        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -30,6 +41,13 @@
    <nz-tab nzTitle="全部"></nz-tab>
  </nz-tabset>

-    <st #st [data]="service.$api_get_abnormal_gold_page" [columns]="columns" [req]="{   process: beforeReq }" [page]="{}"
-        [loading]="false" [scroll]="{ x:'1200px' }"></st>
+  <st
+    #st
+    [data]="service.$api_get_getAbnormalAmountPage"
+    [columns]="columns"
+    [req]="{ process: beforeReq }"
+    [page]="{}"
+    [loading]="false"
+    [scroll]="{ x: '1200px' }"
+  ></st>
 </nz-card>
--- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts
+++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts
@ -189,4 +189,8 @@ export class AbnormalGoldComponent implements OnInit {
      }
    ];
  }
+      // 导出
+      exprot() {
+        this.service.exportStart({ ...this.beforeReq, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage);
+      }
 }
--- 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 16:21:52
+ * @LastEditTime : 2022-04-11 11:15:57
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\services\\freight-account.service.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -156,6 +156,11 @@ export class FreightAccountService extends ShipperBaseService {
  // 导出预收款余额
  $api_get_reportYskBla = '/api/fcc/ficoYskBla/reportYskBla';

+  // 查询异常入金充值信息
+  $api_get_getAbnormalAmountPage = '/api/fcc/rechargeInfo/list/getAbnormalAmountPage';
+  // 查询异常入金充值信息
+  $api_get_exportAbnormalAmountPage = '/api/fcc/rechargeInfo/exportAbnormalAmountPage';
+
  constructor(public injector: Injector) {
    super(injector);
  }
--- a/src/app/routes/insurance-management/components/list/list.component.ts
+++ b/src/app/routes/insurance-management/components/list/list.component.ts
@ -497,7 +497,10 @@ export class insuranceManagementListComponent implements OnInit {
    ];
  }
  showImg(_record: any) {
+    // var newUrl=_record.policyUrl.replace('http','https')
+    // window.open(newUrl,'_self');
    window.location.href = `${_record.policyUrl}`;
+    // this.service.downloadFile(`${_record.policyUrl}`)
    // const params = {
    //   imgList: [_record.policyUrl],
    //   index: 0
--- a/src/app/routes/order-management/components/complaint/complaint.component.html
+++ b/src/app/routes/order-management/components/complaint/complaint.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-30 13:44:53
+ * @LastEditTime : 2022-04-11 11:28:18
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -12,7 +12,7 @@
 <!-- 搜索表单 -->
 <page-header-wrapper title="" [tab]="tpTab">
  <ng-template #tpTab>
-    <nz-tabset [nzSelectedIndex]="selectedIndex" (nzSelectedIndexChange)="selectChange($event)">
+    <nz-tabset [nzSelectedIndex]="selectedIndex">
      <nz-tab *ngFor="let tab of mainTabs" [nzTitle]="tab.name" (nzSelect)="selectMainTab(tab)">
      </nz-tab>
    </nz-tabset>
--- a/src/app/routes/order-management/components/complaint/complaint.component.ts
+++ b/src/app/routes/order-management/components/complaint/complaint.component.ts
@ -269,9 +269,8 @@ export class OrderManagementComplaintComponent implements OnInit {
   * 切换投诉与被投诉tab
   */
     selectMainTab(e: any) {
-       console.log(e);
-      console.log(this.selectedIndex);
      this.selectedMainTabStatus = e?.status;
+      this.resourceStatus = '';
      this.initST();
      this.initSF();
      setTimeout(() => {
--- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html
+++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html
@ -1,6 +1,16 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-06 10:57:56
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-11 14:00:47
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\etc-invoiced-requested\\etc-invoiced-requested.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header-wrapper [title]="'申请记录'">
 </page-header-wrapper>
-
+<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 <nz-card class="search-box" nzBordered>
    <div nz-row nzGutter="8">
        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
--- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts
+++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts
@ -57,9 +57,9 @@ export class ETCInvoicedRequestedComponent implements OnInit {
          .subscribe(res => {
            if (res) {
              this.service.msgSrv.success('申请开票成功');
-              modal.destroy();
              this.st.load(1);
            }
+            modal.destroy();
          });

        return false;