edit

src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-05 11:01:55
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-24 10:23:53
+ * @LastEditTime : 2022-02-24 20:06:26
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -12,6 +12,7 @@ import { DatePipe } from '@angular/common';
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { ContractManagementService } from '../../services/contract-management.service';
 
@@ -27,7 +28,8 @@ export class ContractManagementTemplateTextComponent implements OnInit {
     public service: ContractManagementService,
     public route: ActivatedRoute,
     private datePipe: DatePipe,
-    private router: Router
+    private router: Router,
+    public shipperservice: ShipperBaseService,
   ) {}
   textStatus = '新建模板';
   @ViewChild('sf', { static: false }) sf!: SFComponent;
@@ -84,19 +86,68 @@ export class ContractManagementTemplateTextComponent implements OnInit {
             }
           } as SFSelectWidgetSchema
         },
+        // contractType: {
+        //   title: '单据类型',
+        //   type: 'string',
+        //   default: '',
+        //   ui: {
+        //     widget: 'dict-select',
+        //     params: { dictKey: 'contract:document:type' },
+        //     containAllLable: true,
+        //     visibleIf: {
+        //       templateType: value => value === 'MX'
+        //     }
+        //   } as SFSelectWidgetSchema
+        // },
+         signingObject: {
+          type: 'string',
+          title: '承包商对象',
+          enum: [
+            { label: '货主', value: '1' },
+            { label: '司机', value: '2' }
+          ],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择'
+          }
+        },
         contractType: {
-          title: '单据类型',
+          title: '合同类型',
           type: 'string',
           default: '',
           ui: {
             widget: 'dict-select',
-            params: { dictKey: 'contract:document:type' },
+            containsAllLable: true,
+            params: { dictKey: 'contract:type' },
             containAllLable: true,
+          } as SFSelectWidgetSchema
+        },
+        resourceType: {
+          title: '货源类型',
+          type: 'string',
+          default: '',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'contract:template:type' },
+            containsAllLable: true,
             visibleIf: {
               templateType: value => value === 'MX'
             }
-          } as SFSelectWidgetSchema
+          } as SFSelectWidgetSchema,
-        }
+        },
+        enterpriseInfoId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            visibleIf: {
+              templateType: value => value === 'KJ' || value === 'HHR'
+            },
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+          }
+        },
       },
       required: ['templateName', 'templateType']
     };
