UI

proxy.conf.js

@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/global-config.module.ts

@@ -12,6 +12,7 @@ import { environment } from '@env/environment';
 
 const alainConfig: AlainConfig = {
   st: {
+    bordered: true,
     req: { method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' } },
     res: { reName: { list: 'data.records', total: 'data.total' } },
     page: { show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000], toTop: false },

src/app/routes/commom/less/commom-table.less

@@ -113,9 +113,9 @@
       line-height: 21px;
     }
 
-    .text-truncate {
+    // .text-truncate {
-      white-space: normal;
+    //   white-space: normal;
-  }
+    // }
   }
 }
 
@@ -138,4 +138,4 @@
   }
 }
 
-.height_box{}
+.height_box {}

src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less

@@ -1,5 +0,0 @@
-:host {
-  .text-black {
-    color: #000;
-  }
-}

src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts

@@ -1,24 +0,0 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { DatatableFundReportingComponent } from './fund-reporting.component';
-
-describe('DatatableFundReportingComponent', () => {
-  let component: DatatableFundReportingComponent;
-  let fixture: ComponentFixture<DatatableFundReportingComponent>;
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [DatatableFundReportingComponent]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DatatableFundReportingComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});

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

@@ -26,15 +26,23 @@
 <nz-card class="table-box">
   <div class="header_box">
     <label class="page_title"> <label class="driver">|</label> 企业列表</label>
-    <div class="mr-sm">
+    <div class="d-flex align-items-center mr-sm">
-      <button nz-button nzDanger [nzLoading]="loadingList" (click)="openDrawer()" acl
+      <div class="mr-md d-flex align-items-center">
-        [acl-ability]="['USERCENTER-FREIGHT-LIST-list']">筛选</button>
+        <input nz-input placeholder="请输入企业名称" [(ngModel)]="sfValue.enterpriseName" class=" mr-sm"
+          style="width: 150px;height: 32PX;" />
+        <input nz-input placeholder="请输入管理员" [(ngModel)]="sfValue.contactName" style="width: 150px;height: 32PX;" />
+      </div>
+      <button nz-button nzDanger [nzLoading]="loadingList" (click)="search()" acl
+        [acl-ability]="['USERCENTER-FREIGHT-LIST-list']">查询</button>
       <button nz-button nzDanger (click)="exportList()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-export']">
         导出</button>
       <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
         更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
       <nz-dropdown-menu #menu="nzDropdownMenu">
         <ul nz-menu>
+          <li nz-menu-item (click)="openDrawer()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-list']">
+            高级筛选
+          </li>
           <li nz-menu-item (click)="creat()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-save']">
             新增企业
           </li>
@@ -52,8 +60,7 @@
 
   <st #st [columns]="columns" [data]='service.$api_get_freight_list' [req]="{  process: beforeReq }"
     [res]="{  process: dataProcess }" [scroll]="{ x: '1200px',y:scrollY }" [page]=" {}" [loading]="loadingList">
-    <ng-template st-row="enterpriseName" let-item let-index="index">
+    <ng-template st-row="score" let-item let-index="index">
-      <label>{{ item.enterpriseName }}</label><br>
       <ng-container *ngIf="item.score!==null; else billEvaluateelseTemplate">
         <nz-rate [ngModel]="item.score" nzDisabled></nz-rate>
       </ng-container>
@@ -68,16 +75,35 @@
       </ng-container>
     </ng-template>
     <ng-template st-row="contacter" let-item let-index="index">
-      {{ item.contacter }}<br>/{{item.mobile}}
+      <p nz-tooltip [nzTooltipTitle]="item.contacter+'/'+item.mobile" style="cursor: pointer;width: 120px;margin: 0;    white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;">
+        {{ item.contacter }}
+      </p>
+    </ng-template>
+    <ng-template st-row="customerServiceIdLabel" let-item let-index="index">
+      <p nz-tooltip [nzTooltipTitle]="item.customerServiceIdLabel" style="cursor: pointer;width: 120px;margin: 0;    white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;">
+        {{ item.customerServiceIdLabel }}
+      </p>
     </ng-template>
     <ng-template st-row="partnerName" let-item let-index="index">
-      {{ item.partnerName }}<br>/{{item.partnerMobile}}
+      <p nz-tooltip [nzTooltipTitle]="item.partnerName+'/'+item.partnerMobile" style="cursor: pointer;width: 120px;margin: 0;    white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;">
+        {{ item.partnerName }}
+      </p>
     </ng-template>
     <ng-template st-row="promotersTelephone" let-item let-index="index">
       <!-- <a acl [acl-ability]="['USERCENTER-FREIGHT-LIST-salesman']" (click)="addPromoter(item)">{{ item.channelName
         }}<br>{{ item.channelMobile
         || '添加' }}</a> -->
