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

src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts

@@ -331,6 +331,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
       { title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
       { title: '关联运单号', index: 'wayBillCode', width: '220px', className: 'text-left' },
       { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
+      { title: '服务类型', index: 'serviceTypeLabel', width: '180px', className: 'text-left' },
       { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
       {
         title: '卸货地',

src/app/routes/order-management/components/risk/risk.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-23 19:45:45
+ * @LastEditTime : 2022-03-24 09:39:49
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -65,7 +65,14 @@
       [loading]="false"
     >
       <ng-template st-row="billCode" let-item let-index="index">
-        <a [routerLink]="'/order-management/risk-detail/' + item.id">{{ item?.billCode }}</a>
+        <a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a>
+        <a *ngIf="item.billType == '2'"  [routerLink]="'/order-management/bulk/bulk-detail/' + item.id">{{ item.billCode }}</a>
+        <div>
+          <span>{{ item?.representationsStatusLabel }}</span>
+        </div>
+        <div>
+          <span >{{item?.billTypeLabel}}{{item?.serviceTypeLabel}}</span>
+        </div>
       </ng-template>
       <ng-template st-row="timeer" let-item let-index="index">
         <p>创建时间：{{ item?.createTime }}</p>