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

2022-04-08 17:00:18 +08:00
parent 7d899c8d9d 0a4591acc3
commit aec3517421
9 changed files with 87 additions and 61 deletions
--- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html
+++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 10:11:15
+ * @LastEditTime : 2022-04-08 16:34:26
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\abnormal-warning\\abnormal-warning.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -70,7 +70,7 @@
    
   
      <ng-template st-row="driverName" let-item let-index="index">
-        <div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : '' }} </div>
+        <div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
      </ng-template>
      <ng-template st-row="longitude" let-item let-index="index">
        <div> {{ item?.longitude }}
--- 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
@ -227,7 +227,9 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
        className: 'text-left',
        index: 'billCode'
      },
-      { title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left' },
+      { title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left',format: (item) => {
+        return item?.resourceTypeLabel + item?.serviceTypeLabel
+      } },
      { title: '货主', index: 'shipperName', width: '220px', className: 'text-left' },
      { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left' },
      { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left' },
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
@ -177,7 +177,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
          }
        },
        checkStatus: {
-          title: '精准',
+          title: '本地校验',
          type: 'string',
          ui: {
            placeholder: '请选择',
@ -241,7 +241,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
    this.columns = [
      { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
      { title: '上传状态', render: 'putStatus', className: 'text-center', width: '120px', },
-      { title: '精准', render: 'checkStatus', className: 'text-center', width: '120px', },
+      { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', },
      {
        title: '订单号',
        index: 'billCode',
--- a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts
+++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-03-30 14:26:01
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-08 15:36:04
+ * @LastEditTime : 2022-04-08 15:48:58
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\verify-result\\verify-result.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -63,11 +63,29 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit {
  initST() {
    this.columns = [
      { title: '序号', type: 'no', className: 'text-center', width: '60px', },
-      { title: '校验字段', index: 'orderStatus', className: 'text-center', width: '120px', },
-      { title: '是否必填', index: 'orderStatus', className: 'text-center', width: '100px', },
-      { title: '上传值', index: 'orderStatus', className: 'text-center', width: '120px', },
-      { title: '本地校验', index: 'orderStatus', className: 'text-center', width: '100px', },
-      { title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', },
+      { title: '校验字段', index: 'checkFieldName', className: 'text-center', width: '120px', },
+      {
+        title: '是否必填',
+        index: 'requiredStatus',
+        className: 'text-center',
+        width: '100px',
+        type: 'enum',
+        enum: {
+          0: '否',
+          1: '是'
+        }
+      },
+      { title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', },
+      {
+        title: '本地校验', index: 'checkStatus', className: 'text-center', width: '100px',
+        type: 'enum',
+        enum: {
+          0: '校验中',
+          1: '通过',
+          2: '不通过'
+        }
+      },
+      { title: '错误内容', index: 'remark', className: 'text-center', width: '150px', },
    ]
  }

--- 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
@ -12,7 +12,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>
--- 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
@ -227,4 +227,8 @@ export class ETCInvoicedRequestedComponent implements OnInit {
      { title: '签收时间', index: 'submissionTime', type: 'date', width: '150px'  }
    ];
  }
+    // 导出
+    exprot() {
+      this.service.exportStart(this.sf?.value, this.service.$api_get_asyncExportEtcApplyList);
+    }
 }
--- a/src/app/routes/ticket-management/services/ticket.service.ts
+++ b/src/app/routes/ticket-management/services/ticket.service.ts
@ -1,10 +1,10 @@
 /*
 * @Author: your name
 * @Date: 2021-12-29 13:12:35
- * @LastEditTime: 2022-01-04 10:36:02
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2022-04-08 16:37:58
+ * @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
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\services\\ticket.service.ts
 */
 import { Injectable, Injector } from '@angular/core';
 import { EACacheService, ShipperBaseService } from '@shared';
@ -132,6 +132,8 @@ export class TicketService extends ShipperBaseService {

  // 根据地区code查询列表
  $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';
+  // ETC申请开票导出
+  $api_get_asyncExportEtcApplyList = '/api/sdc/invoiceEtcOperate/asyncExportEtcApplyList';

  constructor(public injector: Injector) {
    super(injector);
--- a/src/app/routes/vehicle/components/audit/audit.component.ts
+++ b/src/app/routes/vehicle/components/audit/audit.component.ts
@ -10,7 +10,7 @@ import { VehicleService } from '../../../vehicle/services/vehicle.service';
 import { CarSettleCarauthComponent } from '../list/carauth/carauth.component';
@Component({
  selector: 'app-Vehicle-components-audit',
-  templateUrl: './audit.component.html',
+  templateUrl: './audit.component.html'
 })
 export class VehicleComponentsAuditComponent implements OnInit {
  _$expand = false;
@ -22,7 +22,13 @@ export class VehicleComponentsAuditComponent implements OnInit {
  @ViewChild('st', { static: false }) st!: STComponent;
  @ViewChild('sf', { static: false }) sf!: SFComponent;

-  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper) { }
+  constructor(
+    public service: VehicleService,
+    private modal: NzModalService,
+    private router: Router,
+    private ar: ActivatedRoute,
+    private modalHelper: ModalHelper
+  ) {}
  /**
   * 查询字段个数navigate
   */
@ -36,26 +42,26 @@ export class VehicleComponentsAuditComponent implements OnInit {
  get reqParams() {
    const a: any = {};
    if (this.resourceStatus === 1) {
-      a.approvalStatus = 10
+      a.approvalStatus = 10;
    } else if (this.resourceStatus === 2) {
-      a.approvalStatus = 20
+      a.approvalStatus = 20;
    } else if (this.resourceStatus === 3) {
-      a.approvalStatus = 30
+      a.approvalStatus = 30;
    }
    return {
      ...a,
-      ...this.sf?.value,
+      ...this.sf?.value
    };
  }

  get selectedRows() {
-    return this.st?.list.filter((item) => item.checked) || [];
+    return this.st?.list.filter(item => item.checked) || [];
  }

  ngOnInit() {
    this.initSF();
    this.initST();
-    this.ar.url.subscribe((params) => {
+    this.ar.url.subscribe(params => {
      this.st?.load(1);
    });
  }
@ -71,8 +77,8 @@ export class VehicleComponentsAuditComponent implements OnInit {
        expand: {
          type: 'boolean',
          ui: {
-            hidden: true,
-          },
+            hidden: true
+          }
        },
        carNo: {
          title: '车牌号',
@ -106,7 +112,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
          ui: {
            widget: 'dict-select',
            params: { dictKey: 'car:color' },
-            containsAllLabel: true,
+            containsAllLabel: true
          }
        },
        isSelf: {
@ -114,11 +120,11 @@ export class VehicleComponentsAuditComponent implements OnInit {
          title: '是否挂靠',
          enum: [
            { label: '是', value: 1 },
-            { label: '否', value: 0 },
+            { label: '否', value: 0 }
          ],
          ui: {
            widget: 'select',
-            allowClear: true,
+            allowClear: true
          }
        },
        saveUser: {
@ -126,10 +132,10 @@ export class VehicleComponentsAuditComponent implements OnInit {
          title: '录入人员',
          ui: {
            visibleIf: {
-              expand: (value: boolean) => value,
-            },
-          },
-        },
+              expand: (value: boolean) => value
+            }
+          }
+        }
        // approvalStatus: {
        //   type: 'string',
        //   title: '审核状态',
@ -149,7 +155,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
        //     },
        //   },
        // },
-      },
+      }
    };
    this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
  }
@ -162,7 +168,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
      { title: '车型-车长-载重', width: '180px', className: 'text-center', render: 'carLength' },
      { title: '是否挂靠', width: '180px', className: 'text-center', render: 'isSelf' },
      { title: '所有人', width: '180px', className: 'text-center', index: 'carOwner' },
-      { title: '录入人员', width: '180px', className: 'text-center', index: 'saveUser', },
+      { title: '录入人员', width: '180px', className: 'text-center', index: 'saveUser' },
      {
        title: '审核状态',
        className: 'text-center',
@ -176,8 +182,8 @@ export class VehicleComponentsAuditComponent implements OnInit {
          10: { text: '待审核', color: 'warning' },
          20: { text: '已审核', color: 'success' },
          30: { text: '已驳回', color: 'error' },
-          40: { text: '证件过期', color: 'error' },
-        },
+          40: { text: '证件过期', color: 'error' }
+        }
      },
      { title: '申请时间', width: '180px', className: 'text-center', index: 'createTime' },
      {
@ -189,13 +195,13 @@ export class VehicleComponentsAuditComponent implements OnInit {
          {
            text: '查看',
            acl: { ability: ['VEHICLE-AUDIT-view'] },
-            click: (item) => {
+            click: item => {
              this.router.navigate(['./detail', item.id], { relativeTo: this.ar, queryParams: { carId: item.carId } });
              // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
-            },
-          },
-        ],
-      },
+            }
+          }
+        ]
+      }
    ];
  }
  selectChange(e: number) {
@ -213,7 +219,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
    this.sf?.setValue('/expand', this._$expand);
  }
  creat() {
-    this.router.navigate(['./new',], { relativeTo: this.ar });
+    this.router.navigate(['./new'], { relativeTo: this.ar });
  }
  /**
   * 重置表单
@ -224,19 +230,16 @@ export class VehicleComponentsAuditComponent implements OnInit {
  }
  // 导出
  exportFire() {
-    this.service.request(this.service.$api_carLicenseAudit_export, this.reqParams).subscribe((res: any) => {
-      if(res) {
-        this.service.msgSrv.success('导出成功,请去右上角下载中心下载')
-        return
-      }
-    });
+    let params = Object.assign({}, this.reqParams || {});
+    params.pageSize = -1;
+    this.service.exportStart(params, this.service.$api_carLicenseAudit_export);
  }
  addModal() {
    const i = {
-      appUserId: '',
-    }
-    this.modalHelper.create(CarSettleCarauthComponent, { i }, { size: 900 }).subscribe((res) => {
-      this.st.load()
+      appUserId: ''
+    };
+    this.modalHelper.create(CarSettleCarauthComponent, { i }, { size: 900 }).subscribe(res => {
+      this.st.load();
    });
  }
 }
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@ -19,7 +19,7 @@ export class VehicleComponentsListComponent implements OnInit {
  @ViewChild('st', { static: false }) st!: STComponent;
  @ViewChild('sf', { static: false }) sf!: SFComponent;

-  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) { }
+  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}

  /**
   * 查询参数
@ -199,7 +199,7 @@ export class VehicleComponentsListComponent implements OnInit {
              expand: (value: boolean) => value
            }
          }
-        },
+        }
        // putOnRecord: {
        //   type: 'string',
        //   title: '是否已备案',
@ -278,7 +278,7 @@ export class VehicleComponentsListComponent implements OnInit {
            text: '查看',
            acl: { ability: ['VEHICLE-LIST-view'] },
            click: item => {
-              this.router.navigate(['/vehicle/list/detail/' + item.id] );
+              this.router.navigate(['/vehicle/list/detail/' + item.id]);
              // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
            }
          }
@ -308,11 +308,8 @@ export class VehicleComponentsListComponent implements OnInit {
  }
  // 导出
  exportFire() {
-    this.service.request(this.service.$api_carLicense_export, this.reqParams).subscribe((res: any) => {
-      if(res) {
-        this.service.msgSrv.success('导出成功,请去右上角下载中心下载')
-        return
-      }
-    });
+    let params = Object.assign({}, this.reqParams || {});
+    params.pageSize = -1;
+    this.service.exportStart(params, this.service.$api_carLicense_export);
  }
 }