diff --git a/package.json b/package.json index 2b60058a..1439c62d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tms-obc-web", - "version": "1.0.1", + "version": "1.2.0", "description": "运营后台-WEB", "author": "cipchk ", "repository": { diff --git a/proxy.conf.js b/proxy.conf.js index 4690cd30..50eec04b 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-28 14:09:56 + * @LastEditTime : 2022-04-28 16:08:43 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/datatable/components/compliance/index/index.component.html b/src/app/routes/datatable/components/compliance/index/index.component.html index 5b3c4635..8063729e 100644 --- a/src/app/routes/datatable/components/compliance/index/index.component.html +++ b/src/app/routes/datatable/components/compliance/index/index.component.html @@ -24,7 +24,7 @@
- +
合格：{{cardData1?.leftQuantity}} 不合格：{{cardData1?.rightQuantity}} @@ -33,7 +33,7 @@
- +
货源单：{{cardData2?.leftQuantity}} 合同单：{{cardData2?.rightQuantity}} @@ -42,7 +42,7 @@
- +
司机：{{cardData3?.leftQuantity}} 车队长：{{cardData3?.rightQuantity}} @@ -51,7 +51,7 @@
- +
准时：{{cardData4?.leftQuantity}} 逾期：{{cardData4?.rightQuantity}} diff --git a/src/app/routes/datatable/components/compliance/index/index.component.ts b/src/app/routes/datatable/components/compliance/index/index.component.ts index b545a4f5..f531e14e 100644 --- a/src/app/routes/datatable/components/compliance/index/index.component.ts +++ b/src/app/routes/datatable/components/compliance/index/index.component.ts @@ -47,27 +47,30 @@ export class DatatableComplianceIndexComponent implements OnInit { time:this.time } this.service.request(this.service.$api_getBillRateQualified, params).subscribe(res => { + if (res) { this.cardData1 = res; - this.cardData1.proportion = this.cardData1.proportion*100 +'%' + console.log(this.cardData1); + + this.cardData1.proportion = (this.cardData1?.proportion*100).toFixed(2) +'%' } }); this.service.request(this.service.$api_getBillRateProportion, params).subscribe(res => { if (res) { this.cardData2 = res; - this.cardData2.proportion = this.cardData2.proportion*100 +'%' + this.cardData2.proportion = (this.cardData2?.proportion*100).toFixed(2) +'%' } }); this.service.request(this.service.$api_getBillRateDirectPayment, params).subscribe(res => { if (res) { this.cardData3 = res; - this.cardData3.proportion = this.cardData3.proportion*100 +'%' + this.cardData3.proportion = (this.cardData3?.proportion*100).toFixed(2) +'%' } }); this.service.request(this.service.$api_getBillTimelyPayment, params).subscribe(res => { if (res) { this.cardData4 = res; - this.cardData4.proportion = this.cardData4.proportion*100 +'%' + this.cardData4.proportion = (this.cardData4?.proportion*100).toFixed(2) +'%' } }); diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts index f5fac6ee..860a4753 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts @@ -273,6 +273,7 @@ export class PayableOrderComponent implements OnInit { buttons: [ { text: '浏览', + acl: { ability: ['FINANCIAL-PAYABLE-view'] }, click: item => this.router.navigate(['/financial-management/payable-order/detail/' + item.id], { queryParams: { billHId: item.id } }) } 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 2dad7899..f9ee3d69 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 @@ -33,7 +33,7 @@
+ [acl-ability]="['FINANCIAL-PAYMENT-ORDER-list']">筛选
diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts index 63a2ec0b..151c7e56 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts @@ -251,6 +251,7 @@ export class ReceiptOrderComponent extends BasicTableComponent implements OnInit buttons: [ { text: '浏览', + acl: { ability: ['FINANCIAL-RECEIPT-view'] }, click: item => this.router.navigate(['/financial-management/receipt-order/detail/' + item.id]) } // { diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html index d0ed4c80..8f33ae3e 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.html @@ -40,7 +40,8 @@
- +
', + acl: { ability: ['FINANCIAL-RECHARGE-receiptApply'] }, click: item => this.service.getReceiptUrl(item.receiptUrl, { bankType: item.bankType, @@ -207,6 +208,7 @@ export class RechargeRecordComponent extends BasicTableComponent implements OnIn }, { text: '添加备注', + acl: { ability: ['FINANCIAL-RECHARGE-addRemark'] }, click: item => this.addRemark(item) } ] diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts index 029d31c7..0f556f33 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts @@ -283,10 +283,12 @@ export class VoucherSummaryComponent extends BasicTableComponent implements OnIn buttons: [ { text: '浏览', + acl: { ability: ['FINANCIAL-VOUCHER-SUMMARY-view'] }, click: (item: any) => this.router.navigate(['/financial-management/voucher-summary/detail/' + item.id]) }, { text: '列表', + acl: { ability: ['FINANCIAL-VOUCHER-SUMMARY-child-list'] }, click: (item: any) => this.router.navigate(['/financial-management/voucher-summary/list/' + item.vc2code]) } ] 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 1511a500..00db0eb7 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -39,16 +39,24 @@ const routes: Routes = [ { path: 'freight-account', component: FreightAccountComponent, data: { guard: { ability: ['FINANCIAL-FREIGHT-ACOUNT-list'] } } }, { path: 'freight-account/detail/:id', component: FreightAccountDetailComponent }, { path: 'driver-account', component: DriverAccountComponent, data: { guard: { ability: ['FINANCIAL-DRIVER-ACOUNT-list'] } } }, - { path: 'driver-account/detail/:id', component: DriverAccountDetailComponent, data: { guard: { ability: ['FINANCIAL-DRIVER-ACOUNT-DETAIL-view'] } } }, - { path: 'platform-account', component: PlatformAccountComponent , data: { guard: { ability: ['FINANCIAL-PLATFORM-list'] } } }, - { path: 'platform-account/detail/:id', component: PlatformAccountDetailComponent , data: { guard: { ability: ['FINANCIAL-PLATFORM-DETAIL-detail'] } } }, - { path: 'recharge-record', component: RechargeRecordComponent }, + { + path: 'driver-account/detail/:id', + component: DriverAccountDetailComponent, + data: { guard: { ability: ['FINANCIAL-DRIVER-ACOUNT-DETAIL-view'] } } + }, + { path: 'platform-account', component: PlatformAccountComponent, data: { guard: { ability: ['FINANCIAL-PLATFORM-list'] } } }, + { + path: 'platform-account/detail/:id', + component: PlatformAccountDetailComponent, + data: { guard: { ability: ['FINANCIAL-PLATFORM-DETAIL-detail'] } } + }, + { path: 'recharge-record', component: RechargeRecordComponent, data: { guard: { ability: ['FINANCIAL-RECHARGE-list'] } } }, { path: 'withdrawals-record', component: WithdrawalsRecordComponent }, { path: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent }, { path: 'refund-record', component: RefundRecordComponent }, - { path: 'voucher-management', component: VoucherManagementComponent }, + { path: 'voucher-management', component: VoucherManagementComponent, data: { guard: { ability: ['FINANCIAL-VOUCHER-list'] } } }, { path: 'voucher-management/detail/:id', component: VoucherDetailComponent }, - { path: 'voucher-summary', component: VoucherSummaryComponent }, + { path: 'voucher-summary', component: VoucherSummaryComponent, data: { guard: { ability: ['FINANCIAL-VOUCHER-SUMMARY-list'] } } }, { path: 'voucher-summary/detail/:id', component: SummaryDetailComponent }, { path: 'voucher-summary/list/:id', component: VoucherListComponent }, { path: 'voucher-summary/list/detail/:id', component: VoucherDetailComponent }, @@ -66,10 +74,18 @@ const routes: Routes = [ { path: 'receipt-order/detail/:id', component: ReceiptOrderDetailComponent }, { path: 'advance-collection', component: AdvanceCollectionComponent }, { path: 'advance-collection/detail/:id', component: AdvanceCollectionDetailComponent }, - { 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: '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: 'payable-order/detail/:id', + component: PayableOrderDetailComponent, + data: { guard: { ability: ['FINANCIAL-PAYABLE-DETAIL-view'] } } + }, { path: 'bank-card-management/index', component: CwcBankCardManagementIndexComponent } ]; diff --git a/src/app/routes/menu-manager/components/api-auth/api-auth.component.html b/src/app/routes/menu-manager/components/api-auth/api-auth.component.html index f1d7c7f0..86ffe160 100644 --- a/src/app/routes/menu-manager/components/api-auth/api-auth.component.html +++ b/src/app/routes/menu-manager/components/api-auth/api-auth.component.html @@ -23,8 +23,8 @@ - - + + + [nzLoading]="service.http.loading" *ngIf="isShowFre || isShowBackEND"> @@ -65,7 +65,7 @@ {{ item.sorted }} - 权限配置 + 权限配置 diff --git a/src/app/routes/menu-manager/components/api-auth/api-auth.component.ts b/src/app/routes/menu-manager/components/api-auth/api-auth.component.ts index c61cab04..f6004b13 100644 --- a/src/app/routes/menu-manager/components/api-auth/api-auth.component.ts +++ b/src/app/routes/menu-manager/components/api-auth/api-auth.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit, ViewChild } from '@angular/core'; +import { ACLService } from '@delon/acl'; import { SFComponent, SFSchema } from '@delon/form'; import { EAEnvironmentService } from '@shared'; import { NzDrawerService } from 'ng-zorro-antd/drawer'; @@ -34,14 +35,26 @@ export class ApiAuthComponent implements OnInit { mapOfExpandedData: { [key: string]: any[] } = {}; listOfMapData: any[] = []; - constructor(private envSrv: EAEnvironmentService, public service: MenuManagerService, private drawer: NzDrawerService) { + + isShowBackEND = false; + isShowFre = false; + + constructor( + private envSrv: EAEnvironmentService, + public service: MenuManagerService, + private drawer: NzDrawerService, + private acl: ACLService + ) { + const acls = acl.data.abilities || []; + this.isShowBackEND = acl.data.full || !!acls.find(acl => acl === 'MENU-AUTH-obclist'); + this.isShowFre = acl.data.full || !!acls.find(acl => acl === 'MENU-AUTH-smclist'); this.initData(); } ngOnInit(): void {} initData(): void { - this.selectedPlatform = this.platforms[0]; + this.selectedPlatform = this.isShowFre ? this.platforms[0] : this.platforms[1]; this.loadMemu(this.selectedPlatform.appId); } diff --git a/src/app/routes/menu-manager/components/index/index.component.html b/src/app/routes/menu-manager/components/index/index.component.html index 8b1acd73..3577b04b 100644 --- a/src/app/routes/menu-manager/components/index/index.component.html +++ b/src/app/routes/menu-manager/components/index/index.component.html @@ -23,14 +23,15 @@ - - + +
- - + + + [nzLoading]="service.http.loading" *ngIf="isShowFre || isShowBackEND"> @@ -85,12 +86,12 @@ 查看 - 编辑 + 编辑 - 删除 + 删除 - 新增子项 + 新增子项 diff --git a/src/app/routes/menu-manager/components/index/index.component.ts b/src/app/routes/menu-manager/components/index/index.component.ts index 2f9b1306..3cd5cf8c 100644 --- a/src/app/routes/menu-manager/components/index/index.component.ts +++ b/src/app/routes/menu-manager/components/index/index.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; +import { ACLService } from '@delon/acl'; import { SFComponent, SFSchema } from '@delon/form'; import { Menu, ModalHelper } from '@delon/theme'; import { EAEnvironmentService } from '@shared'; @@ -37,14 +38,26 @@ export class MenuManagerComponentsIndexComponent implements OnInit { mapOfExpandedData: { [key: string]: any[] } = {}; listOfMapData: any[] = []; - constructor(private envSrv: EAEnvironmentService, public service: MenuManagerService, private modal: NzModalService, private modalHelper: ModalHelper,) { + + isShowBackEND = false; + isShowFre = false; + constructor( + private envSrv: EAEnvironmentService, + public service: MenuManagerService, + private modal: NzModalService, + private modalHelper: ModalHelper, + private acl: ACLService + ) { + const acls = acl.data.abilities || []; + this.isShowBackEND = acl.data.full || !!acls.find(acl => acl === 'MENU-INDEX-obclist'); + this.isShowFre = acl.data.full || !!acls.find(acl => acl === 'MENU-INDEX-smclist'); this.initData(); } ngOnInit(): void {} initData(): void { - this.selectedPlatform = this.platforms[0]; + this.selectedPlatform = this.isShowFre ? this.platforms[0] : this.platforms[1]; this.loadMemu(this.selectedPlatform.appId); } @@ -126,13 +139,13 @@ export class MenuManagerComponentsIndexComponent implements OnInit { } }); } - menuSort(){ + menuSort() { const dialogData = { appId: this.selectedPlatform.appId }; - this.modalHelper.create(MenuManagerMenusortComponent, { i: dialogData }, { size: 900 }).subscribe((res:any) => { - if(res) { - console.log('a') + this.modalHelper.create(MenuManagerMenusortComponent, { i: dialogData }, { size: 900 }).subscribe((res: any) => { + if (res) { + console.log('a'); this.loadMemu(this.selectedPlatform.appId); } }); diff --git a/src/app/routes/menu-manager/menu-manager-routing.module.ts b/src/app/routes/menu-manager/menu-manager-routing.module.ts index d46c398f..4879b5aa 100644 --- a/src/app/routes/menu-manager/menu-manager-routing.module.ts +++ b/src/app/routes/menu-manager/menu-manager-routing.module.ts @@ -5,12 +5,16 @@ import { MenuManagerComponentsIndexComponent } from './components/index/index.co const routes: Routes = [ { path: '', redirectTo: 'index', pathMatch: 'full' }, - { path: 'index', component: MenuManagerComponentsIndexComponent }, - { path: 'auth', component: ApiAuthComponent }, + { + path: 'index', + component: MenuManagerComponentsIndexComponent, + data: { guard: { ability: ['MENU-INDEX-obclist', 'MENU-INDEX-smclist'] } } + }, + { path: 'auth', component: ApiAuthComponent, data: { guard: { ability: ['MENU-AUTH-obclist', 'MENU-AUTH-smclist'] } } } ]; @NgModule({ imports: [RouterModule.forChild(routes)], - exports: [RouterModule], + exports: [RouterModule] }) export class MenuManagerRoutingModule {} diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index bf23f79e..c0f99450 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 19:52:15 + * @LastEditTime : 2022-04-28 19:49:17 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -112,8 +112,6 @@ export class OrderManagementVehicleDetailComponent implements OnInit { .request(this.service.$api_get_log_list, { operateObject: this.i?.billCode, operateTypeList: ['3', '8'] }) .subscribe(res => { if (res) { - console.log('操作日志'); - console.log(res); let a: any = []; res.records.forEach((item: any) => { a.push({ @@ -122,7 +120,6 @@ export class OrderManagementVehicleDetailComponent implements OnInit { color: 'green' }); }); - console.log(a); this.operationList = a; } }); @@ -133,15 +130,11 @@ export class OrderManagementVehicleDetailComponent implements OnInit { }); this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => { if (res) { - console.log('风险详情'); - console.log(res); this.abnormalList = res; } }); this.service.request(this.service.$api_getAbnormalWarningByBillId, { id: this.id }).subscribe(res => { if (res) { - console.log('异常预警'); - console.log(res); this.warringList = res; } }); diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html index dee32307..5604bdbf 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-29 17:27:37 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:22:55 + * @LastEditTime : 2022-04-28 19:28:16 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-captain\\modify-captain.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -28,8 +28,8 @@ - - + + diff --git a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts index 7e3ab9d6..68d4bdc0 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-30 14:45:39 * @LastEditors : Shiming - * @LastEditTime : 2022-04-22 16:31:57 + * @LastEditTime : 2022-04-28 19:27:14 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-captain\\modify-captain.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -38,6 +38,21 @@ export class VehicleModifyCaptainComponent implements OnInit { this.initSF(); this.initST(); } + initData(id: string) { + // this.service.request(this.service.$api_getDriverBankInfoList, {roleId: id}).subscribe((res:any) => { + // console.log(res); + // if(res) { + // let List :any= [] + // res.forEach((element: any) => { + // List.push({ + // bankCardNumber: element.bankBranchName + '/'+element.bankCardNumber, + // value: element.id + // }) + // }); + // this.bankData = List + // } + // }) + } initSF() { this.schema = { properties: { @@ -120,6 +135,7 @@ export class VehicleModifyCaptainComponent implements OnInit { this.service.request(this.service.$api_get_getCarCaptainByMobile, params).subscribe((res: any) => { if (res) { this.dataList = [res]; + this.initData(res.appUserId); } }); } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index f68ed55c..a684e125 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-22 17:14:39 + * @LastEditTime : 2022-04-28 19:19:01 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -222,6 +222,9 @@ export class OrderManagementService extends ShipperBaseService { // 订单上报推送 $api_manualOrderSubmission = '/api/sdc/billOperate/manualOrderSubmission'; + // 获取司机所有银行卡信息 + $api_getDriverBankInfoList= '/api/fcc/bankInfoDMC/getDriverBankInfoList'; + // // 生成卸货单 // public $api_createBillDischargeGoods = `/api/sdc/billOperate/createBillDischargeGoods`; // // 生成提货单 diff --git a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html index 22030b03..8888f432 100644 --- a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html +++ b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html @@ -1,4 +1,17 @@ + + +
+
-
- - -
+
+ + +
+ + +
\ No newline at end of file diff --git a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html index 0f517765..2f8b7ad1 100644 --- a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html +++ b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.html @@ -4,12 +4,13 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 14:27:20 + * @LastEditTime : 2022-04-28 17:36:31 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\choose-famifiar\\choose-famifiar.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> +
@@ -19,6 +20,7 @@
+
@@ -55,7 +57,9 @@
+ +
-
+
\ No newline at end of file diff --git a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html index e70f7e38..ff5a6eb5 100644 --- a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html +++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html @@ -25,8 +25,10 @@
- - + + +
this.roleAction(item, 2) }, { text: '删除', + acl: { ability: ['SYSTEM-ANNOUNCEMENT-delete'] }, click: item => this.deleteAction(item) }, ] diff --git a/src/app/routes/sys-setting/components/cart-config/cart-config.component.html b/src/app/routes/sys-setting/components/cart-config/cart-config.component.html index c5cfa144..00d6b58b 100644 --- a/src/app/routes/sys-setting/components/cart-config/cart-config.component.html +++ b/src/app/routes/sys-setting/components/cart-config/cart-config.component.html @@ -1,7 +1,11 @@ - + + + + + @@ -22,10 +26,10 @@
- +
+ [req]="{process: beforeReq }" [res]="{ process: afterRes }" [loading]="loading" [scroll]="{ y: '370px' }"> \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/cart-config/cart-config.component.ts b/src/app/routes/sys-setting/components/cart-config/cart-config.component.ts index b7039fb0..0682a22e 100644 --- a/src/app/routes/sys-setting/components/cart-config/cart-config.component.ts +++ b/src/app/routes/sys-setting/components/cart-config/cart-config.component.ts @@ -1,5 +1,6 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; +import { ACLService } from '@delon/acl'; import { SFComponent, SFSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { SystemService } from '../../services/system.service'; @@ -20,17 +21,20 @@ export class CartConfigComponent implements OnInit { { name: '车型配置', type: 1, - isActived: false + isActived: false, + isShow: true }, { name: '车长配置', type: 2, - isActived: false + isActived: false, + isShow: true }, { name: '禁限物品名单', type: 3, - isActived: false + isActived: false, + isShow: true } ]; tabType = 1; @@ -102,10 +106,12 @@ export class CartConfigComponent implements OnInit { buttons: [ { text: '编辑', + acl: { ability: ['SYSTEM-CART-CONFIG-edit'] }, click: item => this.configAction(item) }, { text: '删除', + acl: { ability: ['SYSTEM-CART-CONFIG-delete'] }, click: item => this.deleteAction(item) } ] @@ -113,7 +119,35 @@ export class CartConfigComponent implements OnInit { ]; loading = true; - constructor(public service: SystemService, private nzModalService: NzModalService, private cdr: ChangeDetectorRef) {} + constructor( + public service: SystemService, + private nzModalService: NzModalService, + private cdr: ChangeDetectorRef, + private acl: ACLService + ) { + const acls = acl.data.abilities || []; + this.tabs = [ + { + name: '车型配置', + type: 1, + isActived: false, + isShow: acl.data.full || !!acls.find(acl => acl === 'SYSTEM-CART-CONFIG-modeList') + }, + { + name: '车长配置', + type: 2, + isActived: false, + isShow: acl.data.full || !!acls.find(acl => acl === 'SYSTEM-CART-CONFIG-cartLength') + }, + { + name: '禁限物品名单', + type: 3, + isActived: false, + isShow: acl.data.full || !!acls.find(acl => acl === 'SYSTEM-CART-CONFIG-goodsList') + } + ]; + this.tabType = this.tabs.find(tab => tab.isShow)?.type || 1; + } ngOnInit(): void {} diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.html b/src/app/routes/sys-setting/components/close-account/close-account.component.html index 0dae990d..b29143f4 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.html +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.html @@ -1,10 +1,10 @@ @@ -16,7 +16,6 @@
- edit
diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.ts b/src/app/routes/sys-setting/components/close-account/close-account.component.ts index 1472bf4e..3506236f 100644 --- a/src/app/routes/sys-setting/components/close-account/close-account.component.ts +++ b/src/app/routes/sys-setting/components/close-account/close-account.component.ts @@ -156,22 +156,23 @@ export class CloseAccountComponent implements OnInit { maxLength: 30, ui: { widget: 'select', - serverSearch: true, + // serverSearch: true, + allowClear: true, searchDebounceTime: 300, searchLoadingText: '搜索中...', onSearch: (q: any) => { - let str =q.replace(/^\s+|\s+$/g,""); + let str = q?.replace(/^\s+|\s+$/g, ''); if (str) { return this.service - .request(this.service.$api_enterpriceList, { enterpriseName: str}) - .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) + .request(this.service.$api_enterpriceList, { enterpriseName: str }) + .pipe(map(res => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) .toPromise(); } else { return of([]); } }, - } as SFSelectWidgetSchema, - }, + } as SFSelectWidgetSchema + }, }, required: ['customerName', 'customerCode', 'networkTransporterId', 'enterpriseId'] }; @@ -186,11 +187,16 @@ this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; this.service.request(this.service.$api_settlementCustomer_get, {id: value.id}).subscribe((res: any) => { console.log(res) if(res) { - this.formData = res; const List: any = []; - List.push({ label: res.enterpriseName, value: res.id }); - this.sfFre.getProperty('/enterpriseId')!.schema.enum = List; - this.sfFre.getProperty('/enterpriseId')!.widget.reset(List); + List.push({ label: value.enterpriseName, value: res.enterpriseId }); + this.formData = res; + setTimeout(() => { + this.sfFre.getProperty('/enterpriseId')!.schema.enum = List; + this.sfFre.getProperty('/enterpriseId')!.widget.reset(List); + if (res?.enterpriseId) { + this.sfFre.setValue('/enterpriseId', res.enterpriseId); + } + }) } }) this.edit = true; diff --git a/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts b/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts index 1db86b54..b71b2f52 100644 --- a/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts +++ b/src/app/routes/sys-setting/components/organization-management/menu-tree/menu-tree.component.ts @@ -122,8 +122,17 @@ export class MenuTreeComponent implements OnInit, OnChanges { }); } } else { + console.log(event); + if (event.node?.isChecked) { this.recursionSetNodeAuth(event.node.origin); + if (event.node.parentNode) { + this._NodeAuthMap.set(event.node.parentNode.origin.id, { + authorityId: event.node.parentNode.origin.id, + buttonAuthorityIds: [], + isUpdateAuthority: 1 + }); + } if (this.origin.checked) { this.origin.buttonInfoList.forEach((auth: any) => this._apiAuthSet.add(auth.functionButtonId)); } diff --git a/src/app/routes/sys-setting/components/organization-management/organization-management.component.html b/src/app/routes/sys-setting/components/organization-management/organization-management.component.html index a7fdf0d0..38f4416d 100644 --- a/src/app/routes/sys-setting/components/organization-management/organization-management.component.html +++ b/src/app/routes/sys-setting/components/organization-management/organization-management.component.html @@ -1,7 +1,8 @@
- +
- 编辑 + 编辑 - 删除 + 删除 - 新增子组织 + 新增子组织
- 配置接口权限 + 配置接口权限 - 配置数据权限 + 配置数据权限 - + diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.html b/src/app/routes/sys-setting/components/sms-template/sms-template.component.html index 2b413ab5..41716b59 100644 --- a/src/app/routes/sys-setting/components/sms-template/sms-template.component.html +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.html @@ -2,7 +2,7 @@
- +
- + - + \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts index 43d1df9c..3e3bd75b 100644 --- a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts @@ -1,5 +1,5 @@ -import { AfterViewInit, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema } from '@delon/form'; @@ -23,7 +23,7 @@ export class SmsTemplateComponent implements OnInit { isVisible = false; tempData = {}; isEdit = false; - + searchSchema: SFSchema = { properties: { templateName: { @@ -50,27 +50,27 @@ export class SmsTemplateComponent implements OnInit { templateName: { type: 'string', title: '模板名称', - ui: { placeholder: '请输入模板名称', errors: { require: '必填项'} } + ui: { placeholder: '请输入模板名称', errors: { require: '必填项' } } }, templateCode: { type: 'string', title: '模板编码', readOnly: this.isEdit, - ui: { placeholder: '请输入模板编码', errors: { require: '必填项'} } + ui: { placeholder: '请输入模板编码', errors: { require: '必填项' } } }, templateContent: { type: 'string', title: '模板内容', - ui: { placeholder: '请输入模板内容', errors: { require: '必填项'} } + ui: { placeholder: '请输入模板内容', errors: { require: '必填项' } } } }, - required: ['templateName','templateCode','templateContent'] - } + required: ['templateName', 'templateCode', 'templateContent'] + }; } columns: STColumn[] = [ - { title: '模板名称', className: 'text-center', index: 'templateName' }, - { title: '模板编码', className: 'text-center', index: 'templateCode' }, + { title: '模板名称', className: 'text-center', width: '200px', index: 'templateName' }, + { title: '模板编码', className: 'text-center', width: '140px', index: 'templateCode' }, { title: '模板内容', className: 'text-center', index: 'templateContent' }, // { // title: '创建人', className: 'text-center', index: 'content', @@ -79,21 +79,23 @@ export class SmsTemplateComponent implements OnInit { title: '更新时间', index: 'modifyTime', type: 'date', + width: '160px', className: 'text-center' }, { title: '操作', + width: '90px', buttons: [ { text: '编辑', - click: i => this.edit(i), + acl: { ability: ['SMS_TEMPLATE-save'] }, + click: i => this.edit(i) } ] } ]; - constructor(public service: SystemService, private nzModalService: NzModalService, private route: ActivatedRoute) { - } + constructor(public service: SystemService, private nzModalService: NzModalService, private route: ActivatedRoute) {} ngOnInit(): void { this.initSF(); @@ -144,7 +146,7 @@ export class SmsTemplateComponent implements OnInit { templateCode, templateName, templateContent - } + }; this.service.request(this.service.$api_smsTemplate_edit, params).subscribe(res => { // console.log(res); @@ -152,8 +154,7 @@ export class SmsTemplateComponent implements OnInit { this.isVisible = false; this.st.reload(); } - }) - + }); } handleCancel(): void { diff --git a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts index f29c7b7d..d363a597 100644 --- a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts +++ b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts @@ -68,20 +68,20 @@ export class StaffManagementComponent implements OnInit { { text: '冻结', iif: item => - item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone, + !item.stateLocked && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone, click: item => this.action(item, 1), acl: { ability: ['SYSTEM-STAFF-lock'] } }, { text: '超管转授', - iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1, + iif: item => !item.stateLocked && item.roleCode.split(',').indexOf('Administrator') === -1, click: item => this.transpowerAction(item), acl: { ability: ['SYSTEM-STAFF-shiftAdmin'] } }, { text: '删除', iif: item => - item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone, + !item.stateLocked && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone, click: item => this.action(item, 3), acl: { ability: ['SYSTEM-STAFF-delete'] } } diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts index 3eb42854..fb77019d 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -54,9 +54,9 @@ const routes: Routes = [ { path: 'network-freight/new/:id', component: NetworkFreightNewComponent }, { path: 'close-account', component: CloseAccountComponent }, // { path: 'btn-management', component: BtnManagementComponent }, - { path: 'announcement-message', component: AnnouncementMessageComponent }, + { path: 'announcement-message', component: AnnouncementMessageComponent, data: { guard: { ability: ['SYSTEM-ANNOUNCEMENT-list'] } } }, { path: 'insurance-set', component: InsuranceSetComponent }, - { path: 'sms-template', component: SmsTemplateComponent } + { path: 'sms-template', component: SmsTemplateComponent, data: { guard: { ability: ['SMS_TEMPLATE-search'] } } } ]; @NgModule({ diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html index 3087e371..bf8b851d 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.html +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html @@ -45,10 +45,10 @@ 已选择 {{ selectedRows.length }} 条数据
- - - - + + + +
diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html index 010dee32..6784c8fd 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html @@ -9,7 +9,7 @@
- +
- +
diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts index 9ec54f1a..4bf92d71 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts @@ -281,26 +281,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { }); } - /** - *撤销 - * @param record 记录实例 - */ - resetData() { - if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要更新的数据！'); - return; - } - let params: any[] = []; - this.selectedRows.forEach(item => { - params.push(item.billId); - }); - this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('更新成功'); - this.st.load(1); - } - }) - } + /** *撤销 * @param record 记录实例 @@ -333,28 +314,13 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { } selectChange(item: any) { - console.log(item); - this.selectedIndex = item?.value || ''; - console.log(this.selectedIndex); setTimeout(() => { this.st.load(); }) } - /** - * 查看当行数据 - */ - view(record: STData) { - // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar }); - this.router.navigate(['../detail'], { - queryParams: { - id: record.id, - }, - relativeTo: this.ar - }); - } /** * 上传 @@ -368,6 +334,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { this.selectedRows.forEach(item => { params.push(item.id); }); + return; //TODO 接口未提供 this.service.request(this.service.$api_get_uploadingTaxOrder, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('上传成功'); diff --git a/src/app/routes/tax-management/tax-management-routing.module.ts b/src/app/routes/tax-management/tax-management-routing.module.ts index ce7b3f5f..01f84120 100644 --- a/src/app/routes/tax-management/tax-management-routing.module.ts +++ b/src/app/routes/tax-management/tax-management-routing.module.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-03-30 13:58:28 @@ -16,18 +16,20 @@ import { TaxManagementIndividualIncomeComponent } from './components/individual- import { TaxManagementInvoiceReportingComponent } from './components/invoice-reporting/invoice-reporting.component'; import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component'; - const routes: Routes = [ - { path: 'orderReport', component: TaxManagementOrderReportingComponent }, - { path: 'income', component: TaxManagementIndividualIncomeComponent }, - { path: 'collect', component: TaxManagementIndividualCollectComponent }, - { path: 'declare', component: TaxManagementIndividualDeclareComponent }, - { path: 'invoiceReport', component: TaxManagementInvoiceReportingComponent }, + { path: 'orderReport', component: TaxManagementOrderReportingComponent, data: { guard: { ability: ['TAX-ORDERREPORT-search'] } } }, + { path: 'income', component: TaxManagementIndividualIncomeComponent, data: { guard: { ability: ['TAX-INCOME-search'] } } }, + { path: 'collect', component: TaxManagementIndividualCollectComponent, data: { guard: { ability: ['TAX-COLLECT-search'] } } }, + { path: 'declare', component: TaxManagementIndividualDeclareComponent, data: { guard: { ability: ['TAX-DECLARE-search'] } } }, + { + path: 'invoiceReport', + component: TaxManagementInvoiceReportingComponent, + data: { guard: { ability: ['TAX_INVOICE_REPORT-list'] } } + } ]; - @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class TaxManagementModuleRoutingModule { } +export class TaxManagementModuleRoutingModule {} diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html index 047cdf2a..e6588a35 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html @@ -11,9 +11,9 @@
- + - +
- - + +