Merge branch 'develop'

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/routes/commom/components/basic-table/basic-table.component.ts

@@ -1,8 +1,8 @@
 import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core';
 import { SFComponent, SFSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
 import { fromEvent, Subscription } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
-import { SearchDrawerService } from 'src/app/shared/components/search-drawer/search-drawer.service';
 
 @Component({
   template: ''
@@ -40,14 +40,14 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy {
     } else {
       const drawer = this.searchDrawerService.create(this.sfValue, this.schema);
       this.drawer.push(
-        drawer.initEvent.subscribe(sf => {
+        drawer.initEvent.subscribe((sf: SFComponent) => {
           if (sf) {
             this.sf = sf;
           }
         })
       );
       this.drawer.push(
-        drawer.closeEvent.subscribe(res => {
+        drawer.closeEvent.subscribe((res: Record<string, any>) => {
           this.sfValue = res;
           if (res) {
             this.search();

src/app/routes/datatable/components/customtable/customindex/customindex.component.html

@@ -12,85 +12,67 @@
 <page-header-wrapper [title]="'客户报表'"></page-header-wrapper>
 <div nz-row [nzGutter]="16">
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'货主'" [bordered]="true" [total]="hzData?.total || '0'" [footer]="'已认证' + ' ' + hzData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'货主'" [bordered]="true" [total]="hzData?.total || '0'"
+      [footer]="'已认证' + ' ' + hzData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'合伙人'" [bordered]="true" [total]="hhrData?.total || '0'" [footer]="'已认证' + ' ' + hhrData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'合伙人'" [bordered]="true" [total]="hhrData?.total || '0'"
+      [footer]="'已认证' + ' ' + hhrData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'司机'" [bordered]="true" [total]="sjData?.total || '0'" [footer]="'已认证' + ' ' + sjData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'司机'" [bordered]="true" [total]="sjData?.total || '0'"
+      [footer]="'已认证' + ' ' + sjData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
   <div nz-col class="gutter-row" [nzSpan]="6">
-    <g2-card [title]="'车辆'" [bordered]="true" [total]="clData?.total || '0'" [footer]="'已认证'  + ' '+ clData?.auditPassTotal" contentHeight="46">
+    <g2-card [title]="'车辆'" [bordered]="true" [total]="clData?.total || '0'"
+      [footer]="'已认证'  + ' '+ clData?.auditPassTotal" contentHeight="46">
     </g2-card>
   </div>
 </div>
-<nz-card nzTitle="客户报表" [nzExtra]="extraTemplate">
+<nz-card nzTitle="客户报表" [nzExtra]="extraTemplate" acl [acl-ability]="['customindex-client']">
   <ng-template #extraTemplate>
     <div class="chooseBox">
       <div class="timeBox">
-        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()"  acl  [acl-ability]="['customindex-client']">
+        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
           <label nz-radio-button nzValue="year">年</label>
           <label nz-radio-button nzValue="month">月</label>
           <label nz-radio-button nzValue="date">日</label>
           <label nz-radio-button nzValue="define">自定义</label>
         </nz-radio-group>
         <div class="dateBox">
-          <nz-date-picker
+          <nz-date-picker [(ngModel)]="date" [nzMode]="mode" [nzFormat]="dateFormat" *ngIf="mode !== 'define'"
-            [(ngModel)]="date"
+            [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-date-picker>
-            [nzMode]="mode"
+          <nz-range-picker [(ngModel)]="defineDate" [nzFormat]="dateFormat" *ngIf="mode === 'define'"
-            [nzFormat]="dateFormat"
+            [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-range-picker>
-            *ngIf="mode !== 'define'"
-            [nzDisabledDate]="disabledDate"
-            (ngModelChange)="onChange($event)"
-          ></nz-date-picker>
-          <nz-range-picker
-            [(ngModel)]="defineDate"
-            [nzFormat]="dateFormat"
-            *ngIf="mode === 'define'"
-            [nzDisabledDate]="disabledDate"
-            (ngModelChange)="onChange($event)"
-          ></nz-range-picker>
         </div>
       </div>
     </div>
   </ng-template>
-  <st
+  <st #st multiSort [columns]="columns" [ps]="20" [data]="reportData" [scroll]="{ x: '1200px' }"
-    #st
-    multiSort
-    [columns]="columns"
-    [ps]="20"
-    [data]="reportData"
-    [scroll]="{ x: '1200px' }"
     [res]="{ reName: { list: 'data', total: 'data.total' } }"
-    [page]="{ show: false, showSize: false, pageSizes: [20, 50, 100] }"
+    [page]="{ show: false, showSize: false, pageSizes: [20, 50, 100] }">
-  >
     <ng-template st-row="type" let-item>
       <div *ngIf="item.type == '1'">货主</div>
       <div *ngIf="item.type == '2'">合伙人</div>
       <div *ngIf="item.type == '3'">司机</div>
       <div *ngIf="item.type == '4'">车辆</div>
     </ng-template>
-</st>
+  </st>
 </nz-card>
-<nz-card nzTitle="用户新增报表" [nzExtra]="extraTemplate01">
+<nz-card nzTitle="用户新增报表" [nzExtra]="extraTemplate01" acl [acl-ability]="['customindex-totalAdd']">
   <ng-template #extraTemplate01>
     <div class="chooseBox">
       <div class="timeBox">
-        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext2()" acl  [acl-ability]="['customindex-totalAdd']">
+        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext2()">
           <label nz-radio-button nzValue="year">年</label>
           <label nz-radio-button nzValue="month">月</label>
         </nz-radio-group>
         <div class="dateBox">
-          <nz-date-picker
+          <nz-date-picker [nzDisabledDate]="disabledDate" [(ngModel)]="dateNext" [nzMode]="modeNext"
-            [nzDisabledDate]="disabledDate"
+            (ngModelChange)="onChangeNext($event)"></nz-date-picker>
-            [(ngModel)]="dateNext"
-            [nzMode]="modeNext"
-            (ngModelChange)="onChangeNext($event)"
-          ></nz-date-picker>
         </div>
       </div>
     </div>

src/app/routes/datatable/components/financetable/financetable.component.html

@@ -10,20 +10,22 @@
 -->
 <!-- 页头 -->
 <page-header-wrapper [title]="'财务报表'"></page-header-wrapper>
-<nz-card nzTitle="财务报表" [nzExtra]="extraTemplate">
+<nz-card nzTitle="财务报表" [nzExtra]="extraTemplate" acl [acl-ability]="['financetable-table']">
   <ng-template #extraTemplate>
     <div class="chooseBox">
       <!-- <button nz-button nzType="primary" (click)="exportFun()">导出</button> -->
       <div class="timeBox">
-        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl  [acl-ability]="['financetable-table']">
+        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
           <label nz-radio-button nzValue="year">年</label>
           <label nz-radio-button nzValue="month">月</label>
           <label nz-radio-button nzValue="date">日</label>
           <label nz-radio-button nzValue="define">自定义</label>
         </nz-radio-group>
         <div class="dateBox">
-          <nz-date-picker [(ngModel)]="date" [nzMode]="mode" [nzFormat]="dateFormat" *ngIf="mode !== 'define'" [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-date-picker>
+          <nz-date-picker [(ngModel)]="date" [nzMode]="mode" [nzFormat]="dateFormat" *ngIf="mode !== 'define'"
-          <nz-range-picker [(ngModel)]="defineDate" [nzFormat]="dateFormat" *ngIf="mode === 'define'" [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-range-picker>
+            [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-date-picker>
+          <nz-range-picker [(ngModel)]="defineDate" [nzFormat]="dateFormat" *ngIf="mode === 'define'"
+            [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-range-picker>
         </div>
 
       </div>
@@ -31,9 +33,7 @@
 
   </ng-template>
   <st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listFinancialReportPage"
-    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [req]="{  params: reqParams }" [scroll]="{ x: '1200px' }" [page]="{  }" [loading]="service.http.loading">
-    [scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
     <ng-template st-row="czcgje" let-item let-index="index">
       {{item.czcgje | currency}}
     </ng-template>
@@ -66,19 +66,20 @@
     </ng-template>
   </st>
 </nz-card>
-<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01">
+<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01" acl [acl-ability]="['financetable-report']">
   <ng-template #extraTemplate01>
     <div class="chooseBox">
-      <nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData()" acl  [acl-ability]="['financetable-report']">
+      <nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData()">
         <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of interManlist"></nz-option>
       </nz-select>
       <div class="timeBox">
-        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext()" acl  [acl-ability]="['financetable-report']">
+        <nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext()">
           <label nz-radio-button nzValue="year">年</label>
           <label nz-radio-button nzValue="month">月</label>
         </nz-radio-group>
         <div class="dateBox">
-          <nz-date-picker [nzDisabledDate]="disabledDate" [(ngModel)]="dateNext" [nzMode]="modeNext" (ngModelChange)="onChangeNext($event)"></nz-date-picker>
+          <nz-date-picker [nzDisabledDate]="disabledDate" [(ngModel)]="dateNext" [nzMode]="modeNext"
+            (ngModelChange)="onChangeNext($event)"></nz-date-picker>
         </div>
       </div>
     </div>

src/app/routes/datatable/components/operationtable/operationtable.component.html

@@ -1,19 +1,21 @@
 <!-- 页头 -->
 <page-header-wrapper [title]="'运营报表'"></page-header-wrapper>
-<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate">
+<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate" acl [acl-ability]="['operationtable-table']">
   <ng-template #extraTemplate>
     <div class="chooseBox">
       <button nz-button nzType="primary" (click)="exportFun()" acl [acl-ability]="['operationtable-export']">导出</button>
       <div class="timeBox">
-        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl  [acl-ability]="['operationtable-table']">
+        <nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
           <label nz-radio-button nzValue="year">年</label>
           <label nz-radio-button nzValue="month">月</label>
           <label nz-radio-button nzValue="date">日</label>
           <label nz-radio-button nzValue="define">自定义</label>
         </nz-radio-group>
         <div class="dateBox">
-          <nz-date-picker [(ngModel)]="date" [nzMode]="mode" [nzFormat]="dateFormat" *ngIf="mode !== 'define'" [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-date-picker>
+          <nz-date-picker [(ngModel)]="date" [nzMode]="mode" [nzFormat]="dateFormat" *ngIf="mode !== 'define'"
-          <nz-range-picker [(ngModel)]="defineDate" [nzFormat]="dateFormat" *ngIf="mode === 'define'" [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-range-picker>
+            [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-date-picker>
+          <nz-range-picker [(ngModel)]="defineDate" [nzFormat]="dateFormat" *ngIf="mode === 'define'"
+            [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-range-picker>
         </div>
 
       </div>
@@ -25,10 +27,10 @@
     [scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
     [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"></st>
 </nz-card>
-<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01">
+<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01" acl [acl-ability]="['operationtable-operationalReport']">
   <ng-template #extraTemplate01>
     <div class="chooseBox">
-      <nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData(true)" acl  [acl-ability]="['operationtable-operationalReport']">
+      <nz-select [(ngModel)]="enterpriseInfoId" style="width: 200px" (ngModelChange)="initPillarData(true)">
         <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of interManlist"></nz-option>
       </nz-select>
       <div class="timeBox">
@@ -37,19 +39,20 @@
           <label nz-radio-button nzValue="month">月</label>
         </nz-radio-group>
         <div class="dateBox">
-          <nz-date-picker [nzDisabledDate]="disabledDate" [(ngModel)]="dateNext" [nzMode]="modeNext" (ngModelChange)="onChangeNext($event)"></nz-date-picker>
+          <nz-date-picker [nzDisabledDate]="disabledDate" [(ngModel)]="dateNext" [nzMode]="modeNext"
+            (ngModelChange)="onChangeNext($event)"></nz-date-picker>
         </div>
       </div>
     </div>
   </ng-template>
-  <div nz-row [nzGutter]="64">
+  <!-- <div nz-row [nzGutter]="64">
     <div nz-col class="gutter-row" [nzSpan]="12">
       <app-operation-curve #curve [chartData]="chartData.lineChart"></app-operation-curve>
     </div>
     <div nz-col class="gutter-row" [nzSpan]="12">
       <app-operation-pillar #pillar [chartData]="chartData.histogram"></app-operation-pillar>
     </div>
-  </div>
+  </div> -->
 </nz-card>
 
 <app-opeationtable-pie #pie></app-opeationtable-pie>

src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-21 13:49:21
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-27 17:19:41
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receipt-order\\receipt-order-detail\\receipt-order-detail.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header-wrapper title="收款单" [logo]="logo">
   <ng-template #logo>
     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
@@ -30,7 +40,7 @@
           {{ costInfo?.brmtypeLabel }}
         </se>
         <se label="收款账户" required>
-          {{ costInfo?.ltdaccountId }}
+          {{ costInfo?.ltdaccountCode }}
         </se>
         <se label="尾差">
           {{ costInfo?.recnopay |currency }}

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

@@ -209,7 +209,7 @@ export class ReceiptOrderComponent extends BasicTableComponent implements OnInit
       // { title: '费用号', index: 'feeCode',  width: 180, className: 'text-left' },
       { title: '网络货运人', index: 'ltdName', width: 200, className: 'text-left' },
       { title: '到账日期', index: 'brmdate', type: 'date', width: 200, className: 'text-left' },
-      { title: '收款账户', index: 'ltdaccountId', width: 200, className: 'text-left' },
+      { title: '收款账户', index: 'ltdaccountCode', width: 200, className: 'text-left' },
       {
         title: '到账金额',
         index: 'brmmoney',

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -8,10 +8,9 @@ import { OrderManagementService } from '../../services/order-management.service'
 import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component';
 import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component';
 import { of, Subscription } from 'rxjs';
-import { ShipperBaseService } from '@shared';
+import { SearchDrawerService, ShipperBaseService } from '@shared';
 import { Router, ActivatedRoute } from '@angular/router';
 import { OneCarOrderCancelConfirmComponent } from '../../modal/vehicle/cancel-confirm/cancel-confirm.component';
-import { SearchDrawerService } from 'src/app/shared/components/search-drawer/search-drawer.service';
 import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component';
 
 @Component({
@@ -104,6 +103,8 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
         }
       });
     }
+    console.log(requestOptions);
+    
     this.loading = true;
     return requestOptions;
   };

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts

@@ -53,14 +53,14 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
     if (this.resourceStatus) {
       a.auditStatus = this.resourceStatus;
     }
-    const params: any = Object.assign({}, this.sf?.value || {});
+    const params: any = Object.assign({}, this.sfValue || {});
     delete params._$expand;
     return {
       ...a,
       ...params,
       createTime: {
-        start: this.sf?.value?.createTime?.[0] || '',
+        start: this.sfValue?.createTime?.[0] || '',
-        end: this.sf?.value?.createTime?.[1] || ''
+        end: this.sfValue?.createTime?.[1] || ''
       }
     };
   }
@@ -69,15 +69,15 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
     if (this.resourceStatus) {
       a.auditStatus = this.resourceStatus;
     }
-    const params: any = Object.assign({}, this.sf?.value || {});
+    const params: any = Object.assign({}, this.sfValue || {});
     delete params._$expand;
-    if (this.sf) {
+    if (this.sfValue) {
       Object.assign(requestOptions.body, {
         ...a,
         ...params,
         createTime: {
-          start: this.sf?.value?.createTime?.[0] || '',
+          start: this.sfValue?.createTime?.[0] || '',
-          end: this.sf?.value?.createTime?.[1] || ''
+          end: this.sfValue?.createTime?.[1] || ''
         }
       });
     }
@@ -170,9 +170,6 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
             searchDebounceTime: 300,
             searchLoadingText: '搜索中...',
             allowClear: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
             onSearch: (q: any) => {
               let str = q.replace(/^\s+|\s+$/g, '');
               if (str) {
@@ -195,54 +192,42 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
           ui: {
             widget: 'select',
             placeholder: '请先选择货主',
-            visibleIf: {
+            
-              _$expand: (value: boolean) => value
-            }
           } as SFSelectWidgetSchema
         },
         loadingPlace: {
           type: 'string',
           title: '装货地',
           ui: {
-            visibleIf: {
+            
-              _$expand: (value: boolean) => value
-            }
           }
         },
         dischargePlace: {
           type: 'string',
           title: '卸货地',
           ui: {
-            visibleIf: {
+            
-              _$expand: (value: boolean) => value
-            }
           }
         },
         driverName: {
           title: '承运司机',
           type: 'string',
           ui: {
-            visibleIf: {
+            
-              _$expand: (value: boolean) => value
-            }
           }
         },
         carNo: {
           title: '车牌号',
           type: 'string',
           ui: {
-            visibleIf: {
+            
-              _$expand: (value: boolean) => value
-            }
           }
         },
         carCaptainName: {
           title: '车队长',
           type: 'string',
           ui: {
-            visibleIf: {
+            
-              _$expand: (value: boolean) => value
-            }
           }
         },
         paymentStatus: {
@@ -252,9 +237,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
             widget: 'dict-select',
             params: { dictKey: 'overall:payment:status' },
             containsAllLabel: true,
-            visibleIf: {
+            
-              _$expand: (value: boolean) => value
-            }
           } as SFSelectWidgetSchema
         },
         enterpriseInfoId: {
@@ -264,9 +247,6 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
             asyncData: () => this.shipperservice.getNetworkFreightForwarder()
           }
         },
@@ -278,9 +258,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
             widget: 'dict-select',
             params: { dictKey: 'service:type' },
             containsAllLabel: true,
-            visibleIf: {
+            
-              _$expand: (value: boolean) => value
-            }
           } as SFSelectWidgetSchema
         },
         billStatus: {
@@ -291,9 +269,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
             widget: 'dict-select',
             params: { dictKey: 'bill:status' },
             containsAllLabel: true,
-            visibleIf: {
+            
-              _$expand: (value: boolean) => value
-            }
           } as SFSelectWidgetSchema
         },
         loadingDocuments: {
@@ -310,9 +286,7 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
             widget: 'select',
             placeholder: '请选择',
             allowClear: true,
-            visibleIf: {
+            
-              _$expand: (value: boolean) => value
-            }
           }
         }
       },

src/app/routes/order-management/components/risk-detail/risk-detail.component.ts

@@ -79,7 +79,6 @@ export class OrderManagementRiskDetailComponent implements OnInit {
       '*': {
         spanLabelFixed: 180,
         grid: { span: 18 },
-        width: 600,
       },
       $title1: {
         spanLabelFixed: 0,
@@ -94,6 +93,10 @@ export class OrderManagementRiskDetailComponent implements OnInit {
         spanLabelFixed: 20,
         grid: { span: 3 },
       },
+      $uploadVanchor: {
+        spanLabelFixed: 180,
+        grid: { span: 24 },
+      },
     };
   }
     /**

src/app/routes/order-management/components/risk/risk.component.ts

@@ -51,34 +51,38 @@ export class OrderManagementRiskComponent extends BasicTableComponent implements
     if (this.resourceStatus) {
       a.representationsStatus = this.resourceStatus;
     }
-    const params: any = Object.assign({}, this.sf?.value || {});
+    const params: any = Object.assign({}, this.sfValue || {});
     delete params._$expand;
     return {
       ...a,
       ...params,
       createTime: {
-        start: this.sf?.value?.createTime?.[0] || '',
+        start: this.sfValue?.createTime?.[0] || '',
-        end: this.sf?.value?.createTime?.[1] || ''
+        end: this.sfValue?.createTime?.[1] || ''
       }
     };
   }
   beforeReq = (requestOptions: STRequestOptions) => {
     const a: any = {};
     if (this.resourceStatus) {
+      console.log(this.resourceStatus);
+      
       a.representationsStatus = this.resourceStatus;
     }
-    const params: any = Object.assign({}, this.sf?.value || {});
+    const params: any = Object.assign({}, this.sfValue || {});
     delete params._$expand;
-    if (this.sf) {
+    if (this.sfValue) {
       Object.assign(requestOptions.body, {
         ...a,
         ...params,
         createTime: {
-          start: this.sf?.value?.createTime?.[0] || '',
+          start: this.sfValue?.createTime?.[0] || '',
-          end: this.sf?.value?.createTime?.[1] || ''
+          end: this.sfValue?.createTime?.[1] || ''
         }
       });
     }
+    console.log(requestOptions);
+    
     this.loading = true;
     return requestOptions;
   };

src/app/routes/partner/level-config/components/list/list.component.ts

@@ -52,8 +52,8 @@ export class ParterLevelConfigListComponent implements OnInit {
           title: '状态',
           enum: [
             { label: '全部', value: '' },
-            { label: '启用', value: '1' },
+            { label: '启用', value: '0' },
-            { label: '禁用', value: '0' }
+            { label: '禁用', value: '1' }
           ],
           ui: {
             widget: 'select'
@@ -96,7 +96,7 @@ export class ParterLevelConfigListComponent implements OnInit {
         title: '状态',
         index: 'stateLocked',
         format: (item: any) => {
-          return item.stateLocked ? '启用' : '禁用';
+          return item.stateLocked ? '禁用' : '启用';
         }
       },
       {

src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts

@@ -49,15 +49,15 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
       properties: {
         configName: {
           type: 'string',
-          title: '配置名称',
+          title: '模板名称',
         },
         stateLocked: {
           type: 'string',
           title: '状态',
           enum: [
             {label: '全部', value: ''},
-            {label: '启用', value: 0},
+            {label: '生效中', value: 1},
-            {label: '禁用', value: 1},
+            {label: '失效', value: 0},
           ],
           ui: {
             widget: 'select',
@@ -129,7 +129,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
           },
           {
             text: '禁用',
-            iif: (_record) =>{ return _record.stateLocked == true},
+            iif: (_record) =>{ return _record.stateLocked == true && (_record.partnerType == 3 ||  _record.partnerType == 2)},
             click: _record => this.viewEvaluate(_record),
           },
           {

src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts

@@ -158,6 +158,7 @@ export class MenuTreeComponent implements OnInit, OnChanges {
       auths.push(origin.id);
       const authsSet = new Set<string>(auths);
       this.authorityAssistId = [...Array.from(authsSet)];
+      this.recursionAddParantNode(node);
     } else {
       data.forEach(auth => this._apiAuthSet.delete(auth.functionButtonId));
       this._NodeAuthMap.delete(origin.id);
@@ -243,9 +244,29 @@ export class MenuTreeComponent implements OnInit, OnChanges {
   private recursionDeleteParantNode(node: NzTreeNode) {
     this.authorityAssistId = this.authorityAssistId.filter(auth => auth !== node.origin.id);
     if (node.parentNode) {
+      if (!node.parentNode.children.find(node => node.isChecked) && node.parentNode.origin.level !== 0) {
+        this._NodeAuthMap.delete(node.parentNode.origin.id);
+      }
       this.recursionDeleteParantNode(node.parentNode);
     }
   }
+
+  /**
+   * 向上递归添加父节点到源数据
+   * 清理勾选数据
+   *
+   * @param node
+   */
+  private recursionAddParantNode(node: NzTreeNode) {
+    this._NodeAuthMap.set(node.origin.id, {
+      authorityId: node.origin.id,
+      buttonAuthorityIds: [],
+      isUpdateAuthority: 1
+    });
+    if (node.parentNode) {
+      this.recursionAddParantNode(node.parentNode);
+    }
+  }
 }
 
 export interface AuthorityIdVO {

src/app/routes/sys-setting/sys-setting.module.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:23:05
- * @LastEditTime : 2022-04-27 11:28:48
+ * @LastEditTime : 2022-04-27 15:52:30
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting.module.ts
@@ -38,7 +38,6 @@ import { OrganizationManagementComponent } from './components/organization-manag
 import { OrganizationModalComponent } from './components/organization-management/organization-modal/organization-modal.component';
 import { ApiAuthModalComponent } from './components/organization-management/api-auth-modal/api-auth-modal.component';
 import { MenuTreeComponent } from './components/organization-management/menu-tree/menu-tree.component';
-import { PartnerSystemConfigComponent } from './components/config/config.component';
 
 const COMPONENTS = [
   StaffManagementComponent,
@@ -59,7 +58,6 @@ const COMPONENTS = [
   NoTeManagementComponent,
   SmsTemplateComponent,
   OrganizationManagementComponent,
-  PartnerSystemConfigComponent
 ];
 const NOTROUTECOMPONENTS = [
   BuyerTranspowerComponent,

src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html

@@ -44,7 +44,7 @@
     <st #st [data]="service.$api_get_apply_invoice_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
         [loading]="false" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
         <ng-template st-row="call1No" let-item let-index="index" let-column="column">
-            {{item.driverName}}<br>{{item.driverTelephone}}
+            {{item.driverName}}<br>{{item.driverPhone}}
         </ng-template>
         <ng-template st-row="call1N2o" let-item let-index="index" let-column="column">
             {{item.licenseCarNo}}<br> {{item.licenseBelonging}}

src/app/routes/vehicle/components/list/carauth/carauth.component.ts

@@ -181,6 +181,14 @@ export class CarSettleCarauthComponent implements OnInit {
           placeholder:'请上传行驶证自动带出'
           },
         },
+        carEnergyType: {
+          title: '车辆能源类型',
+          type: 'string',
+          readOnly: true,
+          ui: {
+          placeholder:'请输入车辆能源类型'
+          },
+        },
         carLength: {
           title: '车长',
           type: 'string',
@@ -461,13 +469,8 @@ export class CarSettleCarauthComponent implements OnInit {
           title: '使用性质',
           type: 'string',
           maxLength: 30,
-          enum: [
-            { label: '非营运', value: 0 },
-            { label: '营运', value: 1 },
-          ],
           ui: {
-            widget: 'select',
+            placeholder: '请输入',
-            placeholder: '请选择',
           },
         },
         curbWeight: {
@@ -594,6 +597,7 @@ export class CarSettleCarauthComponent implements OnInit {
         'carNo',
         'carNoColor',
         'carModel',
+        'carEnergyType',
         'carLength',
         'carLoad',
         'isSelf',
@@ -681,7 +685,7 @@ export class CarSettleCarauthComponent implements OnInit {
           this.sf.setValue('/driverLicenseSigningOrg', res.issuingAuthority);
           this.sf.setValue('/carDistinguishCode', res.vin);
           this.sf.setValue('/carOwner', res.name);
-          this.sf.setValue('/useNature', res.useCharacter === '非营运' ? 0 : 1);
+          this.sf.setValue('/useNature', res.useCharacter);
           this.sf.setValue('/carModel', res?.vehicleType);
           
         } else {

src/app/routes/waybill-management/waybill-management-routing.module.ts

@@ -15,14 +15,30 @@ import { WaybillManagementVehicleDetailComponent } from './components/vehicle-de
 import { WaybillManagementVehicleComponent } from './components/vehicle/vehicle.component';
 
 const routes: Routes = [
-  { path: 'vehicle', component: WaybillManagementVehicleComponent },
+  {
-  { path: 'vehicle/vehicle-detail/:id', component: WaybillManagementVehicleDetailComponent },
+    path: 'vehicle',
-  { path: 'bulk', component: WaybillManagementBulkComponent },
+    component: WaybillManagementVehicleComponent,
-  { path: 'bulk/bulk-detail/:id', component: WaybillManagementBulkeDetailComponent },
+    data: { guard: { ability: ['WAYBILL-VEHICLE-search'] } }
-  { path: 'abnormal-appear', component: WaybillManagementAbnormalAppearComponent },
+  },
-]
+  {
+    path: 'vehicle/vehicle-detail/:id',
+    component: WaybillManagementVehicleDetailComponent,
+    data: { guard: { ability: ['WAYBILL-VEHICLE-DETAIL-wholeUnloadCarInfo'] } }
+  },
+  { path: 'bulk', component: WaybillManagementBulkComponent, data: { guard: { ability: ['WAYBILL-BULK-search'] } } },
+  {
+    path: 'bulk/bulk-detail/:id',
+    component: WaybillManagementBulkeDetailComponent,
+    data: { guard: { ability: ['WAYBILL-BULK-DETAIL-insertBulkStartCarInfo'] } }
+  },
+  {
+    path: 'abnormal-appear',
+    component: WaybillManagementAbnormalAppearComponent,
+    data: { guard: { ability: ['WAYBILL-ABNORMAL-search'] } }
+  }
+];
 @NgModule({
   imports: [RouterModule.forChild(routes)],
   exports: [RouterModule]
 })
-export class WaybillManagementRoutingModule { }
+export class WaybillManagementRoutingModule {}