diff --git a/src/app/routes/commom/components/basic-table/basic-table.component.ts b/src/app/routes/commom/components/basic-table/basic-table.component.ts index dfe8a25d..f3645ebf 100644 --- a/src/app/routes/commom/components/basic-table/basic-table.component.ts +++ b/src/app/routes/commom/components/basic-table/basic-table.component.ts @@ -73,22 +73,29 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy { for (let index = 0; index < tabset.length; index++) { tabsetHeight += tabset[index].clientHeight; } - console.log('tabsetHeight', tabsetHeight); if (tabset) { scrollY -= tabsetHeight; } // 剔除高度容器 - // 计算所有tabs高度 const headerBox = document.getElementsByClassName('header_box'); let headerBoxHeight = 0; for (let index = 0; index < headerBox.length; index++) { headerBoxHeight += headerBox[index].clientHeight; } - console.log('headerBoxHeight', headerBoxHeight); - if (headerBox) { scrollY -= headerBoxHeight; } + + // 剔除高度容器 + const heightBox = document.getElementsByClassName('height_box'); + let heightBoxHeight = 0; + for (let index = 0; index < heightBox.length; index++) { + heightBoxHeight += heightBox[index].clientHeight; + } + if (heightBox) { + scrollY -= heightBoxHeight; + } + if (typeof this.deviationHeight === 'number') { scrollY -= this.deviationHeight; } diff --git a/src/app/routes/commom/less/commom-table.less b/src/app/routes/commom/less/commom-table.less index c1256d36..152d7534 100644 --- a/src/app/routes/commom/less/commom-table.less +++ b/src/app/routes/commom/less/commom-table.less @@ -136,4 +136,6 @@ margin-right: 6px; } } -} \ No newline at end of file +} + +.height_box{} \ No newline at end of file diff --git a/src/app/routes/commom/less/common-table-bar.less b/src/app/routes/commom/less/common-table-bar.less new file mode 100644 index 00000000..22e166de --- /dev/null +++ b/src/app/routes/commom/less/common-table-bar.less @@ -0,0 +1,17 @@ +:host::ng-deep { + nz-card { + margin: -8px -8px 0 !important + } + + .height_box { + margin-bottom: 18px !important; + } +} + +.total-footer { + position : absolute; + bottom : 0px; + height : 32px; + margin : 4px 8px; + line-height: 32px; +} \ No newline at end of file diff --git a/src/app/routes/datatable/datatable-routing.module.ts b/src/app/routes/datatable/datatable-routing.module.ts index 8298fdf5..86809094 100644 --- a/src/app/routes/datatable/datatable-routing.module.ts +++ b/src/app/routes/datatable/datatable-routing.module.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-04-28 20:27:07 + * @LastEditors : Shiming + * @LastEditTime : 2022-04-28 21:10:06 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\datatable-routing.module.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { DatatableCustomindexComponent } from './components/customtable/customindex/customindex.component'; @@ -20,29 +30,33 @@ import { DatatableReportingFundInfoComponent } from './reporting/components/fund import { DatatableDatascreenComponent } from './components/datascreen/datascreen.component'; const routes: Routes = [ - { path: 'dataindex', component: DatatableDataindexComponent }, - { path: 'customtable/customindex', component: DatatableCustomindexComponent }, - { path: 'customtable/owner', component: DatatableOwnerComponent }, - { path: 'customtable/driver', component: DatatableDriverComponent }, - { path: 'customtable/mancustomtable', component: DatatableMancustomtableComponent }, - { path: 'customtable/partnertable', component: DatatablePartnertableComponent }, - { path: 'operationtable', component: DatatableOperationtableComponent }, - { path: 'reporting/order', component: DatatableOrderReportingComponent }, - { path: 'compliancetabel/index', component: DatatableComplianceIndexComponent }, - { path: 'compliancetabel/salesman', component: DatatableComplianceSalesmanComponent }, - { path: 'compliancetabel/customer', component: DatatableComplianceCustomerComponent }, - { path: 'financetable', component: DatatableFinancetableComponent }, - { path: 'invoicetable', component: DatatableInvoicetableComponent }, - { path: 'reporting/fund', component: DatatableFundReportingComponent }, - { path: 'busitable/busiindex', component: DatatableBusiindexComponent }, - { path: 'busitable/mantable', component: DatatableMantableComponent }, - { path: 'reporting/fund', component: DatatableFundReportingComponent }, - { path: 'fund-info', component: DatatableReportingFundInfoComponent }, - { path: 'datascreen', component: DatatableDatascreenComponent }]; - + { path: 'dataindex', component: DatatableDataindexComponent, data: { guard: { ability: ['dataindex-search'] } } }, + { path: 'customtable/customindex', component: DatatableCustomindexComponent, data: { guard: { ability: ['customindex-client'] } } }, + { path: 'customtable/owner', component: DatatableOwnerComponent, data: { guard: { ability: ['owner-search'] } } }, + { path: 'customtable/driver', component: DatatableDriverComponent, data: { guard: { ability: ['driver-search'] } } }, + { + path: 'customtable/mancustomtable', + component: DatatableMancustomtableComponent, + data: { guard: { ability: ['mancustomtable-search'] } } + }, + { path: 'customtable/partnertable', component: DatatablePartnertableComponent, + data: { guard: { ability: ['partnertable-search'] } } }, + { path: 'operationtable', component: DatatableOperationtableComponent, data: { guard: { ability: ['operationtable-search'] } } }, + { path: 'reporting/order', component: DatatableOrderReportingComponent, data: { guard: { ability: ['ORDER-REPORTING-search'] } } }, + { path: 'compliancetabel/index', component: DatatableComplianceIndexComponent , data: { guard: { ability: ['index-lRateQualified'] } }}, + { path: 'compliancetabel/salesman', component: DatatableComplianceSalesmanComponent, data: { guard: { ability: ['salesman-ComplianceReportPage'] } } }, + { path: 'compliancetabel/customer', component: DatatableComplianceCustomerComponent, data: { guard: { ability: ['customer-search'] } } }, + { path: 'financetable', component: DatatableFinancetableComponent , data: { guard: { ability: ['financetable-search'] } }}, + { path: 'invoicetable', component: DatatableInvoicetableComponent , data: { guard: { ability: ['invoicetable-search'] } }}, + { path: 'reporting/fund', component: DatatableFundReportingComponent , data: { guard: { ability: ['FUND-REPORTING-search'] } }}, + { path: 'busitable/busiindex', component: DatatableBusiindexComponent , data: { guard: { ability: ['busiindex-search'] } }}, + { path: 'busitable/mantable', component: DatatableMantableComponent, data: { guard: { ability: ['customer-search'] } } }, + { path: 'fund-info', component: DatatableReportingFundInfoComponent , data: { guard: { ability: ['customer-search'] } }}, + { path: 'datascreen', component: DatatableDatascreenComponent, data: { guard: { ability: ['datascreen-search'] } } } +]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class DatatableRoutingModule { } +export class DatatableRoutingModule {} diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index ef60a6e7..1884a0ef 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -1,3 +1,13 @@ + @@ -85,6 +95,6 @@ + [acl-ability]="['ORDER-REPORTING-search-updata']">上传设置 diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts index 3b1bb143..60e99082 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts @@ -46,7 +46,7 @@ export class FreightAccountDetailComponent implements OnInit { } }); } - // this.loadStatistics(requestOptions.body); + this.loadStatistics(requestOptions.body); return requestOptions; }; @@ -75,6 +75,8 @@ export class FreightAccountDetailComponent implements OnInit { loadStatistics(params: any) { this.service.request(this.service.$api_get_shipper_account_balance_detail, params).subscribe(res => { if (res) { + console.log(res); + this.static = res; } }); diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.html b/src/app/routes/financial-management/components/payable-order/payable-order.component.html index e7fc0bc8..cbe647cb 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.html +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.html @@ -1,17 +1,10 @@ - - - + - + +
+ +
- + + + - - - + --> + +
+
+
+ +
+
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 33b73f97..447dfa8f 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 @@ -3,24 +3,21 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-payable-order', templateUrl: './payable-order.component.html', - styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'], - providers: [CurrencyPipe] + styleUrls: ['../../../commom/less/commom-table.less', '../../../commom/less/common-table-bar.less'] }) -export class PayableOrderComponent implements OnInit { +export class PayableOrderComponent extends BasicTableComponent implements OnInit { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; columns: STColumn[] = this.initST(); - searchSchema: SFSchema = this.initSF(); - - _$expand = false; + schema: SFSchema = this.initSF(); selectedRows: any[] = []; info: any = {}; @@ -28,10 +25,15 @@ export class PayableOrderComponent implements OnInit { public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, - private currencyPipe: CurrencyPipe - ) {} + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } - ngOnInit(): void { + ngOnInit(): void {} + + search() { + this.st?.load(1); } loadInfo() { @@ -76,21 +78,6 @@ export class PayableOrderComponent implements OnInit { } } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } private initSF(): SFSchema { return { @@ -133,9 +120,6 @@ export class PayableOrderComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } }, cno: { @@ -146,9 +130,6 @@ export class PayableOrderComponent implements OnInit { placeholder: '请选择', allowClear: true, asyncData: () => this.service.getCloseAccount(), - visibleIf: { - expand: (value: boolean) => value - } } }, driver2IdName: { @@ -157,9 +138,6 @@ export class PayableOrderComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } }, sts: { @@ -172,9 +150,6 @@ export class PayableOrderComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } }, phxdate: { @@ -183,9 +158,6 @@ export class PayableOrderComponent implements OnInit { ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } } as SFDateWidgetSchema }, createTime: { @@ -194,9 +166,6 @@ export class PayableOrderComponent implements OnInit { ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } } as SFDateWidgetSchema }, billHCode: { @@ -204,9 +173,6 @@ export class PayableOrderComponent implements OnInit { title: '订单号', ui: { placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } } }, feeHCode: { @@ -214,9 +180,6 @@ export class PayableOrderComponent implements OnInit { title: '费用号', ui: { placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } } }, remarks: { @@ -225,9 +188,6 @@ export class PayableOrderComponent implements OnInit { ui: { autocomplete: 'off', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } } } @@ -246,15 +206,17 @@ export class PayableOrderComponent implements OnInit { title: '核销金额', index: 'phxmoney', width: 140, + type: 'widget', className: 'text-right', - format: item => `${this.currencyPipe.transform(item.phxmoney || 0)}` + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.phxmoney }) } }, { title: '应付金额', index: 'prmoney', width: 140, + type: 'widget', className: 'text-right', - format: item => `${this.currencyPipe.transform(item.prmoney || 0)}` + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.prmoney }) } }, { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 }, { title: '付款类型', index: 'brmtype', type: 'enum', enum: { '1': '费用款项' }, width: 120 }, diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.html b/src/app/routes/financial-management/components/platform-account/platform-account.component.html index ccbbcf20..613120d9 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.html +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.html @@ -1,7 +1,10 @@ - - + - + +
+ +
- + - + +
+
+
+ + +
+
@@ -60,4 +70,4 @@ - + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts index e939b50a..3c7c0268 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts @@ -2,7 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { FreightAccountService } from '../../services/freight-account.service'; import { CwcBankCardManagementBindComponent } from '../bank-card-management/bind/bind.component'; import { CwcAccountManagementWithdrawDepositComponent } from './withdraw-deposit/withdraw-deposit.component'; @@ -10,14 +12,12 @@ import { CwcAccountManagementWithdrawDepositComponent } from './withdraw-deposit @Component({ selector: 'app-platform-account', templateUrl: './platform-account.component.html', - styleUrls: ['../../../commom/less/box.less'] + styleUrls: ['../../../commom/less/commom-table.less', '../../../commom/less/common-table-bar.less'] }) -export class PlatformAccountComponent implements OnInit { +export class PlatformAccountComponent extends BasicTableComponent implements OnInit { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; - searchSchema: SFSchema = this.initSF(); + schema: SFSchema = this.initSF(); columns: STColumn[] = this.initST(); info: any = {}; @@ -27,11 +27,16 @@ export class PlatformAccountComponent implements OnInit { public service: FreightAccountService, private router: Router, private nzModalService: NzModalService, - public modal: NzModalService - ) {} + public modal: NzModalService, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } - ngOnInit(): void { - this.loadInfo(); + ngOnInit(): void {} + + search() { + this.st?.load(1); } beforeReq = (requestOptions: STRequestOptions) => { @@ -39,6 +44,7 @@ export class PlatformAccountComponent implements OnInit { Object.assign(requestOptions.body, { ...this.sf?.value }); } this.loadStatistics(requestOptions.body); + this.loadInfo(); return requestOptions; }; diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html index 0755a3f3..ceb5e6f5 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.html @@ -1,16 +1,29 @@ - - + - + + + +
+ +
- -
-
- -
-
- - - - + +
+
+
+
- - + [loading]="false" [scroll]="{ x: '1200px',y:scrollY }" (change)="stChange($event)"> \ No newline at end of file diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts index 19007ae6..c27928e7 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts @@ -3,25 +3,22 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { TicketService } from 'src/app/routes/ticket-management/services/ticket.service'; import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-receivable-order', templateUrl: './receivable-order.component.html', - styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'], - providers: [CurrencyPipe] + styleUrls: ['../../../commom/less/commom-table.less','../../../commom/less/common-table-bar.less'] }) -export class ReceivableOrderComponent implements OnInit { +export class ReceivableOrderComponent extends BasicTableComponent implements OnInit { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; columns: STColumn[] = this.initST(); - searchSchema: SFSchema = this.initSF(); - - _$expand = false; + schema: SFSchema = this.initSF(); selectedRows: any[] = []; @@ -30,10 +27,15 @@ export class ReceivableOrderComponent implements OnInit { public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, - private currencyPipe: CurrencyPipe - ) {} + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } - ngOnInit(): void { + ngOnInit(): void {} + + search() { + this.st?.load(1); } loadInfo() { @@ -78,21 +80,6 @@ export class ReceivableOrderComponent implements OnInit { } } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } private initSF(): SFSchema { return { @@ -135,9 +122,6 @@ export class ReceivableOrderComponent implements OnInit { widget: 'dict-select', params: { dictKey: 'driverrecord:receive:type' }, placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } }, arvattype: { @@ -147,9 +131,6 @@ export class ReceivableOrderComponent implements OnInit { widget: 'dict-select', params: { dictKey: 'pay:type' }, placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } }, cno: { @@ -160,9 +141,6 @@ export class ReceivableOrderComponent implements OnInit { placeholder: '请选择', allowClear: true, asyncData: () => this.service.getCloseAccount(), - visibleIf: { - expand: (value: boolean) => value - } } }, arto: { @@ -175,9 +153,6 @@ export class ReceivableOrderComponent implements OnInit { searchLoadingText: '搜索中...', allowClear: true, onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }), - visibleIf: { - expand: (value: boolean) => value - } } }, sts: { @@ -190,9 +165,7 @@ export class ReceivableOrderComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + } }, banktype: { @@ -206,9 +179,7 @@ export class ReceivableOrderComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + }, default: '' }, @@ -218,9 +189,7 @@ export class ReceivableOrderComponent implements OnInit { ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } + } as SFDateWidgetSchema }, createTime: { @@ -229,9 +198,6 @@ export class ReceivableOrderComponent implements OnInit { ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } } as SFDateWidgetSchema }, billHCode: { @@ -239,9 +205,6 @@ export class ReceivableOrderComponent implements OnInit { title: '订单号', ui: { placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } } }, // orderS3: { @@ -260,9 +223,6 @@ export class ReceivableOrderComponent implements OnInit { ui: { autocomplete: 'off', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } } } @@ -282,15 +242,17 @@ export class ReceivableOrderComponent implements OnInit { title: '核销金额', index: 'ahxmoney', width: 140, + type: 'widget', className: 'text-right', - format: item => `${this.currencyPipe.transform(item.ahxmoney)}` + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ahxmoney }) } }, { title: '应收金额', index: 'armoney', width: 140, + type: 'widget', className: 'text-right', - format: item => `${this.currencyPipe.transform(item.armoney)}` + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.armoney }) } }, { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 }, { title: '收款类型', index: 'arvattype', type: 'enum', enum: { '1': '费用款项' }, width: 120 }, 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 7cdee930..07e9f0d6 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -64,8 +64,12 @@ const routes: Routes = [ { path: 'voucher-summary/detail/:id', component: SummaryDetailComponent }, { path: 'voucher-summary/list/:id', component: VoucherListComponent }, { path: 'voucher-summary/list/detail/:id', component: VoucherDetailComponent }, - { path: 'cost-management', component: CostManagementComponent }, - { path: 'cost-management/detail/:id', component: CostManagementDetailComponent }, + { path: 'cost-management', component: CostManagementComponent, data: { guard: { ability: ['FINANCIAL-COST-list'] } } }, + { + path: 'cost-management/detail/:id', + component: CostManagementDetailComponent, + data: { guard: { ability: ['FINANCIAL-COST-DETAIL-view'] } } + }, { path: 'cost-management/expenses-receivable/:id', component: ExpensesReceivableComponent }, { path: 'cost-management/expenses-payable/:id', component: ExpensesPayableComponent }, { path: 'abnormal-gold', component: AbnormalGoldComponent }, diff --git a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html index 26129d7a..e5312e5c 100644 --- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html +++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-08 16:34:26 + * @LastEditTime : 2022-04-29 10:41:20 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\abnormal-warning\\abnormal-warning.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -35,25 +35,27 @@
- - + +
- - - + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" + [loading]="false" + > -
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}
+
{{ item?.driverName }}{{ item?.driverPhone ? '/' + item?.driverPhone : '' }}
-
{{ item?.longitude }} - {{ item?.latitude ? "," + item?.latitude : '' }}
+
{{ item?.longitude }} {{ item?.latitude ? ',' + item?.latitude : '' }}
@@ -118,7 +118,7 @@
- + diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html index ad382091..8f453052 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html @@ -4,14 +4,14 @@ * @Author : Shiming * @Date : 2021-12-29 14:51:07 * @LastEditors : Shiming - * @LastEditTime : 2022-03-08 13:21:35 + * @LastEditTime : 2022-04-28 22:11:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - { + console.log(res); + this.dataList = res + }) + } initSF() { this.schema = { properties: { @@ -63,7 +74,13 @@ export class VehicleModifyRateComponent implements OnInit { ui: { unit: '%', widgetWidth: 200, - precision: 2 + precision: 2, + change:(item: any) => { + console.log(item); + setTimeout(() => { + this.initData() + }); + } } as SFNumberWidgetSchema } }, diff --git a/src/app/routes/order-management/order-management-routing.module.ts b/src/app/routes/order-management/order-management-routing.module.ts index 7be4f4e5..709d45b0 100644 --- a/src/app/routes/order-management/order-management-routing.module.ts +++ b/src/app/routes/order-management/order-management-routing.module.ts @@ -1,10 +1,10 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-01-06 09:24:00 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 09:43:47 + * @LastEditTime : 2022-04-29 10:41:21 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management-routing.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -25,22 +25,34 @@ import { OrderManagementVehicleDetailComponent } from './components/vehicle-deta import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component'; const routes: Routes = [ - { path: 'vehicle', component: OrderManagementVehicleComponent }, - { path: 'vehicle/vehicle-detail/:id', component: OrderManagementVehicleDetailComponent }, + { path: 'vehicle', component: OrderManagementVehicleComponent, data: { guard: { ability: ['ORDER-VEHICLE-search'] } } }, + { + path: 'vehicle/vehicle-detail/:id', + component: OrderManagementVehicleDetailComponent, + data: { guard: { ability: ['ORDER-VEHICLE-DETAIL-search'] } } + }, { path: 'vehicle-detailChange/:id', component: OrderManagementVehicleDetailChangeComponent }, - { path: 'bulk', component: OrderManagementBulkComponent }, - { path: 'bulk/bulk-detail/:id', component: OrderManagementBulkeDetailComponent }, + { path: 'bulk', component: OrderManagementBulkComponent, data: { guard: { ability: ['ORDER-BULK-search'] } } }, + { + path: 'bulk/bulk-detail/:id', + component: OrderManagementBulkeDetailComponent, + data: { guard: { ability: ['ORDER-BULK-DETAIL-search'] } } + }, { path: 'bulk-detailChange/:id', component: OrderManagementBulkDetailChangeComponent }, - { path: 'risk', component: OrderManagementRiskComponent }, + { path: 'risk', component: OrderManagementRiskComponent, data: { guard: { ability: ['ORDER-RISK-search'] } } }, { path: 'risk-detail/:id', component: OrderManagementRiskDetailComponent }, - { path: 'complaint', component: OrderManagementComplaintComponent }, + { path: 'complaint', component: OrderManagementComplaintComponent, data: { guard: { ability: ['ORDER-COMPLAINT-search'] } } }, { path: 'complaint-detail/:id', component: OrderManagementComplaintDetailComponent }, - { path: 'receipts-audit', component: OrderManagementReceiptsAuditComponent }, - { path: 'compliance-audit', component: OrderManagementComplianceAuditComponent }, - { path: 'abnormal-warning', component: OrderManagementAbnormalWarningComponent }, -] + { path: 'receipts-audit', component: OrderManagementReceiptsAuditComponent, data: { guard: { ability: ['ORDER-RECEIPTS-search'] } } }, + { + path: 'compliance-audit', + component: OrderManagementComplianceAuditComponent, + data: { guard: { ability: ['ORDER-COMPLIANCE-AUDIT-search'] } } + }, + { path: 'abnormal-warning', component: OrderManagementAbnormalWarningComponent, data: { guard: { ability: ['ORDER-ABNORMAL-search'] } } } +]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class OrderManagementRoutingModule { } +export class OrderManagementRoutingModule {} diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html index 83110997..32115fda 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html @@ -162,7 +162,7 @@ nzTheme="fill" class="mr-xs">通过

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 b29143f4..2bf35804 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 @@ -22,8 +22,8 @@
- - + + +
this.roleAction(item, 2) + click: item => this.roleAction(item, 2), + acl: { ability: ['SYSTEM-CLOSE-ACCOUNT-edit'] }, }, { text: '删除', - click: item => this.deleteAction(item) + click: item => this.deleteAction(item), + acl: { ability: ['SYSTEM-CLOSE-ACCOUNT-delete'] }, }, ] } diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html index 50da782f..e234be75 100644 --- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html +++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 15:54:08 * @LastEditors : Shiming - * @LastEditTime : 2022-03-24 11:10:44 + * @LastEditTime : 2022-04-29 10:20:21 * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\network-freight.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -48,7 +48,7 @@
- +
', - click: item => this.creat(item) + click: item => this.creat(item), + acl: { ability: ['SYSTEM-NETWORK-FREIGHT-basicSetting'] }, }, { text: '财务设置
', - click: item => this.ticket(item) + click: item => this.ticket(item), + acl: { ability: ['SYSTEM-NETWORK-FREIGHT-finanical'] }, }, { text: '充值账户
', - click: item => this.settingPay(item) + click: item => this.settingPay(item), + acl: { ability: ['SYSTEM-NETWORK-FREIGHT-TOPUP'] }, }, { text: '应用设置
', - click: item => this.settingApp(item) + click: item => this.settingApp(item), + acl: { ability: ['SYSTEM-NETWORK-FREIGHT-APPLY'] }, }, { text: '系统配置
', - click: item => this.settingAction(item) + click: item => this.settingAction(item), + acl: { ability: ['SYSTEM-NETWORK-FREIGHT-SYSTEMCONFIG'] }, }, // { // text: '合同设置', diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.html b/src/app/routes/sys-setting/components/network-freight/new/new.component.html index d509f252..ad77da91 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.html +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.html @@ -8,7 +8,12 @@ * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\new\\new.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - + + + @@ -17,15 +22,13 @@
正面照
示例
-
+
-
-
- 请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证 -
-
+
+
请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证
+
@@ -42,14 +45,14 @@ -
营业执照法人信息
+
营业执照法人信息
 -
