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

src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts

@@ -49,7 +49,7 @@ export class AdvanceCollectionComponent implements OnInit {
   }
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
+    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value,  pageSize: -1 });
   }
 
   private initSF(): SFSchema {

src/app/routes/financial-management/components/cost-management/cost-management.component.ts

@@ -90,7 +90,7 @@ export class CostManagementComponent implements OnInit {
   }
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
+    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
   }
 
   routeTo(url: string, params?: any, status?: any) {
@@ -188,7 +188,7 @@ export class CostManagementComponent implements OnInit {
             searchLoadingText: '搜索中...',
             allowClear: true,
             onSearch: (q: any) => {
-              let str =q.replace(/^\s+|\s+$/g,"");
+              let str = q.replace(/^\s+|\s+$/g, '');
               if (str) {
                 return this.service
                   .request(this.service.$api_enterpriceList, { enterpriseName: str })
@@ -213,10 +213,10 @@ export class CostManagementComponent implements OnInit {
             searchLoadingText: '搜索中...',
             allowClear: true,
             onSearch: (q: any) => {
-              let str =q.replace(/^\s+|\s+$/g,"");
+              let str = q.replace(/^\s+|\s+$/g, '');
               if (str) {
                 return this.service
-                  .request(this.service.$api_enterpriceList, { enterpriseName: str})
+                  .request(this.service.$api_enterpriceList, { enterpriseName: str })
                   .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
                   .toPromise();
               } else {
@@ -302,13 +302,13 @@ export class CostManagementComponent implements OnInit {
           {
             text: '浏览',
             click: item => this.routeTo('/financial-management/cost-management/detail/' + item.id, { status: item?.feetypeLabel }),
-            acl: { ability: ['FINANCIAL-COST-view'] },
+            acl: { ability: ['FINANCIAL-COST-view'] }
           },
           {
             text: '审核',
             click: item => this.auditAction(item),
             iif: item => item.sts === 2,
-            acl: { ability: ['FINANCIAL-COST-audit'] },
+            acl: { ability: ['FINANCIAL-COST-audit'] }
           }
           // {
           //   text: '修改',

src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts

@@ -74,7 +74,7 @@ export class DriverAccountDetailComponent implements OnInit {
   stChange(e: STChange): void {}
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
+    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value,  pageSize: -1 });
   }
 
   goBack() {

src/app/routes/financial-management/components/driver-account/driver-account.component.ts

@@ -74,7 +74,7 @@ export class DriverAccountComponent implements OnInit {
   }
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
+    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
   }
 
   private initSF(): SFSchema {

src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts

@@ -74,7 +74,7 @@ export class FreightAccountDetailComponent implements OnInit {
   stChange(e: STChange): void {}
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
+    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
   }
 
   goBack() {

src/app/routes/financial-management/components/freight-account/freight-account.component.ts

@@ -80,7 +80,7 @@ export class FreightAccountComponent implements OnInit {
   }
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
+    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
   }
 
   private initSF(): SFSchema {
@@ -171,7 +171,7 @@ export class FreightAccountComponent implements OnInit {
       { title: '联系人', width: 120, index: 'name' },
       { title: '联系人电话', width: 140, index: 'phone' },
       { title: '网络货运人', width: 140, index: 'ltdName' },
-      { title: '银行类型',width: 120, index: 'bankTypeLabel' },
+      { title: '银行类型', width: 120, index: 'bankTypeLabel' },
       { title: '虚拟账户', width: 140, index: 'virtualAccount' },
       {
         title: '可用余额',
@@ -199,7 +199,7 @@ export class FreightAccountComponent implements OnInit {
       {
         title: '状态',
         index: 'stateDeletedLabel',
-        width: 80,
+        width: 80
       },
       {
         title: '操作',

src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts

@@ -65,7 +65,7 @@ export class PlatformAccountDetailComponent implements OnInit {
   stChange(e: STChange): void {}
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
+    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
   }
 
   goBack() {

src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts

@@ -49,7 +49,7 @@ export class RechargeRecordComponent implements OnInit {
   }
 
   exportList() {
-    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
+    this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
   }
 
   private initSF(): SFSchema {

src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts

@@ -104,10 +104,10 @@ export class InvoiceRequestedDetailComponent implements OnInit {
               id: this.id
             };
             this.service.request(this.service.$api_get_applyFicoVatinv, params).subscribe((res: any) => {
-              console.log(res);
               if (res) {
                 this.loadHeadInfo();
                 this.st.load(1);
+                this.service.msgSrv.success('开票成功');
                 modal.destroy();
               }
             });
@@ -122,10 +122,10 @@ export class InvoiceRequestedDetailComponent implements OnInit {
               id: this.id
             };
             this.service.request(this.service.$api_get_applyFicoVatinv, params).subscribe((res: any) => {
-              console.log(res);
               if (res) {
                 this.loadHeadInfo();
                 this.st.load(1);
+                this.service.msgSrv.success('开票成功');
                 modal.destroy();
               }
             });

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

@@ -113,7 +113,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
 
   exportList() {
     const params = this.reqParams;
-    this.service.downloadFile(this.service.$api_export_driver_cap, params);
+    this.service.downloadFile(this.service.$api_export_driver_cap, {...params,  pageSize: -1});
   }
 
   private initSF(): SFSchema {

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

@@ -61,7 +61,7 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
 
   exportList() {
     const params = this.reqParams;
-    this.service.downloadFile(this.service.$api_export_driver_cap, params);
+    this.service.downloadFile(this.service.$api_export_driver_cap, { ...params, pageSize: -1 });
   }
 
   private initSF(): SFSchema {

src/app/routes/usercenter/components/driver/driver.component.ts

@@ -26,7 +26,13 @@ export class UserCenterComponentsDriverComponent implements OnInit {
   promotersTelephone = '';
 
   resourceStatus: any = 10;
-  constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute,private modalHelper: ModalHelper) {}
+  constructor(
+    public service: UsermanageService,
+    private modal: NzModalService,
+    private router: Router,
+    private ar: ActivatedRoute,
+    private modalHelper: ModalHelper
+  ) {}
 
   /**
    * 查询参数
@@ -134,7 +140,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
 
   exportList() {
     const params = this.reqParams;
-    this.service.downloadFile(this.service.$api_export_driver, params);
+    this.service.downloadFile(this.service.$api_export_driver, { ...params, pageSize: -1 });
   }
 
   private initSF(): SFSchema {
@@ -223,7 +229,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
             { label: '全部', value: '' },
             { label: '用户注册', value: 1 },
             { label: '货主添加', value: 2 },
-            { label: '运营添加', value: 3 },
+            { label: '运营添加', value: 3 }
           ],
           default: '',
           ui: {
@@ -249,18 +255,18 @@ export class UserCenterComponentsDriverComponent implements OnInit {
     };
   }
   add() {
-    this.modalHelper.create(CarSettleAddDriverComponent, { size: 900 }).subscribe((res) => {
+    this.modalHelper.create(CarSettleAddDriverComponent, { size: 900 }).subscribe(res => {
       this.st.load();
     });
   }
   private initST(): STColumn[] {
     return [
-      { title: '司机姓名', className: 'text-center', index: 'name' , width: 150},
+      { title: '司机姓名', className: 'text-center', index: 'name', width: 150 },
-      { title: '手机号', className: 'text-center', index: 'mobile',width: 150  },
+      { title: '手机号', className: 'text-center', index: 'mobile', width: 150 },
       { title: '身份证号码', className: 'text-center', index: 'identityNo', width: 200 },
-      { title: '当前车辆', className: 'text-center', render: 'carNo' , width: 200},
+      { title: '当前车辆', className: 'text-center', render: 'carNo', width: 200 },
-      { title: '驾驶证审核人', className: 'text-center', index: 'approvalUserName' , width: 200},
+      { title: '驾驶证审核人', className: 'text-center', index: 'approvalUserName', width: 200 },
-      { title: '审核时间', className: 'text-center', index: 'approvalTime' , width: 200},
+      { title: '审核时间', className: 'text-center', index: 'approvalTime', width: 200 },
       {
         title: '实名认证状态',
         className: 'text-center',
@@ -271,9 +277,8 @@ export class UserCenterComponentsDriverComponent implements OnInit {
           0: { text: '待审核', color: 'default' },
           1: { text: '通过', color: 'success' },
           2: { text: '驳回', color: 'warning' }
-        }
+        },
-        , width: 180
+        width: 180
-
       },
       {
         title: '驾驶证状态',
@@ -286,8 +291,8 @@ export class UserCenterComponentsDriverComponent implements OnInit {
           20: { text: '审核通过', color: 'success' },
           30: { text: '驳回', color: 'warning' },
           40: { text: '证件过期', color: 'error' }
-        }
+        },
-        , width: 180
+        width: 180
       },
       {
         title: '从业资格证状态',
@@ -300,24 +305,31 @@ export class UserCenterComponentsDriverComponent implements OnInit {
           20: { text: '审核通过', color: 'success' },
           30: { text: '驳回', color: 'warning' },
           40: { text: '证件过期', color: 'error' }
-        }
+        },
-        , width: 180
+        width: 180
+      },
+      { title: '推广业务员', className: 'text-center', render: 'promotersTelephone', width: 180 },
+      {
+        title: '注册渠道',
+        className: 'text-center',
+        index: 'source',
+        type: 'enum',
+        enum: { 1: '用户注册', 2: '货主添加', 3: '运营添加' },
+        width: 150
       },
-      { title: '推广业务员', className: 'text-center', render: 'promotersTelephone' , width: 180},
-      { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加', 3: '运营添加'  }, width: 150 },
       { title: '注册时间', className: 'text-center', index: 'createTime', width: 200 },
       {
         title: '操作',
         width: '110px',
         className: 'text-center',
-        fixed:'right',
+        fixed: 'right',
         buttons: [
           {
             text: '查看<br/>',
             click: item => {
               this.router.navigate(['./detail', item.appUserId], { relativeTo: this.ar });
             },
-            acl: { ability: ['USERCENTER-DRIVER-LIST-view'] },
+            acl: { ability: ['USERCENTER-DRIVER-LIST-view'] }
           },
           // {
           //   text: '基础设置',
@@ -327,13 +339,13 @@ export class UserCenterComponentsDriverComponent implements OnInit {
           {
             text: '资金账户',
             click: item => this.showAccountDetail(item),
-            acl: { ability: ['USERCENTER-DRIVER-LIST-account'] },
+            acl: { ability: ['USERCENTER-DRIVER-LIST-account'] }
           }
         ]
       }
     ];
   }
   viewCar(item: any) {
-    this.router.navigate(['/vehicle/list/detail/' + item.carId] );
+    this.router.navigate(['/vehicle/list/detail/' + item.carId]);
   }
 }

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

@@ -102,17 +102,18 @@ export class AuditAdminComponent implements OnInit {
           default: user.creditPhoto
         },
         approvalOpinion: {
-          title: '备注',
+          title: this.isReadOnly ? '驳回原因' : '备注',
           type: 'string',
           maxLength: 100,
           ui: {
             placeholder: '审核不通过需要说明原因',
-            widget: 'textarea',
+            widget: this.i?.approvalStatus === 30 && this.isReadOnly ? 'text' : 'textarea',
             autosize: { minRows: 3, maxRows: 6 },
             visibleIf: {
-              expand: (value: boolean) => !this.isReadOnly
+              expand: (value: boolean) => !this.isReadOnly || this.i?.approvalStatus === 30
             }
-          }
+          },
+          default: user.approvalOpinion
         }
       }
     };

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

@@ -228,7 +228,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
   }
 
   exportList() {
-    const params = { ...this.sf.value, flag: this.tabType, listSource: 2 };
+    const params = { ...this.sf.value, flag: this.tabType, listSource: 2,  pageSize: -1 };
     this.service.downloadFile(this.service.$api_export_enterprise, params);
   }
 
@@ -318,10 +318,10 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
     return [
       { title: '企业名称', className: 'text-center', index: 'enterpriseName' },
       { title: '当前管理员', className: 'text-center', index: 'oldAdminName', width: 140 },
-      { title: '当前管理员手机号', className: 'text-center', index: 'oldAdminMobile', width: 150 },
+      { title: '当前管理员手机号', className: 'text-center', index: 'oldAdminMobile', width: 170 },
       { title: '转授对象', className: 'text-center', index: 'newAdminName', width: 140 },
       { title: '转授对象手机号', className: 'text-center', index: 'newAdminMobile', width: 150 },
-      { title: '申请时间', className: 'text-center', index: 'createTime', width: 160 },
+      { title: '申请时间', className: 'text-center', index: 'createTime', width: 170 },
       {
         title: '状态',
         className: 'text-center',

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

@@ -21,7 +21,7 @@
       class="text-right">
       <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl
         [acl-ability]="['USERCENTER-FREIGHT-LIST-list']">查询</button>
-      <button nz-button nzType="primary" [disabled]="service.http.loading" acl
+      <button nz-button nzType="primary" [disabled]="service.http.loading" acl (click)="exportList()"
         [acl-ability]="['USERCENTER-FREIGHT-LIST-export']">导出</button>
       <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">

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

@@ -38,8 +38,6 @@ export class FreightConfigComponent implements OnInit {
 
   beforeReq = (requestOptions: STRequestOptions) => {
     Object.assign(requestOptions.body, { listSource: 1 });
-    console.log(1);
-
     if (this.sf?.value) {
       Object.assign(requestOptions.body, {
         ...this.sf.value
@@ -168,13 +166,13 @@ export class FreightConfigComponent implements OnInit {
   }
 
   exportList() {
-    const params = {};
+    const params = { listSource: 1,  pageSize: -1 };
     if (this.sf) {
       Object.assign(params, {
         ...this.sf.value
       });
     }
-    this.service.downloadFile(this.service.$api_export_enterprise, params);
+    this.service.downloadFile(this.service.$api_export_freight_config, params);
   }
   loadltdId() {
     this.service.getNetworkFreightForwarder().subscribe(res => {

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

@@ -280,7 +280,7 @@ export class FreightComponentsListComponent implements OnInit {
           enum: [
             { label: '全部', value: '' },
             { label: '是', value: true },
-            { label: '否', value: false },
+            { label: '否', value: false }
           ],
           default: '',
           ui: {
@@ -439,7 +439,7 @@ export class FreightComponentsListComponent implements OnInit {
   }
 
   exportList() {
-    const params = { listSource: 1 };
+    const params = { listSource: 1, pageSize: -1 };
     if (this.sf) {
       Object.assign(params, {
         ...this.sf.value

src/app/routes/usercenter/services/usercenter.service.ts

@@ -39,6 +39,8 @@ export class UsermanageService extends ShipperBaseService {
 
   // 查询货主配置列表
   $api_freight_config_page = '/api/mdc/cuc/enterpriseInfo/operate/list/configPage';
+  // 导出货主配置列表
+  $api_export_freight_config = '/api/mdc/cuc/enterpriseInfo/operate/exportConfig';
   // 更新企业超级管理员权限
   $api_update_enter_role_batch = '/api/mdc/cuc/enterpriseInfo/operate/updateRole';
   // 批量更新企业网络货运人