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

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.
 -->
@@ -224,6 +224,7 @@
 <nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
   <nz-tabset>
     <nz-tab nzTitle="风险异常检测">
+     <div  *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
       <div>
         您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
       </div>
@@ -231,8 +232,8 @@
       <ul *ngFor="let item of abnormalList">
         <li>系统识别:{{item?.complianceTypeName}}</li>
         <li>{{item?.determineDetails}}，您可在企业端提交申诉材料或联系客服。</li>
-        <li>2021-11-07 03:20:15</li>
       </ul>
+     </div>
     </nz-tab>
     <nz-tab nzTitle="异常预警">
       <st #st [data]="service.$api_get_order_abnormalWarning" [columns]="logColumns3"

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.
  */
@@ -68,6 +68,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
   trajectory = 'car';
   mapList: any[] = []; //地图点位数据组
   addressItems: any[] = []; //打点地址数据组
+  warringList: any[] = []; //打点地址数据组
   constructor(
     public route: ActivatedRoute,
     private msgSrv: NzMessageService,
@@ -120,6 +121,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
       if (res) {
         console.log('异常预警');
         console.log(res);
+        this.warringList = res
       }
     });
   }

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 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.
 -->
@@ -229,16 +229,17 @@
     </ng-template>
   </div>
 </nz-card>
-<nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
+<nz-card >
   <nz-tabset>
     <nz-tab nzTitle="风险异常检测">
+      <div  *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
       <div> 您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您! </div>
       <div>如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈</div>
       <ul *ngFor="let item of abnormalList">
         <li>系统识别:{{ item?.complianceTypeName }}</li>
         <li>{{ item?.determineDetails }}，您可在企业端提交申诉材料或联系客服。</li>
-        <li>2021-11-07 03:20:15</li>
       </ul>
+      </div>
     </nz-tab>
     <nz-tab nzTitle="异常预警">
       <st #st [data]="service.$api_get_order_abnormalWarning" [columns]="logColumns3"

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: [],
@@ -114,6 +115,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
       if (res) {
         console.log('异常预警');
         console.log(res);
+        this.warringList = res
       }
     });
   }

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);
+        });
+      }
+    });
+  }
 }

src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html

@@ -8,7 +8,7 @@
 
 <nz-card class="statistics-box">
   <div nz-row nzGutter="8">
-    <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
+    <div nz-col [nzXl]="12" [nzLg]="12" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
       <se label="销售方">
         {{ headerInfo?.ltdName }}
       </se>
@@ -34,7 +34,7 @@
         {{ headerInfo?.remarks }}
       </se>
     </div>
-    <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
+    <div nz-col [nzXl]="12" [nzLg]="12" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
       <se label="购买方">
         {{ headerInfo?.artoname }}
       </se>
@@ -57,7 +57,7 @@
         {{headerInfo?.otherremarks || '-'}}
       </se>
     </div>
-    <div *ngIf="isCanEdit && selectedIndex===2" nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" class="text-right">
+    <div *ngIf="isCanEdit && selectedIndex===2" nz-col [nzXl]="12" [nzLg]="12" [nzSm]="8" [nzXs]="8" class="text-right">
       <ng-container *ngIf="isEdit; else elseTemplate">
         <button nz-button (click)="isEdit = false; invoiceST?.load(1)">取消</button>
         <button nz-button nzType="primary" (click)="saveInvoices()">保 存</button>

src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html

@@ -8,13 +8,12 @@
 
 <nz-card class="statistics-box">
     <div nz-row nzGutter="8">
-        <div nz-col [nzXl]="8" [nzLg]="12" nzMd="12" [nzSm]="24" [nzXs]="24" se-container [labelWidth]="150" col="1">
+        <div nz-col [nzXl]="8" [nzLg]="12" [nzMd]="12" [nzSm]="24" [nzXs]="24" se-container [labelWidth]="150" col="1">
-            <se label="网络货运人">
+         
+            <se label="网络货运人" [labelWidth]="133">
                 {{headerInfo?.ltdidName}}
             </se>
-            <se label="申请编号">
+          
-                {{headerInfo?.vatappcode}}
-            </se>
             <se label="已开/全部订单数">
                 {{headerInfo?.vatinvHNum}} / {{headerInfo?.vatinvBillNum}}
             </se>
@@ -31,13 +30,16 @@
                 {{headerInfo?.provinceName}}{{headerInfo?.cityName}}{{headerInfo?.areaName}}{{headerInfo?.reciaddr}}
             </se>
         </div>
-        <div nz-col [nzXl]="8" [nzLg]="12" nzMd="12" [nzSm]="24" [nzXs]="24" se-container [labelWidth]="100" col="1">
+        <div nz-col [nzXl]="8" [nzLg]="12" [nzMd]="12" [nzSm]="24" [nzXs]="24" se-container [labelWidth]="100" col="1">
             <se label="购买方">
                 {{headerInfo?.artoName}}
             </se>
             <se label="纳税号">
                 {{headerInfo?.taxNumber}}
             </se>
+            <se label="申请编号">
+                {{headerInfo?.vatappcode}}
+            </se>
             <se label="地址">
                 {{headerInfo?.registerAddr}}
             </se>