From 5832cc4fbac54e5b5742aeeb7ac5e081cd7f502e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 23 Feb 2022 16:20:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract-frame.component.html | 21 +- .../contract-list.component.html | 2 +- .../contract-list/contract-list.component.ts | 19 -- .../contract-template-detail.component.ts | 4 - .../contract-template.component.html | 60 +++-- .../contract-template.component.ts | 2 + .../components/policy/policy.component.html | 12 +- .../components/policy/policy.component.ts | 10 +- .../services/contract-management.service.ts | 35 ++- .../components/list/list.component.html | 8 +- .../components/list/list.component.ts | 9 +- .../complaint/complaint.component.html | 4 +- .../complaint/complaint.component.ts | 1 + .../compliance-audit.component.html | 234 ++++++++++-------- .../compliance-audit.component.ts | 6 +- .../modify-rate/modify-rate.component.ts | 4 +- .../components/list/list.component.html | 2 +- .../abnormal-appear.component.html | 4 +- .../bulk-detail/bulk-detail.component.html | 4 +- .../components/bulk/bulk.component.html | 6 +- .../components/bulk/bulk.component.ts | 2 + .../vehicle-detail.component.html | 4 +- .../components/vehicle/vehicle.component.html | 6 +- .../components/vehicle/vehicle.component.ts | 6 +- .../insurance-table.component.ts | 3 - 25 files changed, 253 insertions(+), 215 deletions(-) diff --git a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html index 46be1da2..14be2c5c 100644 --- a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html +++ b/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 @@
- +
+ (click)="st?.load(1)" acl [acl-ability]="['CONTRACT-INDEX-searchDetail']">查询 - + +
- +
- +
-
+
- - {{item.templateName}} - + + {{ item.templateName }} +
diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts index e1a34797..3a28c9f8 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts +++ b/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'] }, }, ], }, diff --git a/src/app/routes/contract-management/components/policy/policy.component.html b/src/app/routes/contract-management/components/policy/policy.component.html index 266fd620..d54bd837 100644 --- a/src/app/routes/contract-management/components/policy/policy.component.html +++ b/src/app/routes/contract-management/components/policy/policy.component.html @@ -1,3 +1,13 @@ + @@ -24,7 +34,7 @@
- +
- - + + +
diff --git a/src/app/routes/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts index ea716bf9..7cc54aaa 100644 --- a/src/app/routes/insurance-management/components/list/list.component.ts +++ b/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'] }, } ] } diff --git a/src/app/routes/order-management/components/complaint/complaint.component.html b/src/app/routes/order-management/components/complaint/complaint.component.html index ff10dcde..e4563026 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.html +++ b/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 @@
+ (click)="st?.load(1)" acl [acl-ability]="['ORDER-COMPLAINT-search']">查询 diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index edf11ab5..7f743dd1 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/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'] }, }, ], }, diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html index d958b017..4430599b 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html +++ b/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. --> - - +
- +
@@ -25,10 +32,18 @@
- - + + +
- - + - - + @@ -125,23 +138,22 @@ - + - - {{ index + 1 }} - - + #stFloat + multiSort + size="small" + [bordered]="true" + [data]="service.$api_get_listChangeApply" + [columns]="columnsFloat" + [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }" + [res]="{ reName: { list: 'data', total: 'data.total' } }" + > + + {{ index + 1 }} + + @@ -149,33 +161,35 @@ - + - - {{ item.amountBeforeChange | currency}} - - - ￥{{ item.amountchangeValue | number: '0.2-2'}} - - - {{ item.amountAfterChange | currency}} - - -
变更原因：{{ViewCause?.changeCause}}
-
拒绝原因：{{ViewCause?.refuseCause}}
-
注：附加费依据调整后的运输费用重新计算
+ #stFloatView + size="small" + [bordered]="true" + [data]="service.$api_getChangeRecordWholeDetail" + [columns]="columnsFloatView" + [req]="{ method: 'POST', allInBody: true, params: changeViewParams }" + [res]="{ reName: { list: 'data.list', total: 'data.total' } }" + > + + {{ item.amountBeforeChange | currency }} + + ￥{{ item.amountchangeValue | number: '0.2-2' }} + + {{ item.amountAfterChange | currency }} + + +
变更原因：{{ ViewCause?.changeCause }}
+
拒绝原因：{{ ViewCause?.refuseCause }}
+
注：附加费依据调整后的运输费用重新计算
 - \ No newline at end of file + diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index df351650..d6e0fa51 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/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'] }, }, ] } diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts index 3b8c81a2..87a1a092 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts +++ b/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, diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html index 7e3b450d..be3fb947 100644 --- a/src/app/routes/vehicle/components/list/list.component.html +++ b/src/app/routes/vehicle/components/list/list.component.html @@ -24,7 +24,7 @@ [nzLoading]="service.http.loading" (click)="st?.load(1)" >查询 - diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html index 2bb0d079..b17e0699 100644 --- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html +++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html @@ -1,7 +1,7 @@