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

src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-04-06 10:57:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-11 11:17:19
+ * @LastEditTime : 2022-04-11 14:23:35
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\abnormal-gold\\abnormal-gold.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->

src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts

@@ -191,6 +191,6 @@ export class AbnormalGoldComponent implements OnInit {
   }
       // 导出
       exprot() {
-        this.service.exportStart({ ...this.beforeReq, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage);
+        this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage);
       }
 }

src/app/routes/financial-management/components/payment-record/payment-record.component.html

@@ -22,7 +22,7 @@
             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>

src/app/routes/financial-management/components/payment-record/payment-record.component.ts

@@ -299,4 +299,8 @@ export class PaymentRecordComponent implements OnInit {
       }
     ];
   }
+  // 导出
+  exprot() {
+    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_asyncExportBillPaymentApplicationList);
+  }
 }

src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts

@@ -98,7 +98,7 @@ export class ReceivableOrderComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        ltdid: {
+        ltdId: {
           type: 'string',
           title: '网络货运人',
           ui: {

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-11 11:15:57
+ * @LastEditTime : 2022-04-11 14:26:38
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\services\\freight-account.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -158,8 +158,10 @@ export class FreightAccountService extends ShipperBaseService {
 
   // 查询异常入金充值信息
   $api_get_getAbnormalAmountPage = '/api/fcc/rechargeInfo/list/getAbnormalAmountPage';
-  // 查询异常入金充值信息
+  // 异步导出运营后台异常入金列表
   $api_get_exportAbnormalAmountPage = '/api/fcc/rechargeInfo/exportAbnormalAmountPage';
+  // 异步导出运营后台支付记录列表
+  $api_get_asyncExportBillPaymentApplicationList = '/api/fcc/billPaymentApplicationOBC/asyncExportBillPaymentApplicationList';
 
   constructor(public injector: Injector) {
     super(injector);

src/app/routes/insurance-management/components/list/list.component.ts

@@ -499,7 +499,7 @@ 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.reviewPDF( `${_record.policyUrl}`)
     // this.service.downloadFile(`${_record.policyUrl}`)
     // const params = {
     //   imgList: [_record.policyUrl],

src/app/routes/insurance-management/services/insurance-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 15:31:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 17:11:54
+ * @LastEditTime : 2022-04-11 14:12:35
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\insurance-management\\services\\insurance-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -32,6 +32,28 @@ export class InsuranceManagementService extends ShipperBaseService {
   //  保险费列表数据导出接口
   $api_get_asyncExport = `/api/sdc/premiumInfo/asyncExport`;
 
+  public reviewPDF(url: string) {
+    if (!url) {
+      return;
+    }
+    const uA = window.navigator.userAgent; // 判断浏览器内核
+    const isIE =
+      /msie\s|trident\/|edge\//i.test(uA) &&
+      !!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window);
+    const objectUrl = url;
+    const a = document.createElement('a');
+    document.body.appendChild(a);
+    a.href = objectUrl;
+    a.download = '保单.pdf';
+    if (isIE) {
+      // 兼容IE11无法触发下载的问题
+      (navigator as any).msSaveBlob(url, a.download);
+    } else {
+      a.click();
+    }
+    a.remove();
+  }
+
   constructor(public injector: Injector) {
     super(injector);
   }

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-04-11 11:28:18
+ * @LastEditTime : 2022-04-11 14:33:19
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -27,7 +27,7 @@
       <div nz-col [nzSpan]="24" style="display: flex; justify-content: flex-end;">
         <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
           (click)="st?.load(1)"  acl  [acl-ability]="['ORDER-COMPLAINT-search']">查询</button>
-        <button nz-button nzType="primary" acl  [acl-ability]="['ORDER-COMPLAINT-export']"
+        <button nz-button nzType="primary" acl  [acl-ability]="['ORDER-COMPLAINT-export']" (click)="exprot()"
          >导出</button>
         <button nz-button (click)="resetSF()">重置</button>
       </div>

src/app/routes/order-management/components/complaint/complaint.component.ts

@@ -7,7 +7,6 @@ import { NzModalService } from 'ng-zorro-antd/modal';
 import { map } from 'rxjs/operators';
 import { OrderManagementService } from '../../services/order-management.service';
 
-
 @Component({
   selector: 'app-supply-management-complaint',
   templateUrl: './complaint.component.html',
@@ -32,30 +31,27 @@ export class OrderManagementComplaintComponent implements OnInit {
   isLoading: boolean = false;
   mainTabs = [
     { name: '司机投诉', status: '2' },
-    { name: '货主投诉', status: '1' },
+    { name: '货主投诉', status: '1' }
-  ]
+  ];
-  tabs = [  {
+  tabs = [
+    {
       name: '全部',
-    type: 0,
+      type: 0
     },
     {
       name: '待处理',
-    type: 1,
+      type: 1
     },
     {
       name: '已处理',
-    type: 2,
+      type: 2
     },
     {
       name: '已撤销',
-    type: 3,
+      type: 3
     }
   ];
-  constructor(
+  constructor(public service: OrderManagementService, private modal: NzModalService, private router: Router) {
-    public service: OrderManagementService,
-    private modal: NzModalService,
-    private router: Router
-     ) {   
     //    console.log(this.selectedIndex);
     //   if (this.selectedIndex === 0) {
     //   this.selectedMainTabStatus = '2';
@@ -69,21 +65,21 @@ export class OrderManagementComplaintComponent implements OnInit {
    */
   get reqParams() {
     const a: any = {};
-    if(this.resourceStatus) {
+    if (this.resourceStatus) {
-      a.complaintStatus = this.resourceStatus 
+      a.complaintStatus = this.resourceStatus;
     }
-    if(this.selectedMainTabStatus) {
+    if (this.selectedMainTabStatus) {
-      a.complainantParty = this.selectedMainTabStatus
+      a.complainantParty = this.selectedMainTabStatus;
     }
     const params: any = Object.assign({}, this.sf?.value || {});
     delete params._$expand;
     return {
       ...a,
-      ...params,
+      ...params
     };
   }
   get selectedRows() {
-    return this.st?.list.filter((item) => item.checked) || [];
+    return this.st?.list.filter(item => item.checked) || [];
   }
   ngOnInit(): void {
     this.initSF();
@@ -91,8 +87,6 @@ export class OrderManagementComplaintComponent implements OnInit {
     this.initSTAudit();
   }
 
-
-
   /**
    * 初始化查询表单
    */
@@ -101,7 +95,7 @@ export class OrderManagementComplaintComponent implements OnInit {
       properties: {
         complaintCode: {
           type: 'string',
-          title: '投诉单号',
+          title: '投诉单号'
         },
         complaintCause: {
           title: '投诉原因',
@@ -109,7 +103,7 @@ export class OrderManagementComplaintComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'drvcomplaint:cause' },
-            containsAllLabel: true,
+            containsAllLabel: true
           } as SFSelectWidgetSchema
         },
         complainantTime: {
@@ -117,14 +111,15 @@ export class OrderManagementComplaintComponent implements OnInit {
 
           title: '投诉时间',
           ui: {
-            widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd' } as SFDateWidgetSchema,
+            widget: 'sl-from-to',
-        },
+            type: 'date',
-      },
+            format: 'yyyy-MM-dd'
+          } as SFDateWidgetSchema
+        }
+      }
     };
-    this.ui = 
+    this.ui = {
-    {
+      '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 8 } }
-     '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 8 } },
-   
     };
   }
 
@@ -150,7 +145,7 @@ export class OrderManagementComplaintComponent implements OnInit {
         title: '投诉时间',
         width: '170px',
         index: 'complainantTime',
-        className: 'text-center',
+        className: 'text-center'
       },
       { title: '托运方', index: 'shipperAppUserName', width: '200px', className: 'text-center' },
       { title: '司机', index: 'driverName', width: '120px', className: 'text-center' },
@@ -160,8 +155,20 @@ export class OrderManagementComplaintComponent implements OnInit {
       //   width: '170px',
       //   render: 'complaintCauseLabel'
       // },
-      { title: '投诉原因',iif: value => this.selectedMainTabStatus == '1', index: 'shpComplaintCauseLabel', className: 'text-center',width: '170px', },
+      {
-      { title: '投诉原因',iif: value => this.selectedMainTabStatus == '2', index: 'drvComplaintCauseLabel', className: 'text-center',width: '170px', },
+        title: '投诉原因',
+        iif: value => this.selectedMainTabStatus == '1',
+        index: 'shpComplaintCauseLabel',
+        className: 'text-center',
+        width: '170px'
+      },
+      {
+        title: '投诉原因',
+        iif: value => this.selectedMainTabStatus == '2',
+        index: 'drvComplaintCauseLabel',
+        className: 'text-center',
+        width: '170px'
+      },
       {
         title: '投诉状态',
         className: 'text-center',
@@ -172,19 +179,19 @@ export class OrderManagementComplaintComponent implements OnInit {
         title: '处理人',
         className: 'text-center',
         width: '200px',
-        index:'handlePartyLabel'
+        index: 'handlePartyLabel'
       },
       {
         title: '处理时间',
         className: 'text-center',
         width: '200px',
-        index:'handleTime'
+        index: 'handleTime'
       },
       {
         title: '处理结果',
         className: 'text-center',
         width: '170px',
-        index:'handleResult'
+        index: 'handleResult'
       },
       {
         title: '投诉方',
@@ -211,11 +218,11 @@ export class OrderManagementComplaintComponent implements OnInit {
           // },
           {
             text: '查看',
-            click: (_record) => this.view(_record),
+            click: _record => this.view(_record),
-            acl: { ability: ['ORDER-COMPLAINT-view'] },
+            acl: { ability: ['ORDER-COMPLAINT-view'] }
-          },
+          }
-        ],
+        ]
-      },
+      }
     ];
   }
   initSTAudit() {
@@ -229,8 +236,8 @@ export class OrderManagementComplaintComponent implements OnInit {
             placeholder: '最多不超过50字',
             widget: 'textarea',
             autosize: { minRows: 3, maxRows: 6 }
-          },
+          }
-        },
+        }
       },
       required: ['handleResult']
     };
@@ -249,14 +256,13 @@ export class OrderManagementComplaintComponent implements OnInit {
     this._$expand = !this._$expand;
     this.sf?.setValue('/_$expand', this._$expand);
   }
-  tabChange(item: any) {
+  tabChange(item: any) {}
-  }
   /**
    * 重置表单
    */
   resetSF(): void {
     this.sf.reset();
-    this.isLoading = true
+    this.isLoading = true;
   }
   selectChange(e: number) {
     this.resourceStatus = e;
@@ -275,17 +281,14 @@ export class OrderManagementComplaintComponent implements OnInit {
     this.initSF();
     setTimeout(() => {
       this.st.load(1);
-      })
+    });
   }
 
   /**
    * 导入货源
    */
-  importGoodsSource() {
+  importGoodsSource() {}
-
+  audit(item: any) {}
-  }
-  audit(item: any) {
-  }
 
   /*
   * 审核关闭弹窗
@@ -298,35 +301,35 @@ export class OrderManagementComplaintComponent implements OnInit {
       ...this.sfView.value,
       handleStatus: 0,
       id: this.channelId
+    };
+    this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) => {
+      if (res) {
+        this.service.msgSrv.success('已拒绝！');
+        this.isVisibleRE = false;
+        this.st.reload(1);
+      } else {
+        this.service.msgSrv.error(res?.msg);
       }
-    this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{
+    });
-      if(res) {
+    this.isVisibleRE = false;
-        this.service.msgSrv.success('已拒绝！')
-        this.isVisibleRE = false
-        this.st.reload(1)
-      } else{
-        this.service.msgSrv.error(res?.msg)
-      }
-    })
-    this.isVisibleRE = false
   }
   Cancel() {
-    this.isVisibleRE = false
+    this.isVisibleRE = false;
   }
   handleCancel2() {
     const paramsa = {
       id: this.channelId
+    };
+    this.service.request(this.service.$api_get_canelComplaint, paramsa).subscribe((res: any) => {
+      if (res) {
+        this.service.msgSrv.success('已拒绝！');
+        this.isVisibleRE = false;
+        this.st.reload(1);
+      } else {
+        this.service.msgSrv.error(res?.msg);
       }
-    this.service.request(this.service.$api_get_canelComplaint, paramsa).subscribe((res: any) =>{
+    });
-      if(res) {
+    this.isVisibleRE = false;
-        this.service.msgSrv.success('已拒绝！')
-        this.isVisibleRE = false
-        this.st.reload(1)
-      } else{
-        this.service.msgSrv.error(res?.msg)
-      }
-    })
-    this.isVisibleRE = false
   }
   /**
    * 审核通过按钮
@@ -336,22 +339,22 @@ export class OrderManagementComplaintComponent implements OnInit {
       ...this.sfView.value,
       handleStatus: 1,
       id: this.channelId
+    };
+    this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) => {
+      if (res) {
+        this.service.msgSrv.success('已通过！');
+        this.isVisibleRE = false;
+        this.st.reload(1);
+      } else {
+        this.service.msgSrv.error(res?.msg);
       }
-    this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{
+    });
-      if(res) {
-        this.service.msgSrv.success('已通过！')
-        this.isVisibleRE = false
-        this.st.reload(1)
-      } else{
-        this.service.msgSrv.error(res?.msg)
-      }
-    })
   }
   /**
    *查看评价
    */
   viewEvaluate(item: any) {
-    this.isVisibleRE = true
+    this.isVisibleRE = true;
     this.channelId = item.id;
   }
   view(value: any) {
@@ -359,6 +362,10 @@ export class OrderManagementComplaintComponent implements OnInit {
       queryParams: {
         detail: JSON.stringify(value)
       }
-    })
+    });
+  }
+  // 导出
+  exprot() {
+    this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_asyncExportComplaintListDrv);
   }
 }

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-09 16:16:09
+ * @LastEditTime : 2022-04-11 14:35:08
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -202,6 +202,8 @@ export class OrderManagementService extends ShipperBaseService {
   $api_get_asyncExportExamineBillList= `/api/sdc/billExamine/asyncExportExamineBillList`;
   //  异步导出单据审核导出
   $api_abnormalWarning_asyncExport= `/api/sdc/abnormalWarning/asyncExport`;
+  //  异步导出投诉管理导出
+  $api_asyncExportComplaintListDrv= `/api/sdc/complaint/operate/asyncExportComplaintListDrv`;
   /**
    * 根据企业ID，获取企业历史网络货运人
    * @returns

src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html

@@ -4,13 +4,12 @@
  * @Author       : Shiming
  * @Date         : 2022-04-06 10:57:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-11 14:00:47
+ * @LastEditTime : 2022-04-11 14:10:13
  * @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">

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 17:08:15
+ * @LastEditTime : 2022-04-11 14:11:21
  * @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
@@ -145,7 +145,7 @@ export class TicketService extends ShipperBaseService {
     super(injector);
   }
 
-  reviewPDF(url: string) {
+  public reviewPDF(url: string) {
     if (!url) {
       return;
     }