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

src/app/routes/financial-management/components/payable-order/payable-order.component.ts

@@ -227,10 +227,10 @@ export class PayableOrderComponent implements OnInit {
     return [
       { title: '', index: 'key', type: 'checkbox' },
       { title: '核销单号', index: 'phxcode', type: 'link', width: 140 },
-      { title: '网络货运人', index: 'ltdName', width: 140 },
+      { title: '网络货运人', index: 'ltdName', width: 160 },
       { title: '核销日期', index: 'phxdate', type: 'date', width: 160 },
-      { title: '付款账户', index: 'shipperaccount', width: 120 },
+      { title: '付款账户', index: 'shipperaccount', width: 170 },
-      { title: '收款账户', index: 'ltdaccount', width: 120 },
+      { title: '收款账户', index: 'ltdaccountId', width: 170 },
       {
         title: '核销金额',
         index: 'phxmoney',
@@ -251,7 +251,7 @@ export class PayableOrderComponent implements OnInit {
       { title: '结算客户', index: 'cno', width: 120 },
       { title: '银行水单', index: 'bankreceipt', width: 120 },
       { title: '创建时间', index: 'createTime', width: 160 },
-      { title: '创建人', index: 'createUserIdLabel', width: 120 },
+      // { title: '创建人', index: 'createUserIdLabel', width: 120 },
       { title: '核销状态', index: 'sts', type: 'enum', enum: { 0: '待核销', 1: '已核销' }, width: 120 },
       { title: '核销备注', index: 'remarks', width: 120 },
       {

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

@@ -20,11 +20,11 @@
     <div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
       <button nz-button nzType="primary" (click)="creat()" acl
         [acl-ability]="['USERCENTER-FREIGHT-LIST-save']">新增企业</button>
-      <button nz-button nzType="primary" [disabled]="!loadingList && service.http.loading" [nzLoading]="loadingList"
+      <button nz-button nzType="primary"  [nzLoading]="loadingList"
         (click)="st?.load(1)" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-list']">查询</button>
-      <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportList()" acl
+      <button nz-button nzType="primary" [disabled]="loadingList" (click)="exportList()" acl
         [acl-ability]="['USERCENTER-FREIGHT-LIST-export']">导出</button>
-      <button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
+      <button nz-button (click)="resetSF()" [disabled]="loadingList">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">
         {{ !_$expand ? '展开' : '收起' }}
         <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

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

@@ -3,6 +3,7 @@ import { BaseService } from '../core/base.service';
 import { map } from 'rxjs/operators';
 import { cacheConf } from '@conf/cache.conf';
 import { EACacheService } from '..';
+import { of } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
@@ -19,6 +20,8 @@ export class ShipperBaseService extends BaseService {
   // 根据FullKey获取系统子配置(树)
   $api_getSysConfigTreeByParentFullKey = `/api/mdc/pbc/sysConfig/getSysConfigTreeByParentFullKey`;
   envCache: any;
+
+  list: any[] = [];
   constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
     super(injector);
     this.envCache = this.eaCacheSrv.get(cacheConf.env);
@@ -46,21 +49,25 @@ export class ShipperBaseService extends BaseService {
    * @returns
    */
   getEnterpriseProject(params?: any) {
+    if (this.list.length > 0) {
+      return of(this.list);
+    }
     return this.request(this.$api_get_enterprise_project, params).pipe(
       map((res: any) => {
         if (!res) {
           return [];
         }
-        const list = res.map(((item: any) => {
+        const list = res.map((item: any) => {
           return {
             label: item.projectName,
             value: item.id
-          }
+          };
-        }))
+        });
         const obj = [{ value: '', label: '全部' }];
+        this.list = [...obj, ...list];
         return [...obj, ...list];
       })
-    )
+    );
   }
 
   /**