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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-04-14 16:25:58 +08:00
parent 503f68fec8
commit cca5e02384
2 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts
View File

@ -161,7 +161,10 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
ui: { ui: {
placeholder: '请选择', placeholder: '请选择',
widget: 'select', widget: 'select',
containsAllLabel: true containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
}, },
default: '' default: ''
}, },
@ -271,39 +274,39 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
} }
/** /**
*撤销 *更正
* @param record 记录实例 * @param record 记录实例
*/ */
recall() { recall() {
if (this.selectedRows.length === 0) { if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要撤回的数据'); this.openWainingModal('请选择需要更正的数据');
return; return;
} }
this.modal.confirm({ // this.modal.confirm({
nzTitle: '撤回提示', // nzTitle: '撤回提示',
nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', // nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？',
nzOkText: '确定', // nzOkText: '确定',
nzCancelText: '取消', // nzCancelText: '取消',
nzOnOk: () => { // nzOnOk: () => {
this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
if (res) { // if (res) {
this.service.msgSrv.success('撤销成功'); // this.service.msgSrv.success('撤销成功');
this.search(); // this.search();
} // }
}); // });
} // }
}); // });
} }
/** /**
*撤销 *修改
* @param record 记录实例 * @param record 记录实例
*/ */
uploadSetting() { uploadSetting() {
if (this.selectedRows.length === 0) { if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要更新的数据！'); this.openWainingModal('请选择需要修改的数据！');
return; return;
} }
this.isVisible = true // this.isVisible = true
} }
/** /**
@ -370,7 +373,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit {
*/ */
upload() { upload() {
if (this.selectedRows.length === 0) { if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要上传的数据'); this.openWainingModal('请选择需要申报的数据');
return; return;
} }
// this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {

10
src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
View File

@ -39,17 +39,23 @@ export class CancellationInvoiceComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => { beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) { if (this.sf) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
...this.sf.value, ...this.sf.value
});
if (this.sf.value.createTime) {
Object.assign(requestOptions.body, {
createTime: { createTime: {
start: this.sf.value.createTime?.[0] || '', start: this.sf.value.createTime?.[0] || '',
end: this.sf.value.createTime?.[1] || '' end: this.sf.value.createTime?.[1] || ''
} }
}); });
} }
}
if (this.resourceStatus) { if (this.resourceStatus) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
sts: this.resourceStatus sts: this.resourceStatus
}); });
} else {
delete requestOptions.body.sts;
} }
return requestOptions; return requestOptions;
}; };
@ -401,7 +407,7 @@ export class CancellationInvoiceComponent implements OnInit {
text: '手工开票<br>', text: '手工开票<br>',
iif: item => item.sts != '3', iif: item => item.sts != '3',
click: item => this.requestedAction(item) click: item => this.requestedAction(item)
}, }
// { // {
// text: '推送开票<br>', // text: '推送开票<br>',
// iif: item => item.sts === '1', // iif: item => item.sts === '1',