diff --git a/proxy.conf.js b/proxy.conf.js index 8fd91df6..d9d60dfc 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-22 14:01:00 + * @LastEditTime : 2022-04-25 10:32:29 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ diff --git a/src/app/layout/layout.module.ts b/src/app/layout/layout.module.ts index 3afd4206..a2961e91 100644 --- a/src/app/layout/layout.module.ts +++ b/src/app/layout/layout.module.ts @@ -27,6 +27,7 @@ import { NzToolTipModule } from 'ng-zorro-antd/tooltip'; import { NzGridModule } from 'ng-zorro-antd/grid'; import { LayoutPassportComponent } from './passport/passport.component'; import { PRO_COMPONENTS } from './pro/index'; +import { SearchDrawerModule } from '../shared/components/search-drawer/search-drawer.module'; const COMPONENTS: Array> = [...PRO_COMPONENTS, LayoutPassportComponent]; @@ -57,7 +58,8 @@ const COMPONENTS: Array> = [...PRO_COMPONENTS, LayoutPassportComponent ThemeBtnModule, ScrollbarModule, NzGridModule, - NzMessageModule + NzMessageModule, + SearchDrawerModule ], declarations: COMPONENTS, exports: COMPONENTS diff --git a/src/app/layout/pro/pro.component.html b/src/app/layout/pro/pro.component.html index 94c8c60b..4193e6bc 100644 --- a/src/app/layout/pro/pro.component.html +++ b/src/app/layout/pro/pro.component.html @@ -37,4 +37,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/src/app/routes/account/components/center/center.component.ts b/src/app/routes/account/components/center/center.component.ts index 3298034d..5c6caa5e 100644 --- a/src/app/routes/account/components/center/center.component.ts +++ b/src/app/routes/account/components/center/center.component.ts @@ -151,7 +151,7 @@ export class AccountComponentsCenterComponent implements OnInit { } this.defaultCompany = res if (res.projectId) { - this.getPayPw() + this.getPayPw() } }) } 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 99def7f4..ab7c5e86 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 @@ -1,14 +1,23 @@ -import { AfterViewInit, Component, OnInit } from '@angular/core'; -import { fromEvent } from 'rxjs'; +import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core'; +import { SFComponent, SFSchema } from '@delon/form'; +import { fromEvent, Subscription } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; +import { SearchDrawerService } from 'src/app/shared/components/search-drawer/search-drawer.service'; @Component({ template: '' }) -export class BasicTableComponent implements AfterViewInit { +export class BasicTableComponent implements AfterViewInit, OnDestroy { scrollY = '400px'; - constructor() {} + sf!: SFComponent; + sfValue: Record = {}; + drawer: Subscription[] = []; + schema: SFSchema = {}; + + deviationHeight = 0; + + constructor(public searchDrawerService: SearchDrawerService) {} ngAfterViewInit(): void { setTimeout(() => { @@ -21,20 +30,71 @@ export class BasicTableComponent implements AfterViewInit { }); } + ngOnDestroy(): void { + this.drawer.forEach(sub => sub.unsubscribe()); + } + + openDrawer() { + if (this.drawer?.length > 0) { + this.searchDrawerService.create(this.sfValue, this.schema); + } else { + const drawer = this.searchDrawerService.create(this.sfValue, this.schema); + this.drawer.push( + drawer.initEvent.subscribe(sf => { + if (sf) { + this.sf = sf; + } + }) + ); + this.drawer.push( + drawer.closeEvent.subscribe(res => { + this.sfValue = res; + if (res) { + this.search(); + } + }) + ); + } + } + getScrollY() { const windowHeight = window.innerHeight || Math.max(document.documentElement.clientHeight, document.body.clientHeight); const header = document.getElementsByTagName('layout-pro-header')?.[0]; if (windowHeight && header) { let scrollY = windowHeight - header.clientHeight - 35 - 49; + // 剔除页头高度 const headerWrapper = document.getElementsByTagName('page-header-wrapper')?.[0]; if (headerWrapper) { scrollY -= headerWrapper.clientHeight; } - const tabset = document.getElementsByTagName('nz-tabset')?.[0]; + // 计算所有tabs高度 + const tabset = document.getElementsByTagName('nz-tabs-nav'); + let tabsetHeight = 0; + for (let index = 0; index < tabset.length; index++) { + tabsetHeight += tabset[index].clientHeight; + } + console.log('tabsetHeight', tabsetHeight); if (tabset) { - scrollY -= tabset.clientHeight; + 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; + } + if (typeof this.deviationHeight === 'number') { + scrollY -= this.deviationHeight; } this.scrollY = scrollY + 'px'; } } + + search() {} } diff --git a/src/app/routes/commom/index.ts b/src/app/routes/commom/index.ts new file mode 100644 index 00000000..0bafb3d8 --- /dev/null +++ b/src/app/routes/commom/index.ts @@ -0,0 +1 @@ +export * from './components/basic-table/basic-table.component'; diff --git a/src/app/routes/commom/less/commom-table.less b/src/app/routes/commom/less/commom-table.less index 1eb73d94..c1256d36 100644 --- a/src/app/routes/commom/less/commom-table.less +++ b/src/app/routes/commom/less/commom-table.less @@ -9,7 +9,7 @@ } .ant-tabs-tab { - margin: 0 0 0 16px; + margin : 0 0 0 16px; padding: 12px 0; } @@ -21,31 +21,77 @@ .ant-card-body { padding: 0; } + + .tab_header { + display : flex; + align-items: center; + + .page_title { + font-weight: bold; + font-size : 17px; + + .driver { + color : #ff4d4f; + margin-left : 17px; + margin-right: 6px; + } + } + + nz-tabset { + flex: 1; + } + } + + } + + .double_tabset_box { + margin : -24px -24px 0; + background: #ffffff; + + .tab_header { + .page_title { + font-weight: bold; + font-size : 17px; + + .driver { + color : #ff4d4f; + margin-left : 17px; + margin-right: 6px; + } + } + } + + .header_tab { + + nz-tabs-nav { + margin-bottom: 0; + } + } } .ant-table-pagination.ant-pagination { margin: 8px; } - .ant-table-thead > tr > th, - .ant-table-tbody > tr > td, - .ant-table tfoot > tr > th, - .ant-table tfoot > tr > td { + .ant-table-thead>tr>th, + .ant-table-tbody>tr>td, + .ant-table tfoot>tr>th, + .ant-table tfoot>tr>td { padding: 8px; } - .ant-table.ant-table-bordered > .ant-table-container { + .ant-table.ant-table-bordered>.ant-table-container { border-top: 0; } .ant-pagination-item { - min-width: 24px; - height: 24px; + min-width : 24px; + height : 24px; line-height: 21px; } .ant-pagination-total-text { - height: 24px; + height : 24px; line-height: 24px; } @@ -53,8 +99,8 @@ .ant-pagination-next, .ant-pagination-jump-prev, .ant-pagination-jump-next { - min-width: 24px; - height: 24px; + min-width : 24px; + height : 24px; line-height: 21px; } @@ -66,5 +112,28 @@ .ant-select-single .ant-select-selector .ant-select-selection-placeholder { line-height: 21px; } + + .text-truncate { + white-space: normal; + } } } + + +.header_box { + display : flex; + align-items : center; + justify-content: space-between; + min-height : 47px; + + .page_title { + font-weight: bold; + font-size : 17px; + + .driver { + color : #ff4d4f; + margin-left : 17px; + margin-right: 6px; + } + } +} \ No newline at end of file diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts index a942aff9..e235e937 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts @@ -5,7 +5,7 @@ import { OnChanges } from '@angular/core'; * @Author : Shiming * @Date : 2022-01-05 11:01:55 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 10:45:19 + * @LastEditTime : 2022-04-25 10:28:10 * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -96,8 +96,6 @@ export class ContractManagementTemplateTextComponent implements OnInit { { label: '运单合同', value: '3' }, { label: '运单补充协议', value: '4' }, { label: '委托代收合同', value: '5' }, - { label: '电子提货单', value: '10' }, - { label: '电子卸货单', value: '11' }, ]; this.sf.getProperty('/contractType')!.schema.enum = this.Types; this.sf.getProperty('/contractType')!.widget.reset(this.Types); @@ -178,7 +176,7 @@ export class ContractManagementTemplateTextComponent implements OnInit { } } }, - required: ['templateName', 'templateType'] + required: ['templateName', 'templateType','contractType'] }; this.ui = { '*': { diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.html b/src/app/routes/datatable/components/dataindex/dataindex.component.html index 1ad2da63..3c08cb1a 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.html +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.html @@ -1,5 +1,3 @@ - -
- +
diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.ts b/src/app/routes/datatable/components/dataindex/dataindex.component.ts index 5a16a165..fb428f1e 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.ts +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.ts @@ -19,6 +19,7 @@ import { GeometryLabelCfg } from '@antv/g2/lib/interface'; providers: [CurrencyPipe] }) export class DatatableDataindexComponent implements OnInit { + @ViewChild('AdvanceDeposit', { static: false }) AdvanceDeposit!: G2CustomComponent; @ViewChild('g2custom', { static: false }) g2custom!: G2CustomComponent; @ViewChild('RegionalPerforman', { static: false }) RegionalPerforman!: G2CustomComponent; @ViewChild('BillDirectProportion', { static: false }) BillDirectProportion!: G2CustomComponent; @@ -49,6 +50,7 @@ export class DatatableDataindexComponent implements OnInit { this.service.request(this.service.$api_total_advance_deposit).subscribe((res: DataTotalVO) => { if (res) { this.totalAdvanceDeposit = this.formatMiniAreaData(res); + this.initAreaMap(this.AdvanceDeposit['el'].nativeElement as any, []); } }); // 业绩量总额 @@ -179,7 +181,7 @@ export class DatatableDataindexComponent implements OnInit { .style({ fillOpacity: 1, stroke: 'white', - lineWidth: 8 + lineWidth: 4 }) .state({ active: { @@ -294,42 +296,57 @@ export class DatatableDataindexComponent implements OnInit { * @param el */ private initAreaMap(el: HTMLElement, datas: any[]): void { + const data = [ + { city: '冰岛（雷克雅未克）', type: '首都人口', value: 0.56 }, + { city: '冰岛（雷克雅未克）', type: '城市人口', value: 0.38 } + ]; + const chart = new Chart({ container: el, autoFit: true, - height: 500 + height: 45 }); - chart.data(datas); - chart.scale('Data', { - range: [0, 1], - tickCount: 10, - type: 'timeCat' + chart.data(data); + chart.legend(false); + chart.axis('city', false); + chart.axis('value', { + label: { + formatter: val => val + }, + title: null, + grid: null }); - chart.scale('sales', { - nice: true - }); - chart.axis('Data', false); - chart.axis('sales', false); + chart.coordinate('rect').transpose(); chart.tooltip({ - showCrosshairs: true + customItems: items => { + return []; + }, + showContent: true, + title: '1,968.08万' }); - - // chart.annotation().dataMarker({ - // position: ['2014-01', 1750], - // top: true, - // text: { - // content: '因政策调整导致销量下滑', - // style: { - // fontSize: 13 - // } - // }, - // line: { - // length: 30 - // } - // }); - - chart.line().position('Data*sales'); - chart.area().position('Data*sales'); + chart.interaction('active-region'); + chart + .interval() + .adjust('stack') + .position('city*value') + .color('type*city', (type: any, city: any) => { + if (type === '首都人口') { + return '#E60012'; + } + if (type === '城市人口') { + return '#EAEAEB'; + } + return '#EAEAEB'; + }) + .style('type', (type: any, city: any) => { + if (type === '首都人口') { + return { radius: [0, 0, 20, 20] }; + } + if (type === '城市人口') { + return { radius: [20, 20, 0, 0] }; + } + return {}; + }); chart.render(); } @@ -409,7 +426,7 @@ export class DatatableDataindexComponent implements OnInit { chart.data(data); // 设置坐标轴 chart.scale({ - y1: { alias: y1Title, min: 0, max: 1000000 }, + y1: { alias: y1Title, min: 0, max: 2000000000 }, y2: { alias: y2Title, min: 0, max: 1, formatter: val => (val * 100).toFixed(0) + '%' }, y3: { alias: y3Title, min: 0, max: 1, formatter: val => (val * 100).toFixed(0) + '%' } }); @@ -420,8 +437,8 @@ export class DatatableDataindexComponent implements OnInit { padding: [10, 0, 40, 0], items: [ { value: 'y1', name: y1Title, marker: { symbol: 'circle', style: { fill: '#E60012', r: 5, fontSize: 13 } } }, - { value: 'y3', name: y3Title, marker: { symbol: 'circle', style: { fill: '#6CBFFF', r: 5, fontSize: 13 } } }, - { value: 'y2', name: y2Title, marker: { symbol: 'circle', style: { fill: '#50D4AB', r: 5, fontSize: 13 } } } + { value: 'y2', name: y2Title, marker: { symbol: 'circle', style: { fill: '#FE7823', r: 5, fontSize: 13 } } }, + { value: 'y3', name: y3Title, marker: { symbol: 'circle', style: { fill: '#F7CFCE', r: 5, fontSize: 13 } } } ] }); chart.axis('y2', { @@ -440,16 +457,16 @@ export class DatatableDataindexComponent implements OnInit { .line() .position('x*y2') // .label('pre', val => ({ content: (val * 100).toFixed(0) + '%' })) - .color('#6CBFFF') + .color('#F7CFCE') .size(3); - chart.point().position('x*y2').color('#6CBFFF').size(3).shape('circle'); + chart.point().position('x*y2').color('#F7CFCE').size(3).shape('circle'); chart .line() .position('x*y3') // .label('pre2', val => ({ content: (val * 100).toFixed(0) + '%' })) - .color('#50D4AB') + .color('#FE7823') .size(3); - chart.point().position('x*y3').color('#50D4AB').size(3).shape('circle'); + chart.point().position('x*y3').color('#FE7823').size(3).shape('circle'); chart.interaction('active-region'); chart.removeInteraction('legend-filter'); // 自定义图例，移除默认的分类图例筛选交互 diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html index 593c1e97..650f11fa 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html @@ -1,14 +1,4 @@ - - + - - - - - - + +
+ + + + + + +
- - + +
+ + +
+ + + + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts index 55817107..77f25e8c 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts @@ -2,30 +2,39 @@ 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'; import { ClearingModalComponent } from './clearing-modal/clearing-modal.component'; @Component({ selector: 'app-abnormal-gold', templateUrl: './abnormal-gold.component.html', - styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class AbnormalGoldComponent implements OnInit { +export class AbnormalGoldComponent 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(); rechargeStatus = '1'; - constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} + constructor( + public service: FreightAccountService, + private nzModalService: NzModalService, + private router: Router, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } ngOnInit(): void {} + search() { + this.st?.load(1); + } + beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { rechargeStatus: this.rechargeStatus }); if (this.sf) { @@ -56,22 +65,6 @@ export class AbnormalGoldComponent implements OnInit { }); } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - private initSF(): SFSchema { return { properties: { @@ -116,30 +109,21 @@ export class AbnormalGoldComponent implements OnInit { type: 'string', title: '付款账户', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, transferBankCardNumber: { type: 'string', title: '付款账号', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, transferBankOpenName: { type: 'string', title: '付款银行', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, transferDate: { @@ -149,10 +133,7 @@ export class AbnormalGoldComponent implements OnInit { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', placeholder: '请选择', - nzShowTime: true, - visibleIf: { - expand: (value: boolean) => value - } + nzShowTime: true } as SFDateWidgetSchema } } diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.html b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.html index 065f29b2..74618239 100644 --- a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.html +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.html @@ -1,4 +1,4 @@ - + - - + +
+ +
+ + +
+
+ \ No newline at end of file diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts index 1462a5cd..334c030e 100644 --- a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts @@ -2,26 +2,37 @@ import { Component, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, 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'; @Component({ selector: 'app-advance-collection', templateUrl: './advance-collection.component.html', - styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class AdvanceCollectionComponent { +export class AdvanceCollectionComponent extends BasicTableComponent { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; - searchSchema: SFSchema = this.initSF(); + schema: SFSchema = this.initSF(); columns: STColumn[] = this.initST(); - _$expand = false; - constructor(public service: FreightAccountService, private router: Router, private modal: NzModalService) {} + constructor( + public service: FreightAccountService, + private router: Router, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } + + ngOnInit(): void {} + + search() { + this.st?.load(1); + } beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { @@ -30,24 +41,8 @@ export class AdvanceCollectionComponent { return requestOptions; }; - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - exportList() { - this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_reportYskBla,); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_reportYskBla); } private initSF(): SFSchema { @@ -97,10 +92,7 @@ export class AdvanceCollectionComponent { enum: [{ label: '全部', value: null }], ui: { widget: 'select', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' }, default: null }, @@ -114,10 +106,7 @@ export class AdvanceCollectionComponent { ], ui: { widget: 'select', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' }, default: null } diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.html b/src/app/routes/financial-management/components/cost-management/cost-management.component.html index c9d36bdd..f9b6560d 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.html @@ -8,7 +8,7 @@ * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - + + +
- + --> - -
+ +
+ +
+ + +
+
+ +
- + --> + [loading]="false" [scroll]="{ x: '2000px',y:scrollY }"> {{ item.armoeny | currency }} diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts index 57203a7e..7e0458e2 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts @@ -2,34 +2,43 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema, SFSelectWidgetSchema, SFSchemaEnum } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; import { map } from 'rxjs/operators'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-cost-management', templateUrl: './cost-management.component.html', - styleUrls: ['../../../commom/less/box.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class CostManagementComponent implements OnInit { +export class CostManagementComponent extends BasicTableComponent implements OnInit { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; @ViewChild('auditModal', { static: false }) auditModal!: any; - searchSchema: SFSchema = this.initSF(); + schema: SFSchema = this.initSF(); columns: STColumn[] = this.initST(); selectedRows: any[] = []; - _$expand = false; - - constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} + constructor( + public service: FreightAccountService, + private nzModalService: NzModalService, + private router: Router, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } ngOnInit(): void {} + search() { + this.st?.load(1); + } + beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { @@ -73,24 +82,9 @@ export class CostManagementComponent implements OnInit { }); } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } exportList() { - this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator,); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator); } routeTo(url: string, params?: any, status?: any) { @@ -100,12 +94,6 @@ export class CostManagementComponent implements OnInit { private initSF(): SFSchema { return { properties: { - expand: { - type: 'boolean', - ui: { - hidden: true - } - }, feecode: { type: 'string', title: '费用单号', @@ -131,9 +119,6 @@ export class CostManagementComponent implements OnInit { format: 'yyyy-MM-dd', placeholder: '请选择', nzShowTime: true, - visibleIf: { - expand: (value: boolean) => value - } } as SFDateWidgetSchema }, feetype: { @@ -147,9 +132,6 @@ export class CostManagementComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } }, default: '' }, @@ -159,14 +141,11 @@ export class CostManagementComponent implements OnInit { enum: [ { label: '全部', value: '全部' }, { label: '运输费', value: '1475197820443299842' }, - { label: '附加费', value: '1476197820443299842 ' }, + { label: '附加费', value: '1476197820443299842 ' } ], ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } }, ltdId: { @@ -177,9 +156,6 @@ export class CostManagementComponent implements OnInit { placeholder: '请选择', allowClear: true, asyncData: () => this.service.getNetworkFreightForwarder(), - visibleIf: { - expand: (value: boolean) => value - } } }, hrto: { @@ -202,9 +178,6 @@ export class CostManagementComponent implements OnInit { return of([]); } }, - visibleIf: { - expand: (value: boolean) => value - } } as SFSelectWidgetSchema }, arto: { @@ -227,9 +200,6 @@ export class CostManagementComponent implements OnInit { return of([]); } }, - visibleIf: { - expand: (value: boolean) => value - } } as SFSelectWidgetSchema }, createTime: { @@ -240,9 +210,6 @@ export class CostManagementComponent implements OnInit { format: 'yyyy-MM-dd', placeholder: '请选择', nzShowTime: true, - visibleIf: { - expand: (value: boolean) => value - } } as SFDateWidgetSchema }, ishrhx: { @@ -256,9 +223,6 @@ export class CostManagementComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } }, default: '' }, @@ -270,9 +234,6 @@ export class CostManagementComponent implements OnInit { placeholder: '请选择', allowClear: true, asyncData: () => this.service.getCloseAccount(), - visibleIf: { - expand: (value: boolean) => value - } } } } diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.html b/src/app/routes/financial-management/components/driver-account/driver-account.component.html index 325369c1..622ac1da 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.html +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.html @@ -1,4 +1,4 @@ - + - - + +
+ +
+ + +
+
+ {{ (parseFloat(item.availableBalance) + parseFloat(item.freezeBalance)).toFixed(2) | currency - }} + }} - + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 4892f27a..c1404e1f 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -3,30 +3,38 @@ 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 { ShipperBaseService } from '@shared'; +import { SearchDrawerService, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component'; import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-driver-account', templateUrl: './driver-account.component.html', - styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class DriverAccountComponent implements OnInit { +export class DriverAccountComponent extends BasicTableComponent implements OnInit { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; loading: boolean = true; - searchSchema: SFSchema = this.initSF(); + schema: SFSchema = this.initSF(); columns: STColumn[] = this.initST(); - _$expand = false; - constructor(public service: FreightAccountService, private router: Router, private modal: NzModalService) {} + constructor( + public service: FreightAccountService, + private router: Router, + private modal: NzModalService, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } ngOnInit(): void {} + search() { + this.st?.load(1); + } beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { accountType: 2 }); if (this.sf) { @@ -44,11 +52,8 @@ export class DriverAccountComponent implements OnInit { return requestOptions; }; afterRes = (data: any[], rawData?: any) => { - console.log(data) - this.loading = false - return data.map(item => ({ - ...item, - })); + this.loading = false; + return data; }; showAccountDetail(item: any) { this.modal.create({ @@ -64,25 +69,7 @@ export class DriverAccountComponent implements OnInit { }); } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - exportList() { - console.log(this.sf.value); - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page); } @@ -118,9 +105,6 @@ export class DriverAccountComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - }, allowClear: true, asyncData: () => this.service.getNetworkFreightForwarder() } @@ -135,10 +119,7 @@ export class DriverAccountComponent implements OnInit { ], ui: { widget: 'select', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' }, default: null }, @@ -146,10 +127,7 @@ export class DriverAccountComponent implements OnInit { type: 'string', title: '虚拟账户', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, createTime: { @@ -158,10 +136,7 @@ export class DriverAccountComponent implements OnInit { ui: { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } as SFDateWidgetSchema } } diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.html b/src/app/routes/financial-management/components/freight-account/freight-account.component.html index 5dba1c89..f926f475 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.html +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.html @@ -1,4 +1,4 @@ - + - - + +
+ +
+ + +
+
+ {{ (parseFloat(item.availableBalance) + parseFloat(item.freezeBalance)).toFixed(2) | currency}} diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts index 5abfbe19..51d45ce9 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts @@ -5,9 +5,10 @@ import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { CurrencyService } from '@delon/util'; import { CurrencyCNYPipe } from '@delon/util/pipes/currency/cny.pipe'; -import { ShipperBaseService } from '@shared'; +import { SearchDrawerService, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { parse } from 'path'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { SystemService } from 'src/app/routes/sys-setting/services/system.service'; import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component'; import { FreightAccountService } from '../../services/freight-account.service'; @@ -15,24 +16,31 @@ import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-freight-account', templateUrl: './freight-account.component.html', - styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class FreightAccountComponent implements OnInit { +export class FreightAccountComponent 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(); selectedRows: any[] = []; - _$expand = false; - - constructor(public service: FreightAccountService, private router: Router, private modal: NzModalService) {} + constructor( + public service: FreightAccountService, + private router: Router, + private modal: NzModalService, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } ngOnInit(): void {} + search() { + this.st?.load(1); + } + beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { accountType: 1 }); if (this.sf) { @@ -63,22 +71,6 @@ export class FreightAccountComponent implements OnInit { }); } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - exportList() { this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportShipperAccountBalanceByOperator); } @@ -86,12 +78,6 @@ export class FreightAccountComponent implements OnInit { private initSF(): SFSchema { return { properties: { - expand: { - type: 'boolean', - ui: { - hidden: true - } - }, tenantName: { type: 'string', title: '企业名称', @@ -115,9 +101,6 @@ export class FreightAccountComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - }, allowClear: true, asyncData: () => this.service.getNetworkFreightForwarder() } @@ -133,9 +116,6 @@ export class FreightAccountComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } }, default: null }, @@ -144,9 +124,6 @@ export class FreightAccountComponent implements OnInit { title: '虚拟账户', ui: { placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } } }, createTime: { @@ -156,9 +133,6 @@ export class FreightAccountComponent implements OnInit { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } as SFDateWidgetSchema } } @@ -172,7 +146,7 @@ export class FreightAccountComponent implements OnInit { { title: '联系人电话', width: 140, index: 'phone' }, { title: '网络货运人', width: 170, index: 'ltdName' }, { title: '银行类型', width: 120, index: 'bankTypeLabel' }, - { title: '虚拟账户', width: 140, index: 'virtualAccount' }, + { title: '虚拟账户', width: 160, index: 'virtualAccount' }, { title: '可用余额', index: 'availableBalance', 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 aec490c7..2443272a 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 @@ -1,4 +1,4 @@ - + + + - + --> - + +
+
+ + +
+
+ +
+
-
- + + [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/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index 21a19041..f096e39d 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts @@ -2,7 +2,9 @@ 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 { AddCollectionInvoiceModalComponent } from 'src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component'; import { TicketService } from 'src/app/routes/ticket-management/services/ticket.service'; import { FreightAccountService } from '../../services/freight-account.service'; @@ -10,23 +12,30 @@ import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-payment-order', templateUrl: './payment-order.component.html', - styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class PaymentOrderComponent implements OnInit { +export class PaymentOrderComponent 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[] = []; - constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} + constructor( + public service: FreightAccountService, + private nzModalService: NzModalService, + private router: Router, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } ngOnInit(): void {} + search() { + this.st?.load(1); + } + beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { let params = { ...this.sf.value }; @@ -68,31 +77,9 @@ export class PaymentOrderComponent implements OnInit { }); } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - private initSF(): SFSchema { return { properties: { - expand: { - type: 'boolean', - ui: { - hidden: true - } - }, paycode: { type: 'string', title: '付款单号' @@ -135,10 +122,7 @@ export class PaymentOrderComponent implements OnInit { widget: 'dict-select', containsAllLabel: true, params: { dictKey: 'pay:mode' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } }, arto: { @@ -147,10 +131,7 @@ export class PaymentOrderComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - allowClear: true, - visibleIf: { - expand: (value: boolean) => value - } + allowClear: true } }, billCode: { @@ -159,10 +140,7 @@ export class PaymentOrderComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - allowClear: true, - visibleIf: { - expand: (value: boolean) => value - } + allowClear: true } }, payDate: { @@ -170,10 +148,7 @@ export class PaymentOrderComponent implements OnInit { type: 'string', ui: { widget: 'sl-from-to-search', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } + format: 'yyyy-MM-dd' } as SFDateWidgetSchema }, payDate2: { @@ -181,20 +156,12 @@ export class PaymentOrderComponent implements OnInit { type: 'string', ui: { widget: 'sl-from-to-search', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } + format: 'yyyy-MM-dd' } as SFDateWidgetSchema }, waybillCode: { type: 'string', - title: '运单号', - ui: { - visibleIf: { - expand: (value: boolean) => value - } - } + title: '运单号' }, // feeCode: { // type: 'string', @@ -210,20 +177,14 @@ export class PaymentOrderComponent implements OnInit { type: 'string', ui: { widget: 'sl-from-to-search', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } + format: 'yyyy-MM-dd' } as SFDateWidgetSchema }, payRemarks: { type: 'string', title: '付款备注', ui: { - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } } } @@ -233,9 +194,9 @@ export class PaymentOrderComponent implements OnInit { private initST(): STColumn[] { return [ { title: '', index: 'key', type: 'checkbox', fixed: 'left', className: 'text-center' }, - { title: '付款单号', index: 'payCode', type: 'link', width: 180 }, - { title: '网络货运人', index: 'ltdName', width: 180 }, - { title: '运单号', index: 'waybillCode', width: 180 }, + { title: '付款单号', index: 'payCode', className: 'text-left', type: 'link', width: 180 }, + { title: '网络货运人', index: 'ltdName', className: 'text-left', width: 180 }, + { title: '运单号', index: 'waybillCode', className: 'text-left', width: 180 }, // { title: '费用号', index: 'feeCode', width: 180 }, { title: '要求付款日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 }, { diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.html b/src/app/routes/financial-management/components/payment-record/payment-record.component.html index ecea67f6..a609c79b 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.html +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.html @@ -1,14 +1,4 @@ - - + - + +
+ + + + + + + +
- - - - - - + +
+ + +
+ - + {{ item?.orderPaymentCode }}
{{ item?.paymentStatusLabel }} diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.less b/src/app/routes/financial-management/components/payment-record/payment-record.component.less deleted file mode 100644 index cd8c3436..00000000 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.less +++ /dev/null @@ -1,41 +0,0 @@ -:host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 0; - } - } - - nz-range-picker { - width: 100%; - } - - .ant-tabs-tab-btn { - padding-left : 16px; - padding-right: 16px; - } - - .text-truncate { - white-space: normal; - } -} - -.expend-options { - margin-top: 0px; -} - - -@media (min-width: 1200px) { - .expend-options { - max-width: 400px; - position : absolute; - right : 0; - bottom : 25px; - } - -} \ No newline at end of file diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts index 1442d8fd..8acbf17f 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts @@ -2,31 +2,39 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, 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 { ClearingModalComponent } from '../abnormal-gold/clearing-modal/clearing-modal.component'; @Component({ selector: 'app-payment-record', templateUrl: './payment-record.component.html', - styleUrls: ['./payment-record.component.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class PaymentRecordComponent implements OnInit { +export class PaymentRecordComponent 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(); paymentStatus: any = ''; - constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} + constructor( + public service: FreightAccountService, + private nzModalService: NzModalService, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } ngOnInit(): void {} + search() { + this.st?.load(1); + } + beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { @@ -38,10 +46,10 @@ export class PaymentRecordComponent implements OnInit { handlerDate: { start: this.sf.value.handlerDate?.[0] || '', end: this.sf.value.handlerDate?.[1] || '' - }, - paymentStatus: this.paymentStatus || null + } }); } + Object.assign(requestOptions.body, { paymentStatus: this.paymentStatus || null }); return requestOptions; }; @@ -57,22 +65,6 @@ export class PaymentRecordComponent implements OnInit { }); } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - private initSF(): SFSchema { return { properties: { @@ -109,10 +101,7 @@ export class PaymentRecordComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'service:type' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' }, default: '' }, @@ -120,46 +109,34 @@ export class PaymentRecordComponent implements OnInit { type: 'string', title: '承运司机', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, driverLicensePlate: { type: 'string', title: '车牌号', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, captain: { type: 'string', title: '收款人', ui: { - placeholder: '请输入收款人姓名/手机号', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入收款人姓名/手机号' } }, isCaptain: { type: 'string', title: '车队长收款', enum: [ - {label: '全部', value: ''}, - {label: '是', value: '1'}, - {label: '否', value: '2'} + { label: '全部', value: '' }, + { label: '是', value: '1' }, + { label: '否', value: '2' } ], ui: { widget: 'select', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' }, default: '' }, @@ -169,10 +146,7 @@ export class PaymentRecordComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'paybill:type' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' }, default: '' }, @@ -183,10 +157,7 @@ export class PaymentRecordComponent implements OnInit { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', placeholder: '请选择', - nzShowTime: true, - visibleIf: { - expand: (value: boolean) => value - } + nzShowTime: true } as SFDateWidgetSchema }, handlerDate: { @@ -196,10 +167,7 @@ export class PaymentRecordComponent implements OnInit { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', placeholder: '请选择', - nzShowTime: true, - visibleIf: { - expand: (value: boolean) => value - } + nzShowTime: true } as SFDateWidgetSchema }, bankType: { @@ -212,10 +180,7 @@ export class PaymentRecordComponent implements OnInit { ], ui: { widget: 'select', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' }, default: '' }, @@ -226,10 +191,7 @@ export class PaymentRecordComponent implements OnInit { widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.service.getNetworkFreightForwarder(), - visibleIf: { - expand: (value: boolean) => value - } + asyncData: () => this.service.getNetworkFreightForwarder() } } } diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts index 43e46e5b..d2e4b20c 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts @@ -119,7 +119,7 @@ export class PlatformAccountDetailComponent implements OnInit { nzShowTime: true } as SFDateWidgetSchema }, - businessNumber: { + channelPaySn: { type: 'string', title: '流水号', ui: { 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 f54f0046..1cfb6a07 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 @@ -5,6 +5,7 @@ import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { FreightAccountService } from '../../services/freight-account.service'; import { CwcBankCardManagementBindComponent } from '../bank-card-management/bind/bind.component'; +import { CwcAccountManagementWithdrawDepositComponent } from './withdraw-deposit/withdraw-deposit.component'; @Component({ selector: 'app-platform-account', @@ -192,12 +193,18 @@ export class PlatformAccountComponent implements OnInit { }) }, { - text: '绑定银行卡', - click: item => this.bindBankcard(item) + text: '提现', + click: item => this.withdraw(item), + iif: (_record) => _record.bankType !== '1' }, + // { + // text: '绑定银行卡', + // click: item => this.bindBankcard(item) + // }, { text: '查看银行卡', - click: item => this.viewBankcard(item) + click: item => this.viewBankcard(item), + iif: (_record) => _record.bankType !== '1' }, ] } @@ -239,4 +246,25 @@ export class PlatformAccountComponent implements OnInit { exportList() { this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator,); } + + // 提现 + withdraw(record: any) { + const modalRef = this.modal.create({ + nzTitle: '提现', + nzWidth: '35%', + nzContent: CwcAccountManagementWithdrawDepositComponent, + nzMaskClosable: false, + nzComponentParams: { + record + }, + nzFooter: null + }); + modalRef.afterClose.subscribe(res => { + if (res) { + // this.getSummary(); + // this.withdrawTable.refresh(); + } + }) + } + } diff --git a/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.html b/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.html new file mode 100644 index 00000000..79a7a3e2 --- /dev/null +++ b/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.html @@ -0,0 +1,39 @@ + + +
-
+
{{me.formProperty.value | currency}}
+ + + +
+ +
+ + + + + + + 全部提现 + + + + 忘记密码? + + +
+ + +
+ diff --git a/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.less b/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.less new file mode 100644 index 00000000..d4fad7b5 --- /dev/null +++ b/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.less @@ -0,0 +1,37 @@ +:host { + .bank-card-select-content { + padding: 5px; + border: 1px solid #ccc; + + .band-card-row { + display: flex; + align-items: center; + } + } + + .pay-way-group { + width: 100%; + margin-bottom: 5px; + + .bank-card-row { + display: flex; + align-items: center; + } + + .band-card { + border: 1px solid #e8e8e8; + + .pay-way-label { + width: 100%; + padding: 6px 10px; + } + } + + } + + .input-row { + width: 70%; + margin-right: 8px; + } + +} diff --git a/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.spec.ts b/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.spec.ts new file mode 100644 index 00000000..2d1f933a --- /dev/null +++ b/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { CwcAccountManagementWithdrawDepositComponent } from './withdraw-deposit.component'; + +describe('CwcAccountManagementWithdrawDepositComponent', () => { + let component: CwcAccountManagementWithdrawDepositComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [CwcAccountManagementWithdrawDepositComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CwcAccountManagementWithdrawDepositComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.ts b/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.ts new file mode 100644 index 00000000..f27df88a --- /dev/null +++ b/src/app/routes/financial-management/components/platform-account/withdraw-deposit/withdraw-deposit.component.ts @@ -0,0 +1,298 @@ +import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { cacheConf } from '@conf/cache.conf'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { EACacheService, EAEnvironmentService, ShipperBaseService } from '@shared'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { BankCardManagementService } from '../../../services/bank-card-management.service'; + +@Component({ + selector: 'app-cwc-withdraw-deposit', + templateUrl: './withdraw-deposit.component.html', + styleUrls: ['./withdraw-deposit.component.less'] +}) +export class CwcAccountManagementWithdrawDepositComponent implements OnInit { + accountBalance = 0; + minWithdrawAmount = 0; + minWithdrawFee: any = 0; + code = ''; + bankList: Array = []; + bankAccount = ''; + count = 0; + interval$: any; + ui: SFUISchema = {}; + i: any; + schema: SFSchema = {}; + totalGJ: any = 0.0; + cacFee: any = 0; + columns: STColumn[] = []; + totalBalance = 200; + bankCardList: Array = []; + cardNo = ''; + accountDetail: any = {}; + networkTransporterId = ''; + networkTransporterName = ''; + balanceObj: any = { + allBalance: 99999999 + }; + @ViewChild('st', { static: false }) st!: STComponent; + @ViewChild('sf', { static: false }) sf!: SFComponent; + @ViewChild('psd') psd!: ElementRef; + record: any; + bankType = '2'; + + constructor( + public service: BankCardManagementService, + private modal: NzModalRef, + private shipperSrv: ShipperBaseService, + public eaCacheSrv: EACacheService, + public envSrv: EAEnvironmentService, + public router: Router + ) { + this.networkTransporterId = this.eaCacheSrv.get(cacheConf.env)?.networkTransporterId; + } + + ngOnInit() { + this.initSF(); + this.getBankList(); + this.getProjectBalanceDetail(); + } + + + + + /** + * 初始化查询表单 + */ + initSF() { + this.schema = { + properties: { + ltdName: { + title: '网络货运人', + type: 'string', + default: this.record?.ltdName, + ui: { + widget: 'text', + } + }, + bankType: { + title: '银行', + type: 'string', + default: this.bankType, + enum: [ + { label: '浦发银行', value: '2' } + ], + ui: { + widget: 'select', + containsAllLabel: false, + showRequired: true, + change: (value: any) => { + // if (value && this.sf?.value?.ltdId) { + // const parmas = { bankType: value, ltdId: this.sf.getValue('/ltdId') }; + // this.getProjectBalanceDetail(parmas); + // } + } + } as SFSelectWidgetSchema + }, + availableBalance: { title: '可提现余额', type: 'string', ui: { showRequired: false, widget: 'custom' } }, + bankId: { + title: '提现至', + type: 'string', + ui: { + showRequired: true, widget: 'custom' + }, + }, + amount: { + title: '提现金额', + type: 'string', + ui: { + showRequired: true, + widget: 'custom', + validator: (val) => { + if (!val && val !== 0) { + return [{ keyword: 'required', message: '必填项' }]; + } else if (val > this.balanceObj.allBalance) { + return [{ keyword: 'required', message: '提现金额超过可提现余额' }]; + } + return []; + } + }, + + }, + payPsd: { + title: '支付密码', + type: 'string', + minLength: 6, + maxLength: 6, + ui: { widget: 'custom' }, + }, + payPassword: { + title: '', + type: 'string', + ui: { + hidden: true + } + } + }, + autocomplete: 'off', + required: ['bankType', 'payPsd'] + }; + this.ui = { + '*': { spanLabelFixed: 100, grid: { span: 18, gutter: 2 } }, + $addBankCard1: { + grid: { span: 24 } + }, + $addBankCard2: { + grid: { span: 24 } + } + }; + } + + save(value: any) { + if (this.sf.valid) { + const { amount, bankId, bankType, ltdName, payPassword } = value; + if (amount > this.balanceObj?.allBalance) { + this.service.msgSrv.warning('提现金额超过可提现余额！'); + return; + } + const params = { + amount, + bankId, + bankType, + ltdId: this.record.ltdId, + ltdName, + payPassword + }; + this.service.request(this.service.$api_apply_withdraw, { ...params }) + .subscribe(res => { + if (res) { + this.service.msgSrv.success('提现成功!'); + this.close(true); + } + }) + } + } + close(flag: boolean) { + this.modal.destroy(flag); + } + + + toAddBankPage() { + window.open(`/#/financial-management/bank-card-management/index?ltdId=${this.record?.ltdId}<dName=${this.record?.ltdName}`); + } + /** + * 全部提现 + */ + allWithdrawal() { + if (!this.sf.getValue('/availableBalance')) { + this.sf.setValue('/amount', ''); + return; + } + this.sf.setValue('/amount', this.balanceObj?.allBalance); + } + /** + * 跳转至忘记密码页 + */ + toForgetPsdPage() { + window.open('/#/account/edit-paypassword'); + } + + /** + * 切换银行卡 + */ + checkBankCard(e: any) { + this.sf.setValue('/bankId', e); + } + getBankList() { + this.service.request(this.service.$api_bank_card_list, { accountType: '3', roleId: this.record?.ltdId }).subscribe((res) => { + if (res) { + this.bankCardList = res; + } + }); + } + + /** + * 获取项目账户余额 + */ + getProjectBalanceDetail(params = {}) { + this.service.request(this.service.$api_get_account_available_balance, { bankType: this.bankType, ltdId: this.record?.ltdId }).subscribe(res => { + if (res) { + this.balanceObj = res; + this.sf.setValue('/availableBalance', res?.allBalance); + // this.sf.getProperty('/amount')?.updateValueAndValidity(); + } + }) + } + + keydown(e: any) { + if (e.keyCode == 37 || e.keyCode == 39) e.preventDefault(); + if (e.keyCode === 8) { + // const payPswVal = this.sf.getValue('/password'); + // this.sf.setValue('/password', payPswVal.substr(0, payPswVal.length - 1)); + } + + } + clickInput(e: any) { + this.psd.nativeElement.focus(); + } + changePsd(val: any) { + this.sf.setValue('/payPsd', val); + if (val || val !== '') { + const last = val.substr(val.length - 1); + const password = this.sf.getValue('/payPassword') || ''; + const start = this.psd?.nativeElement.selectionStart; + const index = val.lastIndexOf('•'); + if (last !== '•') { + if (password.length !== 0) { + // 新增 或 替换 + const pre = password.substr(0, index + 1); + const detail = val.substr(index + 1, val.length); + this.sf.setValue('/payPassword', pre + detail); + } else { + // 新增 + this.sf.setValue('/payPassword', val); + } + } else { + // 删除 + this.sf.setValue('/payPassword', password.substr(0, val.length)); + } + const payPswVal = this.sf.getValue('/payPsd'); + this.sf.setValue('/payPsd', payPswVal.replace(/./g, "•")); + } else { + this.sf.setValue('/payPassword', ''); + } + + } + + /** + * 设置光标聚焦 + */ + setFocus() { + + const len = this.psd?.nativeElement.value.length; + this.setSelectionRange(this.psd?.nativeElement, len, len); //将光标定位到文本最后 + } + + /** + * 设置光标位置 + * @param input dom元素 + * @param selectionStart 起始位置 + * @param selectionEnd 结束位置 + */ + setSelectionRange(input: ElementRef | any, selectionStart: number, selectionEnd: number) { + if (input?.setSelectionRange) { + input.focus(); + input.setSelectionRange(selectionStart, selectionEnd); + } + else if (input.createTextRange) { + var range = input.createTextRange(); + range.collapse(true); + range.moveEnd('character', selectionEnd); + range.moveStart('character', selectionStart); + range.select(); + } + } + + +} diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html index 58f7732c..47ffbda4 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.html @@ -1,14 +1,4 @@ - - + + +
- + --> - -
- + +
+
+ + +
+
+ +
+
+ + [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/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts index bf8006d6..e4c3ae26 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 @@ -2,30 +2,38 @@ 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 { AddCollectionInvoiceModalComponent } from 'src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-receipt-order', templateUrl: './receipt-order.component.html', - styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class ReceiptOrderComponent implements OnInit { +export class ReceiptOrderComponent 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[] = []; - constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} + constructor( + public service: FreightAccountService, + private nzModalService: NzModalService, + private router: Router, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } ngOnInit(): void {} + search() { + this.st?.load(1); + } + beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { @@ -48,6 +56,7 @@ export class ReceiptOrderComponent implements OnInit { }); } } + this.selectedRows = []; return requestOptions; }; @@ -72,22 +81,6 @@ export class ReceiptOrderComponent implements OnInit { // }); } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - private initSF(): SFSchema { return { properties: { @@ -128,10 +121,7 @@ export class ReceiptOrderComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'driverrecord:receive:type' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } }, brmmode: { @@ -140,10 +130,7 @@ export class ReceiptOrderComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'receive:mode' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } }, arto: { @@ -155,10 +142,7 @@ export class ReceiptOrderComponent implements OnInit { searchDebounceTime: 300, searchLoadingText: '搜索中...', allowClear: true, - onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }), - visibleIf: { - expand: (value: boolean) => value - } + onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }) } }, sts: { @@ -167,10 +151,7 @@ export class ReceiptOrderComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'write:off:status' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } }, brmdate: { @@ -178,10 +159,7 @@ export class ReceiptOrderComponent implements OnInit { type: 'string', ui: { widget: 'sl-from-to-search', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } + format: 'yyyy-MM-dd' } as SFDateWidgetSchema }, createTime: { @@ -189,10 +167,7 @@ export class ReceiptOrderComponent implements OnInit { type: 'string', ui: { widget: 'sl-from-to-search', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } + format: 'yyyy-MM-dd' } as SFDateWidgetSchema }, // billHCode: { @@ -219,10 +194,7 @@ export class ReceiptOrderComponent implements OnInit { type: 'string', title: '收款备注', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } } } 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 8c7c5d10..d0ed4c80 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 @@ -1,5 +1,5 @@ - - + - + - + +
+ +
+ + +
+
+ [loading]="false" [scroll]="{ x:'1200px',y:scrollY }"> {{ item.transferBankOpenName }}
{{ item.transferBankCardNumber }} diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index f06bc8cb..3ab37b61 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -1,31 +1,36 @@ import { Component, OnInit, ViewChild } from '@angular/core'; 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'; @Component({ selector: 'app-recharge-record', templateUrl: './recharge-record.component.html', - styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class RechargeRecordComponent implements OnInit { +export class RechargeRecordComponent extends BasicTableComponent implements OnInit { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; columns: STColumn[] = this.initST(); - searchSchema: SFSchema = this.initSF(); + schema: SFSchema = this.initSF(); @ViewChild('remarkodal', { static: true }) remarkodal!: any; rechargeRemark = ''; - _$expand = false; - constructor(public service: FreightAccountService, private modal: NzModalService) {} + constructor(public service: FreightAccountService, private modal: NzModalService, public searchDrawerService: SearchDrawerService) { + super(searchDrawerService); + } ngOnInit(): void {} + search() { + this.st?.load(1); + } + beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value }); @@ -70,22 +75,6 @@ export class RechargeRecordComponent implements OnInit { history.go(-1); } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - exportList() { this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPageByOperator); } @@ -93,12 +82,6 @@ export class RechargeRecordComponent implements OnInit { private initSF(): SFSchema { return { properties: { - expand: { - type: 'boolean', - ui: { - hidden: true - } - }, rechargeNo: { type: 'string', title: '充值单号', @@ -137,9 +120,6 @@ export class RechargeRecordComponent implements OnInit { ui: { placeholder: '请输入', autocomplete: 'off', - visibleIf: { - expand: (value: boolean) => value - } } }, accountType: { @@ -154,9 +134,6 @@ export class RechargeRecordComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } }, default: '' }, @@ -166,9 +143,6 @@ export class RechargeRecordComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - }, allowClear: true, asyncData: () => this.service.getNetworkFreightForwarder() } @@ -184,9 +158,6 @@ export class RechargeRecordComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } }, default: '' } diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.html b/src/app/routes/financial-management/components/refund-record/refund-record.component.html index 251eff68..463ab740 100644 --- a/src/app/routes/financial-management/components/refund-record/refund-record.component.html +++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.html @@ -1,4 +1,4 @@ - + - - - - - - - - + +
+ + + + + + + + +
+ [loading]="false" [scroll]="{ x:'1200px',y:scrollY }"> {{ item.orderRefundCode }}
{{ item.refundStatusLabel }} @@ -42,7 +47,7 @@ - {{ bill.paymentApplicationCode }}
+ {{ bill.paymentApplicationCode }}
 @@ -54,6 +59,13 @@ + +
+ + +
+ +
diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts index 6074f36b..70569f0b 100644 --- a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts +++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts @@ -2,32 +2,40 @@ 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-refund-record', templateUrl: './refund-record.component.html', - styleUrls: ['../../../commom/less/box.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class RefundRecordComponent implements OnInit { +export class RefundRecordComponent extends BasicTableComponent implements OnInit { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; @ViewChild('auditModal', { static: false }) auditModal!: any; columns: STColumn[] = this.initST(); - searchSchema: SFSchema = this.initSF(); + schema: SFSchema = this.initSF(); - _$expand = false; refundStatus: any = ''; msg = ''; - constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} + constructor( + public service: FreightAccountService, + private nzModalService: NzModalService, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } ngOnInit(): void {} + search() { + this.st?.load(1); + } beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { refundStatus: this.refundStatus || null }); @@ -120,22 +128,6 @@ export class RefundRecordComponent implements OnInit { }); } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - private initSF(): SFSchema { return { properties: { @@ -177,9 +169,6 @@ export class RefundRecordComponent implements OnInit { type: 'string', title: '订单号', ui: { - visibleIf: { - expand: (value: boolean) => value - }, placeholder: '请输入' } }, @@ -187,19 +176,13 @@ export class RefundRecordComponent implements OnInit { type: 'string', title: '所属项目', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, resourceCode: { type: 'string', title: '货源号', ui: { - visibleIf: { - expand: (value: boolean) => value - }, placeholder: '请输入' } }, @@ -210,9 +193,6 @@ export class RefundRecordComponent implements OnInit { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - }, nzShowTime: true } as SFDateWidgetSchema }, @@ -223,10 +203,7 @@ export class RefundRecordComponent implements OnInit { widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.service.getNetworkFreightForwarder(), - visibleIf: { - expand: (value: boolean) => value - } + asyncData: () => this.service.getNetworkFreightForwarder() } }, bankType: { @@ -235,10 +212,7 @@ export class RefundRecordComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'bankname:type' }, - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } } } diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html index bd7fb2aa..84e9be34 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html @@ -1,4 +1,4 @@ - + - + +
+ +
+ + +
+
- - - + [loading]="false" [scroll]="{ x: '1200px',y:scrollY }"> \ No newline at end of file diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index 0e7987e9..ca397864 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -3,32 +3,29 @@ import { Component, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, 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'; @Component({ selector: 'app-transaction-flow', templateUrl: './transaction-flow.component.html', - styleUrls: ['./transaction-flow.component.less'], - providers: [CurrencyPipe] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class TransactionFlowComponent { +export class TransactionFlowComponent extends BasicTableComponent { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; columns: STColumn[] = this.initST(); - searchSchema: SFSchema = this.initSF(); + schema: SFSchema = this.initSF(); - _$expand = false; - - constructor( - public service: FreightAccountService, - private nzModalService: NzModalService, - private router: Router, - private currencyPipe: CurrencyPipe - ) {} + constructor(public service: FreightAccountService, public searchDrawerService: SearchDrawerService) { + super(searchDrawerService); + } + search() { + this.st?.load(1); + } beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { @@ -43,31 +40,10 @@ export class TransactionFlowComponent { return requestOptions; }; - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } private initSF(): SFSchema { return { properties: { - expand: { - type: 'boolean', - ui: { - hidden: true - } - }, createTime: { title: '交易时间', type: 'string', @@ -96,9 +72,6 @@ export class TransactionFlowComponent { title: '订单号', ui: { placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } } }, tradeType: { @@ -120,9 +93,6 @@ export class TransactionFlowComponent { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } }, default: '' }, @@ -137,9 +107,6 @@ export class TransactionFlowComponent { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } }, default: '' }, @@ -155,9 +122,6 @@ export class TransactionFlowComponent { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } }, default: '' }, @@ -166,9 +130,6 @@ export class TransactionFlowComponent { title: '账户名称', ui: { placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } } }, projectId: { @@ -178,9 +139,6 @@ export class TransactionFlowComponent { widget: 'select', placeholder: '请选择', allowClear: true, - visibleIf: { - expand: (value: boolean) => value - }, asyncData: () => this.service.getEnterpriseProject() }, default: '' @@ -196,9 +154,6 @@ export class TransactionFlowComponent { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } }, default: '' }, @@ -209,9 +164,6 @@ export class TransactionFlowComponent { widget: 'select', placeholder: '请选择', allowClear: true, - visibleIf: { - expand: (value: boolean) => value - }, asyncData: () => this.service.getNetworkFreightForwarder() }, default: '' @@ -225,8 +177,8 @@ export class TransactionFlowComponent { { title: '交易时间', index: 'createTime', width: 180 }, { title: '流水号', index: 'transactionNumber', width: 180 }, { title: '交易类型', index: 'tradeTypeLabel', width: 120 }, - { title: '关联单号', index: 'businessNumber', width: 150 }, - { title: '订单号', index: 'orderSn', width: 150 }, + { title: '关联单号', index: 'businessNumber', width: 170 }, + { title: '订单号', index: 'orderSn', width: 170 }, { title: '账户类型', index: 'accountTypeLabel', width: 130 }, { title: '账户名称', index: 'roleName', width: 180 }, { title: '所属项目', index: 'projectName', width: 140 }, diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html index 30ea85a7..88a9cc2c 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html +++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.html @@ -1,4 +1,4 @@ - + + +
- + --> - + +
+ +
+ +
+
-
- -
+
+ --> + [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/voucher-management/voucher-management.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts index 014bde06..76f4bb47 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts +++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts @@ -1,43 +1,36 @@ -/* - * @Description : - * @Version : 1.0 - * @Author : Shiming - * @Date : 2022-01-18 15:57:44 - * @LastEditors : Shiming - * @LastEditTime : 2022-04-09 16:36:42 - * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-management\\voucher-management.component.ts - * Copyright (C) 2022 huzhenhong. All rights reserved. - */ -import { CurrencyPipe } from '@angular/common'; 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-voucher-management', templateUrl: './voucher-management.component.html', - styleUrls: ['../../../commom/less/box.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class VoucherManagementComponent implements OnInit { +export class VoucherManagementComponent extends BasicTableComponent implements OnInit { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; @ViewChild('auditModal', { static: false }) auditModal!: any; columns: STColumn[] = this.initST(); - searchSchema: SFSchema = this.initSF(); - - _$expand = false; + schema: SFSchema = this.initSF(); selectedRows: any[] = []; - constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} + constructor(public service: FreightAccountService, private router: Router, public searchDrawerService: SearchDrawerService) { + super(searchDrawerService); + } ngOnInit(): void {} + search() { + this.st?.load(1); + } + beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { @@ -71,22 +64,6 @@ export class VoucherManagementComponent implements OnInit { } } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - private initSF(): SFSchema { return { properties: { @@ -128,10 +105,7 @@ export class VoucherManagementComponent implements OnInit { title: '原始单号', ui: { autocomplete: 'off', - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, sourceType: { @@ -155,10 +129,7 @@ export class VoucherManagementComponent implements OnInit { ], ui: { widget: 'select', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } }, createTime: { @@ -166,20 +137,14 @@ export class VoucherManagementComponent implements OnInit { type: 'string', ui: { widget: 'sl-from-to-search', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } + format: 'yyyy-MM-dd' } as SFDateWidgetSchema }, remarks: { type: 'string', title: '凭证摘要', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, vctype: { @@ -188,10 +153,7 @@ export class VoucherManagementComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'credential:type' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' }, default: '' }, @@ -211,20 +173,14 @@ export class VoucherManagementComponent implements OnInit { type: 'string', title: '借方金额', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, crmoney: { type: 'string', title: '贷方金额', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, vcltdid: { @@ -233,10 +189,7 @@ export class VoucherManagementComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'refund:apply:status' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } }, sts: { @@ -245,10 +198,7 @@ export class VoucherManagementComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'credential:status' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' }, default: '' }, @@ -256,20 +206,14 @@ export class VoucherManagementComponent implements OnInit { type: 'string', title: 'NC凭证', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, vc2code: { type: 'string', title: '汇总凭证号', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, importnc: { @@ -278,10 +222,7 @@ export class VoucherManagementComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'refund:apply:status' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } }, isvc2: { @@ -294,10 +235,7 @@ export class VoucherManagementComponent implements OnInit { ], ui: { widget: 'select', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } } } diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html index 5f5f53c7..7380f466 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html @@ -1,14 +1,4 @@ - - + + + - + --> - + +
+ +
+ + +
+
+ [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/voucher-summary/voucher-summary.component.ts b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts index ca64fd91..029d31c7 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 @@ -3,36 +3,41 @@ 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 { DateHelperByDatePipe } from 'ng-zorro-antd/i18n'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { AddCollectionInvoiceModalComponent } from 'src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component'; import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-voucher-summary', templateUrl: './voucher-summary.component.html', - styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class VoucherSummaryComponent implements OnInit { +export class VoucherSummaryComponent 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[] = []; constructor( public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, - private dateHelperByDatePipe: DateHelperByDatePipe - ) {} + private dateHelperByDatePipe: DateHelperByDatePipe, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } ngOnInit(): void {} + search() { + this.st?.load(1); + } + beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { isvc2: 1 }); if (this.sf) { @@ -72,22 +77,6 @@ export class VoucherSummaryComponent implements OnInit { }); } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - exportList() { this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_fico_vch_page); } @@ -133,10 +122,7 @@ export class VoucherSummaryComponent implements OnInit { title: '原始单号', ui: { autocomplete: 'off', - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, sourceType: { @@ -144,10 +130,7 @@ export class VoucherSummaryComponent implements OnInit { title: '原始单类型', ui: { widget: 'select', - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } }, createTime: { @@ -155,20 +138,14 @@ export class VoucherSummaryComponent implements OnInit { type: 'string', ui: { widget: 'sl-from-to-search', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } + format: 'yyyy-MM-dd' } as SFDateWidgetSchema }, remarks: { type: 'string', title: '凭证摘要', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, vctype: { @@ -177,10 +154,7 @@ export class VoucherSummaryComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'credential:type' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' }, default: '' }, @@ -190,30 +164,21 @@ export class VoucherSummaryComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'refund:apply:status' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } }, drmoney: { type: 'string', title: '借方金额', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, crmoney: { type: 'string', title: '贷方金额', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, vcltdid: { @@ -222,10 +187,7 @@ export class VoucherSummaryComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'refund:apply:status' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } }, sts: { @@ -234,30 +196,21 @@ export class VoucherSummaryComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'credential:status' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } }, feecode: { type: 'string', title: 'NC凭证', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, vccode: { type: 'string', title: '凭证号', ui: { - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } }, s22t2ss: { @@ -266,10 +219,7 @@ export class VoucherSummaryComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'refund:apply:status' }, - placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请选择' } }, createt1im2e: { @@ -277,10 +227,7 @@ export class VoucherSummaryComponent implements OnInit { type: 'string', ui: { widget: 'sl-from-to-search', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } + format: 'yyyy-MM-dd' } as SFDateWidgetSchema } } diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index b35e8a87..bbcb46cf 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -210,7 +210,7 @@ export class WithdrawalsDetailComponent implements OnInit { enum: [ {label: '全部', value: ''}, {label: '是', value: '1'}, - {label: '否', value: '2'} + {label: '否', value: '0'} ], ui: { widget: 'select', diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html index a4db6171..8272131b 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html @@ -1,5 +1,5 @@ - - + - + - - - - - - - - - + +
+ + + + + + + + + +
@@ -60,12 +65,14 @@ totalCallNo }} 清空
+ + + [loading]="false" [scroll]="{ x:'1200px',y:scrollY }" (change)="stChange($event)"> {{ item.bankName }}
{{ item.bankCardNumber }} diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 75a921ef..cdb58228 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -2,36 +2,45 @@ import { Component, 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'; @Component({ selector: 'app-withdrawals-record', templateUrl: './withdrawals-record.component.html', - styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class WithdrawalsRecordComponent { +export class WithdrawalsRecordComponent extends BasicTableComponent { @ViewChild('st', { static: true }) st!: STComponent; - @ViewChild('sf', { static: false }) - sf!: SFComponent; @ViewChild('auditModal', { static: false }) auditModal!: any; columns: STColumn[] = this.initST(); - searchSchema: SFSchema = this.initSF(); - - _$expand = false; + schema: SFSchema = this.initSF(); selectedRows: any[] = []; totalCallNo = 0; refundStatus: any = ''; msg = ''; - constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} + constructor( + public service: FreightAccountService, + private nzModalService: NzModalService, + private router: Router, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } ngOnInit(): void {} + search() { + this.st?.load(1); + } + beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { @@ -40,10 +49,12 @@ export class WithdrawalsRecordComponent { start: this.sf.value.createTime?.[0] || '', end: this.sf.value.createTime?.[1] || '' }, - refundStatus: this.refundStatus || null }); } delete requestOptions?.body?.expand; + this.selectedRows = []; + this.totalCallNo = 0; + Object.assign(requestOptions.body, { refundStatus: this.refundStatus || null }); return requestOptions; }; @@ -145,31 +156,9 @@ export class WithdrawalsRecordComponent { }); } - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - } - - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/expand', this._$expand); - } - private initSF(): SFSchema { return { properties: { - expand: { - type: 'boolean', - ui: { - hidden: true - } - }, refundApplyCode: { type: 'string', title: '提现单号', @@ -177,15 +166,6 @@ export class WithdrawalsRecordComponent { placeholder: '请输入' } }, - // refundStatus: { - // type: 'string', - // title: '提现状态', - // ui: { - // widget: 'dict-select', - // params: { dictKey: 'refund:apply:status' }, - // placeholder: '请选择' - // } - // }, createTime: { title: '提现时间', type: 'string', @@ -206,13 +186,14 @@ export class WithdrawalsRecordComponent { accountType: { type: 'string', title: '账户类型', + enum: [ + {label: '全部', value: ''}, + {label: '个人合伙人', value: '4'}, + {label: '企业合伙人', value: '5'} + ], ui: { - widget: 'dict-select', - params: { dictKey: 'bank:type' }, + widget: 'select', placeholder: '请选择', - visibleIf: { - expand: (value: boolean) => value - } } }, ltdId: { @@ -222,10 +203,7 @@ export class WithdrawalsRecordComponent { widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.service.getNetworkFreightForwarder(), - visibleIf: { - expand: (value: boolean) => value - } + asyncData: () => this.service.getNetworkFreightForwarder() } }, bankType: { @@ -234,10 +212,7 @@ export class WithdrawalsRecordComponent { ui: { widget: 'dict-select', params: { dictKey: 'bankname:type' }, - placeholder: '请输入', - visibleIf: { - expand: (value: boolean) => value - } + placeholder: '请输入' } } } @@ -246,7 +221,7 @@ export class WithdrawalsRecordComponent { private initST(): STColumn[] { return [ - { title: '', index: 'key', type: 'checkbox' }, + { title: '', index: 'key', type: 'checkbox', className: 'text-center' }, { title: '提现时间', index: 'createTime', width: 180 }, { title: '提现单号', index: 'refundApplyCode', width: 120 }, { title: '网络货运人', index: 'ltdName', width: 140 }, diff --git a/src/app/routes/financial-management/financial-management.module.ts b/src/app/routes/financial-management/financial-management.module.ts index 63b99337..e99c95d6 100644 --- a/src/app/routes/financial-management/financial-management.module.ts +++ b/src/app/routes/financial-management/financial-management.module.ts @@ -2,7 +2,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FreightAccountComponent } from './components/freight-account/freight-account.component'; import { DriverAccountComponent } from './components/driver-account/driver-account.component'; -import { RechargeRecordComponent } from './components/recharge-record/recharge-record.component'; import { WithdrawalsRecordComponent } from './components/withdrawals-record/withdrawals-record.component'; import { SharedModule } from '@shared'; import { FinancialManagementRoutingModule } from './financial-managemen-routing.module'; @@ -39,6 +38,8 @@ import { AbnormalGoldDetailComponent } from './components/abnormal-gold/abnormal import { CwcBankCardManagementIndexComponent } from './components/bank-card-management/index/index.component'; import { CwcBankCardManagementBindComponent } from './components/bank-card-management/bind/bind.component'; import { CwcBankCardManagementAddComponent } from './components/bank-card-management/add/add.component'; +import { CwcAccountManagementWithdrawDepositComponent } from './components/platform-account/withdraw-deposit/withdraw-deposit.component'; +import { RechargeRecordComponent } from './components/recharge-record/recharge-record.component'; const ROUTESCOMPONENTS = [ FreightAccountComponent, @@ -74,7 +75,8 @@ const ROUTESCOMPONENTS = [ AbnormalGoldDetailComponent, CwcBankCardManagementIndexComponent, CwcBankCardManagementBindComponent, - CwcBankCardManagementAddComponent + CwcBankCardManagementAddComponent, + CwcAccountManagementWithdrawDepositComponent ]; const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, ClearingModalComponent]; diff --git a/src/app/routes/financial-management/services/bank-card-management.service.ts b/src/app/routes/financial-management/services/bank-card-management.service.ts index 65db517b..76faf71c 100644 --- a/src/app/routes/financial-management/services/bank-card-management.service.ts +++ b/src/app/routes/financial-management/services/bank-card-management.service.ts @@ -8,6 +8,8 @@ export class BankCardManagementService extends BaseService { $api_bank_card_list = `/api/fcc/bankInfoOBC/list/myBankInfo`; // 获取银行卡列表 $api_bank_card_del = `/api/fcc/bankInfoOBC/delete`; // 删除银行卡 $api_bank_card_add = `/api/fcc/bankInfoOBC/save`;//新增银行卡 + $api_get_account_available_balance = `/api/fcc/accountBalance/getWithdrawalAccountBalanceOperator`; //平台可提现金额查询 + $api_apply_withdraw = `/api/fcc/refundApplicationOBC/addAgreeRefund`; // 提现申请 constructor(public injector: Injector) { super(injector); } 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 9c9d31eb..26129d7a 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 @@ -9,41 +9,18 @@ * Copyright (C) 2022 huzhenhong. All rights reserved. --> - + -
- -
- -
- - + +
- + --> - -
- +
+ +
+ + +
+
+
+ - - + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"> + +
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}
@@ -84,11 +63,14 @@ {{ item?.billStatusLabel }}
- {{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? '':item?.serviceTypeLabel}} + {{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? + '':item?.serviceTypeLabel}}
+ + \ No newline at end of file diff --git a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts index 70043520..cfea574f 100644 --- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts +++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts @@ -1,29 +1,24 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { STColumn, STComponent } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { ModalHelper, _HttpClient } from '@delon/theme'; import { NzModalService } from 'ng-zorro-antd/modal'; import { map } from 'rxjs/operators'; import { OrderManagementService } from '../../services/order-management.service'; -import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component'; -import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component'; import { of } from 'rxjs'; -import { ShipperBaseService } from '@shared'; +import { SearchDrawerService, ShipperBaseService } from '@shared'; import { Router } from '@angular/router'; -import { OneCarOrderAppealComponent } from '../../modal/audit/appeal/appeal.component'; +import { BasicTableComponent } from 'src/app/routes/commom'; @Component({ selector: 'app-order-management-abnormal-warning', templateUrl: './abnormal-warning.component.html', - styleUrls: ['./abnormal-warning.component.less'] + styleUrls: ['../../../commom/less/commom-table.less', './abnormal-warning.component.less'] }) -export class OrderManagementAbnormalWarningComponent implements OnInit { - ui: SFUISchema = {}; +export class OrderManagementAbnormalWarningComponent extends BasicTableComponent implements OnInit { uiView: SFUISchema = {}; - schema: SFSchema = {}; schemaView: SFSchema = {}; - changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录 - changeViewId: any; // 查看运费变更记录id - 用于查看 + changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录 + changeViewId: any; // 查看运费变更记录id - 用于查看 auditId: any; auditIdR: any; auditMany = false; @@ -31,22 +26,23 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { isVisibleEvaluate = false; isVisible = false; isVisibleRE = false; - _$expand = false; @ViewChild('st') private readonly st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sfView', { static: false }) sfView!: SFComponent; @ViewChild('stFloat') private readonly stFloat!: STComponent; @ViewChild('stFloatView') private readonly stFloatView!: STComponent; columns: STColumn[] = []; columnsFloat: STColumn[] = []; columnsFloatView: STColumn[] = []; - ViewCause: any; // 变更运费查看数据 + ViewCause: any; // 变更运费查看数据 constructor( public service: OrderManagementService, private modal: NzModalService, public shipperservice: ShipperBaseService, - private router: Router - ) { } + private router: Router, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } /** * 查询参数 @@ -96,14 +92,12 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { billCode: { type: 'string', title: '订单号', - ui: { - } + ui: {} }, wayBillCode: { type: 'string', title: '运单号', - ui: { - } + ui: {} }, serviceType: { title: '服务类型', @@ -112,7 +106,7 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'service:type' }, - containsAllLabel: true, + containsAllLabel: true } as SFSelectWidgetSchema }, resourceType: { @@ -120,12 +114,9 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { type: 'string', default: '', ui: { - visibleIf: { - _$expand: (value: boolean) => value - }, widget: 'dict-select', params: { dictKey: 'goodresource:type' }, - containsAllLabel: true, + containsAllLabel: true } as SFSelectWidgetSchema }, shipperId: { @@ -137,11 +128,8 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { searchDebounceTime: 300, searchLoadingText: '搜索中...', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - }, 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 }) @@ -150,44 +138,24 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { } else { return of([]); } - }, + } } as SFSelectWidgetSchema }, loadingPlace: { type: 'string', title: '装货地', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } }, dischargePlace: { type: 'string', title: '卸货地', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } }, driverName: { title: '承运司机', type: 'string', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } }, carNo: { title: '车牌号', type: 'string', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } }, warningTime: { title: '预警时间', @@ -197,15 +165,11 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { mode: 'range', format: 'yyyy-MM-dd', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - } } as SFDateWidgetSchema - }, + } }, type: 'object' }; - this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; } /** @@ -227,13 +191,19 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { className: 'text-left', index: 'wayCode' }, - { title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left',format: (item) => { - return item?.resourceTypeLabel + item?.serviceTypeLabel - } }, + { + title: '服务类型', + index: 'serviceTypeLabel', + width: '220px', + className: 'text-left', + format: item => { + return item?.resourceTypeLabel + item?.serviceTypeLabel; + } + }, { title: '货主', index: 'shipperName', width: '220px', className: 'text-left' }, { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left' }, { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left' }, - { title: '司机', render: 'driverName', width: '180px', className: 'text-left' }, + { title: '司机', render: 'driverName', width: '180px', className: 'text-left' }, { title: '车牌号', index: 'carNo', width: '180px', className: 'text-left' }, { title: '预警类型', index: 'warningTypeLabel', width: '180px', className: 'text-left' }, { @@ -252,39 +222,15 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { title: '提醒内容', className: 'text-left', width: '250px', - index: 'warningContent', - }, - + index: 'warningContent' + } ]; } - /** - * 查询字段个数 - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } + tabChange(item: any) {} - - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); + // 导出 + exprot() { + this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_abnormalWarning_asyncExport); } - tabChange(item: any) { } - /** - * 重置表单 - */ - resetSF(): void { - this.sf.reset(); - this._$expand = false; - } - - - // 导出 - exprot() { - this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_abnormalWarning_asyncExport); - } } diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index bced8f7d..a2b6d182 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -4,37 +4,19 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-14 10:53:35 + * @LastEditTime : 2022-04-22 16:51:29 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - - + -
- -
- - -
- +
- - + --> - - - - - - - - - - -
- +
+ + + + + + + + + + +
+ +
+ + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"> {{ item.freightPrice | currency }} @@ -76,16 +56,19 @@
卸 | {{ item?.unloadTime }}
-
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : ''}}
+
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + + item?.carNo : ''}}
-
{{ item.settlementWeight ? item.settlementWeight + '吨/ ': ''}} {{ item.settlementVolume ? item.settlementVolume + '方 ': ''}}
+
{{ item.settlementWeight ? item.settlementWeight + '吨/ ': ''}} {{ item.settlementVolume ? + item.settlementVolume + '方 ': ''}}
 -
{{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : '' }}
+
{{ item?.payeeName }}{{ item?.payeePhone ? "/" + + item?.payeePhone : '' }}
-
{{ item?.createUserName }}{{ item?.createUserPhone ? "/" + item?.createUserPhone : '' }}
+
{{ item?.createUserName }}{{ item?.createUserPhone ? "/" + item?.createUserPhone : '' }}
{{ item.billCode }} @@ -108,7 +91,8 @@

{{ data.expenseName }}：{{ data.price | currency }} - {{ data.expenseName }}：{{ (data.price * 100).toFixed(2) + '%' }} + {{ data.expenseName }}：{{ (data.price * 100).toFixed(2) + '%' + }} {{ data.paymentStatusLabel }}

@@ -117,25 +101,13 @@
- + - + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"> {{ index + 1 }} @@ -155,14 +127,8 @@ - + @@ -172,30 +138,21 @@
- + [res]="{ reName: { list: 'data.list', total: 'data.total' } }"> {{ item.amountBeforeChange | currency }} - ￥{{ item.amountchangeValue | number: '0.2-2' }} + ￥{{ item.amountchangeValue | number: '0.2-2' + }} {{ item.amountAfterChange | currency }} -
变更原因：{{ ViewCause?.changeCause }}
-
拒绝原因：{{ ViewCause?.refuseCause }}
+
变更原因：{{ ViewCause?.changeCause }}
+
拒绝原因：{{ ViewCause?.refuseCause }}
注：附加费依据调整后的运输费用重新计算
@@ -204,13 +161,8 @@ - + @@ -239,26 +191,21 @@
-
已选择{{ selectedRows?.length || 0 }}条订单，确认批量签收吗？ +
已选择{{ + selectedRows?.length || 0 }}条订单，确认批量签收吗？
签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。
-
- + +
- + \ No newline at end of file diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 15ba339a..aeccbc6d 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; +import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; @@ -7,20 +7,20 @@ import { map } from 'rxjs/operators'; import { OrderManagementService } from '../../services/order-management.service'; import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component'; import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component'; -import { of } from 'rxjs'; +import { of, Subscription } from 'rxjs'; import { ShipperBaseService } from '@shared'; import { Router, ActivatedRoute } from '@angular/router'; import { OneCarOrderCancelConfirmComponent } from '../../modal/vehicle/cancel-confirm/cancel-confirm.component'; +import { SearchDrawerService } from 'src/app/shared/components/search-drawer/search-drawer.service'; +import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component'; @Component({ selector: 'app-supply-management-bulk', templateUrl: './bulk.component.html', - styleUrls: ['./bulk.component.less'] + styleUrls: ['../../../commom/less/commom-table.less','./bulk.component.less'] }) -export class OrderManagementBulkComponent implements OnInit { - ui: SFUISchema = {}; +export class OrderManagementBulkComponent extends BasicTableComponent implements OnInit { uiView: SFUISchema = {}; - schema: SFSchema = {}; schemaView: SFSchema = {}; auditMany = false; isVisibleView = false; @@ -54,13 +54,17 @@ export class OrderManagementBulkComponent implements OnInit { GoingQuantity: 0, totalCount: 0 }; + constructor( public service: OrderManagementService, private modal: NzModalService, public shipperservice: ShipperBaseService, private router: Router, private ar: ActivatedRoute, - ) { } + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } /** * 查询参数 @@ -70,14 +74,14 @@ export class OrderManagementBulkComponent implements OnInit { if (this.resourceStatus) { a.billStatus = this.resourceStatus; } - const params: any = Object.assign({}, this.sf?.value || {}); + const params: any = Object.assign({}, this.sfValue || {}); delete params._$expand; return { ...a, ...params, createTime: { - start: this.sf?.value?.createTime?.[0] || '', - end: this.sf?.value?.createTime?.[1] || '' + start: this.sfValue?.createTime?.[0] || '', + end: this.sfValue?.createTime?.[1] || '' } }; } @@ -86,17 +90,17 @@ export class OrderManagementBulkComponent implements OnInit { if (this.resourceStatus) { a.billStatus = this.resourceStatus; } - const params: any = Object.assign({}, this.sf?.value || {}); + const params: any = Object.assign({}, this.sfValue || {}); delete params._$expand; console.log(params); - if (this.sf) { + if (this.sfValue) { Object.assign(requestOptions.body, { ...a, ...params, createTime: { - start: this.sf?.value?.createTime?.[0] || '', - end: this.sf?.value?.createTime?.[1] || '' + start: this.sfValue?.createTime?.[0] || '', + end: this.sfValue?.createTime?.[1] || '' } }); } @@ -104,8 +108,8 @@ export class OrderManagementBulkComponent implements OnInit { return requestOptions; }; afterRes = (data: any[], rawData?: any) => { - console.log(data) - this.loading = false + console.log(data); + this.loading = false; return data.map(item => ({ ...item, disabled: item.billStatus !== '4' @@ -119,6 +123,7 @@ export class OrderManagementBulkComponent implements OnInit { id: this.changeId }; } + search() { this.st?.load(); this.getGoodsSourceStatistical(); @@ -185,14 +190,14 @@ export class OrderManagementBulkComponent implements OnInit { type: 'string', title: '订单号', ui: { - placeholder: '最多100个单号，空号隔开', + placeholder: '最多100个单号，空号隔开' } }, wayBillCode: { type: 'string', title: '运单号', ui: { - placeholder: '最多100个单号，空号隔开', + placeholder: '最多100个单号，空号隔开' } }, resourceCode: { @@ -208,11 +213,8 @@ export class OrderManagementBulkComponent implements OnInit { searchDebounceTime: 300, searchLoadingText: '搜索中...', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - }, 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 }) @@ -233,55 +235,27 @@ export class OrderManagementBulkComponent implements OnInit { ui: { widget: 'select', placeholder: '请先选择货主', - visibleIf: { - _$expand: (value: boolean) => value - }, } as SFSelectWidgetSchema }, loadingPlace: { type: 'string', title: '装货地', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } }, dischargePlace: { type: 'string', title: '卸货地', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } }, driverName: { title: '承运司机', type: 'string', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } }, carNo: { title: '车牌号', type: 'string', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } }, carCaptainName: { title: '车队长', type: 'string', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } }, paymentStatus: { title: '支付状态', @@ -290,9 +264,6 @@ export class OrderManagementBulkComponent implements OnInit { widget: 'dict-select', params: { dictKey: 'overall:payment:status' }, containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } } as SFSelectWidgetSchema }, createTime: { @@ -303,9 +274,6 @@ export class OrderManagementBulkComponent implements OnInit { mode: 'range', format: 'yyyy-MM-dd', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - } } as SFDateWidgetSchema }, riskStatus: { @@ -319,9 +287,6 @@ export class OrderManagementBulkComponent implements OnInit { ui: { widget: 'select', placeholder: '请选择', - visibleIf: { - _$expand: (value: boolean) => value - } } }, enterpriseInfoName: { @@ -331,9 +296,6 @@ export class OrderManagementBulkComponent implements OnInit { widget: 'select', placeholder: '请选择', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - }, asyncData: () => this.shipperservice.getNetworkEnterpriseName() } }, @@ -345,9 +307,6 @@ export class OrderManagementBulkComponent implements OnInit { widget: 'dict-select', params: { dictKey: 'service:type' }, containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } } as SFSelectWidgetSchema }, settlementBasis: { @@ -358,15 +317,11 @@ export class OrderManagementBulkComponent implements OnInit { containsAllLabel: true, params: { dictKey: 'goodresource:settlement:type' }, containAllLable: true, - visibleIf: { - _$expand: (value: boolean) => value - } } as SFSelectWidgetSchema } }, type: 'object' }; - this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; } /** * 初始化查询表单 @@ -493,7 +448,7 @@ export class OrderManagementBulkComponent implements OnInit { title: '结算数量', render: 'settlementWeight', width: '170px', - className: 'text-left', + className: 'text-left' // format: (item: any) => // `${item.settlementWeight || '0'}吨/ // ${item.settlementVolume || '0'}方` @@ -509,7 +464,6 @@ export class OrderManagementBulkComponent implements OnInit { title: '车队长', className: 'text-left', width: '180px', - index: 'payeeName', render: 'payeeName' }, { @@ -534,27 +488,31 @@ export class OrderManagementBulkComponent implements OnInit { title: '操作', fixed: 'right', width: '130px', - className: 'text-left block-td', + className: 'text-center block-td', buttons: [ { text: '运费变更记录', click: _record => this.OpenPrice(_record), iif: item => - item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', - acl: { ability: ['ORDER-BULK-listChangeApply'] }, + item.billStatus == '4' || + item.billStatus == '5' || + item.billStatus == '2' || + item.billStatus == '3' || + item.billStatus == '6', + acl: { ability: ['ORDER-BULK-listChangeApply'] } }, { text: '查看评价', click: _record => this.viewEvaluate(_record), iif: item => item.billStatus == '5', - acl: { ability: ['ORDER-BULK-evaluation'] }, + acl: { ability: ['ORDER-BULK-evaluation'] } }, { text: '查看详情', click: (item: any) => { this.router.navigate(['./bulk-detail', item.id], { relativeTo: this.ar }); }, - acl: { ability: ['USERCENTER-FREIGHT-USER-view'] }, + acl: { ability: ['USERCENTER-FREIGHT-USER-view'] } }, { text: '变更运费', @@ -563,32 +521,36 @@ export class OrderManagementBulkComponent implements OnInit { const flag = _record.mybidDetailInfo.find((item: any) => item?.expenseCode === 'TRA' && item?.paymentStatus === '4'); return _record.billStatus !== '1' && _record.billStatus !== '6' && !flag; }, - acl: { ability: ['ORDER-BULK-FreightChangeBulkDetail'] }, + acl: { ability: ['ORDER-BULK-FreightChangeBulkDetail'] } }, { text: '确认签收', click: _record => this.confirmReceipt(_record), iif: item => item.billStatus == '4', - acl: { ability: ['VEHICLE-LIST-view'] }, + acl: { ability: ['VEHICLE-LIST-view'] } }, { text: '取消订单', click: _record => this.cancellation(_record), iif: item => - item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1', - acl: { ability: ['ORDER-BULK-signBulkOrder'] }, + item.billStatus == '4' || + item.billStatus == '5' || + item.billStatus == '2' || + item.billStatus == '3' || + item.billStatus == '1', + acl: { ability: ['ORDER-BULK-signBulkOrder'] } }, { text: '申请退款', - click: (_record) => this.applyRefund(_record), + click: _record => this.applyRefund(_record), iif: item => item.isApplyForRefund, - acl: { ability: ['ORDER-VEHICLE-modificationOrder'] }, + acl: { ability: ['ORDER-VEHICLE-modificationOrder'] } }, { text: '修改订单', click: _record => this.changeOrder(_record), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', - acl: { ability: ['ORDER-BULK-BulkBillDetail'] }, + acl: { ability: ['ORDER-BULK-BulkBillDetail'] } } ] } @@ -664,27 +626,13 @@ export class OrderManagementBulkComponent implements OnInit { id: this.changeViewId }; } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } - tabChange(item: any) { } - /** - * 重置表单 - */ - resetSF(): void { - this.sf.reset(); - this._$expand = false; - } + tabChange(item: any) {} /** * 导入货源 */ - importGoodsSource() { } - audit(item: any) { } + importGoodsSource() {} + audit(item: any) {} /* * 审核关闭弹窗 @@ -705,7 +653,7 @@ export class OrderManagementBulkComponent implements OnInit { /** * 审核通过按钮 */ - handleOK() { } + handleOK() {} OpenPrice(item: any) { this.changeId = item.id; this.isVisible = true; @@ -839,8 +787,8 @@ export class OrderManagementBulkComponent implements OnInit { this.router.navigate(['order-management/bulk-detailChange', value.id]); } /** -*申请退款 -*/ + *申请退款 + */ applyRefund(item: any) { const modalRef = this.modal.create({ nzTitle: '申请退款', @@ -853,7 +801,6 @@ export class OrderManagementBulkComponent implements OnInit { }); modalRef.afterClose.subscribe((res: boolean) => { if (res) { - this.resetSF; this.st.load(); } }); diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts index 0c311e0e..19ee68de 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts @@ -195,7 +195,7 @@ export class OrderManagementComplaintDetailComponent implements OnInit { } this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{ if(res) { - this.service.msgSrv.success('已拒绝！') + this.service.msgSrv.success('已取消！') this.isVisibleRE = false this.getDetail(this.id); this.complaintStatus = true; @@ -214,9 +214,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit { return } const paramsa = { + ...this.sfView.value, id: this.channelId } - this.service.request(this.service.$api_get_canelComplaint, paramsa).subscribe((res: any) =>{ + this.service.request(this.service.$api_get_dealWithComplaint, paramsa).subscribe((res: any) =>{ if(res) { this.service.msgSrv.success('已拒绝！') this.isVisibleRE = false diff --git a/src/app/routes/order-management/components/complaint/complaint.component.html b/src/app/routes/order-management/components/complaint/complaint.component.html index da667180..b76b3b8d 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.html +++ b/src/app/routes/order-management/components/complaint/complaint.component.html @@ -10,59 +10,67 @@ --> - + + -
- -
-
- - - -
+
+ +
+
+ + + +
- + --> - - - + +
+ + + + + +
+ + -
- - - {{item.complaintCode}} - - -
{{item?.drvComplaintCauseLabel}}
-
{{item?.complaintCauseLabel}}
- +
+ + + {{item.complaintCode}} + + +
{{item?.drvComplaintCauseLabel}}
+
{{item?.complaintCauseLabel}}
+
- + +
+ + +
+ + + @@ -72,6 +80,4 @@ - - - + \ No newline at end of file diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index a0e077a1..1851f5eb 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -6,20 +6,19 @@ import { ModalHelper, _HttpClient } from '@delon/theme'; import { NzModalService } from 'ng-zorro-antd/modal'; import { map } from 'rxjs/operators'; import { OrderManagementService } from '../../services/order-management.service'; +import { SearchDrawerService } from '@shared'; +import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component'; @Component({ selector: 'app-supply-management-complaint', templateUrl: './complaint.component.html', - styleUrls: ['./complaint.component.less'] + styleUrls: ['../../../commom/less/commom-table.less', './complaint.component.less'] }) -export class OrderManagementComplaintComponent implements OnInit { - ui: SFUISchema = {}; +export class OrderManagementComplaintComponent extends BasicTableComponent implements OnInit { uiView: SFUISchema = {}; - schema: SFSchema = {}; schemaView: SFSchema = {}; auditMany = false; isVisibleRE = false; - _$expand = false; channelId: any; resourceStatus: any; selectedMainTabStatus = '2'; @@ -49,9 +48,19 @@ export class OrderManagementComplaintComponent implements OnInit { { name: '已撤销', type: 3 - } + }, + { + name: '已取消', + type: 4 + }, ]; - constructor(public service: OrderManagementService, private modal: NzModalService, private router: Router) { + constructor( + public service: OrderManagementService, + private modal: NzModalService, + private router: Router, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); // console.log(this.selectedIndex); // if (this.selectedIndex === 0) { // this.selectedMainTabStatus = '2'; @@ -101,16 +110,15 @@ export class OrderManagementComplaintComponent implements OnInit { wayBillCode: { type: 'string', title: '运单号', - ui: { - } + ui: {} }, - complaintCause: { + drvComplaintCause: { title: '投诉原因', type: 'string', ui: { widget: 'dict-select', params: { dictKey: 'drvcomplaint:cause' }, - hidden: this.selectedMainTabStatus == '1', + hidden: this.selectedMainTabStatus == '1', containsAllLabel: true } as SFSelectWidgetSchema }, @@ -120,7 +128,7 @@ export class OrderManagementComplaintComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'drvcomplaint:cause' }, - hidden: this.selectedMainTabStatus == '2', + hidden: this.selectedMainTabStatus == '2', containsAllLabel: true } as SFSelectWidgetSchema }, @@ -132,16 +140,10 @@ export class OrderManagementComplaintComponent implements OnInit { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value - }, } as SFDateWidgetSchema } } }; - this.ui = { - '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 8 } } - }; } /** @@ -270,21 +272,7 @@ export class OrderManagementComplaintComponent implements OnInit { get queryFieldCount(): number { return Object.keys(this.schema?.properties || {}).length; } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } tabChange(item: any) {} - /** - * 重置表单 - */ - resetSF(): void { - this.sf.reset(); - this.isLoading = true; - } selectChange(e: number) { this.resourceStatus = e; this.initST(); diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html index 0803df06..2aaeb8e3 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html @@ -9,41 +9,18 @@ * Copyright (C) 2022 huzhenhong. All rights reserved. --> - + -
- -
- -
- - + +
- + --> - - - - - - - -
- +
+ + + + + + + +
+
+ + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"> {{ item.freightPrice | currency }} @@ -81,20 +55,25 @@
卸 | {{ item?.unloadingTime }}
-
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : '' }}
+
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + + item?.carNo : '' }}
{{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : '' }}
- {{ item.billCode }} - {{ item.billCode }} - {{ item.billCode }} + {{ + item.billCode }} + {{ item.billCode }} + {{ + item.billCode }}
{{ item?.billStatusLabel }}
- {{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? '':item?.serviceTypeLabel}} + {{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? + '':item?.serviceTypeLabel}}
@@ -119,18 +98,16 @@
- + + +
- + @@ -140,18 +117,13 @@ - + - + [res]="{ reName: { list: 'data', total: 'data.total' } }"> {{ index + 1 }} @@ -163,35 +135,27 @@ - + - + {{ item.amountBeforeChange | currency }} - ￥{{ item.amountchangeValue | number: '0.2-2' }} + ￥{{ item.amountchangeValue | number: '0.2-2' + }} {{ item.amountAfterChange | currency }} -
变更原因：{{ ViewCause?.changeCause }}
-
拒绝原因：{{ ViewCause?.refuseCause }}
+
变更原因：{{ ViewCause?.changeCause }}
+
拒绝原因：{{ ViewCause?.refuseCause }}
注：附加费依据调整后的运输费用重新计算
 - + \ No newline at end of file diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index 9009e89a..4b645c2f 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -8,22 +8,21 @@ import { OrderManagementService } from '../../services/order-management.service' import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component'; import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component'; import { of } from 'rxjs'; -import { ShipperBaseService } from '@shared'; +import { SearchDrawerService, ShipperBaseService } from '@shared'; import { Router } from '@angular/router'; import { OneCarOrderAppealComponent } from '../../modal/audit/appeal/appeal.component'; +import { BasicTableComponent } from 'src/app/routes/commom'; @Component({ selector: 'app-order-management-compliance-audit', templateUrl: './compliance-audit.component.html', - styleUrls: ['./compliance-audit.component.less'] + styleUrls: ['../../../commom/less/commom-table.less', './compliance-audit.component.less'] }) -export class OrderManagementComplianceAuditComponent implements OnInit { - ui: SFUISchema = {}; +export class OrderManagementComplianceAuditComponent extends BasicTableComponent implements OnInit { uiView: SFUISchema = {}; - schema: SFSchema = {}; schemaView: SFSchema = {}; - changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录 - changeViewId: any; // 查看运费变更记录id - 用于查看 + changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录 + changeViewId: any; // 查看运费变更记录id - 用于查看 auditId: any; auditIdR: any; auditMany = false; @@ -31,16 +30,14 @@ export class OrderManagementComplianceAuditComponent implements OnInit { isVisibleEvaluate = false; isVisible = false; isVisibleRE = false; - _$expand = false; @ViewChild('st') private readonly st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sfView', { static: false }) sfView!: SFComponent; @ViewChild('stFloat') private readonly stFloat!: STComponent; @ViewChild('stFloatView') private readonly stFloatView!: STComponent; columns: STColumn[] = []; columnsFloat: STColumn[] = []; columnsFloatView: STColumn[] = []; - ViewCause: any; // 变更运费查看数据 + ViewCause: any; // 变更运费查看数据 resourceStatus: any; tabs = { totalCount: 0, @@ -52,8 +49,11 @@ export class OrderManagementComplianceAuditComponent implements OnInit { public service: OrderManagementService, private modal: NzModalService, public shipperservice: ShipperBaseService, - private router: Router - ) { } + private router: Router, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } /** * 查询参数 @@ -99,7 +99,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { unstayQuantity: 0 }; const params: any = Object.assign({}, this.reqParams || {}); - delete params.complianceStatus + delete params.complianceStatus; this.service.request(this.service.$api_get_getComplianceStatisticalStatus, params).subscribe(res => { if (res) { let totalCount = 0; @@ -142,8 +142,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { billCode: { type: 'string', title: '订单号', - ui: { - } + ui: {} }, resourceCode: { type: 'string', @@ -159,7 +158,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { searchLoadingText: '搜索中...', allowClear: true, 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 }) @@ -179,56 +178,28 @@ export class OrderManagementComplianceAuditComponent implements OnInit { title: '所属项目', ui: { widget: 'select', - placeholder: '请先选择货主', - visibleIf: { - _$expand: (value: boolean) => value - }, + placeholder: '请先选择货主' } as SFSelectWidgetSchema }, loadingPlace: { type: 'string', - title: '装货地', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } + title: '装货地' }, dischargePlace: { type: 'string', - title: '卸货地', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } + title: '卸货地' }, driverName: { title: '承运司机', - type: 'string', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } + type: 'string' }, carNo: { title: '车牌号', - type: 'string', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } + type: 'string' }, carCaptainName: { title: '车队长', - type: 'string', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } + type: 'string' }, paymentStatus: { title: '支付状态', @@ -236,10 +207,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'overall:payment:status' }, - containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } + containsAllLabel: true } as SFSelectWidgetSchema }, enterpriseInfoId: { @@ -249,9 +217,6 @@ export class OrderManagementComplianceAuditComponent implements OnInit { widget: 'select', placeholder: '请选择', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - }, asyncData: () => this.shipperservice.getNetworkFreightForwarder() } }, @@ -262,10 +227,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'service:type' }, - containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } + containsAllLabel: true } as SFSelectWidgetSchema }, createTime: { @@ -275,16 +237,12 @@ export class OrderManagementComplianceAuditComponent implements OnInit { widget: 'date', mode: 'range', format: 'yyyy-MM-dd', - allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - } + allowClear: true } as SFDateWidgetSchema - }, + } }, type: 'object' }; - this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; } // 获取城市列表 getRegionCode(regionCode: any) { @@ -397,21 +355,21 @@ export class OrderManagementComplianceAuditComponent implements OnInit { buttons: [ { text: '查看申诉记录', - click: _record => this.appeal(_record), + click: _record => this.appeal(_record) // iif: item => item.billStatus == '5' }, { text: '运费变更记录', click: _record => this.OpenPrice(_record), // iif: item => item.billStatus == '4', - acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] }, + acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] } }, { text: '合规抽查', click: _record => this.audit(_record), iif: item => item.complianceStatus == '0', - acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] }, - }, + acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] } + } ] } ]; @@ -441,15 +399,15 @@ export class OrderManagementComplianceAuditComponent implements OnInit { buttons: [ { text: '查看', - click: (_record) => this.FloatView(_record), + click: _record => this.FloatView(_record) }, { text: '撤销', - click: (_record) => this.revoke(_record), - iif: item => item.handleStatus === '1' || item.handleStatus === 1, - }, - ], - }, + click: _record => this.revoke(_record), + iif: item => item.handleStatus === '1' || item.handleStatus === 1 + } + ] + } ]; } initSTFloatView() { @@ -508,49 +466,38 @@ export class OrderManagementComplianceAuditComponent implements OnInit { this.router.navigate(['/order-management/risk-detail', item.id]); } /** -* 浮动费用查看 -*/ + * 浮动费用查看 + */ FloatView(item: any) { - console.log(item) + console.log(item); this.changeViewId = item.id; - this.service.request(this.service.$api_getChangeRecordWholeDetail, { id: this.changeViewId }).subscribe((res) => { + this.service.request(this.service.$api_getChangeRecordWholeDetail, { id: this.changeViewId }).subscribe(res => { this.ViewCause = res; - }) - this.isVisibleView = true + }); + this.isVisibleView = true; } revoke(item: any) { this.modal.confirm({ nzTitle: '是否确定立即撤销费用变更！', nzOnOk: () => - this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe((res) => { - console.log(res) + this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe(res => { + console.log(res); if (res) { - this.service.msgSrv.success('撤销成功！') - this.stFloat.reload() + this.service.msgSrv.success('撤销成功！'); + this.stFloat.reload(); } }) }); } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } - tabChange(item: any) { } + tabChange(item: any) {} /** * 重置表单 */ - resetSF(): void { - this.sf.reset(); - this._$expand = false; - } /** * 导入货源 */ - importGoodsSource() { } + importGoodsSource() {} OpenPrice(item: any) { this.changeId = item.id; this.isVisible = true; @@ -608,8 +555,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit { this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 24 } } }; } /* - * 审核关闭弹窗 - */ + * 审核关闭弹窗 + */ handleCancel(value?: string) { if (value === '0') { this.isVisible = false; @@ -620,8 +567,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit { } } /** -* 审核通过按钮 -*/ + * 审核通过按钮 + */ handleOK() { let idList: any[] = []; if (this.selectedRows.length > 0) { @@ -629,25 +576,25 @@ export class OrderManagementComplianceAuditComponent implements OnInit { idList.push(item.id); }); } else { - idList.push(this?.auditIdR) + idList.push(this?.auditIdR); } const parms = { ids: idList, complianceRemark: this.sfView.value.complianceRemark, - complianceStatus: 1, + complianceStatus: 1 }; this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => { if (res) { this.service.msgSrv.success('提交成功！'); this.isVisibleRE = false; this.st?.load(1); - this.getGoodsSourceStatistical() + this.getGoodsSourceStatistical(); } }); } /** - * 审核拒绝按钮 - */ + * 审核拒绝按钮 + */ reject() { if (!this.sfView.value.complianceRemark) { this.service.msgSrv.error('备注不能为空！'); @@ -659,25 +606,25 @@ export class OrderManagementComplianceAuditComponent implements OnInit { idList.push(item.id); }); } else { - idList.push(this.sfView.value.billCode) + idList.push(this.sfView.value.billCode); } const parms = { ids: idList, complianceRemark: this.sfView.value.complianceRemark, - complianceStatus: 2, + complianceStatus: 2 }; this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => { if (res) { this.service.msgSrv.success('提交成功！'); this.isVisibleRE = false; this.st?.load(1); - this.getGoodsSourceStatistical() + this.getGoodsSourceStatistical(); } }); } /** -*合规抽查 -*/ + *合规抽查 + */ audit(item?: any) { if (item) { this.isVisibleRE = true; @@ -686,7 +633,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { this.initSTAudit(1); } else { if (this.selectedRows.length <= 0) { - this.service.msgSrv.error('请选择订单！') + this.service.msgSrv.error('请选择订单！'); return; } else { this.isVisibleRE = true; @@ -694,8 +641,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit { } } } - // 导出 - exprot() { - this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportSpotCheckList); - } + // 导出 + exprot() { + this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportSpotCheckList); + } } diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html index cabacf83..d367d660 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html @@ -1,4 +1,4 @@ -billCode - + -
- +
+ +
+
+ + + +
- - - -
- -
-
- - - - -
-
- + --> - - - - - - -
- +
+ + + + + + +
+ +
+ + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"> {{ item.freightPrice | currency }} @@ -79,12 +58,13 @@ billCode - {{ item.billCode }} - {{ item.billCode }} - {{ item.billCode }} + {{ + item.billCode }} + {{ + item.billCode }} + {{ + item.billCode }}
{{item?.billStatusLabel}}
- {{item?.resourceTypeLabel}}{{item?.serviceTypeLabel === item?.resourceTypeLabel ? '':item?.serviceTypeLabel}} + {{item?.resourceTypeLabel}}{{item?.serviceTypeLabel === item?.resourceTypeLabel ? + '':item?.serviceTypeLabel}}
@@ -131,7 +116,20 @@ billCode - + -
- +
+ +
+
+ + + +
- - - -
- -
-
- - - - -
-
- + --> - - - - - - - - -
- +
+ + + + + + + + +
+ +
+ + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"> - {{ item.billCode }} - {{ item.billCode }} - {{ item.billCode }} + {{ + item.billCode }} + {{ item.billCode + }} + {{ + item.billCode }}
{{ item?.representationsStatusLabel }}
- {{item?.billTypeLabel}}{{item?.billTypeLabel === item?.serviceTypeLabel ? '' : item?.serviceTypeLabel}} + {{item?.billTypeLabel}}{{item?.billTypeLabel === item?.serviceTypeLabel ? '' : + item?.serviceTypeLabel}}
@@ -96,7 +81,8 @@
-
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : ''}}
+
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + + item?.carNo : ''}}
@@ -113,7 +99,7 @@

货物名称：{{ i?.goodsName }}

-

重量/体积：{{ i?.weight ? i?.weight + '吨' : '' }}{{ i?.volume ? "/" + i?.volume + '方' : ''}}

+

重量/体积：{{ i?.weight ? i?.weight + '吨' : '' }}{{ i?.volume ? "/" + i?.volume + '方' : ''}}

车型/车长：{{ i?.carModelLabel }} {{ i?.carLengthLabel ? "/" + i?.carLengthLabel : ''}}

 @@ -121,14 +107,8 @@
- + @@ -139,7 +119,10 @@ -
- +
+ + +
- + \ No newline at end of file diff --git a/src/app/routes/order-management/components/risk/risk.component.less b/src/app/routes/order-management/components/risk/risk.component.less index 987664d0..e69de29b 100644 --- a/src/app/routes/order-management/components/risk/risk.component.less +++ b/src/app/routes/order-management/components/risk/risk.component.less @@ -1,13 +0,0 @@ - - :host { - p{ - margin-bottom: 0 - } - .left_btn { - width: 50px; - height: 32px; - padding-left: 8px; - line-height:32px; - background-color: #d7d7d7; - } - } \ No newline at end of file diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 400d1fb0..118f1e60 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -4,21 +4,20 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; -import { ShipperBaseService } from '@shared'; +import { SearchDrawerService, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; import { map } from 'rxjs/operators'; import { OrderManagementService } from '../../services/order-management.service'; +import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component'; @Component({ selector: 'app-supply-management-risk', templateUrl: './risk.component.html', - styleUrls: ['./risk.component.less'] + styleUrls: ['../../../commom/less/commom-table.less', './risk.component.less'] }) -export class OrderManagementRiskComponent implements OnInit { - ui: SFUISchema = {}; +export class OrderManagementRiskComponent extends BasicTableComponent implements OnInit { uiView: SFUISchema = {}; - schema: SFSchema = {}; schemaView: SFSchema = {}; auditMany = false; loading: boolean = true; @@ -26,9 +25,7 @@ export class OrderManagementRiskComponent implements OnInit { auditIdR: any; isVisibleRE = false; resourceStatus: any; - _$expand = false; @ViewChild('st') private readonly st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sfView', { static: false }) sfView!: SFComponent; columns: STColumn[] = []; tabs = { @@ -40,9 +37,11 @@ export class OrderManagementRiskComponent implements OnInit { constructor( public service: OrderManagementService, public shipperservice: ShipperBaseService, - private modal: NzModalService, - public router: Router - ) { } + public router: Router, + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); + } /** * 查询参数 @@ -50,7 +49,7 @@ export class OrderManagementRiskComponent implements OnInit { get reqParams() { const a: any = {}; if (this.resourceStatus) { - a.representationsStatus = this.resourceStatus + a.representationsStatus = this.resourceStatus; } const params: any = Object.assign({}, this.sf?.value || {}); delete params._$expand; @@ -59,14 +58,14 @@ export class OrderManagementRiskComponent implements OnInit { ...params, createTime: { start: this.sf?.value?.createTime?.[0] || '', - end: this.sf?.value?.createTime?.[1] || '', - }, + end: this.sf?.value?.createTime?.[1] || '' + } }; } beforeReq = (requestOptions: STRequestOptions) => { const a: any = {}; if (this.resourceStatus) { - a.representationsStatus = this.resourceStatus + a.representationsStatus = this.resourceStatus; } const params: any = Object.assign({}, this.sf?.value || {}); delete params._$expand; @@ -76,51 +75,51 @@ export class OrderManagementRiskComponent implements OnInit { ...params, createTime: { start: this.sf?.value?.createTime?.[0] || '', - end: this.sf?.value?.createTime?.[1] || '', - }, + end: this.sf?.value?.createTime?.[1] || '' + } }); } this.loading = true; return requestOptions; }; afterRes = (data: any[], rawData?: any) => { - console.log(data) - this.loading = false + console.log(data); + this.loading = false; return data.map(item => ({ ...item, - disabled: item.representationsStatus !== '2' + disabled: item.representationsStatus !== '2' })); }; search() { this.st?.load(1); - this.getGoodsSourceStatistical() + this.getGoodsSourceStatistical(); } get selectedRows() { return this.st?.list.filter(item => item.checked) || []; } ngOnInit(): void { - this.getGoodsSourceStatistical() + this.getGoodsSourceStatistical(); this.initSF(); this.initST(); } getGoodsSourceStatistical() { this.service.request(this.service.$api_get_listStatisticalStatus, this.reqParams).subscribe(res => { if (res) { - res.forEach((element: any) => { - console.log(element.representationsStatus); - if(element.representationsStatus === '1') { - this.tabs.stayQuantity = element.quantity - } else if (element.representationsStatus == '4') { - this.tabs.cancelQuantity = element.quantity - } else if (element.representationsStatus == '3') { - this.tabs.receivedQuantity = element.quantity - }else if (element.representationsStatus == '2') { - this.tabs.underwayQuantity = element.quantity - } - }); - console.log(this.tabs) + res.forEach((element: any) => { + console.log(element.representationsStatus); + if (element.representationsStatus === '1') { + this.tabs.stayQuantity = element.quantity; + } else if (element.representationsStatus == '4') { + this.tabs.cancelQuantity = element.quantity; + } else if (element.representationsStatus == '3') { + this.tabs.receivedQuantity = element.quantity; + } else if (element.representationsStatus == '2') { + this.tabs.underwayQuantity = element.quantity; + } + }); + console.log(this.tabs); } - }) + }); } /** * 初始化查询表单 @@ -146,48 +145,23 @@ export class OrderManagementRiskComponent implements OnInit { }, loadingPlace: { type: 'string', - title: '装货地', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } + title: '装货地' }, dischargePlace: { type: 'string', - title: '卸货地', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } + title: '卸货地' }, driverName: { title: '承运司机', - type: 'string', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } + type: 'string' }, carNo: { title: '车牌号', - type: 'string', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } + type: 'string' }, payeeName: { type: 'string', - title: '车队长', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } + title: '车队长' }, wayBillType: { title: '运单类型', @@ -195,10 +169,7 @@ export class OrderManagementRiskComponent implements OnInit { ui: { widget: 'dict-select', params: { dictKey: 'bill:type' }, - containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } + containsAllLabel: true } as SFSelectWidgetSchema }, shipperAppUserName: { @@ -210,11 +181,8 @@ export class OrderManagementRiskComponent implements OnInit { searchDebounceTime: 300, searchLoadingText: '搜索中...', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - }, 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 }) @@ -223,7 +191,7 @@ export class OrderManagementRiskComponent implements OnInit { } else { return of([]); } - }, + } } as SFSelectWidgetSchema }, enterpriseInfoId: { @@ -233,11 +201,8 @@ export class OrderManagementRiskComponent implements OnInit { widget: 'select', placeholder: '请选择', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value, - }, - asyncData: () => this.shipperservice.getNetworkFreightForwarder(), - }, + asyncData: () => this.shipperservice.getNetworkFreightForwarder() + } }, createTime: { title: '创建时间', @@ -246,16 +211,12 @@ export class OrderManagementRiskComponent implements OnInit { widget: 'date', mode: 'range', format: 'yyyy-MM-dd', - allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - } + allowClear: true } as SFDateWidgetSchema } }, type: 'object' }; - this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; } /** @@ -347,14 +308,14 @@ export class OrderManagementRiskComponent implements OnInit { { text: '审核', click: _record => this.audit(_record), - iif: item => item.representationsStatus == '2' , - acl: { ability: ['ORDER-RISK-audit'] }, + iif: item => item.representationsStatus == '2', + acl: { ability: ['ORDER-RISK-audit'] } }, { text: '详情', click: _record => this.viewEvaluate(_record), - iif: item => item.representationsStatus !== '1' , - acl: { ability: ['ORDER-RISK-riskDetail'] }, + iif: item => item.representationsStatus !== '1', + acl: { ability: ['ORDER-RISK-riskDetail'] } } ] } @@ -419,30 +380,10 @@ export class OrderManagementRiskComponent implements OnInit { this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 24 } } }; } - /** - * 查询字段个数 - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } + tabChange(item: any) { console.log(item); } - /** - * 重置表单 - */ - resetSF(): void { - this.sf.reset(); - this._$expand = false; - } - selectChange(e: number) { this.resourceStatus = e; @@ -454,7 +395,7 @@ export class OrderManagementRiskComponent implements OnInit { /** * 导入货源 */ - importGoodsSource() { } + importGoodsSource() {} /* * 审核关闭弹窗 @@ -472,20 +413,20 @@ export class OrderManagementRiskComponent implements OnInit { idList.push(item.id); }); } else { - idList.push(this.sfView.value.id) + idList.push(this.sfView.value.id); } const parms = { ids: idList, auditRemark: this.sfView.value.representationsCause, representationsStatus: 3, - auditStatus: 2, + auditStatus: 2 }; this.service.request(this.service.$api_get_listRisk_audit, parms).subscribe(res => { if (res) { this.service.msgSrv.success('审核通过成功！'); this.isVisibleRE = false; this.st?.load(1); - this.getGoodsSourceStatistical() + this.getGoodsSourceStatistical(); } }); } @@ -499,7 +440,7 @@ export class OrderManagementRiskComponent implements OnInit { idList.push(item.id); }); } else { - idList.push(this.sfView.value.id) + idList.push(this.sfView.value.id); } if (!this.sfView.value.representationsCause) { this.service.msgSrv.error('拒绝原因为空！'); @@ -509,14 +450,14 @@ export class OrderManagementRiskComponent implements OnInit { ids: idList, auditRemark: this.sfView.value.representationsCause, representationsStatus: 4, - auditStatus: 3, + auditStatus: 3 }; this.service.request(this.service.$api_get_listRisk_audit, parms).subscribe(res => { if (res) { this.service.msgSrv.success('审核拒绝成功！'); this.isVisibleRE = false; this.st?.load(1); - this.getGoodsSourceStatistical() + this.getGoodsSourceStatistical(); } }); } @@ -531,7 +472,7 @@ export class OrderManagementRiskComponent implements OnInit { this.isVisibleRE = true; } else { if (this.selectedRows.length <= 0) { - this.service.msgSrv.error('请选择订单！') + this.service.msgSrv.error('请选择订单！'); return; } else { this.initSTAudit(2); @@ -545,8 +486,8 @@ export class OrderManagementRiskComponent implements OnInit { viewEvaluate(item: any) { this.router.navigate(['/order-management/risk-detail', item.id]); } - // 导出 - exprot() { - this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportRiskBillList); - } + // 导出 + exprot() { + this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportRiskBillList); + } } diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 77591f60..1da90e5c 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-21 17:03:50 + * @LastEditTime : 2022-04-22 16:27:43 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html index 35c07449..542019b6 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-08 11:32:46 + * @LastEditTime : 2022-04-22 16:53:07 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -31,11 +31,11 @@ --> -
-