merge partner

src/app/routes/vehicle/components/audit/audit.component.ts

@@ -22,7 +22,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
   @ViewChild('st', { static: false }) st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
 
-  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper) {}
+  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper) { }
   /**
    * 查询字段个数navigate
    */
@@ -34,14 +34,14 @@ export class VehicleComponentsAuditComponent implements OnInit {
    * 查询参数
    */
   get reqParams() {
-    const a:any = {};
-    if(this.resourceStatus === 1) {
+    const a: any = {};
+    if (this.resourceStatus === 1) {
       a.approvalStatus = 10
-    } else if(this.resourceStatus === 2) {
+    } else if (this.resourceStatus === 2) {
       a.approvalStatus = 20
-    } else if(this.resourceStatus === 3) {
+    } else if (this.resourceStatus === 3) {
       a.approvalStatus = 30
-    } 
+    }
     return {
       ...a,
       ...this.sf?.value,
@@ -106,7 +106,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'car:color' },
-            containsAllLable: true,
+            containsAllLabel: true,
           }
         },
         isSelf: {
@@ -157,17 +157,17 @@ export class VehicleComponentsAuditComponent implements OnInit {
   initST() {
     this.columns = [
       // { title: '', type: 'checkbox', className: 'text-center' },
-      { title: '车牌号',  width:'180px', className: 'text-center', index: 'carNo' },
-      { title: '车牌颜色',  width:'180px', className: 'text-center', index: 'carNoColorLabel' },
-      { title: '车型-车长-载重',   width:'180px',className: 'text-center', render: 'carLength' },
-      { title: '是否挂靠',  width:'180px', className: 'text-center', render: 'isSelf' },
-      { title: '所有人',  width:'180px', className: 'text-center', index: 'carOwner' },
-      { title: '录入人员',  width:'180px', className: 'text-center', index: 'saveUser', },
+      { title: '车牌号', width: '180px', className: 'text-center', index: 'carNo' },
+      { title: '车牌颜色', width: '180px', className: 'text-center', index: 'carNoColorLabel' },
+      { title: '车型-车长-载重', width: '180px', className: 'text-center', render: 'carLength' },
+      { title: '是否挂靠', width: '180px', className: 'text-center', render: 'isSelf' },
+      { title: '所有人', width: '180px', className: 'text-center', index: 'carOwner' },
+      { title: '录入人员', width: '180px', className: 'text-center', index: 'saveUser', },
       {
         title: '审核状态',
         className: 'text-center',
         index: 'approvalStatus',
-        width:'180px',
+        width: '180px',
         type: 'badge',
         badge: {
           '-1': { text: '未上传', color: 'default' },
@@ -179,7 +179,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
           40: { text: '证件过期', color: 'error' },
         },
       },
-      { title: '申请时间',  width:'180px', className: 'text-center', index: 'createTime' },
+      { title: '申请时间', width: '180px', className: 'text-center', index: 'createTime' },
       {
         title: '操作',
         fixed: 'right',
@@ -190,7 +190,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
             text: '查看',
             acl: { ability: ['VEHICLE-AUDIT-view'] },
             click: (item) => {
-              this.router.navigate(['./detail', item.id], { relativeTo: this.ar,queryParams: { carId: item.carId } });
+              this.router.navigate(['./detail', item.id], { relativeTo: this.ar, queryParams: { carId: item.carId } });
               // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
             },
           },
@@ -224,13 +224,13 @@ export class VehicleComponentsAuditComponent implements OnInit {
   }
   // 导出
   exportFire() {
-    this.service.downloadFile(this.service.$api_carLicenseAudit_export,  this.reqParams );
+    this.service.downloadFile(this.service.$api_carLicenseAudit_export, this.reqParams);
   }
   addModal() {
     const i = {
       appUserId: '',
     }
-    this.modalHelper.create(CarSettleCarauthComponent, {i}, { size: 900 }).subscribe((res) => {
+    this.modalHelper.create(CarSettleCarauthComponent, { i }, { size: 900 }).subscribe((res) => {
       this.st.load()
     });
   }

src/app/routes/vehicle/components/list/list.component.ts

@@ -19,7 +19,7 @@ export class VehicleComponentsListComponent implements OnInit {
   @ViewChild('st', { static: false }) st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
 
-  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
+  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) { }
 
   /**
    * 查询参数
@@ -87,7 +87,7 @@ export class VehicleComponentsListComponent implements OnInit {
           title: '车牌颜色',
           ui: {
             widget: 'dict-select',
-            containsAllLable: true,
+            containsAllLabel: true,
             params: { dictKey: 'car:color' }
           }
         },
@@ -109,7 +109,7 @@ export class VehicleComponentsListComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'car:model' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -121,7 +121,7 @@ export class VehicleComponentsListComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'car:length' },
-            containsAllLable: true,
+            containsAllLabel: true,
             visibleIf: {
               expand: (value: boolean) => value
             }