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 06710506..5d08faa3 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -640,13 +640,14 @@ resourceStatus: any; *变更运费 */ updateFreight(item: any) { + console.log(item?.isFreightChangeApplication) this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: item.id }).subscribe(data => { if (data) { const modal = this.modal.create({ nzTitle: '变更运费', nzWidth: 580, nzContent: VehicleUpdateFreightComponent, - nzComponentParams: { data: { ...data, id: item.id } }, + nzComponentParams: { data: { ...data, id: item.id,isFreightChangeApplication: item?.isFreightChangeApplication } }, nzFooter: null, // nzOnOk: sin => { // this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => { diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html index 3daaa236..37dc0262 100644 --- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html +++ b/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-01-24 16:40:01 + * @LastEditTime : 2022-02-21 14:44:38 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -33,10 +33,10 @@

总运费：{{ data.totalFreight |currency }}总运费：{{ data.totalAmount |currency }}

-

运输费：{{ data.freight |currency }}，附加费：{{ data.surcharge |currency}}

+

运输费：{{ data.totalFreight |currency }}，附加费：{{ data.totalSurcharge |currency}}

diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html index 6d08fc39..30f42c9b 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-02-11 11:08:42 + * @LastEditTime : 2022-02-21 14:27:51 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts index 60ed2901..ec153aa7 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts +++ b/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-14 09:34:18 + * @LastEditTime : 2022-02-21 14:27:50 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -122,7 +122,11 @@ export class VehicleUpdateFreightComponent implements OnInit { } save(value: any): void { - if (!this.sf.valid) { + if (this.data.isFreightChangeApplication) { + this.service.msgSrv.error('变更申请未处理，请勿重复申请！'); + return; + } + if (!this.save) { this.service.msgSrv.error('请填写必填项！'); return; } diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html index 4d7567db..fb4c2eb6 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html @@ -13,9 +13,9 @@
网络货运人：{{ i?.shipperAppUserName }}
- - - + + +
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html index 99efb8e8..fea654b7 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html @@ -220,9 +220,9 @@
- - + + - +
diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html index ab161395..88cd31bb 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html @@ -241,8 +241,8 @@
- - - + + +
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.html b/src/app/routes/supply-management/components/bulk/bulk.component.html index 1d1939ad..f9da7979 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.html +++ b/src/app/routes/supply-management/components/bulk/bulk.component.html @@ -31,7 +31,7 @@
- + - + +
diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index 9377a818..f64e2a74 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -303,9 +303,10 @@ export class SupplyManagementBulkComponent implements OnInit { { text: '货源审核', click: (_record) => this.audit(_record, 1), - iif: item => item.auditStatus === '1' + iif: item => item.auditStatus === '1', + acl: { ability: ['SUPPLY-INDEX-bulkBatchAudit'] }, }, - { + { text: '二维码　', click: (_record) => this.assignedQrcode(_record), iif: item => item.resourceStatus == 1, @@ -314,15 +315,18 @@ export class SupplyManagementBulkComponent implements OnInit { text: '修改单价', click: (_record) => this.modification(_record), iif: item => item.resourceStatus == 1 , + acl: { ability: ['SUPPLY-INDEX-modificationUnitPrice'] }, }, { text: '取消货源', click: (_record) => this.delOne(_record), iif: item => item.resourceStatus == 1, + acl: { ability: ['SUPPLY-INDEX-bulkCancelSupply'] }, }, { text: '再下一单', click: (_record) => this.nextOrder(_record), + acl: { ability: ['SUPPLY-INDEX-bulkPlaceOrder'] }, }, ], }, diff --git a/src/app/routes/supply-management/components/index/index.component.html b/src/app/routes/supply-management/components/index/index.component.html index 70f2cdab..56ba2fbb 100644 --- a/src/app/routes/supply-management/components/index/index.component.html +++ b/src/app/routes/supply-management/components/index/index.component.html @@ -1,18 +1,15 @@ + - - diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index 732c2ba7..7de4a2a1 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -135,7 +135,7 @@
- 装货时间 + 装货时间
- 卸货时间 + 卸货时间 提交修改 - + 司机抢单
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index 49e823ef..7218b087 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -364,7 +364,7 @@
- - + +
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index 51da4b8d..f03c553c 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -13,11 +13,11 @@
网络货运人：{{i?.enterpriseInfoName}}
- + - - + *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派 + +
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.html b/src/app/routes/supply-management/components/vehicle/vehicle.component.html index cce87ee1..533fd632 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html @@ -17,9 +17,8 @@ [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } } }" [compact]="true" [button]="'none'">
-
- +
+ - - + + +
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index ef138cfd..01e8ab3c 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -573,12 +573,14 @@ export class SupplyManagementVehicleComponent implements OnInit { { text: '货源审核', click: _record => this.audit(_record, 1), - iif: item => item.auditStatus === '1' + iif: item => item.auditStatus === '1', + acl: { ability: ['SUPPLY-INDEX-vehicleBatchAudit'] }, }, { text: '修改货源', click: _record => this.amend(_record), - iif: item => item.resourceStatus === '1' + iif: item => item.resourceStatus === '1', + acl: { ability: ['SUPPLY-INDEX-vehicleModificationSupply'] }, }, // { // text: '修改运费', @@ -588,16 +590,19 @@ export class SupplyManagementVehicleComponent implements OnInit { { text: '取消货源', click: _record => this.cancleGoodsSource(_record), - iif: item => item.resourceStatus === '1' + iif: item => item.resourceStatus === '1', + acl: { ability: ['SUPPLY-INDEX-vehicleCancelSupply'] }, }, { text: '再下一单', - click: _record => this.nextOrder(_record) + click: _record => this.nextOrder(_record), + acl: { ability: ['SUPPLY-INDEX-vehiclePlaceOrder'] }, }, { text: '重新指派　', click: _record => this.assignedCar(_record), - iif: item => item.resourceStatus === '1' && item.serviceType === '2' + iif: item => item.resourceStatus === '1' && item.serviceType === '2', + acl: { ability: ['SUPPLY-INDEX-vehicleReassign'] }, } ] } diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts index de88a29d..c38311ea 100644 --- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts +++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts @@ -86,12 +86,13 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit { settingAction(item?: any) { this.modal.create({ - nzTitle: '基础设置', + nzTitle: '配置', nzContent: DynamicSettingModalComponent, nzWidth: 900, nzComponentParams: { - extendType: '4', - businessId: item.id + extendType: '3', + businessId: item.id, + configvalue: 'sys.config' }, nzFooter: null });