From f666675c47029ac155147947621b8966a20a55b9 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Feb 2022 11:19:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/vehicle/vehicle.component.html | 3 ++- .../supply-management/components/vehicle/vehicle.component.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html index 2d93d4c2..0b4f228e 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-02-11 10:30:16 + * @LastEditTime : 2022-02-25 11:18:30 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -65,6 +65,7 @@ [columns]="columns" [req]="{ params: reqParams }" [res]="{ process: afterRes }" + [page]="{ }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '500px' }" > diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 1d192fa2..01744546 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -65,9 +65,10 @@ export class SupplyManagementVehicleComponent implements OnInit { afterRes = (data: any[], rawData?: any) => { return data.map(item => ({ ...item, - disabled: item.auditStatus !== '1' + disabled: item.auditStatus !== '1', })); }; + get selectedRows() { return this.st?.list.filter(item => item.checked) || []; } From 891d346ad19d43a2b5f75d1411391fde6ced0a9c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 25 Feb 2022 13:28:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/risk-detail/risk-detail.component.html | 6 ++++-- .../components/risk/risk.component.html | 7 ++++++- .../order-management/components/risk/risk.component.ts | 2 +- .../onecar-publish/onecar-publish.component.html | 10 ++++++++-- .../onecar-publish/onecar-publish.component.less | 4 ++++ 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/app/routes/order-management/components/risk-detail/risk-detail.component.html b/src/app/routes/order-management/components/risk-detail/risk-detail.component.html index ee52c295..ff434c8d 100644 --- a/src/app/routes/order-management/components/risk-detail/risk-detail.component.html +++ b/src/app/routes/order-management/components/risk-detail/risk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-16 10:19:08 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:19:25 + * @LastEditTime : 2022-02-25 11:38:11 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -32,7 +32,9 @@ {{datailList?.dischargePlace}}
- {{datailList?.abnormalCause}} +
+
{{items.complianceName}}
+
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 2cf84559..56d3fdd6 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-01-18 19:49:23 + * @LastEditTime : 2022-02-25 11:30:51 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -72,6 +72,11 @@

装货时间：{{ item?.loadTime }}

卸货时间：{{ item?.unloadTime }}

+ +
+
{{items.complianceName}}
+
+
{{ item?.driverName }}/{{ item?.driverPhoneNumber }}
diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index cbacbd13..5900d943 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -246,7 +246,7 @@ export class OrderManagementRiskComponent implements OnInit { title: '异常信息', width: '200px', className: 'text-left', - index: 'billComplianceVOS' + render: 'billComplianceVOS' }, { title: '托运人', index: 'shipperName', width: '200px', className: 'text-left' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' }, diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index 6fb0dc32..7ba3b371 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -32,7 +32,10 @@ /> - + @@ -93,7 +96,10 @@ placeholder="请输入卸货地" /> - + + diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less index f6d4bb4f..35b08935 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less @@ -50,3 +50,7 @@ input[type='number']::-webkit-outer-spin-button { margin: 0; -webkit-appearance: none; } +.hides { + margin-left: 10px; + color: aqua; +}