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

src/app/shared/components/imagelist/imagelist.component.html

@@ -1,6 +1,16 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-23 14:24:05
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-03-25 15:47:50
+ * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\imagelist\\imagelist.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <div class="imgBox">
   <ng-container *ngFor="let item of imgList; let i = index">
-    <ng-container *ngIf="item; else elseTemplate">
+    <ng-container *ngIf="item;">
       <img nz-image [nzSrc]="item" />
     </ng-container>
     <ng-template #elseTemplate>

src/app/shared/components/imagelist/imagelist.component.ts

@@ -1,10 +1,10 @@
 /*
  * @Author: your name
  * @Date: 2021-12-09 17:36:13
- * @LastEditTime: 2021-12-10 14:12:24
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2022-03-25 15:43:12
+ * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \tms-obc-web\src\app\shared\components\imagelist\imagelist.component.ts
+ * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\imagelist\\imagelist.component.ts
  */
 import { Component, Input, OnInit } from '@angular/core';
 import { ModalHelper, _HttpClient } from '@delon/theme';
@@ -26,13 +26,20 @@ export class ImageListComponent implements OnInit {
     private nzImageService: NzImageService
   ) {}
 
-  ngOnInit(): void {}
+  ngOnInit(): void {
+    
+  }
   showImg(index: any) {
     const params = {
       imgList: this.imgList,
       index
     };
-    const images = this.imgList.map((url: string) => ({ src: url }));
+    const images = this.imgList.map((url: string) => {
+      if(url) {
+        console.log(url);
+        ({ src: url })
+      }
+    });
     this.nzImageService.preview(images);
     // this.modal.create(ImageViewComponent, { params }).subscribe(res => {});
   }

src/app/shared/services/business/shipper-base.service.ts

@@ -23,13 +23,16 @@ export class ShipperBaseService extends BaseService {
   $api_get_rebate_config = `/api/mdc/rebateConfig/list/listRebateConfig`;
   // 获取渠道销售管理集合
   $api_get_channel = `/api/mdc/channelSalesManagement/list/listChannelSalesManagement`;
+
+  // 获取货主企业列表
+  public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
   constructor(public injector: Injector) {
     super(injector);
   }
 
   /**
    * 获取无车承运人
-   * @returns 
+   * @returns
    */
   getCarlessCarrier() {
     const params = {};
@@ -166,6 +169,33 @@ export class ShipperBaseService extends BaseService {
     );
   }
 
+  /**
+   * 获取货主企业列表
+   * @returns
+   */
+  getEnterpriceList(params = { enterpriseName: '' }, containerAll = false) {
+    let str = params.enterpriseName.replace(/^\s+|\s+$/g, '');
+    if (str) {
+      return this.request(this.$api_enterpriceList, params).pipe(
+        map((res: any) => {
+          if (!res) {
+            return [];
+          }
+          const list = res.map((item: any) => {
+            return { label: item.enterpriseName, value: item.id };
+          });
+          const obj = [];
+          if (containerAll) {
+            obj.push({ label: '全部', value: '' });
+          }
+          return [...obj, ...list];
+        })
+      ).toPromise();;
+    } else {
+      return of([]);
+    }
+  }
+
   /**
    * 获取结算客户
    * @returns
@@ -267,7 +297,7 @@ export class ShipperBaseService extends BaseService {
       map(res => {
         if (res) {
           return res.map((m: any) => {
-            return { label: m.name, value: m.id };
+            return { label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.id };
           });
         } else {
           return [];