From 9e2900ad75c9d23251743327db5de8d5329951ef Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 15 Feb 2022 15:12:38 +0800 Subject: [PATCH] fix bug --- .../bulk-detail/bulk-detail.component.html | 209 +++++++------ .../components/bulk/bulk.component.html | 288 ++++++++++-------- .../components/bulk/bulk.component.ts | 50 +-- .../receipts-audit.component.html | 4 +- .../receipts-audit.component.ts | 17 +- .../components/risk/risk.component.html | 108 +++---- .../components/risk/risk.component.ts | 2 + .../vehicle-detail.component.html | 140 +++++---- .../components/vehicle/vehicle.component.html | 277 +++++++++-------- .../components/vehicle/vehicle.component.ts | 7 + .../voucher-view/voucher-view.component.html | 4 +- 11 files changed, 579 insertions(+), 527 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 7833e3f6..9caa3594 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-02-10 14:44:36 + * @LastEditTime : 2022-02-15 14:52:18 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -16,52 +16,63 @@
- -

订单号: {{ i?.billCode }}

+ +

订单号: {{ i?.billCode }}

-
+
- - + +
-
+
{{ i?.goodsResource?.enterpriseInfoName }} {{ i?.goodsResource?.shipperAppUserName }} - {{i?.goodsResource?.enterpriseProjectName}} - {{i?.goodsResource?.serviceTypeLabel}} - {{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} - {{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchPhone}} -
- - - - - - - - - - - - -
+ {{ i?.goodsResource?.enterpriseProjectName }} + {{ i?.goodsResource?.serviceTypeLabel }} + {{ i?.goodsResource?.createUserName }} /{{ i?.goodsResource?.createUserPhone }} + {{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} +
+ + + + + + + +
- +
-   -   -   -   +   + +   + +   + +  
@@ -71,85 +82,76 @@ {{i?.goodsInfoList?.[0]?.goodsName}} - - - - {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 - + + + {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 {{ i?.carModel }}/{{ i?.carLength }} - - {{i?.driverName}}/{{i?.driverPhone}}{{i?.carNo}} - + {{ i?.driverName }}/{{ i?.driverPhone }}{{ i?.carNo }} {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 - {{i?.loadPlanTime}} + {{ i?.loadPlanTime }} - {{i?.unloadPlanTime}} + {{ i?.unloadPlanTime }} - - {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 - - - {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 - - - {{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件 - - -
-

装货卸货信息 - ( - - - - ) -

-
-
-
-
-
-
装
-
-

装货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+ {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 + {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 + {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 + +
+

装货卸货信息 + ( + + + + ) +

+
+
+
+
+
+
装
+
+

装货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}

+

联系人：{{ item.appUserName }}/{{ item.contractTelephone }}

+
-
-
-
-
-
-
卸
-
-

卸货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
+
+
+
+
卸
+
+

卸货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}

+

联系人：{{ item.appUserName }}/{{ item.contractTelephone }}

+
-

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）

- {{ item.price | currency}} + {{ item.price | currency }} - {{ item.surcharge | currency}} + {{ item.surcharge | currency }}
- 总计：{{ i?.totalAmount | currency }} - （运费{{i?.totalFreight | currency}}， - 附加费{{ i?.totalSurcharge | currency }}，附加费率{{i?.totalRate * 100 }}%） + 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | currency }}， + 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 }}%）
收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}
@@ -165,12 +167,10 @@ - - + - - + @@ -189,40 +189,39 @@ {{ i?.supplementaryInformationVO?.address }} - - {{i?.goodsResource?.remarks}} + {{ i?.goodsResource?.remarks }}
- -
-
- -
-
- -
-
+
+
+ +
+
- + - + - \ No newline at end of file + diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index cfc7d5c6..a1f430c5 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -9,14 +9,21 @@ * Copyright (C) 2022 huzhenhong. All rights reserved. --> - - +
- +
@@ -25,10 +32,10 @@
- - + + @@ -155,41 +162,48 @@ - - + -
- -
元/吨
-
+
+ +
元/吨
+
- - - {{ item.amountBeforeChange | currency}} - - - ￥{{ item.amountchangeValue | number: '0.2-2'}} - - - {{ item.amountAfterChange | currency}} - - -
变更原因：{{ViewCause?.changeCause}}
-
拒绝原因：{{ViewCause?.refuseCause}}
-
注：附加费依据调整后的运输费用重新计算
+ #stFloatView + multiSort + size="small" + [bordered]="true" + [data]="service.$api_getChangeRecordBulkDetail" + [columns]="columnsFloatView" + [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, 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 }}
+
注：附加费依据调整后的运输费用重新计算
 @@ -197,12 +211,18 @@ - + - + @@ -210,7 +230,7 @@ - + @@ -226,18 +246,26 @@
-
已选择{{selectedRows?.length || 0}}条订单，确认批量签收吗？ -
-
- 签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。 +
已选择{{ selectedRows?.length || 0 }}条订单，确认批量签收吗？
+
签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。
- +
- \ No newline at end of file + diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 6dfb8176..c15079ef 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -115,7 +115,7 @@ export class OrderManagementBulkComponent implements OnInit { totalCount: 0 }; const params: any = Object.assign({}, this.reqParams || {}); - delete params.billStatus + delete params.billStatus; this.service.request(this.service.$api_getBulkStatistical, params).subscribe(res => { if (res) { let totalCount = 0; @@ -463,33 +463,39 @@ export class OrderManagementBulkComponent implements OnInit { text: '运费变更记录', click: _record => this.OpenPrice(_record), iif: item => - item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6' + item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', + acl: { ability: ['ORDER-BULK-listChangeApply'] }, }, { text: '查看评价　', click: _record => this.viewEvaluate(_record), - iif: item => item.billStatus == '5' + iif: item => item.billStatus == '5', + acl: { ability: ['ORDER-BULK-evaluation'] }, }, { text: '变更运费　', click: _record => this.updateFreight(_record), - iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2' + iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2', + acl: { ability: ['ORDER-BULK-FreightChangeBulkDetail'] }, }, { text: '确认签收　', click: _record => this.confirmReceipt(_record), - iif: item => item.billStatus == '4' + iif: item => item.billStatus == '4', + acl: { ability: ['VEHICLE-LIST-view'] }, }, { text: '取消订单　', click: _record => this.cancellation(_record), iif: item => - item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1' + item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1', + acl: { ability: ['ORDER-BULK-signBulkOrder'] }, }, { text: '修改订单　', click: _record => this.changeOrder(_record), - iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' + iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', + acl: { ability: ['ORDER-BULK-BulkBillDetail'] }, } ] } @@ -624,25 +630,25 @@ export class OrderManagementBulkComponent implements OnInit { /** *查看评价 */ - viewEvaluate(item: any) { - console.log(item) - this.isVisibleEvaluate = true + viewEvaluate(item: any) { + console.log(item); + this.isVisibleEvaluate = true; const params = { businessCode: item.billCode, - evaluateUserId: item.shipperAppUserId, - } + evaluateUserId: item.shipperAppUserId + }; const params2 = { businessCode: item.billCode, - passiveUserId: item.shipperAppUserId, - } + passiveUserId: item.shipperAppUserId + }; this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => { - console.log(res) - console.log(res.evaluateInfos) - this.shipList = res.evaluateInfos + console.log(res); + console.log(res.evaluateInfos); + this.shipList = res.evaluateInfos; }); this.service.request(this.service.$api_getBillEvaluateDriverByShipper, params2).subscribe(res => { - console.log(res) - this.diverList = res.evaluateInfos + console.log(res); + this.diverList = res.evaluateInfos; }); } /** @@ -685,9 +691,9 @@ export class OrderManagementBulkComponent implements OnInit { }); } userAction() { - if(this.selectedRows.length <= 0) { - this.service.msgSrv.error('请选择订单！') - return + if (this.selectedRows.length <= 0) { + this.service.msgSrv.error('请选择订单！'); + return; } let params: any[] = []; this.selectedRows.forEach(item => { diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html index cc51500b..412ccb1b 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-01-24 15:40:10 + * @LastEditTime : 2022-02-15 15:03:39 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -91,7 +91,7 @@ {{item?.serviceTypeName}}
- {{item?.billStatusLabel}} + {{item?.auditStatusLabel}}
diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts index b07044a6..9a325e4a 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts @@ -335,17 +335,22 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { { text: '通过', click: _record => this.sign(_record), - // iif: item => item.billStatus == '5' + iif: item => item.auditStatus == '1' }, { text: '生成电子单据', - click: _record => this.generate(_record), - // iif: item => item.billStatus == '4' + click: _record => this.generate(_record, 2), + iif: item => item.auditStatus == '1' + }, + { + text: '查看凭证', + click: _record => this.generate(_record, 3), + iif: item => item.auditStatus == '2' }, { text: '修改', click: _record => this.modification(_record), - // iif: item => item.billStatus == '4' + iif: item => item.auditStatus == '1' }, ] } @@ -404,14 +409,14 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { }); } // 生成电子单据 - generate(item: any) { + generate(item: any, sts?: number) { const modalRef = this.modal.create({ nzTitle: '查看凭证', nzWidth: '50%', nzContent: orderManagementVoucherViewComponent, nzComponentParams: { i: item, - Status: 2 + Status: sts }, nzFooter: null }); diff --git a/src/app/routes/order-management/components/risk/risk.component.html b/src/app/routes/order-management/components/risk/risk.component.html index c63313b8..2cf84559 100644 --- a/src/app/routes/order-management/components/risk/risk.component.html +++ b/src/app/routes/order-management/components/risk/risk.component.html @@ -9,14 +9,21 @@ * Copyright (C) 2022 huzhenhong. All rights reserved. --> - - +
- +
@@ -25,11 +32,9 @@
- - - + + + @@ -109,10 +113,6 @@
- +
- - diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 774ad548..541c4424 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -308,10 +308,12 @@ export class OrderManagementRiskComponent implements OnInit { text: '审核', click: _record => this.audit(_record), iif: item => item.representationsStatus == '1' || item.representationsStatus == '2' , + acl: { ability: ['ORDER-RISK-audit'] }, }, { text: '详情　', click: _record => this.viewEvaluate(_record), + acl: { ability: ['ORDER-RISK-riskDetail'] }, } ] } diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index ca62c8e7..fbb2e773 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -16,13 +16,25 @@
- -

订单号: {{ i?.billCode }}

+ +

订单号: {{ i?.billCode }}

-
+
- - + +
@@ -30,65 +42,65 @@
{{ i?.goodsResource?.enterpriseInfoName }} {{ i?.goodsResource?.shipperAppUserName }} - {{i?.goodsResource?.enterpriseProjectName}} - {{i?.goodsResource?.serviceTypeLabel}} - {{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} - {{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchPhone}} + {{ i?.goodsResource?.enterpriseProjectName }} + {{ i?.goodsResource?.serviceTypeLabel }} + {{ i?.goodsResource?.createUserName }} /{{ i?.goodsResource?.createUserPhone }} + {{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }}
- - - - - - - - - - - + + + + + + -
- +
-   -   -   -   +   + +   + +   + +  
- + 货物信息 - {{i?.goodsResource?.enterpriseInfoName}} + {{ i?.goodsResource?.enterpriseInfoName }} {{i?.goodsInfoList?.[0]?.goodsName}} - - {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 - + {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 {{ i?.carModel }}/{{ i?.carLength }} - - {{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}} - + {{ i?.driverName }}/{{ i?.driverPhone }}/{{ i?.carNo }} {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 -
-

装货卸货信息 - ( - - +
+

装货卸货信息 + ( + + )

@@ -99,12 +111,12 @@
装
-

装货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+

装货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}

+

联系人：{{ item.appUserName }}/{{ item.contractTelephone }}

-

计划装货时间：{{i?.goodsResource?.loadingTime}}

+

计划装货时间：{{ i?.goodsResource?.loadingTime }}

@@ -113,38 +125,36 @@
卸
-

卸货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+

卸货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}

+

联系人：{{ item.appUserName }}/{{ item.contractTelephone }}

-

计划卸货时间：{{i?.goodsResource?.unloadingTime}}

+

计划卸货时间：{{ i?.goodsResource?.unloadingTime }}

- - + - {{ item.price | currency}} + {{ item.price | currency }} - {{ item.surcharge | currency}} + {{ item.surcharge | currency }}
- 总计：{{ i?.totalAmount | currency }} - （运费{{i?.totalFreight | currency}}， - 附加费{{ i?.totalSurcharge | currency }}，附加费率{{i?.totalRate * 100 }}%） + 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | currency }}， + 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 }}%）
收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}
 - + @@ -154,19 +164,17 @@ - - + - - + - {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} + {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} @@ -178,27 +186,26 @@ {{ i?.supplementaryInformationVO?.address }} - - {{i?.goodsResource?.remarks}} + {{ i?.goodsResource?.remarks }}
- +
-
+
-
+
@@ -206,8 +213,7 @@
- + @@ -215,4 +221,4 @@ - \ No newline at end of file + diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index 3716536c..ce71596f 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -9,14 +9,21 @@ * Copyright (C) 2022 huzhenhong. All rights reserved. --> - - +
- +
@@ -25,10 +32,8 @@
- - + + @@ -142,31 +139,32 @@ - - + - - {{ 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 }}
+
注：附加费依据调整后的运输费用重新计算
 @@ -174,12 +172,12 @@ - + - + @@ -187,7 +185,7 @@ - + @@ -202,28 +200,29 @@
- - - - + + + +
-
已选择{{selectedRows?.length || 0}}条订单，确认批量签收吗？ -
-
- 签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。 +
已选择{{ selectedRows?.length || 0 }}条订单，确认批量签收吗？
+
签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。
- \ No newline at end of file + diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 1e304c27..96e760a7 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -415,36 +415,43 @@ resourceStatus: any; text: '运费变更记录', click: (_record) => this.OpenPrice(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', + acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] }, }, { text: '查看评价　', click: (_record) => this.viewEvaluate(_record), iif: item => item.billStatus == '5', + acl: { ability: ['ORDER-VEHICLE-evaluation'] }, }, { text: '变更运费　', click: (_record) => this.updateFreight(_record), iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2', + acl: { ability: ['ORDER-VEHICLE-FreightChangeWholeDetail'] }, }, { text: '确认签收　', click: (_record) => this.confirmReceipt(_record), iif: item => item.billStatus == '4', + acl: { ability: ['ORDER-VEHICLE-signWholeOrder'] }, }, { text: '取消订单　', click: (_record) => this.cancellation(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1', + acl: { ability: ['ORDER-VEHICLE-cancelAnOrder'] }, }, { text: '修改订单　', click: (_record) => this.changeOrder(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', + acl: { ability: ['ORDER-VEHICLE-modificationOrder'] }, }, { text: '查看轨迹　', click: (_record) => this.cancellation(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', + // acl: { ability: ['VEHICLE-LIST-view'] }, }, ], diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html index 24e884c1..79c0788c 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-01-21 16:59:43 + * @LastEditTime : 2022-02-15 15:12:02 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\audit\\voucher-view\\voucher-view.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -27,5 +27,5 @@
- +