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

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-21 15:09:10
+ * @LastEditTime : 2022-03-22 09:42:03
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -92,7 +92,7 @@
         <div *ngFor="let i of item?.goodsInfoVOList">
           <p>货物名称：{{ i?.goodsName }}</p>
           <p>重量/体积：{{ i?.weight }}吨/{{ i?.volume }}方</p>
-          <p>车型/车长：{{ i?.carModel }}/ {{ i?.carLength }}</p>
+          <p>车型/车长：{{ i?.carModelLabel }}/ {{ i?.carLengthLabel }}</p>
         </div>
       </ng-template>
     </st>

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

@@ -279,7 +279,7 @@ export class OrderManagementRiskComponent implements OnInit {
       {
         title: '货物信息',
         className: 'text-left',
-        width: '200px',
+        width: '250px',
         render: 'goodsInfoVOList'
       },
       {