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

src/app/routes/usercenter/components/freight/list/list.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STChange, STColumn, STColumnBadge, STComponent, STData, STRequestOptions } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { DynamicSettingModalComponent, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
@@ -116,7 +116,124 @@ export class FreightComponentsListComponent implements OnInit {
             showRequired: false
           }
         },
-
+        lockedStatus: {
+          type: 'string',
+          title: '企业类型',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '物流企业', value: 0 }
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        lockedStatus8: {
+          type: 'string',
+          title: '公司所在地',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '物流企业', value: 0 }
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        lockedStatus7: {
+          type: 'string',
+          title: '常用服务',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '整车服务', value: 0 },
+            { label: '大宗服务', value: 1 }
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        lockedStatus6: {
+          type: 'string',
+          title: '客户类型',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '直客', value: 0 },
+            { label: '渠道客户', value: 1 }
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        contactName5: {
+          title: '渠道销售',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false
+          }
+        },
+        contactName4: {
+          title: '合伙人',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false
+          }
+        },
+        contactName3: {
+          title: '客服人员',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false
+          }
+        },
+        contactName2: {
+          title: '审核人',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false
+          }
+        },
+        applyDate: {
+          type: 'string',
+          title: '申请时间',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFDateWidgetSchema,
+        },
+        applyDate1: {
+          type: 'string',
+          title: '审核时间',
+          ui: {
+            widget: 'sl-from-to',
+            type: 'date',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFDateWidgetSchema,
+        },
         networkTransporter: {
           type: 'string',
           title: '网络货运人',
@@ -138,6 +255,22 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
+        lockedStatus3: {
+          type: 'string',
+          title: '企业状态',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '正常', value: 0 },
+            { label: '冻结', value: 1 }
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
         source: {
           type: 'string',
           title: '注册渠道',
@@ -155,13 +288,13 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
-        lockedStatus: {
+        source2: {
           type: 'string',
-          title: '企业状态',
+          title: '证件是否过期',
           enum: [
             { label: '全部', value: '' },
-            { label: '正常', value: 0 },
+            { label: '是', value: 1 },
-            { label: '冻结', value: 1 }
+            { label: '否', value: 2 }
           ],
           default: '',
           ui: {
@@ -170,7 +303,21 @@ export class FreightComponentsListComponent implements OnInit {
               expand: (value: boolean) => value
             }
           }
-        }
+        },
+        source1: {
+          type: 'string',
+          title: '网络货运人',
+          enum: [
+            { label: '全部', value: '' },
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
       }
     };
     this.ui = { '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } };

src/assets/mocks/menu-data.json

@@ -593,6 +593,20 @@
               "text": "入账详情",
               "link": "/partner/recorded/record/:id",
               "hide": true
+            },
+            {
+              "text": "轮播图管理",
+              "link": "/partner/scroll-img/list",
+              "hide": true
+            },
+            {
+              "text": "知识库管理",
+              "icon": "iconfont icon-yundan-copy",
+              "group": true,
+              "children": [{
+                "text": "banner管理",
+                "link": "/knowledge/banner"
+              }]
             }
           ]
         }

src/styles.less

@@ -47,4 +47,4 @@ input[type="number"] {
 .break-word-all {
     word-break: break-all;
     word-wrap : break-word;
-}
+}