From 5c9ba7b7f195a27fd2625353a00007abfc6dbc5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 8 Apr 2022 13:34:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B5=84=E9=87=91=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fund-info/fund-info.component.html | 6 +- .../fund-info/fund-info.component.ts | 20 ++++- .../fund-reporting.component.ts | 4 +- .../order-reporting.component.html | 19 ++--- .../order-reporting.component.ts | 15 ++-- .../verify-result.component.html | 12 ++- .../verify-result/verify-result.component.ts | 79 +++++++++++++------ .../reporting/services/reporting.service.ts | 4 +- 8 files changed, 100 insertions(+), 59 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 4714651b..b8bbd698 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 @@ -3,10 +3,8 @@ - -
-
{{item.expenseName}}:{{item.price | currency}}
-
+ + {{filterCheckStatus(item?.checkStatus)}} 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 eed6adc2..ed3f6b4e 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 @@ -51,16 +51,17 @@ export class DatatableReportingFundInfoComponent implements OnInit { width: '10%', type: 'enum', enum: { - '0': '非必填', - '1': '必填', + 0: '否', + 1: '是', }, }, { title: '上传值', index: 'fieldValue', className: 'text-center', width: '15%', }, { title: '本地校验', - index: 'checkStatus', + render: 'checkStatus', className: 'text-center', type: 'enum', + enum: { '0': '校验中', '1': '通过', @@ -97,6 +98,19 @@ export class DatatableReportingFundInfoComponent implements OnInit { this.modalRef.destroy(); } + filterCheckStatus(status: number) { + switch (status) { + case 0: + return '校验中'; + case 1: + return '通过'; + case 2: + return '不通过'; + default: + return ''; + + } + } } 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 e7bdf47b..c62fca11 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 @@ -116,7 +116,7 @@ export class DatatableFundReportingComponent implements OnInit { title: '承运司机', type: 'string', ui: { - placeholder: '请输入司机姓名/手机号', visibleIf: { + placeholder: '请输入司机姓名', visibleIf: { _$expand: (value: boolean) => value, }, } @@ -169,7 +169,7 @@ export class DatatableFundReportingComponent implements OnInit { }, } }, - enterpriseInfoId: { + ltdId: { title: '网络货运人', type: 'string', ui: { 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 8b14bd1c..1d8a4f94 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 @@ -31,24 +31,25 @@ [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading" (change)="changeSt($event)"> - {{filterStatus(item?.orderCheckStatus)}} - {{filterStatus(item?.orderCheckStatus)}} + {{filterStatus(item?.orderCheckStatus)}} + {{filterStatus(item?.orderCheckStatus)}} {{filterStatus(item?.driverCheckStatus)}} - {{filterStatus(item?.driverCheckStatus)}} + *ngIf="item?.driverCheckStatus === 2">{{filterStatus(item?.driverCheckStatus)}} + {{filterStatus(item?.driverCheckStatus)}} - {{filterStatus(item?.carCheckStatus)}} - {{filterStatus(item?.carCheckStatus)}} + {{filterStatus(item?.carCheckStatus)}} + {{filterStatus(item?.carCheckStatus)}} - {{filterCheckStatus(item?.checkStatus)}} - {{filterCheckStatus(item?.checkStatus)}} + {{filterCheckStatus(item?.checkStatus)}} + {{filterCheckStatus(item?.checkStatus)}} + {{item?.billCode}} 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 77b16932..b3ad4682 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 @@ -29,8 +29,7 @@ export class DatatableOrderReportingComponent implements OnInit { { name: '异常', value: '4' }, { name: '全部', value: '' } ]; - selectedIndex = ''; //选择的项目 - serviceTel = ''; + selectedIndex = '1'; isLoading: boolean = false; selectedRows: any[] = []; constructor( @@ -54,7 +53,7 @@ export class DatatableOrderReportingComponent implements OnInit { */ get reqParams() { const params = Object.assign({}, this.sf?.value || {}, { - representationsStatus: this.selectedIndex, + putStatus: this.selectedIndex, }); delete params._$expand; return { ...params }; @@ -407,7 +406,7 @@ export class DatatableOrderReportingComponent implements OnInit { } selectChange(item: any) { - this.selectedIndex = item?.representationsStatus || ''; + this.selectedIndex = item?.value || ''; setTimeout(() => { this.selectedRows = []; this.st.load(1); @@ -555,7 +554,7 @@ export class DatatableOrderReportingComponent implements OnInit { return; } const ids = this.selectedRows.map(i => i?.id); - this.service.request(this.service.$api_update_fund_data, ids).subscribe(res => { + this.service.request(this.service.$api_update_order_data, ids).subscribe(res => { if (res) { this.selectedRows = []; this.st.reload(); @@ -567,11 +566,11 @@ export class DatatableOrderReportingComponent implements OnInit { filterStatus(status: number) { switch (status) { case 0: - return '校验中'; + return '待上传'; case 1: - return '通过'; + return '已上传'; case 2: - return '不通过'; + 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 f66d4313..033b9584 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,14 +5,12 @@
- - -
-
{{item.expenseName}}:{{item.price | currency}}
-
+ [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false,showSize:false}" + [loading]="false" [bordered]="true"> + + {{filterCheckStatus(item?.checkStatus)}}
diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts index 3d52b397..ac8b8350 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts @@ -1,8 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STColumn, STComponent } from '@delon/abc/st'; -import { SFSchema } from '@delon/form'; -import { ModalHelper, _HttpClient } from '@delon/theme'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { ReportingService } from '../../services/reporting.service'; @@ -11,26 +9,22 @@ import { ReportingService } from '../../services/reporting.service'; templateUrl: './verify-result.component.html', }) export class DatatableReportingVerifyResultComponent implements OnInit { - url = `/user`; - searchSchema: SFSchema = { - properties: { - no: { - type: 'string', - title: '编号' - } - } - }; @ViewChild('st') private readonly st!: STComponent; columns: STColumn[] = []; - record: any = {} - tabs: any[] = [ - { name: '订单信息', value: '1' }, - { name: '司机信息', value: '2' }, - { name: '车辆信息', value: '3' }, - ]; + record: any = {}; + tabs: any[] = [ + { name: '订单信息', value: 3 }, + { name: '司机信息', value: 2 }, + { name: '车辆信息', value: 4 }, + ]; + subjectType = 3; + subjectId = ''; get reqParams() { - return {}; + return { + subjectType: this.subjectType, + subjectId: this.record?.id + }; } constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) { @@ -46,13 +40,31 @@ export class DatatableReportingVerifyResultComponent 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: 'thirdPartyFieldName', className: 'text-center', width: '120px', }, + { title: '系统字段', index: 'checkFieldName', 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: 'orderStatus', className: 'text-center', width: '100px', }, - { title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', }, + { + 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', }, ] } @@ -64,7 +76,10 @@ export class DatatableReportingVerifyResultComponent implements OnInit { } selectTab(e: any) { - + setTimeout(() => { + this.subjectType = e?.value; + this.st.load(1); + }) } update() { @@ -77,9 +92,23 @@ export class DatatableReportingVerifyResultComponent implements OnInit { } + + close(): void { this.modalRef.destroy(); } + filterCheckStatus(status: number) { + switch (status) { + case 0: + return '校验中'; + case 1: + return '通过'; + case 2: + return '不通过'; + default: + return ''; + } + } } diff --git a/src/app/routes/datatable/reporting/services/reporting.service.ts b/src/app/routes/datatable/reporting/services/reporting.service.ts index 155de748..f4216c85 100644 --- a/src/app/routes/datatable/reporting/services/reporting.service.ts +++ b/src/app/routes/datatable/reporting/services/reporting.service.ts @@ -6,12 +6,14 @@ import { BaseService } from '@shared'; }) export class ReportingService extends BaseService { - $api_get_order_reporting_page = `/api/sdc/regulation/list/queryPage`; // 订单上报列表 + $api_get_order_reporting_page = `/api/sdc/regulation/list/queryPage`; // 订单上报-列表 $api_upload_order_reporting = `/api/sdc/regulation/push`; // 上传订单上报 $api_recall_order_reporting = `/api/sdc/regulation/withdraw`; // 撤回上传订单上报 $api_async_export_order_reporting_list = ``; // 导出订单上报 $api_get_upload_setting = `/api/sdc/regulation/getPushConfig`; // 获取上传设置 $api_upload_setting_save = `/api/sdc/regulation/setPushConfig`; // 保存上传设置 + $api_get_order_valid_result = `/api/sdc/regulation/queryPage/checkRes`;//订单上报-校验结果 + $api_update_order_data = `/api/sdc/regulation/renewalOrderById`;//订单批量更新订单数据 $api_get_fund_reporting_page = `/api/fcc/fundUploadHead/list/page`; // 资金上报列表 $api_fund_reporting_upload = `/api/fcc/fundUploadHead/uploadFundNumber`; // 资金批量上传 From 3cdd46cdced79935724accbdf5753e2fc4d246dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 8 Apr 2022 13:46:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fund-reporting.component.ts | 23 +++++++++++++------ .../order-reporting.component.ts | 3 +++ 2 files changed, 19 insertions(+), 7 deletions(-) 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 c62fca11..fa7ecd77 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 @@ -146,11 +146,16 @@ export class DatatableFundReportingComponent implements OnInit { uploadStatus: { title: '上传状态', type: 'string', + default: 0, + enum: [ + { label: '待上传', value: 0 }, + { label: '已上传', value: 1 }, + { label: '异常', value: 2 } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, + widget: 'select', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value, }, @@ -159,11 +164,15 @@ export class DatatableFundReportingComponent implements OnInit { verifyStatus: { title: '本地校验', type: 'string', + enum: [ + { label: '校验中', value: 0 }, + { label: '通过', value: 1 }, + { label: '不通过', value: 2 } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, + allowClear: true, + widget: 'select', visibleIf: { _$expand: (value: boolean) => value, }, @@ -242,7 +251,7 @@ export class DatatableFundReportingComponent implements OnInit { { title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' }, { title: '总金额', render: 'tolalAmount', className: 'text-center', width: '120px' }, - { title: '付款方式', index: 'payTypeLabel', className: 'text-center', width: '150px' }, + { title: '付款方式', index: 'payType', className: 'text-center', width: '150px' }, { title: '车队长', index: 'payee', className: 'text-center', width: '150px' }, { title: '收款账户', index: 'collectionAccount', className: 'text-center', width: '180px' }, 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 b3ad4682..e10847f0 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 @@ -149,6 +149,7 @@ export class DatatableOrderReportingComponent implements OnInit { putStatus: { title: '上传状态', type: 'string', + default: 0, enum: [ { label: '待上传', value: 0 }, { label: '已上传', value: 1 }, @@ -158,6 +159,7 @@ export class DatatableOrderReportingComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value, }, @@ -174,6 +176,7 @@ export class DatatableOrderReportingComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value, }, From 7b1728622262c5dcb28037177d85e91c5005f4df Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 8 Apr 2022 13:48:52 +0800 Subject: [PATCH 3/4] fix bug --- .../components/busitable/busiindex/busiindex.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts index 1dbf859b..6a27ee0b 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts @@ -37,7 +37,9 @@ export class DatatableBusiindexComponent implements OnInit { { title: '客户预存款', index: 'czcgje', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.czcgje }) } }, { title: '业绩量', index: 'yisje', className: 'text-center' }, { title: '已收附加费', index: 'yisfjf', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yisfjf }) } }, - { title: '平均附加费率', index: 'fjfl', className: 'text-center' }, + { title: '平均附加费率', index: 'fjfl', className: 'text-center',format: (item)=> { + return item.fjfl + '%' + } }, { title: '已开票金额', index: 'ykpje', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ykpje }) } }, ]; /** From 50beff0bbb1f912b08042ffc7d56a401f1a3d08b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 8 Apr 2022 13:51:50 +0800 Subject: [PATCH 4/4] fix bug --- .../components/risk/risk.component.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/app/routes/order-management/components/risk/risk.component.html b/src/app/routes/order-management/components/risk/risk.component.html index c7ff2549..9f81f0fe 100644 --- a/src/app/routes/order-management/components/risk/risk.component.html +++ b/src/app/routes/order-management/components/risk/risk.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-01 11:02:21 + * @LastEditTime : 2022-04-08 13:51:12 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -86,8 +86,12 @@
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : ''}}
- -
{{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : '' }}
+ +
+
{{item.payeeName}}
+
{{item.payeePhone}}
+
+
-