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 30878968..2696463d 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 @@ -91,9 +91,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit { placeholder: '请选择', widget: 'select', containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } }, default: '' }, @@ -109,20 +106,17 @@ export class TaxManagementIndividualCollectComponent implements OnInit { type: 'string', enum: [ { value: '', label: '全部' }, - { value: '0', label: '否' }, - { value: '1', label: '是' } + { value: false, label: '否' }, + { value: true, label: '是' } ], ui: { placeholder: '请选择', widget: 'select', containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } }, default: '' }, - createTime: { + skss: { title: '税款所属期', type: 'string', ui: { @@ -134,7 +128,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit { } } as SFDateWidgetSchema }, - createTime3: { + sbrq: { title: '申报日期', type: 'string', ui: { @@ -182,7 +176,14 @@ export class TaxManagementIndividualCollectComponent implements OnInit { '3': { text: '不通过', color: 'error' } } }, - { title: '是否逾期', index: 'overdueStatus', className: 'text-center', width: '120px', type: 'enum', enum: { '0': '否', '1': '是' } }, + { + title: '是否逾期', + index: 'overdueStatus', + className: 'text-center', + width: '120px', + type: 'enum', + enum: { false: '否', true: '是' } + }, { title: '税款所属期起', index: 'skssqq', @@ -197,12 +198,46 @@ export class TaxManagementIndividualCollectComponent implements OnInit { width: '180px' }, { title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' }, - { title: '税率', index: 'sl', className: 'text-center', width: '150px' }, - { title: '申报人数', index: 'sbrs', className: 'text-center', width: '150px' }, - { title: '应税收入', index: 'yssr', className: 'text-center', width: '150px' }, - { title: '应纳税额', index: 'ynse', className: 'text-center', width: '180px' }, - { title: '累计已缴纳税额', index: 'ljyjnse', className: 'text-center', width: '150px' }, - { title: '本期应补退税额', index: 'bqybtse', className: 'text-center', width: '150px' }, + { + title: '税率', + index: 'sl', + className: 'text-right', + width: '150px', + format: item => `${item.sl ? ((item.sl as number) * 100).toFixed(2) : 0}%` + }, + { title: '申报人数', index: 'sbrs', className: 'text-right', width: '150px' }, + { + title: '应税收入', + index: 'yssr', + className: 'text-right', + width: '150px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yssr }) } + }, + { + title: '应纳税额', + index: 'ynse', + className: 'text-right', + width: '180px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) } + }, + { + title: '累计已缴纳税额', + index: 'ljyjnse', + className: 'text-center', + width: '150px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ljyjnse }) } + }, + { + title: '本期应补退税额', + index: 'bqybtse', + className: 'text-center', + width: '150px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.bqybtse }) } + }, { title: '申报日期', index: 'sbrq', className: 'text-center', width: '150px' } ]; } @@ -233,7 +268,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit { } selectChange(item: any) { - this.selectedIndex = item?.name || ''; + this.selectedIndex = item?.value || ''; setTimeout(() => { this.st.load(1); });