diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts index a5cc2092..4501e8fd 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts @@ -88,8 +88,8 @@ export class DatatableBusiindexComponent implements OnInit { if (res) { this.chartData = res if(flag) { - // this.pillar.reRender() - // this.curve.reRender() + this.pillar.reRender() + this.curve.reRender() } } }) 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 e81c0f4b..efbfe907 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -20,6 +20,7 @@ export class DatatableMancustomtableComponent implements OnInit { mode = 'year'; date: any = null; defineDate = []; + resourceStatus: number = 0; time: any = ['2022-01-01 00:00:00']; dateFormat = 'yyyy'; today = new Date(); @@ -61,31 +62,33 @@ export class DatatableMancustomtableComponent implements OnInit { } }; columns: STColumn[] = [ - { title: '部门', index: 'enterpriseName', className: 'text-center', width: '200px' }, - { title: '业务员', index: 'registerTime', className: 'text-center', width: '200px' }, - { title: '已认证货主数', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '新增合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '合伙人活跃率', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '主动合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '纪念合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '流失合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '未搭档合伙人', index: 'customerType', className: 'text-center', width: '100px' }, - { title: '新增货主数', index: 'salesmanName', className: 'text-center', width: '100px' }, - { title: '货主活跃率', index: 'partnerName', className: 'text-center', width: '100px' }, + { title: '部门', index: 'department', className: 'text-center', width: '200px' }, + { title: '业务员', index: 'salesmen', className: 'text-center', width: '200px' }, + { title: '已认证货主数', index: 'certifiedCount', className: 'text-center', width: '100px' }, + { title: '已认证合伙人', index: 'certifiedCount', className: 'text-center', width: '100px' }, + { title: '新增合伙人数', index: 'addCount', className: 'text-center', width: '100px' }, + { title: '合伙人活跃率', index: 'alivePer', className: 'text-center', width: '100px' }, + { title: '活跃合伙人数', index: 'aliveCount', className: 'text-center', width: '100px' }, + { title: '沉默合伙人数', index: 'silentCount', className: 'text-center', width: '100px' }, + { title: '流失合伙人数', index: 'drainCount', className: 'text-center', width: '100px' }, + { title: '未激活合伙人数', index: 'notActiveCount', className: 'text-center', width: '100px' }, + + { title: '新增货主数', index: 'addCount', className: 'text-center', width: '100px' }, + { title: '货主活跃率', index: 'alivePer', className: 'text-center', width: '100px' }, { title: '活跃货主数', - index: 'customerStatus', + index: 'aliveCount', className: 'text-center', width: '100px' }, - { title: '纪念货主数', index: 'zsl', className: 'text-center', width: '100px' }, + { title: '沉默货主数', index: 'silentCount', className: 'text-center', width: '100px' }, { - title: '货货主数', - index: 'ddje', + title: '流失货主数', + index: 'drainCount', className: 'text-right', width: '100px', }, - { title: '未激活货主数', index: 'ysdds', className: 'text-center', width: '120px' } + { title: '未激活货主数', index: 'notActiveCount', className: 'text-center', width: '120px' } ]; /** * 查询参数 @@ -225,7 +228,9 @@ export class DatatableMancustomtableComponent implements OnInit { this.isLoading = true; } selectChange(e: number) { - // this.resourceStatus = e; + console.log(e); + + this.resourceStatus = e; // this.initST(); setTimeout(() => { this.st.load(); 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 a22ef126..59dd9601 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 @@ -94,19 +94,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit { }, default: '' }, - declareResult: { - title: '申报结果', - type: 'string', - ui: { - placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } - } - }, overdueStatus: { title: '是否逾期', type: 'string',