解决冲突

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

@@ -5,6 +5,7 @@ import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema, SFSelectWidgetSc
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { ContractManagementService } from '../../services/contract-management.service';
 import { DatePipe } from '@angular/common';
+import { ShipperBaseService } from '@shared';
 
 @Component({
   selector: 'app-contract-management-contract-list',
@@ -47,6 +48,7 @@ export class ContractManagementContractListComponent implements OnInit {
   constructor(
     public service: ContractManagementService,
     private nzModalService: NzModalService,
+    public shipperservice: ShipperBaseService,
     private router: Router,
     private datePipe: DatePipe,
     ) {}
@@ -67,19 +69,31 @@ export class ContractManagementContractListComponent implements OnInit {
         render: 'contractCode'
       },
       {
-        title: '单据类型',
+        title: '签约对象',
         width: '100px',
         className: 'text-center',
-        index:'documentType'
+        index:'signingObject'
       },
       {
-        title: '合同名称',
+        title: '合同类型',
         width: '100px',
         className: 'text-center',
-        index:'contractName'
+        index:'contractType'
+      },
+      {
+        title: '货源类型',
+        width: '100px',
+        className: 'text-center',
+        index:'resourceType'
+      },
+      { title: '合同名称', index: 'contractName', width: '120px', className: 'text-center' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' },
+      {
+        title: '合同对象',
+        className: 'text-center',
+        width: '120px',
+        index: 'contractObjectName'
       },
-      { title: '托运人', index: 'shipperName', width: '120px', className: 'text-center' },
-      { title: '承运人', index: 'carrierName', width: '120px', className: 'text-center' },
       {
         title: '业务单号',
         className: 'text-center',
@@ -126,21 +140,35 @@ export class ContractManagementContractListComponent implements OnInit {
             type: 'string',
             title: '业务单号'
           },
-          shipperName: {
+          signingObject: {
             type: 'string',
-            title: '托运人'
-          },
-          carrierName: {
-            type: 'string',
-            title: '承运人',
+            title: '签约对象',
+            enum: [
+              { label: '全部', value: '' },
+              { label: '货主', value: 1 },
+              { label: '司机', value: 2 },
+            ],
             ui: {
+              widget: 'select',
+              placeholder: '请选择',
+            }
+          },
+          contractType: {
+            title: '合同类型',
+            type: 'string',
+            default: '',
+            ui: {
+              widget: 'dict-select',
+              containsAllLable: true,
+              params: { dictKey: 'contract:type' },
+              containAllLable:true,
               visibleIf: {
                 _$expand: (value: boolean) => value,
               },
-            }
+            } as SFSelectWidgetSchema,
           },
-          documentType: {
-            title: '单据类型',
+          resourceType: {
+            title: '货源类型',
             type: 'string',
             default: '',
             ui: {
@@ -153,6 +181,28 @@ export class ContractManagementContractListComponent implements OnInit {
               },
             } as SFSelectWidgetSchema,
           },
+          enterpriseInfoId: {
+            type: 'string',
+            title: '网络货运人',
+            ui: {
+              widget: 'select',
+              placeholder: '请选择',
+              allowClear: true,
+              visibleIf: {
+                _$expand: (value: boolean) => value
+              },
+              asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+            }
+          },
+          contractObjectName: {
+            type: 'string',
+            title: '合同对象',
+            ui: {
+              visibleIf: {
+                _$expand: (value: boolean) => value,
+              },
+            }
+          },
           signTime: {
             title: '签署日期',
             type: 'string',
@@ -163,6 +213,20 @@ export class ContractManagementContractListComponent implements OnInit {
               },
             }
           },
+          esignFlowStatus: {
+            title: '状态',
+            type: 'string',
+            default: '',
+            ui: {
+              widget: 'dict-select',
+              containsAllLable: true,
+              params: { dictKey: 'esign:flow:status' },
+              containAllLable:true,
+              visibleIf: {
+                _$expand: (value: boolean) => value,
+              },
+            } as SFSelectWidgetSchema,
+          },
         },
         type: 'object',
       };