From 691567904be96d28d2949797b51dae3aaade4c1f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 3 Mar 2022 15:36:54 +0800 Subject: [PATCH 01/12] fix bug --- .../components/driver/detail/detail.component.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html index f4e3885c..07687f6e 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.html +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html @@ -95,9 +95,12 @@ [nzBorderless]="!isEditUser" [placeholder]="isEditUser?'':'-'"> - - + --> + + - From df1bcf46548b6c38ed043b47892222205a869008 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 3 Mar 2022 15:45:44 +0800 Subject: [PATCH 02/12] fix bug --- .../driver/detail/detail.component.html | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html index 07687f6e..53d25019 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.html +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html @@ -95,9 +95,6 @@ [nzBorderless]="!isEditUser" [placeholder]="isEditUser?'':'-'"> - @@ -218,25 +215,7 @@ - - - - - - - - - - - - - - + @@ -248,6 +227,24 @@ {{licenseDetail?.regionCodeName }} + + + + - + + + + + + + + + + + From 2296944130a7beec3c5f917143e3241669a310c8 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 3 Mar 2022 16:02:27 +0800 Subject: [PATCH 03/12] fix bug --- .../tran-agreement/tran-agreement.component.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html index 025765ab..3d17366e 100644 --- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html +++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html @@ -1,6 +1,9 @@ -

+ + +
+
\ No newline at end of file From ad9ee653df39f343ba3273aaf98518fa6dcaa214 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 3 Mar 2022 16:33:01 +0800 Subject: [PATCH 04/12] fix bug --- .../components/tran-agreement/tran-agreement.component.html | 3 --- .../supply-management/components/vehicle/vehicle.component.ts | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html index 3d17366e..bbe21f8f 100644 --- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html +++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.html @@ -1,6 +1,3 @@ -
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 d3c00b09..b5ac320a 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -549,10 +549,9 @@ export class SupplyManagementVehicleComponent implements OnInit { }, { title: '创建时间', - width: '170px', + width: '200px', index: 'createTime', className: 'text-left', - type: 'date' }, { title: '审核状态', From 46227ebd480ba8d3b0e24e948aa182970cf564d0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 3 Mar 2022 16:34:33 +0800 Subject: [PATCH 05/12] fix bug --- .../components/vehicle/vehicle.component.html | 4 ++-- 1 file changed, 2 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 7baaf88d..752c19a3 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-03-01 13:12:12 + * @LastEditTime : 2022-03-03 16:34:12 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -90,7 +90,7 @@
车型: {{ item?.carModelLabel }}
-
车长: {{ item?.expand }} 米
+
车长: {{ item?.carLenghtLabel }} 米
 From 2d7f75d90c60c4d68ef799c3dab7297f7240b4b8 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 09:34:35 +0800 Subject: [PATCH 06/12] fix bug --- .../confir-receipt/confir-receipt.component.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html index b1289919..8022eb52 100644 --- a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-14 15:02:52 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 13:43:55 + * @LastEditTime : 2022-03-04 09:34:13 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\confir-receipt\\confir-receipt.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -34,18 +34,18 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误 -
{{detailList?.goodsInfoVO?.weight}}吨
+
{{ detailList?.acceptWeight }}吨
 -
{{detailList?.goodsInfoVO?.volume}}方
+
{{ detailList?.acceptVolume }}方
 - + -
{{detailList?.goodsInfoVO?.volume}}吨
+
{{ detailList?.settlementWeight }}吨
 -
{{detailList?.settlementVolume}}方
+
{{ detailList?.settlementVolume }}方
 From 43a9d48930e32d484d9a9ebd8d6a482685c06b9b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 09:38:49 +0800 Subject: [PATCH 07/12] fix bug --- .../modal/bulk/confir-receipt/confir-receipt.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html index 8022eb52..bd2b7f0e 100644 --- a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-14 15:02:52 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 09:34:13 + * @LastEditTime : 2022-03-04 09:38:45 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\confir-receipt\\confir-receipt.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -34,10 +34,10 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误 -
{{ detailList?.acceptWeight }}吨
+
{{ detailList?.loadWeight }}吨
 -
{{ detailList?.acceptVolume }}方
+
{{ detailList?.loadVolume }}方
 From 1f806432d109767ab19b687f7ddd596d4ad9804a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 09:47:58 +0800 Subject: [PATCH 08/12] fix bug --- .../vehicle/sure-arrive/sure-arrive.component.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts index e0e8f6e3..eee67218 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts +++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts @@ -422,7 +422,10 @@ export class VehicleSureArriveComponent implements OnInit { }; } save(value: any): void { + console.log('444'); if(this.Status === 1) { + console.log('555'); + if(!value.time) { this.service.msgSrv.warning('必填项为空！') return; @@ -449,11 +452,11 @@ export class VehicleSureArriveComponent implements OnInit { console.log(this.i) const params = { id: this.i?.id, - imgUrl1: value.imgUrl1.data.fullFilePath, - imgUrl2: value.imgUrl2.data.fullFilePath, - time: value.time, - volume: this.data.volume, - weight: this.data.weight + imgUrl1: value?.imgUrl1?.data?.fullFilePath, + imgUrl2: value?.imgUrl2?.data?.fullFilePath, + time: value?.time, + volume: this.data?.volume, + weight: this.data?.weight } params.time = this.datePipe.transform(value.time, 'yyyy-MM-dd HH:mm:ss ') console.log(params) From 3274d6b5b089e7c91d680a7eb348d34aad826d29 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 09:48:16 +0800 Subject: [PATCH 09/12] fix bug --- .../modal/vehicle/sure-arrive/sure-arrive.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html index 47ab667b..16cdb712 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html +++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:23:52 + * @LastEditTime : 2022-03-04 09:48:12 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\sure-arrive\\sure-arrive.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -12,13 +12,13 @@
- +
吨
- +
方
 From a44a4412037f7fe29de6d47e78757daf7b5b7968 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 09:57:44 +0800 Subject: [PATCH 10/12] fix bug --- .../components/vehicle/vehicle.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 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 752c19a3..34c8614b 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-03-03 16:34:12 + * @LastEditTime : 2022-03-04 09:57:16 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -80,10 +80,10 @@

{{ item?.resourceStatusLabel }}

-
{{ item?.totalAmount + item?.surcharge | currency }}
+
{{ item?.totalAmount | currency }}
-
{{ item?.totalAmount | currency }}
+
{{ item?.freight | currency }}
{{ item?.surcharge | currency }}
From 82dc8255c105baa69ff6ad113ea80987e63b0649 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 10:00:04 +0800 Subject: [PATCH 11/12] fix bug --- .../components/vehicle-detail/vehicle-detail.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index 28c6636e..0d9643ed 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -159,10 +159,10 @@ {{ i?.insuranceTypeLabel }} - + {{ i?.goodsValue | currency }} - {{ i?.insurancePremium | currency }} 元 + {{ i?.insurancePremium | currency }} 元 From ff9a59a759ea0ba979d3d6c50cd2bc50dc7d276e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 4 Mar 2022 10:04:21 +0800 Subject: [PATCH 12/12] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 3fa12800..2380b6c0 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 11:14:37 + * @LastEditTime : 2022-03-04 10:04:11 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -135,7 +135,7 @@ -

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）

+

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）

到付