diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts index f4db64b7..33d0efd4 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -12,7 +12,6 @@ import { DataService } from '../../../services/data.service'; providers: [DatePipe] }) export class DatatableMancustomtableComponent implements OnInit { - url = `/user`; @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; _$expand = false; @@ -20,6 +19,7 @@ export class DatatableMancustomtableComponent implements OnInit { mode = 'year'; date: any = null; defineDate = []; + columns: STColumn[] =[]; resourceStatus: number = 1; time: any = ['2022-01-01 00:00:00']; dateFormat = 'yyyy'; @@ -61,7 +61,8 @@ export class DatatableMancustomtableComponent implements OnInit { } } }; - columns: STColumn[] = [ + initST() { + this.columns =[ { title: '部门', index: 'department', className: 'text-center', width: '200px' }, { title: '业务员', index: 'salesmen', className: 'text-center', width: '200px' }, { title: '已认证货主数', index: 'certifiedCount', className: 'text-center', width: '100px', iif: ()=> { @@ -94,6 +95,7 @@ export class DatatableMancustomtableComponent implements OnInit { }, { title: '未激活货主数', index: 'notActiveCount', className: 'text-center', width: '120px' } ]; + } /** * 查询参数 */ @@ -121,6 +123,7 @@ export class DatatableMancustomtableComponent implements OnInit { constructor(public service: DataService, private datePipe: DatePipe) {} ngOnInit(): void { this.initSF(); + this.initST(); } /** * 初始化查询表单 @@ -239,7 +242,8 @@ export class DatatableMancustomtableComponent implements OnInit { this.resourceStatus = e + 1; // this.initST(); setTimeout(() => { - this.st.load(); + this.initST(); + // this.st.load(1); }, 500); } } diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index 59dd9601..2ae3d17a 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -130,7 +130,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit { } } as SFDateWidgetSchema }, - enterpriseInfoId: { + nsrmc: { type: 'string', title: '网络货运人', ui: {