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/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index 39e8bd93..a9d95464 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -39,17 +39,23 @@ export class CancellationInvoiceComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value, - createTime: { - start: this.sf.value.createTime?.[0] || '', - end: this.sf.value.createTime?.[1] || '' - } + ...this.sf.value }); + if (this.sf.value.createTime) { + Object.assign(requestOptions.body, { + createTime: { + start: this.sf.value.createTime?.[0] || '', + end: this.sf.value.createTime?.[1] || '' + } + }); + } } if (this.resourceStatus) { Object.assign(requestOptions.body, { sts: this.resourceStatus }); + } else { + delete requestOptions.body.sts; } return requestOptions; }; @@ -339,7 +345,7 @@ export class CancellationInvoiceComponent implements OnInit { click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.vatappHId]) }, { title: '申请时间', index: 'createTime', type: 'date', width: 150 }, - { title: '发票类型', index: 'vatapptypeLabel', width: 150 }, + { title: '发票类型', index: 'vatapptypeLabel', width: 150 }, { title: '网络货运人', index: 'ltdName', width: 220 }, { title: '购买人', index: 'artoname', width: 220 }, { title: '订单数', index: 'ordlines', width: 90, className: 'text-right' }, @@ -401,7 +407,7 @@ export class CancellationInvoiceComponent implements OnInit { text: '手工开票
', iif: item => item.sts != '3', click: item => this.requestedAction(item) - }, + } // { // text: '推送开票
', // iif: item => item.sts === '1',