diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html index 0c1d57e9..5f5f53c7 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html @@ -22,8 +22,8 @@ [class.expend-options]="_$expand"> - + + - + \ No newline at end of file diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts index 4dd8bb7d..65af6ff6 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts @@ -161,7 +161,10 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', - containsAllLabel: true + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value + } }, default: '' }, @@ -271,39 +274,39 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { } /** - *撤销 + *更正 * @param record 记录实例 */ recall() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要撤回的数据'); + this.openWainingModal('请选择需要更正的数据'); return; } - this.modal.confirm({ - nzTitle: '撤回提示', - nzContent: ' 撤回后可以重新上传,重新上传会覆盖已上传数据,确定要撤回?', - nzOkText: '确定', - nzCancelText: '取消', - nzOnOk: () => { - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('撤销成功'); - this.search(); - } - }); - } - }); + // this.modal.confirm({ + // nzTitle: '撤回提示', + // nzContent: ' 撤回后可以重新上传,重新上传会覆盖已上传数据,确定要撤回?', + // nzOkText: '确定', + // nzCancelText: '取消', + // nzOnOk: () => { + // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + // if (res) { + // this.service.msgSrv.success('撤销成功'); + // this.search(); + // } + // }); + // } + // }); } /** - *撤销 + *修改 * @param record 记录实例 */ uploadSetting() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要更新的数据!'); + this.openWainingModal('请选择需要修改的数据!'); return; } - this.isVisible = true + // this.isVisible = true } /** @@ -370,7 +373,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { */ upload() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要上传的数据'); + this.openWainingModal('请选择需要申报的数据'); return; } // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html index c2ed91f8..c577b27c 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html @@ -17,8 +17,7 @@
- +