From a92677a5b9d2e1bc7018b768149257463782cc0b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 8 Apr 2022 16:34:32 +0800 Subject: [PATCH] fix bug --- .../abnormal-warning.component.html | 4 +-- .../abnormal-warning.component.ts | 4 ++- .../order-reporting.component.ts | 4 +-- .../verify-result/verify-result.component.ts | 30 +++++++++++++++---- 4 files changed, 31 insertions(+), 11 deletions(-) diff --git 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 index 89c12502..9c9d31eb 100644 --- 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 @@ -
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : '' }}
+
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}
{{ item?.longitude }} diff --git 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 index 68867622..127f3ffb 100644 --- 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' }, diff --git 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 index 3ea3973e..9767948c 100644 --- 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', diff --git 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 index de01a2c0..f82336a2 100644 --- 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', }, ] }