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

src/app/routes/supply-management/components/assigned-car-bulk/assigned-car-bulk.component.ts

@@ -144,30 +144,30 @@ export class SupplyManagementBulkAssignedCarComponent implements OnInit {
         title: '司机姓名',
         index: 'name',
         className: 'text-center',
-        width: '80px'
+        width: '20%'
       },
       {
         title: '手机号',
         index: 'telephone',
         className: 'text-center',
-        width: '100px'
+        width: '15%'
       },
       {
         title: '车队长',
         render: 'captain',
         className: 'text-center',
-        width: '200px'
+        width: '30%'
       },
       {
         title: '指定车辆',
         render: 'carNo',
         className: 'text-center',
-        width: '100px'
+        width: '15%'
       },
       {
         title: '操作',
         className: 'text-center',
-        width: '80px',
+        width: '20%',
         buttons: [
           {
             text: '移除',

src/app/routes/sys-setting/components/network-freight/network-freight.component.less

@@ -14,10 +14,10 @@
       min-height: 32px;
     }
 
-    input {
-      width      : 100px;
-      margin-left: 10px;
-    }
+    // input {
+    //   width      : 100px;
+    //   margin-left: 10px;
+    // }
 
     .ant-form-item-control-input-content {
       display: flex;

src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html

@@ -11,7 +11,7 @@
         <img [src]="userDetail?.avatar" />
         <div style="flex: 1">
           <div style="display: flex; width: 100%; justify-content: space-between">
-            <p style="padding-right: 80px; width: 400px">{{ userDetail?.name }}
+            <p style="padding-right: 80px; width: 400px">{{ userDetail?.realName }}
               <nz-badge nzStatus="success" nzText="正常" *ngIf="!userDetail?.stateLocked" class="ml-xl"> </nz-badge>
               <nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xl"> </nz-badge>
             </p>
@@ -103,10 +103,10 @@
   <sv-container col="3" class="mt-md">
     <sv-title>银行结算信息</sv-title>
     <sv label="开户银行">
-      <!-- {{ detailData?.name }} -->
+      {{ userIdentityDetail?.name }}
     </sv>
     <sv label="银行卡号">
-      <!-- {{ detailData?.certificateNumber }} -->
+      {{ userIdentityDetail?.certificateNumber }}
     </sv>
   </sv-container>
 </nz-card>

src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.ts

@@ -65,8 +65,6 @@ export class CaptainDetailComponent implements OnInit {
 
   /** 启用/冻结司机 */
   userAction(status: number) {
-    console.log(this.userDetail);
-
     this.nzModalService.warning({
       nzTitle: status === 1 ? '确定启用该司机吗？' : '确定冻结该司机吗？',
       nzContent: status === 1 ? '启用后，该司机将恢复正常使用功能，请再次确认！' : '冻结后，司机将被限制使用，无法登陆，请谨慎操作！',

src/app/routes/usercenter/components/driver/detail/detail.component.html

@@ -11,7 +11,7 @@
         <img [src]="userDetail?.avatar" />
         <div style="flex: 1">
           <div style="display: flex;width: 100%;justify-content: space-between;">
-            <p style="padding-right: 80px; width: 400px;">{{ userDetail?.name }}
+            <p style="padding-right: 80px; width: 400px;">{{ userDetail?.realName }}
               <nz-badge nzStatus="success" nzText="正常" *ngIf="!userDetail?.stateLocked" class="ml-xl"></nz-badge>
               <nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xl"></nz-badge>
             </p>
@@ -215,7 +215,7 @@
         <input nz-input type="text" [(ngModel)]="licenseDetail.licenseNo" [readonly]="!isEditDriver"
           [nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'">
       </sv>
-      <sv label="公司所在地" >
+      <!-- <sv label="公司所在地" >
         <ng-container *ngIf="isEditDriver; else cascaderelseTemplate">
           <nz-select [(ngModel)]="licenseDetail.regionCode">
             <ng-container *ngFor="let item of adressCodeList">
@@ -226,8 +226,8 @@
         <ng-template #cascaderelseTemplate>
           {{licenseDetail?.regionCodeName }}
         </ng-template>
-      </sv>
-      <sv label="发证日期" col="1">
+      </sv> -->
+      <sv label="发证日期" col="2">
         <nz-date-picker [(ngModel)]="licenseDetail.validStartTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
         [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;" class="calendar">
       </nz-date-picker>
@@ -301,16 +301,16 @@
   </sv-container>
 
   <nz-divider></nz-divider>
-  <sv-container col="3" class="mt16">
+  <sv-container col="3" class="mt-md">
     <sv-title>服务评级
       <ng-container *ngIf="billEvaluateList?.length===0">(暂无评级)</ng-container>
     </sv-title>
-    <sv [label]="item.evaluateType" *ngFor="let item of billEvaluateList">
+    <sv [label]="item.evaluateTypeLabel" *ngFor="let item of billEvaluateList">
       <nz-rate [ngModel]="item.evaluateFraction" nzDisabled></nz-rate>
     </sv>
   </sv-container>
 
-  <sv-container col="3" class="mt16">
+  <sv-container col="3" class="mt-md">
     <sv-title>关联企业</sv-title>
     <st #st [columns]="columns" [data]="service.$api_get_driver_projects" size="small"
       [req]="{ method: 'POST', allInBody: true, params: {appUserId:route.snapshot.params.id} }" [page]="{ show: false }"

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

@@ -203,6 +203,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
         id: this.detailData.id,
         approvalOpinion: this.approvalOpinion,
         networkTransporter: this.networkTransporter,
+        customerServiceId: this.customerServiceId,
         roleId: this.roleId || null
       })
       .subscribe(res => {

src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html

@@ -42,7 +42,7 @@
     </div>
   </div>
   <!-- 数据列表 -->
-  <st #st [columns]="columns" [data]='service.$api_freight_config_page' [req]="{  process: beforeReq }"
+  <st #st [columns]="columns" [data]='service.$api_freight_config_page' [req]="{  process: beforeReq }" [page]="{}"
     [scroll]="{ x: '1200px' }" [loading]="service.http.loading" (change)="stChange($event)">
   </st>
 </nz-card>

src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts

@@ -51,6 +51,7 @@ export class FreightConfigComponent implements OnInit {
         });
       }
     }
+    this.selectedRows = [];
     return requestOptions;
   };
 
@@ -166,7 +167,7 @@ export class FreightConfigComponent implements OnInit {
   }
 
   exportList() {
-    const params = { listSource: 1,  pageSize: -1 };
+    const params = { listSource: 1, pageSize: -1 };
     if (this.sf) {
       Object.assign(params, {
         ...this.sf.value
@@ -282,7 +283,7 @@ export class FreightConfigComponent implements OnInit {
         format: item => `${item.contractSurchargeRatio}%`
       },
       {
-        title: '合同单业务量（元）',
+        title: '合同单业务量（万元）',
         index: 'contractQuota',
         width: 170,
         type: 'widget',
@@ -290,7 +291,7 @@ export class FreightConfigComponent implements OnInit {
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) }
       },
       {
-        title: '货源单业务量（元）',
+        title: '货源单业务量（万元）',
         index: 'goodsQuota',
         width: 170,
         type: 'widget',