Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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

@@ -90,15 +90,16 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
           ui: {
             placeholder: '请选择',
             widget: 'select',
-            containsAllLabel: true,
+            containsAllLabel: true
           },
           default: ''
         },
-        resourceCode: {
+        declareResult: {
           type: 'string',
           title: '申报结果',
           ui: {
-            placeholder: '请输入'
+            placeholder: '请选择',
+            widget: 'select',
           }
         },
         overdueStatus: {
@@ -112,11 +113,11 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
           ui: {
             placeholder: '请选择',
             widget: 'select',
-            containsAllLabel: true,
+            containsAllLabel: true
           },
           default: ''
         },
-        skss: {
+        taxMonth: {
           title: '税款所属期',
           type: 'string',
           ui: {