diff --git a/proxy.conf.js b/proxy.conf.js index 29173019..4690cd30 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-27 17:26:44 + * @LastEditTime : 2022-04-28 14:09:56 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ diff --git a/src/app/routes/contract-management/components/index/index.component.ts b/src/app/routes/contract-management/components/index/index.component.ts index 4c42914d..d3e7efc8 100644 --- a/src/app/routes/contract-management/components/index/index.component.ts +++ b/src/app/routes/contract-management/components/index/index.component.ts @@ -24,9 +24,8 @@ export class ContractManagementIndexComponent implements OnInit { constructor(private http: _HttpClient, private modal: ModalHelper, private acl: ACLService) { const acls = acl.data.abilities || []; - this.isShowDetail = !!acls.find(acl => acl === 'CONTRACT-INDEX-searchDetail'); - this.isShowFrame = !!acls.find(acl => acl === 'CONTRACT-INDEX-listFrame'); - console.log(this.isShowFrame); + this.isShowDetail =acl.data.full || !!acls.find(acl => acl === 'CONTRACT-INDEX-searchDetail'); + this.isShowFrame =acl.data.full || !!acls.find(acl => acl === 'CONTRACT-INDEX-listFrame'); } diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.html b/src/app/routes/financial-management/components/payment-order/payment-order.component.html index 2443272a..2dad7899 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.html +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.html @@ -32,7 +32,8 @@
- +
diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index bcea97b3..c29dc430 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -60,22 +60,21 @@ const routes: Routes = [ { path: 'abnormal-gold/detail/:id', component: AbnormalGoldDetailComponent }, { path: 'payment-record', component: PaymentRecordComponent }, { path: 'transaction-flow', component: TransactionFlowComponent }, - { path: 'payment-order', component: PaymentOrderComponent }, + { path: 'payment-order', component: PaymentOrderComponent, data: { guard: { ability: ['FINANCIAL-PAYMENT-ORDER-list'] } } }, { path: 'payment-order/detail/:id', component: PaymentOrderDetailComponent }, - { path: 'receipt-order', component: ReceiptOrderComponent }, + { path: 'receipt-order', component: ReceiptOrderComponent, data: { guard: { ability: ['FINANCIAL-RECEIPT-list'] } } }, { path: 'receipt-order/detail/:id', component: ReceiptOrderDetailComponent }, { path: 'advance-collection', component: AdvanceCollectionComponent }, { path: 'advance-collection/detail/:id', component: AdvanceCollectionDetailComponent }, - { path: 'receivable-order', component: ReceivableOrderComponent }, - { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent }, - { path: 'payable-order', component: PayableOrderComponent }, - { path: 'payable-order/detail/:id', component: PayableOrderDetailComponent }, - { path: 'bank-card-management/index', component: CwcBankCardManagementIndexComponent }, - + { path: 'receivable-order', component: ReceivableOrderComponent, data: { guard: { ability: ['FINANCIAL-RECEIVABLE-list'] } } }, + { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent, data: { guard: { ability: ['FINANCIAL-RECEIVABLE-DETAIL-view'] } } }, + { path: 'payable-order', component: PayableOrderComponent, data: { guard: { ability: ['FINANCIAL-PAYABLE-list'] } } }, + { path: 'payable-order/detail/:id', component: PayableOrderDetailComponent, data: { guard: { ability: ['FINANCIAL-PAYABLE-DETAIL-view'] } } }, + { path: 'bank-card-management/index', component: CwcBankCardManagementIndexComponent } ]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class FinancialManagementRoutingModule { } +export class FinancialManagementRoutingModule {} 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 b29ce305..0a2bb7df 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -555,8 +555,8 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements },{ text: '订单上报推送', click: _record => this.orderReportPush(_record), - iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5') - // acl: { ability: ['VEHICLE-LIST-view'] }, + iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5'), + acl: { ability: ['ORDER-BULK-push'] }, } ] } 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 19b0ddd9..7411341a 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -473,8 +473,8 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme { text: '订单上报推送', click: _record => this.orderReportPush(_record), - iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5') - // acl: { ability: ['VEHICLE-LIST-view'] }, + iif: item => item.overallPaymentStatus === '2' && (item.billStatus === '4' || item.billStatus === '5'), + acl: { ability: ['ORDER-VEHICLE-push'] }, } ] } diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts index b7711049..f8b11cf7 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts @@ -125,7 +125,7 @@ export class SupplyManagementBulkDetailComponent implements OnInit { */ placeOrder(record: any) { console.log(record) - this.router.navigate(['/supply-management/bulk-amend', record.id], { + this.router.navigate(['/supply-management/bulk-next', record.id], { queryParams: { sta: 4 }, 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 5055964a..aa0b4eae 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -492,7 +492,7 @@ export class SupplyManagementBulkComponent extends BasicTableComponent implement // 再下一单 nextOrder(item: any) { - this.router.navigate(['/supply-management/bulk-amend', item.id], { + this.router.navigate(['/supply-management/bulk-next', item.id], { queryParams: { sta: 4 } 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 ebe89624..8849d48c 100644 --- a/src/app/routes/supply-management/components/index/index.component.html +++ b/src/app/routes/supply-management/components/index/index.component.html @@ -25,10 +25,10 @@ - + - + diff --git a/src/app/routes/supply-management/components/index/index.component.ts b/src/app/routes/supply-management/components/index/index.component.ts index 17b7b0c7..ef804c30 100644 --- a/src/app/routes/supply-management/components/index/index.component.ts +++ b/src/app/routes/supply-management/components/index/index.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { STColumn, STComponent } from '@delon/abc/st'; +import { ACLService } from '@delon/acl'; import { SFSchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; import { SearchDrawerService } from '@shared'; @@ -12,7 +13,14 @@ import { BasicTableComponent } from 'src/app/routes/commom'; }) export class SupplyManagementIndexComponent implements OnInit { selectedIndex = 0; + isShowVehicle = false; + isShowBulk = false; + constructor(private http: _HttpClient, private modal: ModalHelper, private acl: ACLService) { + const acls = acl.data.abilities || []; + this.isShowVehicle = acl.data.full || !!acls.find(acl => acl === 'SUPPLY-INDEX-vehicleSearch'); + this.isShowBulk = acl.data.full || !!acls.find(acl => acl === 'SUPPLY-INDEX-bulkSearch'); + } ngOnInit(): void {} } 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 3c489ffb..73a34d9a 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 @@ -260,9 +260,9 @@ + [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate']">指派熟车 + [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder']">司机抢单 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 32e40a15..43c1da1b 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 @@ -6,39 +6,6 @@ - -
- -

