fix bug

2021-12-10 14:42:47 +08:00
parent b513099359
commit 144b2eb8b9
13 changed files with 299 additions and 269 deletions
--- a/src/app/routes/vehicle/components/list/detail/detail.component.html
+++ b/src/app/routes/vehicle/components/list/detail/detail.component.html
@ -10,24 +10,25 @@
        <sv-container col="3">
        <sv-title style="font-weight: 700;">车辆基础信息</sv-title>
          <sv label="车牌号">
-            {{ detailData?.contactsName }}
+            {{ detailData?.carNo }}
          </sv>
          <sv label="车牌颜色">
-            {{ detailData?.contactsPhone }}
+            {{ detailData?.carNoColor }}
          </sv>
          <sv label="车型">
-            {{ detailData?.contactsPhone }}
+            {{ detailData?.carModel }}
          </sv>
          <sv label="车长">
-            {{ detailData?.contactsPhone }}
+            {{ detailData?.carLength }}
          </sv>
          <sv label="是否为挂车">
-            {{ detailData?.contactsPhone }}
+            {{ detailData?.isTrailer === true ? '是' : '否'}}
          </sv>
        </sv-container>
        <sv-container col="1">
          <sv label="车头照">
-            <!-- <app-imagelist [imgList]="detailData?.enterpriseQualificationCertificate"></app-imagelist> -->
+            <span>{{detailData?.carFrontPhotoWatermark}}</span>
+            <app-imagelist [imgList]="[detailData?.carFrontPhotoWatermark]"></app-imagelist>
          </sv>
        </sv-container>
    </ng-template>
@ -106,17 +107,17 @@
    <sv-container col="2" class="mt16">
      <sv-title style="font-weight: 700;">认证司机</sv-title>
    </sv-container>
-    <st
+    <!-- <st
    #st
    [bordered]="true"
    [columns]="columns"
-    [data]="detailData.goodsList"
+    [data]="servi"
    [ngStyle]="{ margin: '1rem 0' }"
    multiSort
    size="small"
    [page]="{ show: false }"
  >
-  </st>
+  </st> -->
  </nz-card>
 </ng-container>

--- a/src/app/routes/vehicle/components/list/detail/detail.component.ts
+++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts
@ -44,20 +44,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
      ],
    },
  ];
-  detailData: any = {
-    goodsList: [
-      {
-        perPrice: '22323',
-        goodsQuantity: '项目名称',
-        totalPrice: '角色',
-      },
-      {
-        perPrice: '2259595',
-        goodsQuantity: '项目名称2',
-        totalPrice: '角色',
-      },
-    ]
-  };
+  detailData: any;
  schema!: SFSchema;
  @ViewChild('sf', { static: false }) sf!: SFComponent;
  schema1!: SFSchema;
