Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into lxx

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

@@ -127,42 +127,91 @@ export class ContractManagementContractListComponent implements OnInit {
           type: 'string',
           title: '业务单号'
         },
-        shipperName: {
+        signingObject: {
           type: 'string',
-          title: '托运人'
+          title: '签约对象',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '货主', value: 1 },
+            { label: '司机', value: 2 }
+          ],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择'
+          }
         },
-        carrierName: {
+        contractType: {
+          title: '合同类型',
           type: 'string',
-          title: '承运人',
+          default: '',
+          ui: {
+            widget: 'dict-select',
+            containsAllLable: true,
+            params: { dictKey: 'contract:type' },
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+            containAllLable: true,
+          } as SFSelectWidgetSchema
+        },
+        resourceType: {
+          title: '货源类型',
+          type: 'string',
+          default: '',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'goodresource:type' },
+            containsAllLable: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+          } 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,
             },
           }
         },
-        documentType: {
-          title: '单据类型',
-          type: 'string',
-          default: '',
-          ui: {
-            widget: 'dict-select',
-            containsAllLabel: true,
-            params: { dictKey: 'contract:document:type' },
-            containAllLable: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value,
-            },
-          } as SFSelectWidgetSchema,
-        },
         signTime: {
           title: '签署日期',
           type: 'string',
           ui: {
-            widget: 'custom',
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
-          }
+          } as SFDateWidgetSchema,
+        },
+        esignFlowStatus: {
+          title: '状态',
+          type: 'string',
+          default: '',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'esign:flow:status' },
+            containsAllLable: true,
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+          } as SFSelectWidgetSchema,
         },
       },
       type: 'object',

src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts

@@ -104,7 +104,7 @@ export class AdvanceCollectionComponent {
           },
           default: null
         },
-        bankType: {
+        banktype: {
           type: 'string',
           title: '银行类型',
           enum: [

src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts

@@ -147,8 +147,8 @@ export class ETCInvoicedListComponent implements OnInit {
     return [
       { title: '运单号', index: 'wayBillCode' },
       { title: '订单号', index: 'billCode' },
-      { title: '开票状态', index: 'invoicingStatus', type: 'enum', enum: { '0': '待开票', '1': '开票中', '2': '已开票', '3': '开票失败' } },
+      { title: '开票状态', index: 'invoicingStatus', type: 'enum', enum: { '0': '待开票', '1': '开票中', '2': '已开票', '3': '开票失败' } ,width: 120,},
-      { title: '订单类型', index: 'billType' },
+      { title: '订单类型', index: 'billTypeLabel', width: 120,},
       { title: '装货地', index: 'loadingPlace' },
       { title: '卸货地', index: 'dischargePlace' },
       { title: '司机信息', render: 'call1No' },