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

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html

@@ -46,7 +46,7 @@
     </ng-template>
 
     <ng-template st-row="checkStatus" let-item let-index="index">
-      <a *ngIf="item?.checkStatus === 2" (click)="viewResult(item)">{{filterCheckStatus(item?.checkStatus)}}</a>
+      <a (click)="viewResult(item)">{{filterCheckStatus(item?.checkStatus)}}</a>
       <span *ngIf="item?.checkStatus !== 2">{{filterCheckStatus(item?.checkStatus)}}</span>
     </ng-template>
 

src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html

@@ -7,8 +7,8 @@
   <div style="width: 90%;">
     <st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_order_valid_result" [columns]="columns"
       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false,showSize:false}"
+      [res]="{ reName: { list: 'data', total: 'data.total' } }" [page]="{ show: false,showSize:false}" [loading]="false"
-      [loading]="false" [bordered]="true">
+      [bordered]="true">
       <ng-template st-row="checkStatus" let-item>
         <span [ngClass]="{'text-red-dark':item?.checkStatus === 2}">{{filterCheckStatus(item?.checkStatus)}}</span>
       </ng-template>

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 11:42:40
+ * @LastEditTime : 2022-04-08 14:06:21
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -225,7 +225,6 @@
 <nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
   <nz-tabset >
     <nz-tab nzTitle="风险异常检测">
-      <button nz-button nzType="primary"[disabled]="">申 诉</button>
       <div>
         您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
       </div>

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-06 15:39:20
+ * @LastEditTime : 2022-04-08 14:06:27
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -249,7 +249,6 @@
 <nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
   <nz-tabset>
     <nz-tab nzTitle="风险异常检测">
-      <button nz-button nzType="primary" [disabled]="">申 诉</button>
       <div> 您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您! </div>
       <div>如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈</div>
       <ul *ngFor="let item of abnormalList">

src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html

@@ -1,4 +1,14 @@
 <!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-23 14:24:05
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-08 14:04:13
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\confir-receipt\\confir-receipt.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
+货物单价<!--
  * @Description  : 
  * @Version      : 1.0
  * @Author       : Shiming
@@ -18,7 +28,7 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误
 <sv-container col="1">
   <sv label="货物单价">
     <span>
-      {{detailList?.goodsInfoVO?.freightPrice}} {{detailList?.goodsInfoVO?.freightTypeLabel}}
+      {{detailList?.freightPrice}} {{detailList?.freightTypeLabel}}
      </span>
   </sv>
   <sv label="结算依据">