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

Merge branch 'develop'

Browse Source
This commit is contained in:
Taric Xin
2022-04-21 13:48:08 +08:00
parent 06ccfaf642 528a1ae90b
commit ad115d20dc
20 changed files with 153 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,23 +77,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
declareStatus: {
title: '申报状态',
type: 'string',
enum: [
{ value: '', label: '全部' },
{ value: '0', label: '待申报' },
{ value: '1', label: '待审核' },
{ value: '2', label: '已通过' },
{ value: '3', label: '不通过' }
],
ui: {
placeholder: '请选择',
widget: 'select',
containsAllLabel: true
},
default: ''
},
overdueStatus: {
title: '是否逾期',
type: 'string',

40
src/app/routes/tax-management/components/individual-income/individual-income.component.ts
View File

@ -96,26 +96,26 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
placeholder: '请输入证件号码'
}
},
declareStatus: {
title: '申报状态',
type: 'string',
enum: [
{ value: '', label: '全部' },
{ value: '0', label: '待申报' },
{ value: '1', label: '待审核' },
{ value: '2', label: '已通过' },
{ value: '3', label: '不通过' }
],
ui: {
placeholder: '请选择',
widget: 'select',
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
},
default: ''
},
// declareStatus: {
// title: '申报状态',
// type: 'string',
// enum: [
// { value: '', label: '全部' },
// { value: '0', label: '待申报' },
// { value: '1', label: '待审核' },
// { value: '2', label: '已通过' },
// { value: '3', label: '不通过' }
// ],
// ui: {
// placeholder: '请选择',
// widget: 'select',
// containsAllLabel: true,
// visibleIf: {
// _$expand: (value: boolean) => value
// }
// },
// default: ''
// },
// declareStatu1s: {
// title: '申报结果',
// type: 'string',