解决冲突

src/app/routes/insurance-management/components/list/list.component.ts

@@ -269,6 +269,18 @@ export class insuranceManagementListComponent implements OnInit {
             }
           } as SFSelectWidgetSchema
         },
+        insureRefundStatus: {
+          title: '退款状态',
+          type: 'string',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'insure:refund:status' },
+            containsAllLable: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          } as SFSelectWidgetSchema
+        },
         enterpriseInfoId: {
           type: 'string',
           title: '网络货运人',
@@ -452,6 +464,13 @@ export class insuranceManagementListComponent implements OnInit {
         render: 'processMessage',
         // processResult=2
       },
+      {
+        title: '退款状态',
+        width: '180px',
+        className: 'text-left',
+        index: 'insureRefundStatusLabel',
+        // processResult=2
+      },
       {
         title: '操作',
         fixed: 'right',

src/app/shared/components/insurance-table/insurance-table.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-25 20:18:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-24 17:35:11
+ * @LastEditTime : 2022-02-24 19:19:42
  * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\insurance-table.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -50,7 +50,7 @@
                                     <label>-</label>
                                     <nz-input-number [ngModel]="item.endKm" (ngModelChange)="changeEndKm($event,i)" [nzMin]="0"
                                         [nzFormatter]="formatterDollar" nzSize="small">
-                                    </nz-input-number>
+                                    </nz-input-number>（含）
                             </div>
                         </div>
                   

src/app/shared/components/insurance-table/insurance-table.component.ts

@@ -18,7 +18,7 @@ export class InsuranceTableComponent implements OnInit {
   schema: SFSchema = {};
   ui!: SFUISchema;
 
-  formatterDollar = (value: number): string => `${value} （含）`;
+  formatterDollar = (value: number): string => `${value}`;
   minInsurancePrice: number = 0;
   changeSub = new Subject<string>();
   constructor(public service: BaseService, private cdr: ChangeDetectorRef) {}