From 402bb51a417144c0ebaaaae8aebb9f31c39c9cc0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 15:57:02 +0800 Subject: [PATCH 1/3] fix bug --- .../bulk-detail/bulk-detail.component.html | 9 +++++---- .../bulk-detail/bulk-detail.component.ts | 4 +++- .../vehicle-detail.component.html | 9 +++++---- .../vehicle-detail.component.ts | 4 +++- .../release-publish.component.ts | 20 +++++++++++++++++++ 5 files changed, 36 insertions(+), 10 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 3380fdbe..d20c201a 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-04-08 14:06:21 + * @LastEditTime : 2022-04-13 15:56:56 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -222,9 +222,10 @@ - + +
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
@@ -232,11 +233,11 @@
  • 系统识别:{{item?.complianceTypeName}}
  • {{item?.determineDetails}}，您可在企业端提交申诉材料或联系客服。
    • -
  • 2021-11-07 03:20:15
+
- + diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 86260c56..b37b16ff 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-11 22:31:18 + * @LastEditTime : 2022-04-13 15:53:43 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -64,6 +64,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { trajectory = 'car'; mapList: any[] = []; //地图点位数据组 addressItems: any[] = []; //打点地址数据组 + warringList: any[] = []; //打点地址数据组 constructor( public route: ActivatedRoute, private msgSrv: NzMessageService, @@ -116,6 +117,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { if (res) { console.log('异常预警'); console.log(res); + this.warringList = res } }); } diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index f9519e6c..73e04d2a 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-08 14:06:27 + * @LastEditTime : 2022-04-13 15:56:55 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -246,19 +246,20 @@ - + +
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
  • 系统识别:{{ item?.complianceTypeName }}
  • {{ item?.determineDetails }}，您可在企业端提交申诉材料或联系客服。
    • -
  • 2021-11-07 03:20:15
+
- + diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index db239095..ea0423ce 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-06 15:12:10 + * @LastEditTime : 2022-04-13 15:55:47 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -29,6 +29,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { mapList: any[] = []; //地图点位数据组 pois: any[] = []; addressItems: any[] = []; //打点地址数据组 + warringList: any[] = []; //打点地址数据组 abnormalList: any[] = []; i: any = { unLoadingPlaceList: [], @@ -108,6 +109,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { if (res) { console.log('异常预警'); console.log(res); + this.warringList = res } }); } diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index 5eb7ad4a..6683e303 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -309,6 +309,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit { errors: { required: '请填写货物名称' }, visibleIf: { goodsTypeName: (value: any) => value && value === '其它' + }, + blur: (value: any) => { + this.checkGoodsName(); } } } @@ -1237,4 +1240,21 @@ export class SupplyManagementReleasePublishComponent implements OnInit { } this.payChange(); } + + checkGoodsName() { + const name = this.sf3.getValue('/goodsName1'); + if (!name || name.trim().length === 0) { + return; + } + this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { + if (res === false) { + const modalRef = this.modalService.error({ + nzTitle: '货物名称含有违禁词，请重新输入！', + }); + modalRef.afterClose.subscribe(result => { + // this.sf3.setValue('/goodsName1', null); + }); + } + }); + } } From e8bc79ff9f1be6da49a9778b7cfd10eb868c89c2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 17:53:40 +0800 Subject: [PATCH 2/3] fix bug --- .../invoice-detail/invoice-detail.component.html | 6 +++--- .../invoice-requested-detail.component.html | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html index 578086fb..9f09fdbf 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html @@ -8,7 +8,7 @@
-
+
{{ headerInfo?.ltdName }} @@ -34,7 +34,7 @@ {{ headerInfo?.remarks }}
-
+
{{ headerInfo?.artoname }} @@ -57,7 +57,7 @@ {{headerInfo?.otherremarks || '-'}}
-
+
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html index 65c60264..0d2ad116 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html @@ -8,13 +8,12 @@
-
- +
+ + {{headerInfo?.ltdidName}} - - {{headerInfo?.vatappcode}} - + {{headerInfo?.vatinvHNum}} / {{headerInfo?.vatinvBillNum}} @@ -31,13 +30,16 @@ {{headerInfo?.provinceName}}{{headerInfo?.cityName}}{{headerInfo?.areaName}}{{headerInfo?.reciaddr}}
-
+
{{headerInfo?.artoName}} {{headerInfo?.taxNumber}} + + {{headerInfo?.vatappcode}} + {{headerInfo?.registerAddr}} From 75fc4c9919033dd03819d87cd33f14d83ab2f88b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 13 Apr 2022 17:55:10 +0800 Subject: [PATCH 3/3] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 10 ---------- .../vehicle-detail/vehicle-detail.component.html | 2 +- 2 files changed, 1 insertion(+), 11 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 789d7ca7..eceae53e 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 @@ -221,13 +221,8 @@
-<<<<<<< HEAD - - -======= ->>>>>>> 6a150ee3a3c20c6bb0c0de19a1e105a166194445
@@ -241,14 +236,9 @@
-<<<<<<< HEAD - - -======= ->>>>>>> 6a150ee3a3c20c6bb0c0de19a1e105a166194445 diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index df43a137..658fb561 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 17:54:13 + * @LastEditTime : 2022-04-13 17:54:51 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. -->