解决冲突

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 } 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,7 @@ export class FreightConfigComponent implements OnInit {
   columns: STColumn[] = this.initST();
   @ViewChild('st', { static: false }) st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
-
+  _$expand = false;
   constructor(public service: UsermanageService, private modal: NzModalService, public shipperservice: ShipperBaseService) {}
 
   ngOnInit() {
@@ -28,7 +28,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;
@@ -82,18 +86,25 @@ export class FreightConfigComponent implements OnInit {
     }
     this.service.downloadFile(this.service.$api_export_enterprise, params);
   }
-
+  /**
+   * 伸缩查询条件
+   */
+   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',
@@ -111,22 +122,47 @@ 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,
+        },
       }
     };
   }
 
   initST(): STColumn[] {
     return [
-      { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 160 },
-      { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 160 },
-      {
-        title: '合同单费率',
-        className: 'text-right',
-        index: 'contractSurchargeRatio',
-        width: 140,
-        format: item => `${item.contractSurchargeRatio}%`
-      },
+      { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 250 },
+      { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 250 },
       {
         title: '货源单费率',
         className: 'text-right',
@@ -134,10 +170,17 @@ export class FreightConfigComponent implements OnInit {
         width: 140,
         format: item => `${item.goodsSurchargeRatio}%`
       },
+      {
+        title: '合同单费率',
+        className: 'text-right',
+        index: 'contractSurchargeRatio',
+        width: 140,
+        format: item => `${item.contractSurchargeRatio}%`
+      },
       {
         title: '合同单业务量（元）',
         index: 'contractQuota',
-        width: 100,
+        width: 180,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) }
@@ -145,14 +188,21 @@ export class FreightConfigComponent implements OnInit {
       {
         title: '货源单业务量（元）',
         index: 'goodsQuota',
-        width: 100,
+        width: 180,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.goodsQuota }) }
       },
+      {
+        title: '注册时间',
+        index: 'createTime',
+        width: 180,
+        className: 'text-right',
+      },
       {
         title: '操作',
         width: '110px',
+        fixed: 'right',
         className: 'text-center',
         buttons: [
           {