From 9f61585a6720ddf782dd3ce581060f036b3368e6 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 18 Jan 2022 19:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/risk/risk.component.html       | 20 +++++--
 .../components/risk/risk.component.less       | 13 +++++
 .../components/risk/risk.component.ts         | 52 +++++++++----------
 3 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/src/app/routes/order-management/components/risk/risk.component.html b/src/app/routes/order-management/components/risk/risk.component.html
index 647a573c..09b0ff66 100644
--- a/src/app/routes/order-management/components/risk/risk.component.html
+++ b/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-01-18 18:45:48
+ * @LastEditTime : 2022-01-18 19:49:23
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -68,9 +68,21 @@
         <p>装货时间：{{item?.loadTime}}</p>
         <p>卸货时间：{{item?.unloadTime}}</p>
       </ng-template>
-      <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
-        <div *ngFor="let i of item?.billExpenseDetailVOList">
-          <p>{{i?.costName}}：¥{{i?.price}}</p>
+      <ng-template st-row="driverName" let-item let-index="index">
+        <div>
+          {{item?.driverName}}/{{item?.driverPhoneNumber}}
+        </div>
+        </ng-template>
+        <ng-template st-row="payeeName" let-item let-index="index">
+        <div>
+          {{item?.payeeName}}/{{item?.payeePhoneNumber}}
+        </div>
+        </ng-template>
+      <ng-template st-row="freightDetails" let-item let-index="index">
+        <div *ngIf="item.freightDetails.length > 0">
+          <p *ngFor="let data of item.freightDetails">
+            {{ data.expenseName }}：{{ data.price | currency }}
+          </p>
         </div>
       </ng-template>
       <ng-template st-row="goodsInfoVOList" let-item let-index="index">
diff --git a/src/app/routes/order-management/components/risk/risk.component.less b/src/app/routes/order-management/components/risk/risk.component.less
index e69de29b..987664d0 100644
--- a/src/app/routes/order-management/components/risk/risk.component.less
+++ b/src/app/routes/order-management/components/risk/risk.component.less
@@ -0,0 +1,13 @@
+
+    :host {
+        p{
+            margin-bottom: 0
+        }
+        .left_btn {
+             width: 50px;
+            height: 32px; 
+             padding-left: 8px;
+             line-height:32px; 
+             background-color: #d7d7d7;
+        }
+    }
\ No newline at end of file
diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts
index 9fdc752c..da6bb7fd 100644
--- a/src/app/routes/order-management/components/risk/risk.component.ts
+++ b/src/app/routes/order-management/components/risk/risk.component.ts
@@ -225,75 +225,75 @@ export class OrderManagementRiskComponent implements OnInit {
       {
         title: '申诉状态',
         width: '100px',
-        className: 'text-center',
+        className: 'text-left',
         index: 'representationsStatusLabel'
       },
       {
         title: '订单号',
-        width: '100px',
-        className: 'text-center',
+        width: '200px',
+        className: 'text-left',
         render: 'billCode'
       },
       {
         title: '异常信息',
-        width: '100px',
-        className: 'text-center',
+        width: '200px',
+        className: 'text-left',
         index: 'abnormalCause'
       },
-      { title: '托运人', index: 'shipperName', width: '120px', className: 'text-center' },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' },
+      { title: '托运人', index: 'shipperName', width: '200px', className: 'text-left' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
       {
         title: '运费明细',
-        className: 'text-center',
-        width: '120px',
-        render: 'billExpenseDetailVOList'
+        className: 'text-right',
+        width: '200px',
+        render: 'freightDetails'
       },
       {
         title: '服务类型',
-        className: 'text-center',
-        width: '120px',
+        className: 'text-left',
+        width: '100px',
         index: 'serviceTypeLabel'
       },
       {
         title: '装货地',
-        className: 'text-center',
-        width: '180px',
+        className: 'text-left',
+        width: '200px',
         index: 'loadingPlace'
       },
       {
         title: '卸货地',
-        className: 'text-center',
-        width: '180px',
+        className: 'text-left',
+        width: '200px',
         index: 'dischargePlace'
       },
       {
         title: '货物信息',
-        className: 'text-center',
-        width: '180px',
+        className: 'text-left',
+        width: '200px',
         render: 'goodsInfoVOList'
       },
       {
         title: '承运司机',
-        className: 'text-center',
-        width: '120px',
+        className: 'text-left',
+        width: '200px',
         render: 'driverName'
       },
       {
         title: '收款人',
-        className: 'text-center',
-        width: '120px',
+        className: 'text-left',
+        width: '200px',
         render: 'payeeName'
       },
       {
         title: '运输信息',
-        className: 'text-center',
-        width: '120px',
+        className: 'text-left',
+        width: '200px',
         render: 'timeer'
       },
       {
         title: '操作',
         fixed: 'right',
-        width: '200px',
+        width: '90px',
         className: 'text-left',
         buttons: [
           {
@@ -302,7 +302,7 @@ export class OrderManagementRiskComponent implements OnInit {
             iif: item => item.representationsStatus == '1' || item.representationsStatus == '2' ,
           },
           {
-            text: '详情',
+            text: '详情　',
             click: _record => this.viewEvaluate(_record),
           }
         ]