From f8cc73fb5176399dcf1852131b283c9a3fdfa7f1 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 14 Feb 2022 13:32:52 +0800
Subject: [PATCH] fix bug

---
 .../components/list/list.component.html       | 29 +++++++--------
 .../components/list/list.component.ts         | 36 +++++++++----------
 .../vehicle-detail-change.component.html      |  2 +-
 .../insurance-table.component.ts              |  4 +++
 4 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/src/app/routes/insurance-management/components/list/list.component.html b/src/app/routes/insurance-management/components/list/list.component.html
index af0b072e..226346c3 100644
--- a/src/app/routes/insurance-management/components/list/list.component.html
+++ b/src/app/routes/insurance-management/components/list/list.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-10 10:40:17
+ * @LastEditTime : 2022-02-14 13:29:21
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\list\\list.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -60,27 +60,24 @@
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
     [loading]="service.http.loading"
     >
-    <ng-template st-row="freightPrice" let-item let-index="index">
-      {{ item.freightPrice | currency}}
+    <ng-template st-row="resourceCode" let-item let-index="index">
+      {{ item.resourceCode | currency}}
     </ng-template>
-    <ng-template st-row="loadingTime" let-item let-index="index">
-      <div *ngIf="item?.loadPlanTime">装 | {{item?.loadPlanTime}}</div>
-      <div *ngIf="item?.unloadPlanTime">卸 | {{item?.unloadPlanTime}}</div>
+    <ng-template st-row="practicalPremium" let-item let-index="index">
+      {{ item.practicalPremium | currency}}
+    </ng-template>
+    <ng-template st-row="premium" let-item let-index="index">
+      {{ item.premium | currency}}
     </ng-template>
     <ng-template st-row="driverName" let-item let-index="index">
       <div>
-        {{item?.driverName}}/{{item?.driverPhone}}/{{item?.carNo}}
+        {{item?.driverName}}/{{item?.driverTelephone}}/{{item?.carNo}}
       </div>
       </ng-template>
-      <ng-template st-row="payeeName" let-item let-index="index">
+    <ng-template st-row="insureCode" let-item let-index="index">
+      <div>{{item.insureCode}}</div>
       <div>
-        {{item?.payeeName}}/{{item?.payeePhone}}
-      </div>
-      </ng-template>
-    <ng-template st-row="billCode" let-item let-index="index">
-      <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.billCode}}</a>
-      <div>
-        <span>{{item?.billStatusLabel}}</span>
+        <span>{{item?.insureStatusLabel}}</span>
       </div>
     </ng-template>
     <ng-template st-row="goodsName" let-item let-index="index">
@@ -92,7 +89,7 @@
       </div>
     </ng-template>
     <ng-template st-row="mybidDetailInfo" let-item let-index="index">
-      <div *ngIf="item.mybidDetailInfo.length > 0">
+      <div *ngIf="item.mybidDetailInfo?.length > 0">
         <p *ngFor="let data of item.mybidDetailInfo">
           {{ data.expenseName }}：{{ data.price | currency }}
           <span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
diff --git a/src/app/routes/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts
index acf45810..842b16a8 100644
--- a/src/app/routes/insurance-management/components/list/list.component.ts
+++ b/src/app/routes/insurance-management/components/list/list.component.ts
@@ -328,25 +328,25 @@ export class insuranceManagementListComponent implements OnInit {
         width: '180px',
         fixed: 'left',
         className: 'text-left',
-        render: 'billCode'
+        render: 'insureCode'
       },
       {
         title: '保单号',
         width: '250px',
         className: 'text-right',
-        render: 'mybidDetailInfo'
+        render: 'policyNo'
       },
-      { title: '类型', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
-      { title: '始发地', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
-      { title: '目的地', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
-      { title: '距离', index: 'wayBillCode', width: '180px', className: 'text-left' },
+      { title: '类型', index: 'insureTypeLabel', width: '220px', className: 'text-left' },
+      { title: '始发地', index: 'startAddress', width: '220px', className: 'text-left' },
+      { title: '目的地', index: 'endAddress', width: '220px', className: 'text-left' },
+      { title: '距离', index: 'distance', width: '180px', className: 'text-left' },
       { title: '保额（元）', index: 'resourceCode', width: '180px', className: 'text-left' },
-      { title: '保费（元）', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
+      { title: '保费（元）', render: 'premium', width: '180px', className: 'text-left' },
       {
         title: '实际保费（元）',
         className: 'text-left',
         width: '180px',
-        index: 'unloadingAddressArr'
+        render: 'practicalPremium'
       },
       {
         title: '货物信息',
@@ -358,7 +358,7 @@ export class insuranceManagementListComponent implements OnInit {
         title: '车牌号',
         className: 'text-right',
         width: '180px',
-        render: 'freightPrice'
+        render: 'driverName'
       },
       {
         title: '关联订单号',
@@ -369,46 +369,44 @@ export class insuranceManagementListComponent implements OnInit {
       {
         title: '货源编号',
         className: 'text-right',
-        index: 'settlementWeight',
+        index: 'resourceCode',
         width: '150px'
       },
       {
         title: '网络货运人',
         className: 'text-left',
         width: '250px',
-        index: 'driverName',
-        render: 'driverName'
+        index: 'enterpriseInfoName',
       },
       {
         title: '货主',
         className: 'text-left',
         width: '180px',
-        index: 'payeeName',
-        render: 'payeeName'
+        index: 'shipperAppUserName',
       },
       {
         title: '所属项目',
         width: '200px',
         className: 'text-left',
-        render: 'loadingTime'
+        render: 'enterpriseProjectName'
       },
       {
         title: '投保时间',
         width: '180px',
         className: 'text-left',
-        index: 'createTime'
+        index: 'insureTime'
       },
       {
         title: '生效时间',
         width: '180px',
         className: 'text-left',
-        index: 'createTime'
+        index: 'effectTime'
       },
       {
         title: '录单时间',
         width: '180px',
         className: 'text-left',
-        index: 'createTime'
+        index: 'recordTime'
       },
       {
         title: '创建时间',
@@ -420,7 +418,7 @@ export class insuranceManagementListComponent implements OnInit {
         title: '失败原因',
         width: '180px',
         className: 'text-left',
-        index: 'createTime'
+        index: 'processMessage'
       },
       {
         title: '操作',
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
index c5430704..3b0216e5 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-23 13:39:58
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-20 20:28:15
+ * @LastEditTime : 2022-02-14 10:33:38
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
diff --git a/src/app/shared/components/insurance-table/insurance-table.component.ts b/src/app/shared/components/insurance-table/insurance-table.component.ts
index 73a6139b..6529426f 100644
--- a/src/app/shared/components/insurance-table/insurance-table.component.ts
+++ b/src/app/shared/components/insurance-table/insurance-table.component.ts
@@ -153,6 +153,10 @@ export class InsuranceTableComponent implements OnInit {
     console.log(this.data);
     console.log(this.minInsurancePrice);
     console.log(this.sf.value);
+    if(!this.minInsurancePrice) {
+        this.service.msgSrv.error('必填项为空！')
+        return
+    }
     let params= {
       minInsurancePrice: this.minInsurancePrice,
       insuranceConfigDTOS: this.data