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

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

Browse Source
This commit is contained in:
wangshiming
2022-04-09 15:32:41 +08:00
parent 5cafadb8e2 9d207f98cf
commit 8e9b5f6832
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
View File

@ -10,7 +10,7 @@
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
acl [acl-ability]="['RiskOrder-Search']">查询</button> acl [acl-ability]="['RiskOrder-Search']">查询</button>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="resetSF()">导出</button> <button nz-button (click)="export()">导出</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i> <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

2
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
View File

@ -427,7 +427,7 @@ export class DatatableFundReportingComponent implements OnInit {
* 异步导出 * 异步导出
*/ */
export() { export() {
this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list); this.service.exportStart(this.sf?.value, this.service.$api_export_fund_reporting);
} }
openWainingModal(content: string, title = '提示') { openWainingModal(content: string, title = '提示') {

1
src/app/routes/datatable/reporting/services/reporting.service.ts
View File

@ -21,6 +21,7 @@ export class ReportingService extends BaseService {
$api_fund_reporting_recall = `/api/fcc/fundUploadHead/recallUploadFundNumber`; //资金批量撤回 $api_fund_reporting_recall = `/api/fcc/fundUploadHead/recallUploadFundNumber`; //资金批量撤回
$api_get_fund_valid_result = `/api/fcc/capitalFieldCheck/getCapitalFieldCheckList`; // 查询资金校验表 $api_get_fund_valid_result = `/api/fcc/capitalFieldCheck/getCapitalFieldCheckList`; // 查询资金校验表
$api_update_fund_data = `/api/fcc/fundUploadHead/updateUploadFundNumber`;//资金批量更新数据 $api_update_fund_data = `/api/fcc/fundUploadHead/updateUploadFundNumber`;//资金批量更新数据
$api_export_fund_reporting = `/api/fcc/fundUploadHead/exportFundUpload`; // 导出资金上传
constructor(public injector: Injector) { constructor(public injector: Injector) {