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"> 查询 重置 - {{ !_$expand ? '展开' : '收起' }} diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts index ddb69827..ca64fd91 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts @@ -88,6 +88,10 @@ export class VoucherSummaryComponent implements OnInit { this.sf?.setValue('/expand', this._$expand); } + exportList() { + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_fico_vch_page); + } + private initSF(): SFSchema { return { properties: { @@ -286,7 +290,7 @@ export class VoucherSummaryComponent implements OnInit { private initST(): STColumn[] { return [ { title: '', index: 'key', type: 'checkbox', width: 60, className: 'text-center', fixed: 'left' }, - { title: '汇总凭证号', index: 'vc2code', type: 'link', width: 180 }, + { title: '汇总凭证号', index: 'vc2code', type: 'link', width: 200 }, { title: '帐套', index: 'vcltdcode', width: 180 }, { title: '凭证时间', index: 'createTime', type: 'date', width: 150 }, { @@ -302,7 +306,7 @@ export class VoucherSummaryComponent implements OnInit { }, { title: '凭证类型', index: 'vctype', width: 120 }, { title: '序号', index: 'invmoney', width: 100, format: _ => '1' }, - { title: '摘要', index: 'remarks', width: 120 }, + { title: '摘要', index: 'remarks', width: 220 }, { title: '币种', index: 'currency', width: 100 }, { title: '借方金额', @@ -320,7 +324,7 @@ export class VoucherSummaryComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.crmoney }) } }, - { title: 'NC凭证', index: 'importncnotes', width: 120 }, + { title: 'NC凭证', index: 'importncnotes', width: 180 }, { title: '凭证状态', index: 'stsLabel', width: 120 }, { title: '创建时间', index: 'createTime', width: 180 }, { title: '创建人', index: 'createUserName', width: 120 }, diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index a58055d5..21879053 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -102,6 +102,8 @@ export class FreightAccountService extends ShipperBaseService { // 查询总账凭证表 $api_get_fico_vch_page = '/api/fcc/ficoVcH/list/page'; + // 导出总账凭证表 + $api_export_fico_vch_page = '/api/fcc/ficoVcH/reportVchListPage'; // 获取总账凭证表详情信息 $api_get_fico_vch__detail = '/api/fcc/ficoVcH/getDetail'; diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html index 17ea49f8..139be577 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html @@ -18,8 +18,8 @@ [compact]="true" [button]="'none'"> - 查询 + 查询 重置 导出 diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html index e6ef4aa8..5226090f 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html @@ -17,16 +17,8 @@ - 查询 + 查询 重置 导出 @@ -41,16 +33,10 @@ - + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }" [loading]="false"> {{ item?.billStatusLabel }} {{ item?.billStatusLabel }} @@ -79,7 +65,8 @@ - + 司机姓名:张三/13812345678 是否确认要将该司机的起征点同步调整为超过15万? @@ -88,4 +75,4 @@ 取消 确定 - + \ 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 @@ - 查询 + 查询 重置 导出 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', diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts index cd9b1335..c87eb6e7 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts @@ -33,6 +33,7 @@ export class ETCInvoicedRequestedComponent implements OnInit { ...this.sf.value }); } + this.selectedRows = []; return requestOptions; }; @@ -192,7 +193,7 @@ export class ETCInvoicedRequestedComponent implements OnInit { visibleIf: { expand: (value: boolean) => value } - }, + } }, ltdId: { type: 'string',