Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-04-18 19:19:48 +08:00
parent 364c5f8391
commit c49c3916be
3 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts
View File

@ -88,8 +88,8 @@ export class DatatableBusiindexComponent implements OnInit {
if (res) { if (res) {
this.chartData = res this.chartData = res
if(flag) { if(flag) {
// this.pillar.reRender() this.pillar.reRender()
// this.curve.reRender() this.curve.reRender()
} }
} }
}) })

39
src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts
View File

@ -20,6 +20,7 @@ export class DatatableMancustomtableComponent implements OnInit {
mode = 'year'; mode = 'year';
date: any = null; date: any = null;
defineDate = []; defineDate = [];
resourceStatus: number = 0;
time: any = ['2022-01-01 00:00:00']; time: any = ['2022-01-01 00:00:00'];
dateFormat = 'yyyy'; dateFormat = 'yyyy';
today = new Date(); today = new Date();
@ -61,31 +62,33 @@ export class DatatableMancustomtableComponent implements OnInit {
} }
}; };
columns: STColumn[] = [ columns: STColumn[] = [
{ title: '部门', index: 'enterpriseName', className: 'text-center', width: '200px' }, { title: '部门', index: 'department', className: 'text-center', width: '200px' },
{ title: '业务员', index: 'registerTime', className: 'text-center', width: '200px' }, { title: '业务员', index: 'salesmen', className: 'text-center', width: '200px' },
{ title: '已认证货主数', index: 'customerType', className: 'text-center', width: '100px' }, { title: '已认证货主数', index: 'certifiedCount', className: 'text-center', width: '100px' },
{ title: '新增合伙人', index: 'customerType', className: 'text-center', width: '100px' }, { title: '已认证合伙人', index: 'certifiedCount', className: 'text-center', width: '100px' },
{ title: '合伙人活跃率', index: 'customerType', className: 'text-center', width: '100px' }, { title: '新增合伙人数', index: 'addCount', className: 'text-center', width: '100px' },
{ title: '主动合伙人', index: 'customerType', className: 'text-center', width: '100px' }, { title: '合伙人活跃率', index: 'alivePer', className: 'text-center', width: '100px' },
{ title: '纪念合伙人', index: 'customerType', className: 'text-center', width: '100px' }, { title: '活跃合伙人数', index: 'aliveCount', className: 'text-center', width: '100px' },
{ title: '流失合伙人', index: 'customerType', className: 'text-center', width: '100px' }, { title: '沉默合伙人数', index: 'silentCount', className: 'text-center', width: '100px' },
{ title: '未搭档合伙人', index: 'customerType', className: 'text-center', width: '100px' }, { title: '流失合伙人数', index: 'drainCount', className: 'text-center', width: '100px' },
{ title: '新增货主数', index: 'salesmanName', className: 'text-center', width: '100px' }, { title: '未激活合伙人数', index: 'notActiveCount', className: 'text-center', width: '100px' },
{ title: '货主活跃率', index: 'partnerName', className: 'text-center', width: '100px' },
{ title: '新增货主数', index: 'addCount', className: 'text-center', width: '100px' },
{ title: '货主活跃率', index: 'alivePer', className: 'text-center', width: '100px' },
{ {
title: '活跃货主数', title: '活跃货主数',
index: 'customerStatus', index: 'aliveCount',
className: 'text-center', className: 'text-center',
width: '100px' width: '100px'
}, },
{ title: '纪念货主数', index: 'zsl', className: 'text-center', width: '100px' }, { title: '沉默货主数', index: 'silentCount', className: 'text-center', width: '100px' },
{ {
title: '货货主数', title: '流失货主数',
index: 'ddje', index: 'drainCount',
className: 'text-right', className: 'text-right',
width: '100px', 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; this.isLoading = true;
} }
selectChange(e: number) { selectChange(e: number) {
// this.resourceStatus = e; console.log(e);
this.resourceStatus = e;
// this.initST(); // this.initST();
setTimeout(() => { setTimeout(() => {
this.st.load(); this.st.load();

13
src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
View File

@ -94,19 +94,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
}, },
default: '' default: ''
}, },
declareResult: {
title: '申报结果',
type: 'string',
ui: {
placeholder: '请选择',
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
}
},
overdueStatus: { overdueStatus: {
title: '是否逾期', title: '是否逾期',
type: 'string', type: 'string',