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/order-management/components/complaint-detail/complaint-detail.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-04 17:29:18
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-29 16:26:09
+ * @LastEditTime : 2022-04-13 10:50:02
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint-detail\\complaint-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -24,8 +24,12 @@
   <h2>投诉单号：{{datailList?.complaintCode}}</h2>
   <sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" *ngIf="schema" [formData]="datailList">
     <ng-template sf-template="imgUrls" let-schema="schema" let-item let-ui="ui">
-      <app-imagelist [imgList]="datailList?.imgUrls"></app-imagelist>
+     <!-- <app-imagelist [imgList]="datailList?.imgUrls"></app-imagelist> -->
+
+    <img nz-image width="100px" height="100%" *ngFor="let item of datailList?.imgUrls" [nzSrc]="item"
+    style="margin:0 10px 0 0" alt="" />
     </ng-template>
+
   </sf>
 </nz-card>
 

src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html

@@ -124,7 +124,7 @@
       <div nz-row>
         <div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24">
           <div>
-            <p class="text-warning-light mb-xs text-right">到货后{{ i?.paymentDays }}天内支付运费</p>
+            <p class="text-warning-light mb-xs text-right">收货后{{ i?.paymentDays }}天内支付运费</p>
             <p class="mb-xs text-right"> {{ settlementBasis[item?.settlementBasis] }}，{{ rule[item?.rule] }}</p>
           </div>
           <nz-divider class="mb-xs mt-xs"></nz-divider>

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