Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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' }
           ],

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:

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: '货物名称含有违禁词，请重新输入！',

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: '货物名称含有违禁词，请重新输入！',