道运证信息
+
道运证信息
 - +
请上传身份证原件的高清照片，若上传复印件，则需申请人签字；
@@ -83,7 +86,7 @@
- +
- \ No newline at end of file + diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts index 70658250..b8736ed2 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts @@ -180,14 +180,8 @@ export class NetworkFreightNewComponent implements OnInit { if (this.sf1.value.isLoingDate) { this.sf1.value.operatingEndTime = ''; } - console.log(this.sf1.value); - console.log(this.sf1.valid); - console.log(this.sf?.value); - console.log(this.sf.valid); const sfVlaue = this.sf1.value; const params: any = {}; - console.log(this.sf1.value); - Object.assign(params, { ...this.sf?.value, enterpriseInfoDTO: { @@ -203,7 +197,6 @@ export class NetworkFreightNewComponent implements OnInit { roadTransportLicenceNo: this.sf1.value.legalPersonIdentityVO.roadTransportLicenceNo, //道路运输照片 }); delete params.enterpriseInfoDTO.legalPersonIdentityVO; - console.log(params); params.enterpriseInfoDTO.enterpriseAddressCode = this.sf1.value?.enterpriseAddressCode?.[2]; if (this.route.snapshot.params.id !== 'undefined') { params.id = this.route.snapshot.params.id; 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 fb77019d..c307b78d 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:23:05 - * @LastEditTime : 2022-02-23 17:17:53 + * @LastEditTime : 2022-04-28 21:40:03 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting-routing.module.ts @@ -34,7 +34,7 @@ const routes: Routes = [ { path: 'role-management/freight/:type', component: RoleManagementComponent }, { path: 'organization-management', component: OrganizationManagementComponent, data: { guard: { ability: ['SYSTEM-ROLE-list'] } } }, { path: 'basic-setting', component: BasicSettingComponent, data: { guard: { ability: ['SYSTEM-BASIC_SETTING-list'] } } }, - { path: 'note-management', component: NoTeManagementComponent }, + { path: 'note-management', component: NoTeManagementComponent, data: { guard: { ability: ['NOTE-MANAGEMENT-search'] } } }, { path: 'basic-config', component: BasicConfigComponent }, { path: 'audit-reason-config', component: AuditReasonConfigComponent }, { @@ -52,7 +52,7 @@ const routes: Routes = [ { path: 'crm-management', component: CrmManagementComponent, data: { guard: { ability: ['SYSTEM-CRM-list'] } } }, { path: 'network-freight', component: NetworkFreightComponent, data: { guard: { ability: ['SYSTEM-NETWORK-FREIGHT-list'] } } }, { path: 'network-freight/new/:id', component: NetworkFreightNewComponent }, - { path: 'close-account', component: CloseAccountComponent }, + { path: 'close-account', component: CloseAccountComponent, data: { guard: { ability: ['SYSTEM-CLOSE-ACCOUNT-list'] } } }, // { path: 'btn-management', component: BtnManagementComponent }, { path: 'announcement-message', component: AnnouncementMessageComponent, data: { guard: { ability: ['SYSTEM-ANNOUNCEMENT-list'] } } }, { path: 'insurance-set', component: InsuranceSetComponent }, 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 6784c8fd..2f59f9a9 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 @@ -7,7 +7,7 @@
- +
- - - + + - + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }" + [loading]="service.http.loading" + > 待上传 已上传 上传中 - 上传异常 + 上传异常 增值税专用发票 - 有效 - 作废 + 有效 + 作废 -
{{item?.orderAmount | currency }}
+
{{ item?.orderAmount | currency }}
 @@ -53,7 +58,17 @@ 已选择 {{ selectedRows.length }} 条数据
- - + +
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 490143b2..9da6addd 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -139,7 +139,7 @@ nzTheme="fill" class="mr-xs">通过

diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.html b/src/app/routes/vehicle/components/audit/detail/detail.component.html index 608a8bb0..7b9536d8 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.html +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html @@ -85,6 +85,17 @@ + + + + + - + + + + + + + + + - + + + + + diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts index 50a20048..418b62b2 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts @@ -41,6 +41,7 @@ export class VehicleComponentsListDetailComponent implements OnInit { contenCarNoColor: any; contencarModel: any; contenCarLength: any; + contenCarEnergy: any; constructor( private http: _HttpClient, @@ -158,6 +159,8 @@ export class VehicleComponentsListDetailComponent implements OnInit { this.Serveice('car:color'); this.Serveice('car:model'); this.Serveice('car:length'); + this.Serveice('car:energy:type'); + } Serveice(param: any) { let value: any; @@ -172,6 +175,8 @@ export class VehicleComponentsListDetailComponent implements OnInit { this.contencarModel = res; } else if (param === 'car:length') { this.contenCarLength = res; + } else if (param === 'car:energy:type') { + this.contenCarEnergy = res; } }); return value; diff --git a/src/app/shared/components/search-drawer/search-drawer.component.ts b/src/app/shared/components/search-drawer/search-drawer.component.ts index 20748575..52a15e2f 100644 --- a/src/app/shared/components/search-drawer/search-drawer.component.ts +++ b/src/app/shared/components/search-drawer/search-drawer.component.ts @@ -21,6 +21,7 @@ export class SearchDrawerComponent implements OnInit, AfterViewInit { ngAfterViewInit(): void {} ngOnInit(): void { + this.defaultValue = {}; this.service.createEvent.subscribe(({ defaultValue, newSchema, newUI }) => { if (defaultValue) { this.defaultValue = defaultValue;