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

src/app/layout/pro/components/menu/menu.component.ts

@@ -51,6 +51,7 @@ export class LayoutProMenuComponent implements OnInit, OnDestroy {
       }
     });
     this.menus = res;
+    console.log(res);
 
     this.openStatus();
   }

src/app/routes/menu-manager/components/index/index.component.html

@@ -30,14 +30,14 @@
     <div class="d-flex align-items-center">
       <div>
         <button nz-button nzType="primary" (click)="menuAction('新增菜单')">新增</button>
-        <button nz-button nzType="primary" (click)="menuImport(0)" [disabled]="service.http.loading"
+        <!-- <button nz-button nzType="primary" (click)="menuImport(0)" [disabled]="service.http.loading"
           *ngIf="selectedPlatform.enName==='tms-smc-web'">
           导入货主菜单
         </button>
         <button nz-button nzType="primary" (click)="menuImport(1)" [disabled]="service.http.loading"
           *ngIf="selectedPlatform.enName==='tms-obc-web'">
           导入运营后台菜单
-        </button>
+        </button> -->
       </div>
     </div>
   </ng-template>

src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html

@@ -17,8 +17,10 @@
       </div>
       <div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
         [class.expend-options]="_$expand">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl  [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-list']">查询</button>
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl
-        <button *ngIf="tabType == 1" nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportList()" acl  [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-export']">导出</button>
+          [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-list']">查询</button>
+        <button *ngIf="tabType == 1" nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportList()"
+          acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-export']">导出</button>
         <button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
         <button nz-button nzType="link" (click)="expandToggle(!_$expand)">
           {{ !_$expand ? '展开' : '收起' }}
@@ -31,10 +33,7 @@
   <nz-card>
     <!-- 数据列表 -->
     <st #st multiSort [data]="service.$api_get_freight_list" [columns]="tabType===1?enterColumns:adminColumns"
-      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
+      [req]="{  process: beforeReq }" [loading]="service.http.loading" [scroll]="{ x: '1200px' }">
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-      [loading]="service.http.loading">
     </st>
   </nz-card>
   <ng-template #content>

src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts

@@ -151,8 +151,9 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
   initEnterST(): STColumn[] {
     return [
       { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
-      { title: '联系人', className: 'text-center', index: 'contacter', width: 150 },
+      { title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 180 },
-      { title: '手机号', className: 'text-center', index: 'mobile', width: 150 },
+      { title: '管理员', className: 'text-center', index: 'contacter', width: 150 },
+      { title: '手机号', className: 'text-center', index: 'mobile', width: 140 },
       { title: '申请时间', className: 'text-center', index: 'createTime', width: 160 },
       {
         title: '审核状态',
@@ -173,7 +174,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
         index: 'oftenUsedServices',
         type: 'enum',
         enum: { 10: '整车发货', 20: '大宗发货' },
-        width: 150
+        width: 140
       },
       { title: '推广业务员', className: 'text-center', index: 'promotersTelephone', width: 150 },
       {

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

@@ -13,7 +13,7 @@
           <div style="flex: 1;">
             <div nz-row>
               <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
-                <p style="margin-bottom: 0;">{{ detailData?.enterpriseName }}</p>
+                <p style="margin-bottom: 0;word-break:break-all">{{ detailData?.enterpriseName }}</p>
               </div>
               <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
                 <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0"></nz-badge>
@@ -168,8 +168,13 @@
       </p>
     </sv-title>
     <sv label="公司名称">
-      <input nz-input type="text" [(ngModel)]="detailData.enterpriseName" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+      <ng-container *ngIf="isEdit; else enterpriseNameelseTemplate">
-        [placeholder]="isEdit?'':'-'">
+        <input nz-input type="text" [(ngModel)]="detailData.enterpriseName" [readonly]="!isEdit"
+          [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+      </ng-container>
+      <ng-template #enterpriseNameelseTemplate>
+        <span style="word-break:break-all ">{{detailData.enterpriseName}}</span>
+      </ng-template>
     </sv>
     <sv label="统一社会信用代码">
       <input nz-input type="text" [(ngModel)]="detailData.unifiedSocialCreditCode" [readonly]="!isEdit"
@@ -238,8 +243,15 @@
         [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="经营范围" col="1">
+      <ng-container *ngIf="isEdit; else businessScopeelseTemplate">
         <input nz-input type="text" [(ngModel)]="detailData.businessScope" [readonly]="!isEdit" [nzBorderless]="!isEdit"
           [placeholder]="isEdit?'':'-'">
+      </ng-container>
+      <ng-template #businessScopeelseTemplate>
+        <span style="word-break:break-all ">{{detailData.businessScope}}</span>
+      </ng-template>
+
+
     </sv>
     <sv label="税务机关" col="2">
       <input nz-input type="text" [(ngModel)]="detailData.taxAuthority" [readonly]="!isEdit" [nzBorderless]="!isEdit"

src/app/routes/usercenter/components/freight/list/detail/detail.component.less

@@ -21,10 +21,21 @@
 }
 
 :host::ng-deep {
+
+
   .affix {
-    position: fixed !important;
+    position: fixed;
     top     : 20px !important;
     z-index : 999 !important;
-    width   : 100% !important;
+    right   : 25px;
+    left    : 250px;
+  }
+
+}
+::ng-deep{
+  .aside-collapsed .alain-pro__main {
+    .affix {
+      left: 106px;
+    }
   }
 }

src/styles.less

@@ -9,12 +9,17 @@
 .icon {
     width       : 18px;
     fill        : currentColor;
-    overflow : hidden;
+    font-size   : 18px !important;
-    font-size: 18px !important;
     color       : #ffffff;
     margin-right: 10px;
 }
 
+.ant-menu-submenu-vertical {
+    .icon {
+        margin-right: 40px;
+    }
+}
+
 @layout-gutter: 8px;
 
 /* 全局滚动条美化 */