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

src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts

@@ -363,7 +363,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
         title: '状态',
         width: '180px',
         className: 'text-left',
-        index: 'loadingLadingBillFilePath'
+        index: 'complianceStatusLabel'
       },
       {
         title: '操作',
@@ -384,7 +384,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
           {
             text: '合规抽查　　',
             click: _record => this.audit(_record),
-            // iif: item => item.billStatus == '4' 
+            iif: item => item.complianceStatus == '0' 
           },
         ]
       }

src/app/routes/usercenter/components/driver/captain/captain.component.ts

@@ -175,7 +175,8 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
           enum: [
             { label: '全部', value: '' },
             { label: '用户注册', value: 1 },
-            { label: '货主添加', value: 2 }
+            { label: '货主添加', value: 2 },
+            { label: '运营添加', value: 3 },
           ],
           default: '',
           ui: {
@@ -208,7 +209,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
         }
       },
       { title: '推广业务员', className: 'text-center', render: 'promotersTelephone' },
-      { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' } },
+      { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' , 3: '运营添加'} },
       { title: '注册时间', className: 'text-center', index: 'createTime' },
       {
         title: '操作',

src/app/routes/usercenter/components/driver/driver.component.ts

@@ -222,7 +222,8 @@ export class UserCenterComponentsDriverComponent implements OnInit {
           enum: [
             { label: '全部', value: '' },
             { label: '用户注册', value: 1 },
-            { label: '货主添加', value: 2 }
+            { label: '货主添加', value: 2 },
+            { label: '运营添加', value: 3 },
           ],
           default: '',
           ui: {
@@ -258,7 +259,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
       { title: '手机号', className: 'text-center', index: 'mobile',width: 150  },
       { title: '身份证号码', className: 'text-center', index: 'identityNo', width: 200 },
       { title: '当前车辆', className: 'text-center', index: 'carNo' , width: 200},
-      { title: '审核人名称', className: 'text-center', index: 'approvalUserName' , width: 200},
+      { title: '驾驶证审核人', className: 'text-center', index: 'approvalUserName' , width: 200},
       { title: '审核时间', className: 'text-center', index: 'approvalTime' , width: 200},
       {
         title: '实名认证状态',
@@ -303,7 +304,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
         , width: 180
       },
       { title: '推广业务员', className: 'text-center', render: 'promotersTelephone' , width: 180},
-      { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' }, width: 150 },
+      { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加', 3: '运营添加'  }, width: 150 },
       { title: '注册时间', className: 'text-center', index: 'createTime', width: 200 },
       {
         title: '操作',

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

@@ -137,7 +137,8 @@ export class FreightComponentsListComponent implements OnInit {
           enum: [
             { label: '全部', value: '' },
             { label: '用户注册', value: 1 },
-            { label: '货主添加', value: 2 }
+            { label: '货主添加', value: 2 },
+            { label: '运营添加', value: 3},
           ],
           default: '',
           ui: {
@@ -178,7 +179,7 @@ export class FreightComponentsListComponent implements OnInit {
       { title: '网络货运人', className: 'text-center', index: 'netTranName' },
       { title: '常用服务', className: 'text-center', index: 'oftenUsedServices', type: 'enum', enum: { 10: '整车发货', 20: '大宗发货' } },
       { title: '推广业务员', className: 'text-center', render: 'promotersTelephone' },
-      { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '货主注册', 2: '平台添加' } },
+      { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' } },
       {
         title: '企业状态',
         className: 'text-center',