@ -75,11 +62,9 @@ export class VehicleComponentsListDetailComponent implements OnInit {
  ) {}

  ngOnInit() {
-    console.log(this.route.snapshot);
-    // this.initData();
    this.initSF();
    this.initSF1();
-    // this.launchSign();
+    this.getDetailList();
  }
  /**
   * 初始化查询表单
@ -141,45 +126,16 @@ export class VehicleComponentsListDetailComponent implements OnInit {
      required: this.validData,
    };
  }
-  // async initData() {
-  //   console.log(this.route.snapshot, 'this.route.snapshot');
-
-  //   const params = {
-  //     tenantId: this.route.snapshot.params.id,
-  //     // tenantId: this.route.snapshot.queryParams.tenantId,
-  //   };
-  //   const res = await this.service.asyncRequest(this.service.$api_get_supplier_info, params);
-  //   // // 商品资质
-  //   // if (res.enterpriseBusinessJson) {
-  //   //   res.enterpriseBusinessJson.aptitudes = res.enterpriseBusinessJson?.aptitudes ? res.enterpriseBusinessJson.aptitudes.split(',') : [];
-  //   // }
-  //   // // // 申请人身份证证件
-  //   // // res.applyUserJson.imagelist = [];
-  //   // // res.applyUserJson.imagelist.push(res.applyUserJson.certificatePhotoFront);
-  //   // // res.applyUserJson.imagelist.push(res.applyUserJson.certificatePhotoBack);
-  //   // // res.applyUserJson.imagelist.push(res.applyUserJson.handCertificate);
-
-  //   // 法人身份证证件
-  //   const imagelist = [];
-  //   imagelist.push(res?.certificatePhotoFront);
-  //   imagelist.push(res?.certificatePhotoBack);
-  //   res.certificatePhoto = imagelist;
-
-  //   // 营业执照
-  //   res.enterpriseQualificationCertificate = res.enterpriseQualificationCertificate
-  //     ? res.enterpriseQualificationCertificate.split(',')
-  //     : [];
-
-  //   // 返回所在地
-  //   res.enterpriseAddressCodeStr = await this.getRegionFullName(res.enterpriseAddressCode);
-
-  //   this.detailData = res;
-  //   this.suppliersData = {
-  //     suppliersType: res?.suppliersType,
-  //     externalSuppliersId: res?.externalSuppliersId,
-  //   };
-  // }
-
+  // 获取录单员 
+  getDetailList() {
+    const params = {
+      id: this.route.snapshot?.params?.id
+    };
+   this.service.request(`${this.service.$api_get_operate_get}`, params).subscribe((res) => {
+      console.log(res)
+      this.detailData = res;
+    })
+  }

  goBack() {
    window.history.go(-1);
--- a/src/app/routes/vehicle/components/list/list.component.html
+++ b/src/app/routes/vehicle/components/list/list.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-12-09 17:56:02
+ * @LastEditTime: 2021-12-10 10:48:13
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\list.component.html
@ -59,14 +59,8 @@
    [loadingDelay]="500"
    [loading]="service.http.loading"
  >
-    <ng-template st-row="enterpriseName" let-item let-index="index">
-      <div nz-tooltip [nzTooltipTitle]="item.enterpriseName">
-        <div
-          style="display: inline-block; max-width: 280px; margin: 0 auto; overflow: hidden; white-space: nowrap; text-overflow: ellipsis"
-        >
-          {{ item.enterpriseName }}
-        </div>
-      </div>
+    <ng-template st-row="carLength" let-item let-index="index">
+    <div>{{item?.carModel}}-{{item?.carLength?  item?.carLength + '米' : ''}}-{{ item?.carLoad? item?.carLoad + '吨' : ''}}</div>
    </ng-template>
    <ng-template st-row="contactsPhone" let-item let-index="index">
        <div
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@ -15,34 +15,6 @@ export class VehicleComponentsListComponent implements OnInit {
  ui!: SFUISchema;
  schema!: SFSchema;
  columns!: STColumn[];
-  datalist = [
-    {
-      storeName: '企业名称',
-      contactsName: '152746565',
-      enterpriseName: '湖南',
-      unifiedSocialCreditCode: '45454',
-      contactsPhone: '*97889461561',
-      effectiveDateStr: '废弃eww',
-      enStatusStr2: '正常',
-      enStatusStr3: '正常',
-      unifiedSocialCreditCode3: '常用服务',
-      unifiedSocialCreditCode2: '正常',
-      tenantId: 1
-    },
-    {
-      storeName: '企业名称',
-      contactsName: '152746565',
-      enterpriseName: '湖南',
-      unifiedSocialCreditCode: '45454',
-      contactsPhone: '*97889461561',
-      effectiveDateStr: '废弃eww',
-      enStatusStr2: '正常',
-      enStatusStr3: '正常',
-      unifiedSocialCreditCode3: '常用服务',
-      unifiedSocialCreditCode2: '正常',
-      tenantId: 2
-    },
-  ]
  @ViewChild('st', { static: false }) st!: STComponent;
  @ViewChild('sf', { static: false }) sf!: SFComponent;

@ -96,8 +68,8 @@ export class VehicleComponentsListComponent implements OnInit {
            hidden: true,
          },
        },
-        storeName: { title: '车牌号', type: 'string', ui: { showRequired: false } },
-        contactsName: {
+        carNo: { title: '车牌号', type: 'string', ui: { showRequired: false } },
+        carLength: {
          title: '车型车长载重',
          type: 'string',
          ui: {
@ -119,7 +91,7 @@ export class VehicleComponentsListComponent implements OnInit {
            widget: 'select',
          },
        },
-        enStatus12: {
+        carNoColor: {
          type: 'string',
          title: '车牌颜色',
          enum: [
@ -136,11 +108,10 @@ export class VehicleComponentsListComponent implements OnInit {
            },
          },
        },
-        enStatus2: {
+        isDriverLicenseExpire: {
          type: 'string',
          title: '到期状态',
          enum: [
-            { label: '全部', value: '' },
            { label: '正常', value: 0 },
            { label: '冻结', value: 1 },
            { label: '废弃', value: 2 },
@ -161,9 +132,9 @@ export class VehicleComponentsListComponent implements OnInit {
  initST() {
    this.columns = [
      // { title: '', type: 'checkbox', className: 'text-center' },
-      { title: '车牌号', className: 'text-center', index: 'storeName' },
-      { title: '车牌颜色', className: 'text-center', index: 'contactsName' },
-      { title: '车型-车长-载重', className: 'text-center', render: 'enterpriseName' },
+      { title: '车牌号', className: 'text-center', index: 'carNo' },
+      { title: '车牌颜色', className: 'text-center', index: 'carNoColor' },
+      { title: '车型-车长-载重', className: 'text-center', render: 'carLength' },
      { title: '运营状态', className: 'text-center', index: 'effectiveDateStr',
      type: 'badge',
      badge: {
@ -175,23 +146,21 @@ export class VehicleComponentsListComponent implements OnInit {
      {
        title: '行驶证到期状态',
        className: 'text-center',
-        index: 'enStatusStr2',
+        index: 'isDriverLicenseExpire',
        type: 'badge',
        badge: {
-          正常: { text: '正常', color: 'success' },
-          冻结: { text: '冻结', color: 'warning' },
-          废弃: { text: '废弃', color: 'default' },
+          false: { text: '否', color: 'success' },
+          true: { text: '是', color: 'warning' },
        },
      },
      {
        title: '道运证到期状态',
        className: 'text-center',
-        index: 'enStatusStr3',
+        index: 'isRoadTransportExpire',
        type: 'badge',
        badge: {
-          正常: { text: '正常', color: 'success' },
-          冻结: { text: '冻结', color: 'warning' },
-          废弃: { text: '废弃', color: 'default' },
+          false: { text: '否', color: 'success' },
+          true: { text: '是', color: 'warning' },
        },
      },
      {
@ -202,7 +171,7 @@ export class VehicleComponentsListComponent implements OnInit {
          {
            text: '查看',
            click: (item) => {
-              this.router.navigate(['./detail', item.tenantId], { relativeTo: this.ar });
+              this.router.navigate(['./detail', item.id], { relativeTo: this.ar });
              // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
            },
          },
@ -211,7 +180,7 @@ export class VehicleComponentsListComponent implements OnInit {
    ];
  }
  daoyun(item: any) {
-    this.router.navigate(['./view', item.tenantId], { relativeTo: this.ar });
+    this.router.navigate(['./view', item.id], { relativeTo: this.ar });
  }
  expandToggle() {
    this._$expand = !this._$expand;
--- a/src/app/routes/vehicle/services/vehicle.service.ts
+++ b/src/app/routes/vehicle/services/vehicle.service.ts
@ -1,7 +1,7 @@
 /*
 * @Author: your name
 * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-12-09 17:55:37
+ * @LastEditTime: 2021-12-10 10:51:34
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \tms-obc-web\src\app\routes\usercenter\services\usercenter.service.ts
@ -18,6 +18,8 @@ import { EAFileUtil } from 'src/app/shared/utils/file.util';
 export class VehicleService extends BaseService {
  // 查询车辆认证表
  $api_get_operate_list = `/api/mdc/cuc/carLicense/operate/list/page`;
+  // 获取车辆认证表
+  $api_get_operate_get = `/api/mdc/cuc/carLicense/operate/get`;

  constructor(public injector: Injector) {
    super(injector);