-      {{ item.channelName }}<br>{{ item.channelMobile }}
+      <p nz-tooltip [nzTooltipTitle]="item.channelName+'/'+item.channelMobile" style="cursor: pointer;width: 120px;margin: 0;    white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow: hidden;">
+        {{ item.channelName }}
+      </p>
     </ng-template>
   </st>
 </nz-card>

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

@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { STChange, STColumn, STColumnBadge, STComponent, STData, STRequestOptions } from '@delon/abc/st';
+import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
-import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { SFDateWidgetSchema } from '@delon/form';
 import { DynamicSettingModalComponent, SearchDrawerService, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { BasicTableComponent } from 'src/app/routes/commom';
@@ -24,6 +24,9 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
   promotersTelephone = '';
 
   loadingList = true;
+
+  sfValue = { enterpriseName: '', contactName: '' };
+
   constructor(
     public service: UsermanageService,
     private modal: NzModalService,
@@ -195,12 +198,6 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
   initSF() {
     this.schema = {
       properties: {
-        expand: {
-          type: 'boolean',
-          ui: {
-            hidden: true
-          }
-        },
         enterpriseName: {
           title: '企业名称',
           type: 'string',
@@ -340,7 +337,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
             { label: '全部', value: '' },
             { label: '货主注册', value: 1 },
             { label: '平台添加', value: 2 },
-            { label: '数据迁移', value: 4 },
+            { label: '数据迁移', value: 4 }
           ],
           default: '',
           ui: {
@@ -377,24 +374,31 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
   initST() {
     this.columns = [
       { title: '', type: 'checkbox', className: 'text-center' },
-      { title: '企业名称', render: 'enterpriseName', width: 350 },
+      {
-      { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 },
+        title: '企业名称',
+        index: 'enterpriseName',
+        width: 250,
+        type: 'link',
+        click: item => this.router.navigate(['./detail', item.id], { relativeTo: this.ar })
+      },
+      { title: '企业评分', className: 'text-center', render: 'score', width: 160 },
       {
         title: '公司所在地',
-        className: 'text-center',
         index: 'province',
         width: 200,
         format: item => `${item.provinceName}${item.cityName}${item.areaName}`
       },
+      { title: '管理员', render: 'contacter', width: 150 },
+      { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 },
       {
         title: '企业类型',
         className: 'text-center',
         index: 'enterpriseType',
-        width: 200,
+        width: 160,
         type: 'enum',
         enum: { 1: '物流企业', 2: '货运代理', 3: '生产型企业', 4: '贸易类企业', 5: '科技型企业', 6: '化学化工企业', 7: '其他' }
       },
-      { title: '管理员', className: 'text-center', render: 'contacter', width: 150 },
+
       {
         title: '常用服务',
         className: 'text-center',
@@ -405,14 +409,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
       },
       { title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 150 },
       { title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 },
-      { title: '客服人员', className: 'text-center', index: 'customerServiceIdLabel', width: 150 },
+      { title: '客服人员', className: 'text-center', render: 'customerServiceIdLabel', width: 150 },
       { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
       {
         title: '注册渠道',
         className: 'text-center',
         index: 'source',
         type: 'enum',
-        enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加', 4: '数据迁移'  },
+        enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加', 4: '数据迁移' },
         width: 130
       },
       { title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' },
@@ -442,18 +446,18 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
       },
       {
         title: '操作',
-        width: '200px',
+        width: '180px',
-        className: 'text-center block-td',
+        className: 'text-center ',
         fixed: 'right',
         buttons: [
-          {
+          // {
-            text: '查看',
+          //   text: '查看',
-            acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] },
+          //   acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] },
-            click: item => {
+          //   click: item => {
-              this.router.navigate(['./detail', item.id], { 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 } });
+          //     // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
-            }
+          //   }
-          },
+          // },
           // {
           //   acl: { ability: ['USERCENTER-FREIGHT-LIST-basicSetting'] },
           //   text: '基础设置',
@@ -465,9 +469,9 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
             click: item => this.showAccountDetail(item)
           },
           {
-            text: '分配客服人员',
+            text: '分配客服',
             click: item => this.showService(item)
-          },
+          }
           // {
           //   text: '修改合伙人',
           //   click: item => this.editPartner(item)