@@ -126,6 +177,8 @@ export class ContractManagementTemplateTextComponent implements OnInit {
     };
   }
   initData(url: string) {
+    console.log('编辑');
+    
     this.service.request(url, { id: this.route.snapshot.params.id }).subscribe(res => {
       if (res) {
         this.detailList = res;
@@ -140,21 +193,22 @@ export class ContractManagementTemplateTextComponent implements OnInit {
   }
 
   save() {
-    if (!this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !this.title) {
+    // if (!this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !this.title) {
-      this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
+    //   this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
-      return;
+    //   return;
-    }
+    // }
-    if (this.sf.value.templateType == 'MX') {
+    // if (this.sf.value.templateType == 'MX') {
-      if (this.sf.value.contractType == '') {
+    //   if (this.sf.value.contractType == '') {
-        this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
+    //     this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
-        return;
+    //     return;
-      }
+    //   }
-    }
+    // }
     const params = {
       ...this.sf.value,
       ...this.sf2.value,
-      templateTitle: this.title
+      templateTitle: this.title || this.detailList.templateName
     };
+    console.log(params)
     this.service.request(this.service.$api_save_contractTemplate, params).subscribe((res: any) => {
       if (res) {
         this.service.msgSrv.success('保存成功！');

src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.html

@@ -4,8 +4,8 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-24 10:31:05
+ * @LastEditTime : 2022-02-24 20:01:42
- * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template\\contract-template.component.html
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-frame\\contract-template-frame.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 
@@ -77,6 +77,10 @@
       <ng-template st-row="templateName" let-item let-index="index">
         <a (click)="view(item)">{{ item.templateName }}</a>
       </ng-template>
+      <ng-template st-row="signingObject" let-item let-index="index">
+        <span *ngIf="item?.signingObject == 1">货主</span>
+        <span *ngIf="item?.signingObject == 2">司机</span>
+      </ng-template>
     </st>
   </div>
 </nz-card>

src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts

@@ -131,7 +131,7 @@ export class ContractManagementTemplateFrameComponent implements OnInit {
         title: '签约对象',
         width: '100px',
         className: 'text-center',
-        index: 'signingObject'
+        render: 'signingObject'
       },
       {
         title: '合同类型',

src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts

@@ -49,7 +49,7 @@ export class ContractManagementTemplatePartnerComponent implements OnInit {
  */
   get reqParams() {
     return {
-      templateType: 'MX',
+      templateType: 'HHR',
       ...this.sf?.value,
     };
   }

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-17 11:13:43
+ * @LastEditTime : 2022-02-24 20:03:23
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\list\\list.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -84,7 +84,7 @@
       </ng-template>
       <ng-template st-row="distance" let-item let-index="index">
         <div>
-          {{ item?.distance ? item?.distance + '公里' : '' }}
+          {{ item?.distance ? ((item?.distance)/1000).toFixed(4) + '公里' : '' }}
         </div>
       </ng-template>
       <ng-template st-row="goodsNumber" let-item let-index="index">

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/routes/supply-management/components/vehicle/vehicle.component.html

@@ -13,12 +13,24 @@
 <nz-card>
   <div nz-row nzGutter="8">
     <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-      <sf #sf [schema]="schema"
+      <sf
-        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } } }" [compact]="true"
+        #sf
-        [button]="'none'"></sf>
+        [schema]="schema"
+        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } } }"
+        [compact]="true"
+        [button]="'none'"
+      ></sf>
     </div>
     <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
-      <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()"  acl  [acl-ability]="['SUPPLY-INDEX-vehicleSearch']">查询</button>
+      <button
+        nz-button
+        nzType="primary"
+        [nzLoading]="service.http.loading"
+        (click)="search()"
+        acl
+        [acl-ability]="['SUPPLY-INDEX-vehicleSearch']"
+        >查询</button
+      >
       <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
       <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">
@@ -39,12 +51,23 @@
   <div style="margin-top: 15px">
     <!-- 选中提示框 -->
     <div style="position: relative">
-      <nz-alert nzType="info" [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'" nzShowIcon
+      <nz-alert
-        [ngStyle]="{ margin: '0 0 1rem 0' }">
+        nzType="info"
+        [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
+        nzShowIcon
+        [ngStyle]="{ margin: '0 0 1rem 0' }"
+      >
       </nz-alert>
     </div>
-    <st #st [data]="service.$api_get_wholePage_list" [columns]="columns" [req]="{  params: reqParams }"
+    <st
-      [res]="{ process: afterRes }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '500px' }">
+      #st
+      [data]="service.$api_get_wholePage_list"
+      [columns]="columns"
+      [req]="{ params: reqParams }"
+      [res]="{ process: afterRes }"
+      [loading]="service.http.loading"
+      [scroll]="{ x: '1200px', y: '500px' }"
+    >
       <ng-template st-row="resourceCode" let-item let-index="index">
         <a [routerLink]="'vehicle-detail/' + item?.id">{{ item?.resourceCode }}</a>
         <p>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</p>
@@ -68,25 +91,25 @@
 </nz-card>
 <ng-template #extraTemplate>
   <div>
-    <button (click)="audit('', 2)" nz-button nzType="primary"  acl  [acl-ability]="['SUPPLY-INDEX-vehicleBatchAudit']">批量审核</button>
+    <button (click)="audit('', 2)" nz-button nzType="primary" acl [acl-ability]="['SUPPLY-INDEX-vehicleBatchAudit']">批量审核</button>
-    <button (click)="releaseGoods()" nz-button nzType="primary"  acl  [acl-ability]="['SUPPLY-INDEX-vehicleUndertakesToSupply']">代发货源</button>
+    <button (click)="releaseGoods()" nz-button nzType="primary" acl [acl-ability]="['SUPPLY-INDEX-vehicleUndertakesToSupply']"
-    <button (click)="importGoodsSource()" nz-button nzType="primary" >导入货源</button>
+      >代发货源</button
+    >
+    <button (click)="importGoodsSource()" nz-button nzType="primary">导入货源</button>
   </div>
 </ng-template>
 
-<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核"
+<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnCancel)="handleCancel('suppliersType')">
-  (nzOnCancel)="handleCancel('suppliersType')">
   <ng-container *nzModalContent>
     <div style="position: relative" *ngIf="auditMany">
-      <nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length + '项'" nzShowIcon
+      <nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length + '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }">
-        [ngStyle]="{ margin: '0 0 1rem 0' }">
       </nz-alert>
     </div>
-    <sf #sfFre [schema]="freightSchema" [ui]="{ '*': { spanLabelFixed: 120, grid: { span: 16 } } }" [compact]="false"
+    <sf #sfFre [schema]="freightSchema" [ui]="{ '*': { spanLabelFixed: 120, grid: { span: 16 } } }" [compact]="false" [button]="'none'">
-      [button]="'none'"> </sf>
+    </sf>
   </ng-container>
   <ng-template #nzModalFooter>
     <button nz-button nzType="primary" (click)="handleOK(1)" [disabled]="">通过</button>
     <button nz-button nzType="default" (click)="handleOK(2)">不通过</button>
   </ng-template>
-</nz-modal>
+</nz-modal>

src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html

@@ -1,18 +1,45 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-02-17 20:24:17
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-02-24 17:04:41
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\freight\\freight-config\\freight-config.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header-wrapper [title]="'货主配置'"></page-header-wrapper>
 <nz-card class="search-box">
-    <!-- 搜索表单 -->
+  <!-- 搜索表单 -->
     <div nz-row nzGutter="8">
-        <div nz-col [nzXl]=" 16" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+      <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+        <sf
-                [compact]="true" [button]="'none'"></sf>
+          #sf
-        </div>
+          [schema]="schema"
-        <div nz-col [nzXl]=" 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+          [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } } }"
-            <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl
+          [compact]="true"
-                [acl-ability]="['USERCENTER-FREIGHT-LIST-list']">查询</button>
+          [button]="'none'"
-            <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportList()" acl
+        ></sf>
-                [acl-ability]="['USERCENTER-FREIGHT-LIST-export']">导出</button>
+      </div>
-            <button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
+      <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
-        </div>
+        <button
+          nz-button
+          nzType="primary"
+          [nzLoading]="service.http.loading"
+          (click)="st?.load(1)"
+          acl
+          [acl-ability]="['USERCENTER-FREIGHT-LIST-list']"
+          >查询</button
+        >
+        <button nz-button nzType="primary" [disabled]="service.http.loading" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-export']"
+          >导出</button
+        >
+        <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+        <button nz-button nzType="link" (click)="expandToggle()">
+          {{ !_$expand ? '展开' : '收起' }}
+          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+        </button>
+      </div>
     </div>
 </nz-card>
 <nz-card>
@@ -53,4 +80,4 @@
             </se>
         </div>
     </div>
-</ng-template>
+</ng-template>

src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import { STColumn, STComponent, STRequestOptions, STData, STChange } from '@delon/abc/st';
-import { SFUISchema, SFSchema, SFComponent } from '@delon/form';
+import { SFUISchema, SFSchema, SFComponent, SFDateWidgetSchema } from '@delon/form';
 import { ShipperBaseService, DynamicSettingModalComponent } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
@@ -17,7 +17,6 @@ export class FreightConfigComponent implements OnInit {
   columns: STColumn[] = this.initST();
   @ViewChild('st', { static: false }) st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
-
   selectedRows: any[] = [];
 
   @ViewChild('IWModal', { static: false })
@@ -28,6 +27,7 @@ export class FreightConfigComponent implements OnInit {
   roles: any = [];
   networkTransporter = null;
   roleId = null;
+  _$expand = false;
   constructor(public service: UsermanageService, private modal: NzModalService, public shipperservice: ShipperBaseService) {}
 
   ngOnInit() {
@@ -40,7 +40,11 @@ export class FreightConfigComponent implements OnInit {
     Object.assign(requestOptions.body, { listSource: 1 });
     if (this.sf) {
       Object.assign(requestOptions.body, {
-        ...this.sf.value
+        ...this.sf.value,
+        createTime: {
+          start: this.sf?.value.effectiveDate[0],
+          end: this.sf?.value.effectiveDate[1]
+        }
       });
     }
     return requestOptions;
@@ -164,7 +168,6 @@ export class FreightConfigComponent implements OnInit {
     }
     this.service.downloadFile(this.service.$api_export_enterprise, params);
   }
-
   loadltdId() {
     this.service.getNetworkFreightForwarder().subscribe(res => {
       if (res) {
@@ -180,17 +183,25 @@ export class FreightConfigComponent implements OnInit {
     });
   }
 
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle(): void {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/_$expand', this._$expand);
+  }
   /**
    * 重置表单
    */
-  resetSF() {
+  resetSF(): void {
     this.sf.reset();
-    this.st.reload();
+    this._$expand = false;
   }
 
   private initSF(): SFSchema {
     return {
       properties: {
+        _$expand: { type: 'boolean', ui: { hidden: true } },
         enterpriseName: {
           title: '企业名称',
           type: 'string',
@@ -208,6 +219,38 @@ export class FreightConfigComponent implements OnInit {
             allowClear: true,
             asyncData: () => this.shipperservice.getNetworkFreightForwarder()
           }
+        },
+        goodsSurchargeRatio: {
+          title: '货源单费率',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false
+          }
+        },
+        contractSurchargeRatio: {
+          title: '合同单费率',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            }
+          }
+        },
+        effectiveDate: {
+          title: '注册时间',
+          type: 'string',
+          ui: {
+            widget: 'date',
+            mode: 'range',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+            allowClear: true
+          } as SFDateWidgetSchema
         }
       }
     };
@@ -219,14 +262,14 @@ export class FreightConfigComponent implements OnInit {
       { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
       { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 160 },
       {
-        title: '合同单费率',
+        title: '货源单费率',
         className: 'text-right',
         index: 'contractSurchargeRatio',
         width: 130,
         format: item => `${item.contractSurchargeRatio}%`
       },
       {
-        title: '货源单费率',
+        title: '合同单费率',
         className: 'text-right',
         index: 'goodsSurchargeRatio',
         width: 130,
@@ -235,7 +278,7 @@ export class FreightConfigComponent implements OnInit {
       {
         title: '合同单业务量（元）',
         index: 'contractQuota',
-        width: 140,
+        width: 160,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) }
@@ -243,11 +286,17 @@ export class FreightConfigComponent implements OnInit {
       {
         title: '货源单业务量（元）',
         index: 'goodsQuota',
-        width: 140,
+        width: 160,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.goodsQuota }) }
       },
+      {
+        title: '注册时间',
+        index: 'createTime',
+        width: 180,
+        className: 'text-right'
+      },
       {
         title: '操作',
         width: '90px',

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-14 10:14:19
+ * @LastEditTime : 2022-02-24 19:31:19
  * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\insurance-table.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -28,7 +28,7 @@
            
         </div>
         <nz-table #groupingTable [nzData]="data" nzBordered nzSize="small" [nzFrontPagination]="false"
-            [nzScroll]="{ x: '1200px' }" [nzShowPagination]="false" class="ml-xl" style="max-width: 1100px;">
+            [nzScroll]="{ x: '900px' }" [nzShowPagination]="false" class="ml-xl" style="max-width: 1200px;">
             <thead>
                 <tr>
                     <th rowspan="2" nzWidth="250px" nzAlign="center" nzLeft>险种</th>
@@ -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>
                   
@@ -70,7 +70,7 @@
                         </div>
                     </td>
                     <td nzWidth="60px" nzAlign="center" nzRight>
-                        <a *ngIf="i === groupingTable.data.length-1 && groupingTable.data.length>2"
+                        <a *ngIf="i === groupingTable.data.length-1 && groupingTable.data.length>1"
                              nz-popconfirm
                             nzPopconfirmTitle="是否确认删除?" (nzOnConfirm)="deleteRow(i)"
                             >删除</a>

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) {}
@@ -64,7 +64,7 @@ export class InsuranceTableComponent implements OnInit {
     };
     this.ui = {
       '*': {
-        spanLabelFixed: 140,
+        spanLabelFixed: 160,
         grid: { span: 24 }
       },
       $freightPrice: {
@@ -141,12 +141,11 @@ export class InsuranceTableComponent implements OnInit {
 
   deleteRow(index: number) {
     console.log(index);
-    this.data = this.data.filter((d, i) => {
+    var newArr = this.data.concat();
-      console.log(d);
+    newArr.splice(this.data.length-1,1)
-      console.log(i);
+    // this.data = this.data.pop()
-      index !== i;
+    console.log(newArr);
-    });
+    this.data = [...newArr];
-    console.log(this.data);
   }
 
   save() {