edit

src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts

@@ -159,9 +159,32 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
   initEnterST(): STColumn[] {
     return [
       { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
-      { title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 190 },
+      { title: '统一社会信用代码', className: 'text-center', index: 'unifiedSocialCreditCode', width: 200 },
-      { title: '管理员', className: 'text-center', index: 'contacter', width: 150 },
+      {
-      { title: '手机号', className: 'text-center', index: 'mobile', width: 140 },
+        title: '公司所在地',
+        className: 'text-center',
+        index: 'province',
+        width: 200,
+        format: item => `${item.provinceName}${item.cityName}${item.areaName}`
+      },
+      {
+        title: '企业类型',
+        className: 'text-center',
+        index: 'enterpriseType',
+        width: 200,
+        type: 'enum',
+        enum: { 1: '物流企业', 2: '货运代理', 3: '生产型企业', 4: '贸易类企业', 5: '科技型企业', 6: '化学化工企业', 7: '其他' }
+      },
+      { title: '管理员', className: 'text-center', index: 'contacter', width: 150, format: item => `${item.contacter}/${item.mobile}` },
+      {
+        title: '常用服务',
+        className: 'text-center',
+        index: 'oftenUsedServices',
+        type: 'enum',
+        enum: { 10: '整车发货', 20: '大宗发货' },
+        width: 140
+      },
+      { title: '业务员', className: 'text-center', index: 'promotersTelephone', width: 150 },
       { title: '注册时间', className: 'text-center', index: 'createTime', width: 170 },
       {
         title: '审核状态',
@@ -250,17 +273,26 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        name: {
+        contactName: {
           title: '管理员',
           type: 'string',
           ui: {
             placeholder: '请输入'
           }
         },
-        approval1Status: {
+        enterpriseType: {
           type: 'string',
           title: '企业类型',
-          enum: [{ label: '全部', value: '' }],
+          enum: [
+            { label: '全部', value: '' },
+            { label: '物流企业', value: 1 },
+            { label: '货运代理', value: 2 },
+            { label: '生产型企业', value: 3 },
+            { label: '贸易类企业', value: 4 },
+            { label: '科技型企业', value: 5 },
+            { label: '化学化工企业', value: 6 },
+            { label: '其他', value: 7 }
+          ],
           default: '',
           ui: {
             widget: 'select',
@@ -269,7 +301,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
             }
           }
         },
-        approval11Status: {
+        enterpriseAddressCode: {
           type: 'string',
           title: '公司所在地',
           enum: [{ label: '全部', value: '' }],
@@ -281,10 +313,14 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
             }
           }
         },
-        approval11St1atus: {
+        oftenUsedServices: {
           type: 'string',
           title: '常用服务',
-          enum: [{ label: '全部', value: '' }],
+          enum: [
+            { label: '全部', value: '' },
+            { label: '整车发货', value: 10 },
+            { label: '大宗发货', value: 20 }
+          ],
           default: '',
           ui: {
             widget: 'select',
@@ -293,13 +329,24 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
             }
           }
         },
-        approval11St11atus: {
+        // approval11St11atus: {
+        //   type: 'string',
+        //   title: '客户类型',
+        //   enum: [{ label: '全部', value: '' }],
+        //   default: '',
+        //   ui: {
+        //     widget: 'select',
+        //     visibleIf: {
+        //       expand: (value: boolean) => this.tabType === 1 && value
+        //     }
+        //   }
+        // },
+        promotersTelephone: {
+          title: '业务员',
           type: 'string',
-          title: '客户类型',
-          enum: [{ label: '全部', value: '' }],
-          default: '',
           ui: {
-            widget: 'select',
+            placeholder: '请输入',
+            showRequired: false,
             visibleIf: {
               expand: (value: boolean) => this.tabType === 1 && value
             }
@@ -316,6 +363,41 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
             }
           }
         },
+        approvalUserName: {
+          title: '审核人',
+          type: 'string',
+          maxLength: 11,
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => this.tabType === 1 && value
+            }
+          }
+        },
+        createTime: {
+          title: '申请时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd HH:mm:ss',
+            nzShowTime: true,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        approvalTime: {
+          title: '审核时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd HH:mm:ss',
+            nzShowTime: true,
+            visibleIf: {
+              expand: (value: boolean) => this.tabType === 1 && value
+            }
+          } as SFDateWidgetSchema
+        },
         approvalStatus: {
           type: 'string',
           title: '审核状态',
@@ -334,18 +416,21 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
             }
           }
         },
-        createTime: {
+        source: {
-          title: '注册时间',
           type: 'string',
+          title: '注册渠道',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '货主注册', value: 1 },
+            { label: '平台添加', value: 2 }
+          ],
+          default: '',
           ui: {
-            widget: 'sl-from-to-search',
+            widget: 'select',
-            format: 'yyyy-MM-dd',
-            placeholder: '请选择',
-            nzShowTime: true,
             visibleIf: {
-              expand: (value: boolean) => value
+              expand: (value: boolean) => this.tabType === 1 && value
             }
-          } as SFDateWidgetSchema
+          }
         }
       }
     };

src/app/routes/usercenter/components/freight/list/detail/detail.component.html

@@ -123,7 +123,7 @@
       <label *ngIf="detailData?.approvalStatus===30" style="color: #ff4d4f;"><i nz-icon nzType="close-circle"
           nzTheme="fill" class="mr-xs"></i>驳回&nbsp;驳回原因:{{detailData?.approvalOpinion}}
       </label>
-      <label *ngIf="detailData?.isExpired===30" style="color: #fa8c16;">
+      <label *ngIf="detailData?.isExpired" style="color: #fa8c16;">
         <i nz-icon nzType="info-circle" nzTheme="fill" class="ml-md mr-xs"></i>企业营业期限已过期
       </label>
       <p style="margin-bottom: 0;">
@@ -250,7 +250,7 @@
   <nz-divider></nz-divider>
   <sv-container col="3" class="mt16">
     <sv-title>法人信息
-      <label *ngIf="detailData?.legalPersonIdentityVO?.isExpired===30" style="color: #fa8c16;">
+      <label *ngIf="detailData?.legalPersonIdentityVO?.isExpired" style="color: #fa8c16;">
         <i nz-icon nzType="info-circle" nzTheme="fill" class="ml-md mr-xs"></i>企业营业期限已过期
       </label>
     </sv-title>
@@ -294,7 +294,7 @@
   <nz-divider></nz-divider>
   <sv-container col="3">
     <sv-title>企业管理员信息
-      <label *ngIf="detailData?.adminUserInfo?.isExpired===30" style="color: #fa8c16;">
+      <label *ngIf="detailData?.adminUserInfo?.isExpired" style="color: #fa8c16;">
         <i nz-icon nzType="info-circle" nzTheme="fill" class="ml-md mr-xs"></i>企业营业期限已过期
       </label>
     </sv-title>

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

@@ -134,7 +134,7 @@ export class FreightComponentsListComponent implements OnInit {
             widget: 'select'
           }
         },
-        sou11rce: {
+        enterpriseAddressCode: {
           type: 'string',
           title: '公司所在地',
           enum: [{ label: '全部', value: '' }],
@@ -149,7 +149,11 @@ export class FreightComponentsListComponent implements OnInit {
         oftenUsedServices: {
           type: 'string',
           title: '常用服务',
-          enum: [{ label: '全部', value: '' }],
+          enum: [
+            { label: '全部', value: '' },
+            { label: '整车发货', value: 10 },
+            { label: '大宗发货', value: 20 }
+          ],
           default: '',
           ui: {
             widget: 'select',