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

src/app/routes/tax-management/components/individual-income/individual-income.component.html

@@ -14,12 +14,12 @@
   <!-- 搜索表单 -->
   <div nz-row nzGutter="8">
     <div nz-col [nzSpan]="_$expand ? 24 : 18">
-      <sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
-        [button]="'none'"></sf>
+      <sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}"
+        [compact]="true" [button]="'none'"></sf>
     </div>
     <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
-      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
-        acl [acl-ability]="['RiskOrder-Search']">查询</button>
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
+        (click)="search()">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button (click)="resetSF()">导出</button>
       <button nz-button nzType="link" (click)="expandToggle()">

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

@@ -246,7 +246,14 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
         width: '250px',
         format: item => `${item.yssdl ? ((item.yssdl as number) * 100).toFixed(2) : 0}%`
       },
-      { title: '计税依据', index: 'jsyj', className: 'text-right', width: '150px' },
+      {
+        title: '计税依据',
+        index: 'jsyj',
+        width: '150px',
+        type: 'widget',
+        className: 'text-right',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.jsyj }) }
+      },
       {
         title: '税率',
         index: 'sl',