货源编码 : {{ i?.resourceCode }}

-
-
-
网络货运人：{{ i?.enterpriseInfoName }}
-
- - - - -
-
-
-
- 总费用：{{ i?.totalAmount | currency }} -
-
- -
- {{ i?.externalResourceCode }} - {{ i?.enterpriseProjectName }} - {{ i?.createUserName }}/{{ i?.createUserPhone }} - {{ i?.dispatchName }}/{{ i?.dispatchPhone }} - {{ i?.serviceTypeLabel }} -
-
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts index c2af6ae7..bf86c271 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts @@ -115,18 +115,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { }) } - /** - *再下一单 - * @param record - */ - placeOrder(record: any) { - this.router.navigate(['./pbg/onecar-publish'], { - queryParams: { - id: record?.id, - type: 'add' - } - }) - } + /** * 编辑外部货源号 * @param item st当前行对象 @@ -168,7 +157,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { }); } nextOrder(item: any) { - this.router.navigate(['/supply-management/vehicle-amend', item.id], { + this.router.navigate(['/supply-management/vehicle-next', item.id], { queryParams: { sta: 2 } 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 1d0f3c65..817a0c97 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -324,7 +324,7 @@ export class SupplyManagementVehicleComponent extends BasicTableComponent implem }); } nextOrder(item: any) { - this.router.navigate(['/supply-management/vehicle-amend', item.id], { + this.router.navigate(['/supply-management/vehicle-next', item.id], { queryParams: { sta: 2 } diff --git a/src/app/routes/supply-management/supply-management-routing.module.ts b/src/app/routes/supply-management/supply-management-routing.module.ts index c3eb4ba2..29f59068 100644 --- a/src/app/routes/supply-management/supply-management-routing.module.ts +++ b/src/app/routes/supply-management/supply-management-routing.module.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-02-10 14:39:00 + * @LastEditTime : 2022-04-28 14:45:50 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\supply-management-routing.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -21,13 +21,76 @@ import { SupplyManagementReleasePublishComponent } from './components/release-pu import { SupplyManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component'; const routes: Routes = [ - { path: 'index', component: SupplyManagementIndexComponent }, - { path: 'index/bulk-detail/:id', component: SupplyManagementBulkDetailComponent }, - { path: 'index/vehicle-detail/:id', component: SupplyManagementVehicleDetailComponent }, + { + path: 'index', + component: SupplyManagementIndexComponent, + data: { guard: { ability: ['SUPPLY-INDEX-vehicleSearch', 'SUPPLY-INDEX-bulkSearch'] } } + }, + { + path: 'index/bulk-detail/:id', + component: SupplyManagementBulkDetailComponent, + data: { + guard: { ability: ['SUPPLY-BULK-DETAIL-cancelSupply', 'SUPPLY-BULK-DETAIL-updatePrice', 'SUPPLY-BULK-DETAIL-bulkAnotherOrder'] } + } + }, + { + path: 'index/vehicle-detail/:id', + component: SupplyManagementVehicleDetailComponent, + data: { + guard: { + ability: [ + 'SUPPLY-VEHICLE-DETAIL-cancelSupply', + 'SUPPLY-VEHICLE-DETAIL-changeSupply', + 'SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder', + 'SUPPLY-VEHICLE-DETAIL-vehicleAnew' + ] + } + } + }, { path: 'add-drivers', component: SupplyManagementAddDriversComponent }, - { path: 'vehicle-amend/:id', component: SupplyManagementOnecarPublishComponent }, - { path: 'vehicle-release', component: SupplyManagementReleasePublishComponent }, - { path: 'bulk-release', component: SupplyManagementBulkReleasePublishComponent }, + { + path: 'vehicle-amend/:id', + component: SupplyManagementOnecarPublishComponent, + data: { + guard: { + ability: ['SUPPLY-VEHICLE-AMEND-submitChange'] + } + } + }, + { + path: 'vehicle-next/:id', + component: SupplyManagementOnecarPublishComponent, + data: { + guard: { + ability: [ + 'SUPPLY-VEHICLE-PLACEORDER-QRCode', + 'SUPPLY-VEHICLE-PLACEORDER-vehicleDesignate', + 'SUPPLY-VEHICLE-PLACEORDER-vehicleAnotherOrder' + ] + } + } + }, + { + path: 'vehicle-release', + component: SupplyManagementReleasePublishComponent, + data: { + guard: { ability: ['SUPPLY-VEHICLE-RELEASE-bulkDesignate', 'SUPPLY-VEHICLE-RELEASE-bulkDriverOrder'] } + } + }, + { + path: 'bulk-release', + component: SupplyManagementBulkReleasePublishComponent, + data: { + guard: { ability: ['SUPPLY-BULK-RELEASE-consignBulkAssign', 'SUPPLY-BULK-RELEASE-consignBulk'] } + } + }, + { + path: 'bulk-next/:id', + component: SupplyManagementBulkPublishComponent, + data: { + guard: { ability: ['SUPPLY-BULK-PLACEORDER-vehicleAnotherOrder', 'SUPPLY-BULK-PLACEORDER-vehicleDesignate'] } + } + }, { path: 'bulk-amend/:id', component: SupplyManagementBulkPublishComponent } ]; diff --git a/src/app/routes/sys-setting/components/agreement-config/agreement-config.component.html b/src/app/routes/sys-setting/components/agreement-config/agreement-config.component.html index 17d718f0..a9e98fc1 100644 --- a/src/app/routes/sys-setting/components/agreement-config/agreement-config.component.html +++ b/src/app/routes/sys-setting/components/agreement-config/agreement-config.component.html @@ -19,7 +19,8 @@ 更新时间： {{ tabItem.modifyTime }} 预览 - +
diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html index c1c43834..a8bfa044 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html @@ -8,15 +8,10 @@ * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\basic-setting\\basic-setting.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - + - + - + \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts index bc02ace2..d4adde93 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts @@ -9,8 +9,8 @@ * Copyright (C) 2022 huzhenhong. All rights reserved. */ import { Component, OnInit, ViewChild } from '@angular/core'; +import { ACLService } from '@delon/acl'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; -import { dateTimePickerUtil } from '@delon/util'; import { SystemService } from '../../services/system.service'; const NOJSONTYPE = new Set([8, 12, 13]); @Component({ @@ -23,7 +23,10 @@ export class BasicSettingComponent implements OnInit { selectedTab: any = null; labelWidth = 250; configList: any = []; - constructor(public service: SystemService) {} + isCanSave = false; + constructor(public service: SystemService, private acl: ACLService) { + this.isCanSave = !!acl.data.abilities?.find(a => a === 'SYSTEM-BASIC_SETTING-save'); + } ngOnInit() { this.getTypeList(); diff --git a/src/app/routes/sys-setting/components/config/config.component.html b/src/app/routes/sys-setting/components/config/config.component.html index aaea9add..65bdca2c 100644 --- a/src/app/routes/sys-setting/components/config/config.component.html +++ b/src/app/routes/sys-setting/components/config/config.component.html @@ -7,7 +7,7 @@
按照提现金额收取 - + %手续费
@@ -15,7 +15,7 @@
按照提现金额收取
客户 - + 天内没有交易订单的视为“沉默客户”
客户 - + 天内没有交易订单的视为“流失客户”
@@ -66,15 +66,13 @@
- - +
-
-
- - + +
@@ -48,30 +48,30 @@ 保存 diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html index 0f7e8ee2..3d52444d 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html @@ -156,7 +156,7 @@
+ *ngIf="selectedTab?.configKey!=='freight' && labelWidth!==0 && isCanSave">保存
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts index 544ca3bc..5c3b0261 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts @@ -28,6 +28,8 @@ export class DynamicSettingH5Component implements OnInit { @Input() configList: any = []; + @Input() + isCanSave = true; @Output() selectedEvent = new EventEmitter(); @Output() diff --git a/src/app/shared/index.ts b/src/app/shared/index.ts index 68efd6c7..a4df14f5 100644 --- a/src/app/shared/index.ts +++ b/src/app/shared/index.ts @@ -22,7 +22,7 @@ export * from './components/dynamic-setting'; export * from './components/singlepage-setting'; export * from './components/insurance-table/index'; export * from './components/rebate-table/index'; -export * from './components/search-drawer'; +export * from './components/search-drawer/index'; // Utils export * from './utils'; diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 1662aafc..50040d13 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -39,8 +39,9 @@ import { PipeModule } from './pipes'; import { AccountDetailComponent } from './components/account-detail/account-detail.component'; import { CaptchaModule } from './components/captcha'; import { rebateTableModule } from './components/rebate-table'; -import { SearchDrawerComponent } from './components/search-drawer/search-drawer.component'; -import { SearchDrawerModule } from './components/search-drawer/search-drawer.module'; +import { SearchDrawerModule } from './components/search-drawer'; +// import { SearchDrawerComponent } from './components/search-drawer/search-drawer.component'; + const MODULES = [ AddressModule,