From b2c41c13b552b28824efec3d95c73ca80e9e8a52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Wed, 13 Apr 2022 10:46:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=9D=E7=A6=81=E5=93=81=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bulk-publish/bulk-publish.component.ts       | 6 +++++-
 .../components/onecar-publish/onecar-publish.component.ts   | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
index abcbe7da..733bddf3 100644
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
@@ -1145,7 +1145,11 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
     });
   }
   checkGoodsName() {
-    this.service.request(this.service.$api_checkGoodsName, this.sf3.value.goodsName1).subscribe(res => {
+    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: '货物名称含有违禁词，请重新输入！',
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
index c10c6566..9795724f 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
@@ -1469,7 +1469,11 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
   }
 
   checkGoodsName() {
-    this.service.request(this.service.$api_checkGoodsName, this.sf3.value.goodsName1).subscribe(res => {
+    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: '货物名称含有违禁词，请重新输入！',

From aebaf7c724ffe28bf65c27e3efdb829053a53b49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Wed, 13 Apr 2022 10:49:59 +0800
Subject: [PATCH 2/2] -

---
 .../components/fund-reporting/fund-reporting.component.ts     | 2 +-
 .../components/order-reporting/order-reporting.component.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 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 8e443762..fa6f9e4d 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
@@ -163,7 +163,7 @@ export class DatatableFundReportingComponent implements OnInit {
           title: '本地校验',
           type: 'string',
           enum: [
-            { label: '校验中', value: '0' },
+            { label: '检测中', value: '0' },
             { label: '通过', value: '1' },
             { label: '不通过', value: '2' }
           ],
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 0de0aa39..07a03859 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
@@ -169,7 +169,7 @@ export class DatatableOrderReportingComponent implements OnInit {
           title: '本地校验',
           type: 'string',
           enum: [
-            { label: '校验中', value: 0 },
+            { label: '检测中', value: 0 },
             { label: '通过', value: 1 },
             { label: '不通过', value: 2 }
           ],
@@ -583,7 +583,7 @@ export class DatatableOrderReportingComponent implements OnInit {
   filterCheckStatus(status: number) {
     switch (status) {
       case 0:
-        return '校验中';
+        return '检测中';
       case 1:
         return '通过';
       case 2: