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

src/app/routes/contract-management/components/contract-frame/contract-frame.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-07 13:29:57
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:16:04
+ * @LastEditTime : 2022-02-23 16:04:18
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-frame\\contract-frame.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -36,7 +36,16 @@
         </sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button
+          nz-button
+          nzType="primary"
+          [disabled]="!sf.valid"
+          [nzLoading]="service.http.loading"
+          (click)="st?.load(1)"
+          acl
+          [acl-ability]="['CONTRACT-INDEX-listFrame']"
+          >查询</button
+        >
         <button nz-button (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}

src/app/routes/contract-management/components/contract-list/contract-list.component.html

@@ -30,7 +30,7 @@
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
         <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
-          (click)="st?.load(1)">查询</button>
+          (click)="st?.load(1)"  acl  [acl-ability]="['CONTRACT-INDEX-searchDetail']">查询</button>
         <button nz-button (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}

src/app/routes/contract-management/components/contract-list/contract-list.component.ts

@@ -153,18 +153,6 @@ export class ContractManagementContractListComponent implements OnInit {
               },
             } as SFSelectWidgetSchema,
           },
-          // signTime: {
-          //   title: '签署日期',
-          //   type: 'string',
-          //   ui: {
-          //     widget: 'date',
-          //     mode: 'range',
-          //     format: 'yyyy-MM-dd',
-          //     visibleIf: {
-          //       _$expand: (value: boolean) => value,
-          //     },
-          //   } as SFDateWidgetSchema,
-          // },
           signTime: {
             title: '签署日期',
             type: 'string',
@@ -196,11 +184,6 @@ export class ContractManagementContractListComponent implements OnInit {
         break;
     }
   }
-
-  approval(): void {}
-
-  add(): void {}
-
   routeTo(item: any) {
     this.router.navigate(['/ticket/invoice-requested-detail/1']);
   }
@@ -246,7 +229,6 @@ export class ContractManagementContractListComponent implements OnInit {
       ]
     });
   }
-
   /**
    * 重置表单
    */
@@ -254,7 +236,6 @@ export class ContractManagementContractListComponent implements OnInit {
     this.sf.reset();
     this._$expand = false;
   }
-
   /**
    * 伸缩查询条件
    */

src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts

@@ -140,10 +140,6 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
   }
 
   save() {
-    console.log(this.sf.value)
-    console.log(this.sf2.value) 
-    console.log(this.detailList.templateName)
-    console.log(this.title)
     if (!this.sf.value.templateName || !this.sf.value.templateType || !this.sf2.value.templateContent || !this.title) {
       this.service.msgSrv.error('必填参数为空，请检查再重新保存！');
       return;

src/app/routes/contract-management/components/contract-template/contract-template.component.html

@@ -10,14 +10,21 @@
 -->
 
 <!-- 搜索表单 -->
-<page-header-wrapper [title]="'合同模板'">
+<page-header-wrapper [title]="'合同模板'"> </page-header-wrapper>
-</page-header-wrapper>
 <nz-card>
   <div nz-row nzGutter="8">
     <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
     <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-      <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
+      <sf
-        (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"
+      ></sf>
     </div>
 
     <!-- 查询字段大于3个时，根据展开状态调整布局 -->
@@ -26,10 +33,17 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+        <button
-          (click)="st?.load(1)">查询</button>
+          nz-button
-        <button nz-button nzType="primary" 
+          nzType="primary"
-         >导出</button>
+          [disabled]="!sf.valid"
+          [nzLoading]="service.http.loading"
+          (click)="st?.load(1)"
+          acl
+          [acl-ability]="['CONTRACT-TEMPLATE-search']"
+          >查询</button
+        >
+        <button nz-button nzType="primary" acl [acl-ability]="['CONTRACT-TEMPLATE-export']">导出</button>
         <button nz-button (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}
@@ -42,11 +56,9 @@
 
 <nz-card>
   <div class="NewBtn">
-    <button  nz-button nzType="primary"(click)="creatTemplate()">
+    <button nz-button nzType="primary" (click)="creatTemplate()" acl [acl-ability]="['CONTRACT-TEMPLATE-new']"> 新建 </button>
-    新建
-</button> 
   </div>
-  <div style="margin-top: 15px;">
+  <div style="margin-top: 15px">
     <st
       #st
       [bordered]="true"

src/app/routes/contract-management/components/contract-template/contract-template.component.ts

@@ -125,10 +125,12 @@ export class ContractManagementTemplateComponent implements OnInit {
           {
             text: '编辑',
             click: (_record) => this.edit(_record),
+            acl: { ability: ['CONTRACT-TEMPLATE-edit'] },
           },
           {
             text: '删除',
             click: (_record) => this.delete(_record),
+            acl: { ability: ['CONTRACT-TEMPLATE-delete'] },
           },
         ],
       },

src/app/routes/contract-management/components/policy/policy.component.html

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-01-12 10:52:50
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-02-23 15:57:26
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\policy\\policy.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <page-header [action]="phActionTpl">
   <ng-template #phActionTpl> </ng-template>
 </page-header>
@@ -24,7 +34,7 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)"  acl  [acl-ability]="['CONTRACT-POLICY-search']">查询</button>
         <button nz-button (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}

src/app/routes/contract-management/components/policy/policy.component.ts

@@ -123,7 +123,8 @@ export class ContractManagementPolicyComponent implements OnInit {
             text: '查看传入值',
             click: item => {
               this.openDetail(item)
-            }
+            },
+            acl: { ability: ['CONTRACT-POLICY-view'] },
           }
         ]
       }
@@ -148,7 +149,12 @@ export class ContractManagementPolicyComponent implements OnInit {
         },
         policyNo: {
           type: 'string',
-          title: '保单号'
+          title: '保单号',
+          ui: {
+            visibleIf: {
+              _$expand: (value: boolean) => value
+            },
+          }
         },
         processResult: {
           type: 'string',

src/app/routes/contract-management/services/contract-management.service.ts

@@ -15,7 +15,6 @@ import { BaseService } from 'src/app/shared/services';
   providedIn: 'root'
 })
 export class ContractManagementService extends BaseService {
-
   $api_get_getPremiumInformationPage = `/api/sdc/billOperate/listPremiumInformationPage`;
   // 查询投诉列表
   $api_get_operate_listPage = `/api/sdc/complaint/operate/listPage`;

src/app/routes/insurance-management/components/list/list.component.html

@@ -32,8 +32,8 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl  [acl-ability]="['INSURANCE-LIST-search']">查询</button>
-        <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
+        <button nz-button nzType="primary" [disabled]="service.http.loading" acl  [acl-ability]="['INSURANCE-LIST-export']">导出</button>
         <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}
@@ -123,6 +123,6 @@
 
 <ng-template #extraTemplate>
   <div>
-    <button nz-button nzType="primary" (click)="changeOrder()"> 保险配置 </button>
+    <button nz-button nzType="primary" (click)="changeOrder()" acl  [acl-ability]="['INSURANCE-LIST-insuranceConfig']"> 保险配置 </button>
   </div>
 </ng-template>

src/app/routes/insurance-management/components/list/list.component.ts

@@ -460,19 +460,22 @@ export class insuranceManagementListComponent implements OnInit {
         buttons: [
           {
             text: '再次投保',
-            click: _record => this.retreatNext(_record)
+            click: _record => this.retreatNext(_record),
+            // acl: { ability: ['VEHICLE-LIST-view'] },
             // iif: item =>
             //   item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
           },
           {
             text: '查看保单',
-            click: _record => this.showImg(_record)
+            click: _record => this.showImg(_record),
+            // acl: { ability: ['VEHICLE-LIST-view'] },
             // iif: item =>
             //   item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1'
           },
           {
             text: '退保费',
-            click: _record => this.retreatPrice(_record)
+            click: _record => this.retreatPrice(_record),
+            // acl: { ability: ['VEHICLE-LIST-view'] },
           }
         ]
       }

src/app/routes/order-management/components/complaint/complaint.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:18:42
+ * @LastEditTime : 2022-02-23 15:27:52
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -27,7 +27,7 @@
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
         <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
-          (click)="st?.load(1)">查询</button>
+          (click)="st?.load(1)"  acl  [acl-ability]="['ORDER-COMPLAINT-search']">查询</button>
         <button nz-button nzType="primary" 
          >导出</button>
         <button nz-button (click)="resetSF()">重置</button>

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

@@ -187,6 +187,7 @@ export class OrderManagementComplaintComponent implements OnInit {
           {
             text: '查看',
             click: (_record) => this.view(_record),
+            acl: { ability: ['ORDER-COMPLAINT-view'] },
           },
         ],
       },

src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html

@@ -4,19 +4,26 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-25 14:02:24
+ * @LastEditTime : 2022-02-23 15:36:48
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <!-- 搜索表单 -->
-<page-header-wrapper [title]="''">
+<page-header-wrapper [title]="''"> </page-header-wrapper>
-</page-header-wrapper>
 <nz-card>
   <div nz-row nzGutter="8">
     <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
     <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-      <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
+      <sf
-        (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"
+      ></sf>
     </div>
 
     <!-- 查询字段大于3个时，根据展开状态调整布局 -->
@@ -25,10 +32,18 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading"
+        <button
-          (click)="search()">查询</button>
+          nz-button
-        <button nz-button nzType="primary"  [disabled]="service.http.loading"
+          nzType="primary"
-         >导出</button>
+          [nzLoading]="service.http.loading"
+          (click)="search()"
+          acl
+          [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']"
+          >查询</button
+        >
+        <button nz-button nzType="primary" [disabled]="service.http.loading" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']"
+          >导出</button
+        >
         <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}
@@ -40,14 +55,13 @@
 </nz-card>
 
 <nz-card>
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" 
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
-  [nzTabBarExtraContent]="extraTemplate">
     <nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab>
     <nz-tab [nzTitle]="'待抽查(' + tabs?.spotQuantity + ')'"></nz-tab>
     <nz-tab [nzTitle]="'合格(' + tabs?.qualifiedtity + ')'"></nz-tab>
     <nz-tab [nzTitle]="'不合格(' + tabs?.unstayQuantity + ')'"></nz-tab>
   </nz-tabset>
-  <div style="margin-top: 15px;">
+  <div style="margin-top: 15px">
     <st
       #st
       [bordered]="true"
@@ -67,14 +81,10 @@
         <div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div>
       </ng-template>
       <ng-template st-row="driverName" let-item let-index="index">
-      <div>
+        <div> {{ item?.driverName }}/{{ item?.driverPhone }}/{{ item?.carNo }} </div>
-        {{item?.driverName}}/{{item?.driverPhone}}/{{item?.carNo}}
-      </div>
       </ng-template>
       <ng-template st-row="payeeName" let-item let-index="index">
-      <div>
+        <div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div>
-        {{item?.payeeName}}/{{item?.payeePhone}}
-      </div>
       </ng-template>
       <ng-template st-row="billCode" let-item let-index="index">
         <a [routerLink]="'/order-management/bulk-detail/' + item.id">{{ item.billCode }}</a>
@@ -107,17 +117,20 @@
 
 <ng-template #extraTemplate>
   <div>
-    <button  nz-button nzType="primary" (click)="audit()">
+    <button nz-button nzType="primary" (click)="audit()" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-updateBillByComplianceBatch']"> 批量抽查 </button>
-批量抽查
-</button> 
   </div>
 </ng-template>
 
-
+<nz-modal
-<nz-modal [(nzVisible)]="isVisibleRE"  [nzWidth]="600" [nzFooter]="nzModalFooterview2"  (nzOnOk)="handleOK()" nzTitle="抽查" (nzOnCancel)="handleCancel('1')">
+  [(nzVisible)]="isVisibleRE"
+  [nzWidth]="600"
+  [nzFooter]="nzModalFooterview2"
+  (nzOnOk)="handleOK()"
+  nzTitle="抽查"
+  (nzOnCancel)="handleCancel('1')"
+>
   <ng-container *nzModalContent>
-    <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
+    <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'"> </sf>
-    </sf>
   </ng-container>
   <ng-template #nzModalFooterview2>
     <button nz-button nzType="default" (click)="reject()">不合格</button>
@@ -136,7 +149,6 @@
       [columns]="columnsFloat"
       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }"
       [res]="{ reName: { list: 'data', total: 'data.total' } }"
-    
     >
       <ng-template st-row="order" let-item let-index="index">
         {{ index + 1 }}
@@ -163,15 +175,17 @@
       <ng-template st-row="amountBeforeChange" let-item let-index="index">
         {{ item.amountBeforeChange | currency }}
       </ng-template>
-  <ng-template st-row="amountchangeValue" let-item let-index="index">
+      <ng-template st-row="amountchangeValue" let-item let-index="index"> ￥{{ item.amountchangeValue | number: '0.2-2' }} </ng-template>
-    ￥{{ item.amountchangeValue | number: '0.2-2'}}
-  </ng-template>
       <ng-template st-row="amountAfterChange" let-item let-index="index">
         {{ item.amountAfterChange | currency }}
       </ng-template>
     </st>
-  <div><span>变更原因：{{ViewCause?.changeCause}}</span></div>
+    <div
-  <div><span>拒绝原因：{{ViewCause?.refuseCause}}</span></div>
+      ><span>变更原因：{{ ViewCause?.changeCause }}</span></div
+    >
+    <div
+      ><span>拒绝原因：{{ ViewCause?.refuseCause }}</span></div
+    >
     <div><span>注：附加费依据调整后的运输费用重新计算</span></div>
   </ng-container>
   <ng-template #nzModalFooterview>

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

@@ -398,12 +398,14 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
           {
             text: '运费变更记录',
             click: _record => this.OpenPrice(_record),
-            // iif: item => item.billStatus == '4'
+            // iif: item => item.billStatus == '4',
+            acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] },
           },
           {
             text: '合规抽查　　',
             click: _record => this.audit(_record),
-            iif: item => item.complianceStatus == '0' 
+            iif: item => item.complianceStatus == '0',
+            acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] },
           },
         ]
       }

src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-14 14:03:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-21 14:44:38
+ * @LastEditTime : 2022-02-23 14:20:32
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->

src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-14 14:03:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-22 15:44:05
+ * @LastEditTime : 2022-02-23 14:23:26
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */

src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-29 14:51:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:23:46
+ * @LastEditTime : 2022-02-23 16:19:27
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -42,6 +42,8 @@ export class VehicleModifyRateComponent implements OnInit {
         additionalRate: {
           type: 'number',
           title: '附加费率',
+          maximum: 100,
+          minimum: 0,
           ui: {
             unit: '%',
             widgetWidth: 200,

src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-15 13:17:42
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-22 15:40:01
+ * @LastEditTime : 2022-02-23 14:25:45
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -152,6 +152,7 @@ export class VehicleUpdateFreightComponent implements OnInit {
     this.calculateSub = this.service.request(this.service.$api_getWholeSurchargeDetail, this.getParams()).subscribe((res: any) => {
       if (res) {
         Object.assign(this.data, {
+          totalAmount: res.totalAmount,
           totalFreight: res.totalFreight,
           freight: res.freight,
           surcharge: res.surcharge

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

@@ -350,7 +350,7 @@ export class InvoiceRequestedComponent implements OnInit {
       {
         title: '申请金额',
         index: 'applyAmount',
-        width: 100,
+        width: 140,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.applyAmount }) }
@@ -358,7 +358,7 @@ export class InvoiceRequestedComponent implements OnInit {
       {
         title: '运输费',
         index: 'fjfmoney2',
-        width: 90,
+        width: 140,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fjfmoney2 }) }
@@ -366,7 +366,7 @@ export class InvoiceRequestedComponent implements OnInit {
       {
         title: '附加费',
         index: 'fjfmoney',
-        width: 90,
+        width: 140,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fjfmoney }) }
@@ -374,7 +374,7 @@ export class InvoiceRequestedComponent implements OnInit {
       {
         title: '已开票金额',
         index: 'invoicedMoney',
-        width: 120,
+        width: 140,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoicedMoney }) }

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

@@ -33,7 +33,7 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
   ngOnInit() {}
 
   settingAction(item?: any) {
-    this.modal.create({
+    const modal = this.modal.create({
       nzTitle: '配置',
       nzContent: DynamicSettingModalComponent,
       nzWidth: 900,
@@ -44,6 +44,12 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
       },
       nzFooter: null
     });
+
+    modal.afterClose.subscribe(res => {
+      if (res) {
+        this.st.load(1);
+      }
+    });
   }
 
   /**

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

@@ -153,7 +153,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
       { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
       { title: '联系人', className: 'text-center', index: 'contacter', width: 150 },
       { title: '手机号', className: 'text-center', index: 'mobile', width: 150 },
-      { title: '申请时间', className: 'text-center', index: 'createTime', width: 150 },
+      { title: '申请时间', className: 'text-center', index: 'createTime', width: 160 },
       {
         title: '审核状态',
         className: 'text-center',
@@ -189,11 +189,11 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
   initAdminST(): STColumn[] {
     return [
       { title: '企业名称', className: 'text-center', index: 'enterpriseName' },
-      { title: '当前管理员', className: 'text-center', index: 'oldAdminName' },
+      { title: '当前管理员', className: 'text-center', index: 'oldAdminName', width: 140 },
-      { title: '当前管理员手机号', className: 'text-center', index: 'oldAdminMobile' },
+      { title: '当前管理员手机号', className: 'text-center', index: 'oldAdminMobile', width: 150 },
-      { title: '转授对象', className: 'text-center', index: 'newAdminName' },
+      { title: '转授对象', className: 'text-center', index: 'newAdminName', width: 140 },
-      { title: '转授对象手机号', className: 'text-center', index: 'newAdminMobile' },
+      { title: '转授对象手机号', className: 'text-center', index: 'newAdminMobile', width: 150 },
-      { title: '申请时间', className: 'text-center', index: 'createTime' },
+      { title: '申请时间', className: 'text-center', index: 'createTime', width: 160 },
       {
         title: '状态',
         className: 'text-center',
@@ -203,7 +203,8 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
           10: { text: '待审核', color: 'processing' },
           20: { text: '已成功', color: 'success' },
           30: { text: '已驳回', color: 'warning' }
-        }
+        },
+        width: 130
       },
       {
         title: '操作',

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

@@ -35,7 +35,7 @@ export class FreightConfigComponent implements OnInit {
   };
 
   settingAction(item?: any) {
-    this.modal.create({
+    const modal = this.modal.create({
       nzTitle: '配置',
       nzContent: DynamicSettingModalComponent,
       nzWidth: 900,
@@ -66,6 +66,11 @@ export class FreightConfigComponent implements OnInit {
       },
       nzFooter: null
     });
+    modal.afterClose.subscribe(res => {
+      if (res) {
+        this.st.load(1);
+      }
+    });
   }
 
   exportList() {

src/app/routes/vehicle/components/list/list.component.html

@@ -24,7 +24,7 @@
         [nzLoading]="service.http.loading"
         (click)="st?.load(1)"
         >查询</button>
-      <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportFire()" acl [acl-ability]="'VEHICLE-LIST-view'"
+      <button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportFire()" acl [acl-ability]="'VEHICLE-LIST-export'"
         >导出</button
       >
       <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>

src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-24 15:38:08
- * @LastEditTime : 2022-02-22 09:50:27
+ * @LastEditTime : 2022-02-23 15:43:24
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\abnormal-appear\\abnormal-appear.component.html
@@ -30,7 +30,7 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="search()">查询</button>
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="search()"  acl  [acl-ability]="['WAYBILL-ABNORMAL-search']">查询</button>
         <button nz-button (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}

src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html

@@ -19,8 +19,8 @@
     </div>
     <div nz-row style="display: flex; justify-content: end;">
       <div nz-col nzSpan="10">
-        <button nz-button *ngIf="i.wayBillStatus == '2'"  (click)="sureDepart(i)">确认发车</button>
+        <button nz-button *ngIf="i.wayBillStatus == '2'"  (click)="sureDepart(i)" acl  [acl-ability]="['WAYBILL-BULK-DETAIL-insertBulkStartCarInfo']">确认发车</button>
-        <button nz-button nzType="primary" *ngIf="i.wayBillStatus == '3'" (click)="sureArrive(i)" nzGhost >确认到车</button>
+        <button nz-button nzType="primary" *ngIf="i.wayBillStatus == '3'" (click)="sureArrive(i)" nzGhost acl  [acl-ability]="['WAYBILL-BULK-DETAIL-insertBulkUnloadCarInfo']" >确认到车</button>
       </div>
     </div>
     <nz-divider></nz-divider>

src/app/routes/waybill-management/components/bulk/bulk.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime : 2022-02-21 19:42:59
+ * @LastEditTime : 2022-02-23 15:41:43
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html
@@ -30,8 +30,8 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()"  acl  [acl-ability]="['WAYBILL-BULK-search']">查询</button>
-        <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
+        <button nz-button nzType="primary" [disabled]="service.http.loading" acl  [acl-ability]="['WAYBILL-BULK-export']">导出</button>
         <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}

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

@@ -316,11 +316,13 @@ tabs = {
             text: '确认发车',
             click: (_record) => this.sureDepart(_record),
             iif: item => item.wayBillStatus == '2' ,
+            acl: { ability: ['WAYBILL-BULK-insertBulkStartCarInfo'] },
           },
           {
             text: '确认到车',
             click: (_record) => this.sureArrive(_record),
             iif: item => item.wayBillStatus == '3'  ,
+            acl: { ability: ['WAYBILL-BULK-insertBulkUnloadCarInfo'] },
           },
         ],
       },

src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html

@@ -19,8 +19,8 @@
     </div>
     <div nz-row style="display: flex; justify-content: end;">
       <div nz-col nzSpan="10">
-        <button nz-button (click)="sureDepart(i)" *ngIf="i?.wayBillStatus == '2'" >确认发车</button>
+        <button nz-button (click)="sureDepart(i)" *ngIf="i?.wayBillStatus == '2'" acl  [acl-ability]="['WAYBILL-VEHICLE-DETAIL-wholeStartCarInfo']">确认发车</button>
-        <button nz-button nzType="primary" (click)="sureArrive(i)" *ngIf="i?.wayBillStatus == '3'" nzGhost >确认到车</button>
+        <button nz-button nzType="primary" (click)="sureArrive(i)" *ngIf="i?.wayBillStatus == '3'" nzGhost acl  [acl-ability]="['WAYBILL-VEHICLE-DETAIL-wholeUnloadCarInfo']">确认到车</button>
       </div>
     </div>
     <nz-divider></nz-divider>

src/app/routes/waybill-management/components/vehicle/vehicle.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime : 2022-02-21 19:34:48
+ * @LastEditTime : 2022-02-23 15:39:15
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html
@@ -30,8 +30,8 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
-        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()"  acl  [acl-ability]="['WAYBILL-VEHICLE-search']">查询</button>
-        <button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
+        <button nz-button nzType="primary" [disabled]="service.http.loading"  acl  [acl-ability]="['WAYBILL-VEHICLE-export']">导出</button>
         <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}

src/app/routes/waybill-management/components/vehicle/vehicle.component.ts

@@ -340,12 +340,14 @@ export class WaybillManagementVehicleComponent implements OnInit {
           {
             text: '确认发车',
             click: _record => this.sureDepart(_record),
-            iif: item => item.wayBillStatus == '2'
+            iif: item => item.wayBillStatus == '2',
+            acl: { ability: ['WAYBILL-VEHICLE-wholeStartCarInfo'] },
           },
           {
             text: '确认到车',
             click: _record => this.sureArrive(_record),
-            iif: item => item.wayBillStatus == '3'
+            iif: item => item.wayBillStatus == '3',
+            acl: { ability: ['WAYBILL-VEHICLE-wholeUnloadCarInfo'] },
           }
         ]
       }

src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts

@@ -75,8 +75,6 @@ export class DynamicSettingModalComponent implements OnInit {
           this.configList = this.formatItems(this.selectedTab.items);
           const hiddenType = this.configList.find((item: any) => item.itemType === 7 || item.itemType === 999);
           this.labelWidth = hiddenType ? 0 : 200;
-          console.log(this.configList);
-          
         }
       });
   }
@@ -103,7 +101,7 @@ export class DynamicSettingModalComponent implements OnInit {
     this.service.request('/api/mdc/pbc/sysConfigItemExtend/saveBatch', p).subscribe(res => {
       if (res) {
         this.service.msgSrv.success('修改配置成功');
-        this.modalHelp.destroy();
+        this.modalHelp.destroy(true);
       }
     });
   }

src/app/shared/components/insurance-table/insurance-table.component.ts

@@ -150,9 +150,6 @@ export class InsuranceTableComponent implements OnInit {
   }
 
   save() {
-    console.log(this.data);
-    console.log(this.minInsurancePrice);
-    console.log(this.sf.value);
     if(!this.minInsurancePrice) {
         this.service.msgSrv.error('必填项为空！')
         return