From 3b5ddb5a0cbfe4f65768ae1658cde2defaba2d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Sat, 2 Apr 2022 13:23:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E4=B8=8A=E4=BC=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fund-info/fund-info.component.html | 23 ++-- .../fund-info/fund-info.component.ts | 26 ++-- .../fund-reporting.component.html | 9 +- .../fund-reporting.component.ts | 7 +- .../order-reporting.component.html | 40 ++++-- .../order-reporting.component.ts | 123 ++++++++++++------ .../verify-result.component.html | 2 +- .../reporting/services/reporting.service.ts | 4 +- 8 files changed, 151 insertions(+), 83 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html index ec41a240..4714651b 100644 --- a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html +++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html @@ -1,14 +1,15 @@ - - - -
-
{{item.expenseName}}:{{item.price | currency}}
-
- - +
+ + + +
+
{{item.expenseName}}:{{item.price | currency}}
+
+ + +
diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts index 74fedc47..3c6d0fe2 100644 --- a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { STColumn, STComponent } from '@delon/abc/st'; +import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { SFSchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; import { NzModalRef } from 'ng-zorro-antd/modal'; @@ -21,6 +21,14 @@ export class DatatableReportingFundInfoComponent implements OnInit { get reqParams() { return { capitalCode: this?.record?.orderCode }; } + + beforeReq(requestOptions: STRequestOptions) { + delete requestOptions?.body?.pageSize; + delete requestOptions?.body?.pageIndex; + return requestOptions; + + + } constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) { } @@ -34,22 +42,22 @@ export class DatatableReportingFundInfoComponent implements OnInit { */ initST() { this.columns = [ - { title: '序号', type: 'no', className: 'text-center', width: '60px', }, - { title: '监管平台字段', index: 'thirdPartyFieldName', className: 'text-center', width: '120px', }, - { title: '系统字段', index: 'checkFieldName', className: 'text-center', width: '100px', }, - { title: '归属模块', index: 'orderStatus', className: 'text-center', width: '120px', }, + { title: '序号', type: 'no', className: 'text-center', width: '10%', }, + { title: '监管平台字段', index: 'thirdPartyFieldName', className: 'text-center', width: '15%', }, + { title: '系统字段', index: 'checkFieldName', className: 'text-center', width: '15%', }, + { title: '归属模块', index: 'orderStatus', className: 'text-center', width: '15%', }, { title: '是否必填', index: 'orderStatus', className: 'text-center', - width: '100px', + width: '10%', type: 'enum', enum: { '0': '非必填', '1': '必填', }, }, - { title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', }, + { title: '上传值', index: 'fieldValue', className: 'text-center', width: '15%', }, { title: '本地校验', index: 'checkStatus', @@ -60,9 +68,9 @@ export class DatatableReportingFundInfoComponent implements OnInit { '1': '通过', '2': '不通过' }, - width: '100px', + width: '10%', }, - { title: '错误内容', index: 'remark', className: 'text-center', width: '150px', }, + { title: '错误内容', index: 'remark', className: 'text-center', width: '20%', }, ] } diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html index ed76d2ea..e2894aed 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html @@ -34,8 +34,8 @@ {{item?.billStatusLabel}} - {{item?.billStatusLabel}} - {{item?.billStatusLabel}} + 1111{{item?.verifyStatusLabel}} + {{item?.verifyStatusLabel}} {{item?.orderCode}} @@ -43,11 +43,6 @@ {{item?.wayBillCode}} - - - {{item?.billStatusLabel}} - {{item?.billStatusLabel}} -
{{item?.tolalAmount | currency }}
 diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index cc0563a2..60b9d23d 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -175,7 +175,9 @@ export class DatatableFundReportingComponent implements OnInit { placeholder: '请选择', widget: 'select', asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false), - + visibleIf: { + _$expand: (value: boolean) => value, + }, allowClear: true } }, @@ -363,6 +365,7 @@ export class DatatableFundReportingComponent implements OnInit { const modalRef = this.modal.create({ nzTitle: '校验结果', nzWidth: 1200, + nzContent: DatatableReportingFundInfoComponent, nzComponentParams: { record @@ -377,7 +380,7 @@ export class DatatableFundReportingComponent implements OnInit { * 查看监管审核结果 */ viewAuditResult(record: any) { - if (record?.billStatus !== '2') { + if (record?.verifyStatus !== '1') { return; } this.openWainingModal('监管审核结果', record?.result) diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index b16b7973..0e4d27dd 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -29,18 +29,40 @@ [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading"> - - {{item?.billStatusLabel}} - {{item?.billStatusLabel}} - + + {{filterStatus(item?.orderCheckStatus)}} + {{filterStatus(item?.orderCheckStatus)}} + + + {{filterStatus(item?.driverCheckStatus)}} + {{filterStatus(item?.driverCheckStatus)}} + + + {{filterStatus(item?.orderCheckStatus)}} + {{filterStatus(item?.orderCheckStatus)}} - - {{item?.billStatusLabel}} - {{item?.billStatusLabel}} + + {{filterStatus(item?.checkStatus)}} + {{filterStatus(item?.checkStatus)}} - -
{{item?.amount | currency :' '}}
+ + {{item?.billCode}} + + + {{item?.wayBillCode}} + + + +
{{item?.freightAmount | currency :' '}}
+ + +
+ {{_item?.goodsTypeName}}/{{_item?.goodsName}}/{{_item?.weight}}吨/{{_item?.volume}}m³ +
diff --git 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 index 2491ad82..05361849 100644 --- 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 @@ -95,7 +95,7 @@ export class DatatableOrderReportingComponent implements OnInit { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } }, - resourceCode: { + wayBillCode: { type: 'string', title: '运单号', ui: { @@ -113,7 +113,7 @@ export class DatatableOrderReportingComponent implements OnInit { allowClear: true } }, - externalResourceCode: { + shipperName: { title: '货主', type: 'string', ui: { @@ -143,33 +143,40 @@ export class DatatableOrderReportingComponent implements OnInit { }, } }, - serviceType: { + putStatus: { title: '上传状态', type: 'string', + enum: [ + { label: '待上传', value: 0 }, + { label: '已上传', value: 1 }, + { label: '异常', value: 2 } + ], + ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, + widget: 'select', visibleIf: { _$expand: (value: boolean) => value, }, } }, - serviceType1: { + checkStatus: { title: '本地校验', type: 'string', + enum: [ + { label: '校验中', value: 0 }, + { label: '通过', value: 1 }, + { label: '不通过', value: 2 } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, + widget: 'select', visibleIf: { _$expand: (value: boolean) => value, }, } }, - createTime: { + putTime: { title: '上传时间', type: 'string', ui: { @@ -181,7 +188,7 @@ export class DatatableOrderReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - createTime1: { + orderReceivingTime: { title: '运单生成时间', type: 'string', ui: { @@ -193,7 +200,7 @@ export class DatatableOrderReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - createTime2: { + dispatchedDate: { title: '发货时间', type: 'string', ui: { @@ -205,7 +212,7 @@ export class DatatableOrderReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - createTime3: { + receivingDate: { title: '收货时间', type: 'string', ui: { @@ -218,7 +225,7 @@ export class DatatableOrderReportingComponent implements OnInit { } as SFDateWidgetSchema, }, - loadingPlace: { + trajectoryDataAppStatus: { title: '车辆轨迹', type: 'string', enum: [ @@ -234,7 +241,7 @@ export class DatatableOrderReportingComponent implements OnInit { }, } }, - loadingPlace1: { + trajectoryDataStatus: { title: '司机轨迹', type: 'string', enum: [ @@ -264,48 +271,65 @@ export class DatatableOrderReportingComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '订单状态', render: 'orderStatus', className: 'text-center', width: '120px', }, - { title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', }, + { title: '订单状态', render: 'orderCheckStatus', className: 'text-center', width: '120px', }, + { title: '司机状态', render: 'driverCheckStatus', className: 'text-center', width: '120px', }, + { title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', }, - { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, + + { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', }, { title: '订单号', - render: 'billComplianceVOS', + render: 'billCode', className: 'text-center', width: '150px', }, - { title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', }, + { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '150px', }, { title: '网络货运人', - render: 'serviceType', + index: 'enterpriseInfoName', className: 'text-center', width: '180px', }, - { title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' }, - { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' }, - { title: '发货时间', render: 'driver2', className: 'text-center', width: '180px' }, - { title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' }, - { title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' }, - { title: '收货方名称', render: 'driver1', className: 'text-center', width: '150px' }, - { title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '运费金额', render: 'amount', className: 'text-center', width: '250px' }, - { title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '车牌颜色', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '司机姓名', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '司机手机号码', render: 'transportInfo', className: 'text-center', width: '200px' }, - { title: '司机身份证号', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '货物信息', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '200px' }, + + { title: '统一社会信用代码', index: 'unifiedSocialCreditCode', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '运单生成时间', index: 'wayBillCreateTime', className: 'text-center', width: '180px' }, + { title: '发货时间', index: 'dispatchedDate', className: 'text-center', width: '180px' }, + { title: '收货时间', index: 'receivingDate', className: 'text-center', width: '180px' }, + { title: '托运人名称', index: 'shipperName', className: 'text-center', width: '250px' }, + { title: '托运人统一社会信用代码', index: 'shipperCreditCode', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '装货地址', index: 'loadingAddress', render: 'dischargePlace', 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: '250px' }, + { title: '车牌号', index: 'carNo', className: 'text-center', width: '150px' }, + { + title: '车牌颜色', + index: 'carNoColor', + className: 'text-center', + width: '250px', + type: 'enum', + enum: { + "4": "绿色", + "3": "黄绿色", + "2": "黄色", + "1": "蓝色" + } + + }, + { title: '司机姓名', index: 'driverName', className: 'text-center', width: '150px' }, + { title: '司机手机号码', index: 'driverPhone', className: 'text-center', width: '200px' }, + { title: '司机身份证号', index: 'driverIdentityNo', className: 'text-center', width: '150px' }, + { title: '货物信息', render: 'goodsInfoList', className: 'text-center', width: '180px' }, + { title: '实际承运人名称', index: 'carrierName', className: 'text-center', width: '150px' }, + { title: '实际承运人证件号码', index: 'carrierIdentityNo', className: 'text-center', width: '200px' }, + { title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '车辆轨迹', render: 'car', className: 'text-center', width: '250px' }, { title: '司机轨迹', render: 'driver', className: 'text-center', width: '150px' }, - { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' }, - { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '上传次数', index: 'putNumber', className: 'text-center', width: '150px' }, + { title: '上传时间', index: 'recentlyPutTime', className: 'text-center', width: '180px' }, ]; } @@ -455,5 +479,18 @@ export class DatatableOrderReportingComponent implements OnInit { }) } + filterStatus(status: string) { + switch (status) { + case '0': + return '校验中'; + case '1': + return '通过'; + case '2': + return '不通过'; + default: + return ''; + + } + } } diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html index 8d3df409..f66d4313 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html @@ -5,7 +5,7 @@
- diff --git a/src/app/routes/datatable/reporting/services/reporting.service.ts b/src/app/routes/datatable/reporting/services/reporting.service.ts index ff73672a..4f0ebcd3 100644 --- a/src/app/routes/datatable/reporting/services/reporting.service.ts +++ b/src/app/routes/datatable/reporting/services/reporting.service.ts @@ -6,7 +6,7 @@ import { BaseService } from '@shared'; }) export class ReportingService extends BaseService { - $api_get_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 + $api_get_order_reporting_page = `/api/sdc/regulation/list/page`; // 订单上报列表 $api_recall_reporting = ``; // 撤回 $api_async_export_order_reporting_list = ``; // 导出订单上报 $api_get_upload_setting = ``; // 修改上传设置 @@ -16,6 +16,8 @@ export class ReportingService extends BaseService { $api_fund_reporting_upload = `/api/fcc/fundUploadHead/uploadFundNumber`; // 资金批量上传 $api_fund_reporting_recall = `/api/fcc/fundUploadHead/recallUploadFundNumber`; //资金批量撤回 $api_get_fund_valid_result = `/api/fcc/capitalFieldCheck/getCapitalFieldCheckList`; // 查询资金校验表 + + constructor(public injector: Injector) { super(injector); }