fix bug
This commit is contained in:
@ -0,0 +1,80 @@
|
||||
<!--
|
||||
* @Description :
|
||||
* @Version : 1.0
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-03-30 14:00:43
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-03-31 10:31:40
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-collect\\individual-collect.component.html
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
-->
|
||||
<page-header-wrapper [title]="''"></page-header-wrapper>
|
||||
|
||||
<nz-card>
|
||||
<!-- 搜索表单 -->
|
||||
<div nz-row nzGutter="8">
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 18">
|
||||
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
|
||||
<button
|
||||
nz-button
|
||||
nzType="primary"
|
||||
[disabled]="!sf.valid"
|
||||
[nzLoading]="false"
|
||||
(click)="search()"
|
||||
acl
|
||||
[acl-ability]="['RiskOrder-Search']"
|
||||
>查询</button
|
||||
>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
<button nz-button (click)="resetSF()">导出</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
<nz-card>
|
||||
<nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length > 0">
|
||||
<nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab>
|
||||
</nz-tabset>
|
||||
<!-- 数据列表 -->
|
||||
<st
|
||||
#st
|
||||
[scroll]="{ x: '1200px' }"
|
||||
[data]="service.$api_order_reporting_page"
|
||||
[columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }"
|
||||
[loading]="false"
|
||||
>
|
||||
<ng-template st-row="orderStatus" let-item let-index="index">
|
||||
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
|
||||
<span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
|
||||
<span style="color: red" (click)="unnormal(item)">异常</span>
|
||||
</ng-template>
|
||||
|
||||
<ng-template st-row="localValid" let-item let-index="index">
|
||||
<a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
|
||||
<span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
|
||||
</ng-template>
|
||||
<ng-template st-row="amount" let-item let-index="index">
|
||||
<div class="text-right">{{ item?.amount | currency: ' ' }}</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-card>
|
||||
<ng-template #extraTemplate>
|
||||
<div class="d-flex align-items-center">
|
||||
<div class="mr-md">
|
||||
已选择
|
||||
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据
|
||||
</div>
|
||||
<button nz-button nzType="primary" (click)="upload()">申报</button>
|
||||
<button nz-button nzType="primary" (click)="recall()">更正</button>
|
||||
<button nz-button nzType="primary" (click)="uploadSetting()">更新数据</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
@ -0,0 +1,5 @@
|
||||
:host {
|
||||
.text-black {
|
||||
color: #000;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
/*
|
||||
* @Description :
|
||||
* @Version : 1.0
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-03-30 14:45:52
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-03-30 15:33:06
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-income\\individual-income.component.spec.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { TaxManagementIndividualCollectComponent } from './individual-collect.component';
|
||||
|
||||
describe('TaxManagementIndividualCollectComponent', () => {
|
||||
let component: TaxManagementIndividualCollectComponent;
|
||||
let fixture: ComponentFixture<TaxManagementIndividualCollectComponent>;
|
||||
|
||||
beforeEach(waitForAsync(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ TaxManagementIndividualCollectComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(TaxManagementIndividualCollectComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,358 @@
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { STColumn, STComponent, STData } from '@delon/abc/st';
|
||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||
import { ShipperBaseService } from '@shared';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { of } from 'rxjs';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { TaxManagementService } from '../../services/tax-management.service';
|
||||
// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
|
||||
// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-tax-management-individual-collect',
|
||||
templateUrl: './individual-collect.component.html',
|
||||
styleUrls: ['./individual-collect.component.less']
|
||||
})
|
||||
export class TaxManagementIndividualCollectComponent implements OnInit {
|
||||
_$expand = false;
|
||||
ui!: SFUISchema;
|
||||
schema!: SFSchema;
|
||||
columns!: STColumn[];
|
||||
@ViewChild('st', { static: false }) st!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
tabType!: string;
|
||||
tabs: any[] = [
|
||||
{ name: '待申报', value: '1' },
|
||||
{ name: '待审核', value: '2' },
|
||||
{ name: '已通过', value: '3' },
|
||||
{ name: '不通过', value: '4' },
|
||||
{ name: '全部', value: '' }
|
||||
];
|
||||
selectedIndex = ''; //选择的项目
|
||||
serviceTel = '';
|
||||
constructor(
|
||||
public service: TaxManagementService,
|
||||
private router: Router,
|
||||
private ar: ActivatedRoute,
|
||||
public shipperservice: ShipperBaseService,
|
||||
private modal: NzModalService,
|
||||
public shipperSrv: ShipperBaseService
|
||||
) {}
|
||||
|
||||
/**
|
||||
* 查询字段个数
|
||||
*/
|
||||
get queryFieldCount(): number {
|
||||
return Object.keys(this.schema?.properties || {}).length;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
*/
|
||||
get reqParams() {
|
||||
const params = Object.assign({}, this.sf?.value || {}, {
|
||||
representationsStatus: this.selectedIndex
|
||||
});
|
||||
delete params._$expand;
|
||||
return { ...params };
|
||||
}
|
||||
|
||||
/**
|
||||
* 选中行
|
||||
*/
|
||||
get selectedRows() {
|
||||
return this.st?.list.filter((item: any) => item.checked) || [];
|
||||
}
|
||||
|
||||
/**
|
||||
* 伸缩查询条件
|
||||
*/
|
||||
expandToggle() {
|
||||
this._$expand = !this._$expand;
|
||||
this.sf?.setValue('/_$expand', this._$expand);
|
||||
}
|
||||
|
||||
/**
|
||||
* 重置表单
|
||||
*/
|
||||
resetSF() {
|
||||
this.sf.reset();
|
||||
this._$expand = false;
|
||||
}
|
||||
/**
|
||||
* 程序初始化入口
|
||||
*/
|
||||
ngOnInit() {
|
||||
this.initSF();
|
||||
this.initST();
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化查询表单
|
||||
*/
|
||||
initSF() {
|
||||
this.schema = {
|
||||
properties: {
|
||||
_$expand: { type: 'boolean', ui: { hidden: true } },
|
||||
billCode: { title: '申报状态', type: 'string', ui: { placeholder: '请输入' } },
|
||||
resourceCode: {
|
||||
type: 'string',
|
||||
title: '申报结果',
|
||||
ui: {
|
||||
placeholder: '请输入'
|
||||
}
|
||||
},
|
||||
serviceType3: {
|
||||
title: '是否逾期',
|
||||
type: 'string',
|
||||
ui: {
|
||||
placeholder: '请选择',
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'service:type' },
|
||||
containsAllLabel: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
createTime: {
|
||||
title: '税款所属期',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'sl-from-to',
|
||||
type: 'date',
|
||||
format: 'yyyy-MM-dd',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
createTime3: {
|
||||
title: '申报日期',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'sl-from-to',
|
||||
type: 'date',
|
||||
format: 'yyyy-MM-dd',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
enterpriseInfoId: {
|
||||
type: 'string',
|
||||
title: '网络货运人',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
allowClear: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
this.ui = {
|
||||
'*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
|
||||
$time: { grid: { span: 24 } }
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化数据列表
|
||||
*/
|
||||
initST() {
|
||||
this.columns = [
|
||||
{ title: '', type: 'checkbox', className: 'text-center', width: '60px' },
|
||||
{ title: '申报状态', render: 'orderStatus', className: 'text-center', width: '120px' },
|
||||
{ title: '是否逾期', render: 'localValid', className: 'text-center', width: '120px' },
|
||||
{
|
||||
title: '税款所属期起',
|
||||
render: 'billComplianceVOS',
|
||||
className: 'text-center',
|
||||
width: '150px'
|
||||
},
|
||||
{ title: '税款所属期止', render: 'freightDetails', className: 'text-center', width: '150px' },
|
||||
{
|
||||
title: '纳税人名称',
|
||||
render: 'serviceType',
|
||||
className: 'text-center',
|
||||
width: '180px'
|
||||
},
|
||||
{ title: '纳税人识别号', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||
{ title: '税率', render: 'transportInfo', className: 'text-center', width: '200px' },
|
||||
{ title: '申报人数', render: 'payeeName', className: 'text-center', width: '150px' },
|
||||
{ title: '应税收入', render: 'payeeName', className: 'text-center', width: '150px' },
|
||||
{ title: '应纳税额', render: 'transportInfo', className: 'text-center', width: '180px' },
|
||||
{ title: '累计已缴纳税额', render: 'payeeName', className: 'text-center', width: '150px' },
|
||||
{ title: '本期应补退税额', render: 'transportInfo', className: 'text-center', width: '200px' },
|
||||
{ title: '申报日期', render: 'payeeName', className: 'text-center', width: '150px' },
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
*撤销
|
||||
* @param record 记录实例
|
||||
*/
|
||||
recall() {
|
||||
if (this.selectedRows.length === 0) {
|
||||
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();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
/**
|
||||
*撤销
|
||||
* @param record 记录实例
|
||||
*/
|
||||
unnormal(value: any) {
|
||||
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();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
selectChange(item: any) {
|
||||
this.selectedIndex = item?.representationsStatus || '';
|
||||
setTimeout(() => {
|
||||
this.st.load(1);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看当行数据
|
||||
*/
|
||||
view(record: STData) {
|
||||
// this.router.navigate(['../view', record.uuid], { relativeTo: this.ar });
|
||||
this.router.navigate(['../detail'], {
|
||||
queryParams: {
|
||||
id: record.id
|
||||
},
|
||||
relativeTo: this.ar
|
||||
});
|
||||
}
|
||||
|
||||
// appeal(item: any) {
|
||||
// const modalRef = this.modal.create({
|
||||
// nzTitle: '申诉',
|
||||
// nzWidth: '40%',
|
||||
// nzContent: CtcAppealComponent,
|
||||
// nzComponentParams: {
|
||||
// i: item,
|
||||
// status: 'add'
|
||||
// },
|
||||
// nzFooter: null
|
||||
// });
|
||||
// modalRef.afterClose.subscribe(res => {
|
||||
// if (res) {
|
||||
// this.search({ representationsStatus: '' });
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
|
||||
/**
|
||||
* 申报
|
||||
*/
|
||||
upload() {
|
||||
if (this.selectedRows.length === 0) {
|
||||
this.openWainingModal('请选择需要上传的数据');
|
||||
return;
|
||||
}
|
||||
// this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
|
||||
// if (res) {
|
||||
// this.service.msgSrv.success('申报成功');
|
||||
// this.search();
|
||||
// }
|
||||
// })
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param params 更新数据
|
||||
*/
|
||||
uploadSetting() {
|
||||
if (this.selectedRows.length === 0) {
|
||||
this.openWainingModal('请选择需要上传的数据');
|
||||
return;
|
||||
}
|
||||
// this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
|
||||
// if (res) {
|
||||
// this.service.msgSrv.success('更新成功');
|
||||
// this.search();
|
||||
// }
|
||||
// })
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看校验结果
|
||||
*/
|
||||
viewResult(item: any) {
|
||||
// const modalRef = this.modal.create({
|
||||
// nzTitle: '本地校验结果',
|
||||
// nzWidth: 1200,
|
||||
// nzContent: TaxManagementOrderVerifyResultComponent,
|
||||
// nzComponentParams: {
|
||||
// record: item
|
||||
// },
|
||||
// nzFooter: null
|
||||
// });
|
||||
// modalRef.afterClose.subscribe(res => {
|
||||
// })
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看监管审核结果
|
||||
*/
|
||||
viewAuditResult(record: any) {
|
||||
if (record?.billStatus !== '2') {
|
||||
return;
|
||||
}
|
||||
this.openWainingModal('监管审核结果', record?.result);
|
||||
}
|
||||
|
||||
search() {
|
||||
this.st.load(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 异步导出
|
||||
*/
|
||||
export() {
|
||||
this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
|
||||
}
|
||||
|
||||
openWainingModal(content: string, title = '提示') {
|
||||
this.modal.warning({
|
||||
nzMask: false,
|
||||
nzTitle: title,
|
||||
nzContent: content
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,91 @@
|
||||
<!--
|
||||
* @Description :
|
||||
* @Version : 1.0
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-03-30 14:00:43
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-03-31 10:36:57
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-declare\\individual-declare.component.html
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
-->
|
||||
<page-header-wrapper [title]="''"></page-header-wrapper>
|
||||
|
||||
<nz-card>
|
||||
<!-- 搜索表单 -->
|
||||
<div nz-row nzGutter="8">
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 18">
|
||||
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
|
||||
<button
|
||||
nz-button
|
||||
nzType="primary"
|
||||
[disabled]="!sf.valid"
|
||||
[nzLoading]="false"
|
||||
(click)="search()"
|
||||
acl
|
||||
[acl-ability]="['RiskOrder-Search']"
|
||||
>查询</button
|
||||
>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
<button nz-button (click)="resetSF()">导出</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
<nz-card>
|
||||
<nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length > 0">
|
||||
<nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab>
|
||||
</nz-tabset>
|
||||
<!-- 数据列表 -->
|
||||
<st
|
||||
#st
|
||||
[scroll]="{ x: '1200px' }"
|
||||
[data]="service.$api_order_reporting_page"
|
||||
[columns]="columns"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }"
|
||||
[loading]="false"
|
||||
>
|
||||
<ng-template st-row="orderStatus" let-item let-index="index">
|
||||
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
|
||||
<span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
|
||||
<span style="color: red" (click)="unnormal(item)">异常</span>
|
||||
</ng-template>
|
||||
|
||||
<ng-template st-row="localValid" let-item let-index="index">
|
||||
<a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
|
||||
<span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
|
||||
</ng-template>
|
||||
<ng-template st-row="amount" let-item let-index="index">
|
||||
<div class="text-right">{{ item?.amount | currency: ' ' }}</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-card>
|
||||
<ng-template #extraTemplate>
|
||||
<div class="d-flex align-items-center">
|
||||
<div class="mr-md">
|
||||
已选择
|
||||
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据
|
||||
</div>
|
||||
<button nz-button nzType="primary" (click)="upload()">申报</button>
|
||||
<button nz-button nzType="primary" (click)="recall()">更正</button>
|
||||
<button nz-button nzType="primary" (click)="resetData()">修改起征点</button>
|
||||
<button nz-button nzType="primary" (click)="uploadSetting()">更新数据</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
|
||||
<ng-container *nzModalContent>
|
||||
<div> 司机姓名:张三/13812345678 </div>
|
||||
<div> 是否确认要将该司机的起征点同步调整为超过15万? </div>
|
||||
</ng-container>
|
||||
<ng-template #nzModalFooterEvaluate>
|
||||
<button nz-button nzType="default" (click)="handleCancel()">取消</button>
|
||||
<button nz-button nzType="primary" (click)="handleOK()">确定</button>
|
||||
</ng-template>
|
||||
</nz-modal>
|
||||
@ -0,0 +1,5 @@
|
||||
:host {
|
||||
.text-black {
|
||||
color: #000;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
/*
|
||||
* @Description :
|
||||
* @Version : 1.0
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-03-30 14:45:52
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-03-31 10:36:54
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-declare\\individual-declare.component.spec.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { TaxManagementIndividualDeclareComponent } from './individual-declare.component';
|
||||
|
||||
describe('TaxManagementIndividualDeclareComponent', () => {
|
||||
let component: TaxManagementIndividualDeclareComponent;
|
||||
let fixture: ComponentFixture<TaxManagementIndividualDeclareComponent>;
|
||||
|
||||
beforeEach(waitForAsync(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ TaxManagementIndividualDeclareComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(TaxManagementIndividualDeclareComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,431 @@
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
import { STColumn, STComponent, STData } from '@delon/abc/st';
|
||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||
import { ShipperBaseService } from '@shared';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { of } from 'rxjs';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { TaxManagementService } from '../../services/tax-management.service';
|
||||
// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
|
||||
// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
|
||||
|
||||
@Component({
|
||||
selector: 'app-tax-management-individual-declare',
|
||||
templateUrl: './individual-declare.component.html',
|
||||
styleUrls: ['./individual-declare.component.less']
|
||||
})
|
||||
export class TaxManagementIndividualDeclareComponent implements OnInit {
|
||||
_$expand = false;
|
||||
ui!: SFUISchema;
|
||||
schema!: SFSchema;
|
||||
columns!: STColumn[];
|
||||
@ViewChild('st', { static: false }) st!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
tabType!: string;
|
||||
tabs: any[] = [
|
||||
{ name: '待申报', value: '1' },
|
||||
{ name: '待审核', value: '2' },
|
||||
{ name: '已通过', value: '3' },
|
||||
{ name: '不通过', value: '4' },
|
||||
{ name: '全部', value: '' }
|
||||
];
|
||||
selectedIndex = ''; //选择的项目
|
||||
serviceTel = '';
|
||||
isVisible : boolean = false
|
||||
constructor(
|
||||
public service: TaxManagementService,
|
||||
private router: Router,
|
||||
private ar: ActivatedRoute,
|
||||
public shipperservice: ShipperBaseService,
|
||||
private modal: NzModalService,
|
||||
public shipperSrv: ShipperBaseService
|
||||
) {}
|
||||
|
||||
/**
|
||||
* 查询字段个数
|
||||
*/
|
||||
get queryFieldCount(): number {
|
||||
return Object.keys(this.schema?.properties || {}).length;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
*/
|
||||
get reqParams() {
|
||||
const params = Object.assign({}, this.sf?.value || {}, {
|
||||
representationsStatus: this.selectedIndex
|
||||
});
|
||||
delete params._$expand;
|
||||
return { ...params };
|
||||
}
|
||||
|
||||
/**
|
||||
* 选中行
|
||||
*/
|
||||
get selectedRows() {
|
||||
return this.st?.list.filter((item: any) => item.checked) || [];
|
||||
}
|
||||
|
||||
/**
|
||||
* 伸缩查询条件
|
||||
*/
|
||||
expandToggle() {
|
||||
this._$expand = !this._$expand;
|
||||
this.sf?.setValue('/_$expand', this._$expand);
|
||||
}
|
||||
|
||||
/**
|
||||
* 重置表单
|
||||
*/
|
||||
resetSF() {
|
||||
this.sf.reset();
|
||||
this._$expand = false;
|
||||
}
|
||||
/**
|
||||
* 程序初始化入口
|
||||
*/
|
||||
ngOnInit() {
|
||||
this.initSF();
|
||||
this.initST();
|
||||
const object1 : any = {};
|
||||
const object2 : any = {};
|
||||
Object.defineProperty(object1, 'name',{ writable: false ,value: 'wang'});
|
||||
Object.defineProperty(object2, 'xxoo',{ writable: false ,value: 'wang'});
|
||||
console.log(object1);
|
||||
console.log(object1.name);
|
||||
console.log(object2);
|
||||
console.log(object2.xxoo);
|
||||
object1.name = 'ming'
|
||||
object2.xxoo = 'ming'
|
||||
console.log(object1);
|
||||
console.log(object2);
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化查询表单
|
||||
*/
|
||||
initSF() {
|
||||
this.schema = {
|
||||
properties: {
|
||||
_$expand: { type: 'boolean', ui: { hidden: true } },
|
||||
billCode: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } },
|
||||
resourceCode: {
|
||||
type: 'string',
|
||||
title: '联系电话',
|
||||
ui: {
|
||||
placeholder: '请输入'
|
||||
}
|
||||
},
|
||||
driverName: {
|
||||
title: '证件号码',
|
||||
type: 'string',
|
||||
ui: {
|
||||
placeholder: '请输入证件号码'
|
||||
}
|
||||
},
|
||||
serviceType2: {
|
||||
title: '申报状态',
|
||||
type: 'string',
|
||||
ui: {
|
||||
placeholder: '请选择',
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'service:type' },
|
||||
containsAllLabel: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
serviceType3: {
|
||||
title: '申报结果',
|
||||
type: 'string',
|
||||
ui: {
|
||||
placeholder: '请选择',
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'service:type' },
|
||||
containsAllLabel: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
serviceType1: {
|
||||
title: '是否逾期',
|
||||
type: 'string',
|
||||
ui: {
|
||||
placeholder: '请选择',
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'service:type' },
|
||||
containsAllLabel: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
},
|
||||
createTime: {
|
||||
title: '税款所属期',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'sl-from-to',
|
||||
type: 'date',
|
||||
format: 'yyyy-MM-dd',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
createTime3: {
|
||||
title: '申报日期',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'sl-from-to',
|
||||
type: 'date',
|
||||
format: 'yyyy-MM-dd',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
enterpriseInfoId: {
|
||||
type: 'string',
|
||||
title: '网络货运人',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
allowClear: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
this.ui = {
|
||||
'*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
|
||||
$time: { grid: { span: 24 } }
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化数据列表
|
||||
*/
|
||||
initST() {
|
||||
this.columns = [
|
||||
{ title: '', type: 'checkbox', className: 'text-center', width: '60px' },
|
||||
{ title: '申报状态', render: 'orderStatus', className: 'text-center', width: '120px' },
|
||||
{ title: '是否逾期', render: 'localValid', className: 'text-center', width: '120px' },
|
||||
{
|
||||
title: '税款所属期起',
|
||||
render: 'billComplianceVOS',
|
||||
className: 'text-center',
|
||||
width: '150px'
|
||||
},
|
||||
{ title: '税款所属期止', render: 'freightDetails', className: 'text-center', width: '150px' },
|
||||
{
|
||||
title: '纳税人名称',
|
||||
render: 'serviceType',
|
||||
className: 'text-center',
|
||||
width: '180px'
|
||||
},
|
||||
{ title: '纳税人识别号', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||
{ title: '姓名', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||
{ title: '证件类型', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||
{ title: '证件号码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||
{ title: '联系电话', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||
{ title: '国家(地区)', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||
{ title: '所属行业', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||
{ title: '征收项目', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||
{ title: '征收品目', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||
{ title: '计税依据', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||
{ title: '税率', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' },
|
||||
{ title: '应纳税额', render: 'transportInfo', className: 'text-center', width: '180px' },
|
||||
{ title: '减免税额', render: 'transportInfo', className: 'text-center', width: '180px' },
|
||||
{ title: '已缴纳税额', render: 'transportInfo', className: 'text-center', width: '180px' },
|
||||
{ title: '应代征税额', render: 'transportInfo', className: 'text-center', width: '180px' },
|
||||
{ title: '已代征税额', render: 'payeeName', className: 'text-center', width: '150px' },
|
||||
{ title: '申报日期', render: 'payeeName', className: 'text-center', width: '150px' },
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
*撤销
|
||||
* @param record 记录实例
|
||||
*/
|
||||
recall() {
|
||||
if (this.selectedRows.length === 0) {
|
||||
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();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
/**
|
||||
*撤销
|
||||
* @param record 记录实例
|
||||
*/
|
||||
resetData() {
|
||||
if (this.selectedRows.length === 0) {
|
||||
this.openWainingModal('请选择需要更新的数据!');
|
||||
return;
|
||||
}
|
||||
this.isVisible = true
|
||||
|
||||
}
|
||||
/**
|
||||
*撤销
|
||||
* @param record 记录实例
|
||||
*/
|
||||
unnormal(value: any) {
|
||||
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();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
selectChange(item: any) {
|
||||
this.selectedIndex = item?.representationsStatus || '';
|
||||
setTimeout(() => {
|
||||
this.st.load(1);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看当行数据
|
||||
*/
|
||||
view(record: STData) {
|
||||
// this.router.navigate(['../view', record.uuid], { relativeTo: this.ar });
|
||||
this.router.navigate(['../detail'], {
|
||||
queryParams: {
|
||||
id: record.id
|
||||
},
|
||||
relativeTo: this.ar
|
||||
});
|
||||
}
|
||||
|
||||
// appeal(item: any) {
|
||||
// const modalRef = this.modal.create({
|
||||
// nzTitle: '申诉',
|
||||
// nzWidth: '40%',
|
||||
// nzContent: CtcAppealComponent,
|
||||
// nzComponentParams: {
|
||||
// i: item,
|
||||
// status: 'add'
|
||||
// },
|
||||
// nzFooter: null
|
||||
// });
|
||||
// modalRef.afterClose.subscribe(res => {
|
||||
// if (res) {
|
||||
// this.search({ representationsStatus: '' });
|
||||
// }
|
||||
// })
|
||||
// }
|
||||
|
||||
/**
|
||||
* 申报
|
||||
*/
|
||||
upload() {
|
||||
if (this.selectedRows.length === 0) {
|
||||
this.openWainingModal('请选择需要上传的数据');
|
||||
return;
|
||||
}
|
||||
// this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
|
||||
// if (res) {
|
||||
// this.service.msgSrv.success('申报成功');
|
||||
// this.search();
|
||||
// }
|
||||
// })
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param params 更新数据
|
||||
*/
|
||||
uploadSetting() {
|
||||
if (this.selectedRows.length === 0) {
|
||||
this.openWainingModal('请选择需要上传的数据');
|
||||
return;
|
||||
}
|
||||
// this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
|
||||
// if (res) {
|
||||
// this.service.msgSrv.success('更新成功');
|
||||
// this.search();
|
||||
// }
|
||||
// })
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看校验结果
|
||||
*/
|
||||
viewResult(item: any) {
|
||||
// const modalRef = this.modal.create({
|
||||
// nzTitle: '本地校验结果',
|
||||
// nzWidth: 1200,
|
||||
// nzContent: TaxManagementOrderVerifyResultComponent,
|
||||
// nzComponentParams: {
|
||||
// record: item
|
||||
// },
|
||||
// nzFooter: null
|
||||
// });
|
||||
// modalRef.afterClose.subscribe(res => {
|
||||
// })
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看监管审核结果
|
||||
*/
|
||||
viewAuditResult(record: any) {
|
||||
if (record?.billStatus !== '2') {
|
||||
return;
|
||||
}
|
||||
this.openWainingModal('监管审核结果', record?.result);
|
||||
}
|
||||
|
||||
search() {
|
||||
this.st.load(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 异步导出
|
||||
*/
|
||||
export() {
|
||||
this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
|
||||
}
|
||||
|
||||
openWainingModal(content: string, title = '提示') {
|
||||
this.modal.warning({
|
||||
nzMask: false,
|
||||
nzTitle: title,
|
||||
nzContent: content
|
||||
});
|
||||
}
|
||||
handleOK() {
|
||||
|
||||
}
|
||||
handleCancel() {
|
||||
this.isVisible = false;
|
||||
}
|
||||
}
|
||||
@ -4,12 +4,14 @@
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-03-30 13:58:28
|
||||
* @LastEditors : Shiming
|
||||
* @LastEditTime : 2022-03-30 15:33:48
|
||||
* @LastEditTime : 2022-03-31 10:37:24
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\tax-management-routing.module.ts
|
||||
* Copyright (C) 2022 huzhenhong. All rights reserved.
|
||||
*/
|
||||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule, Routes } from '@angular/router';
|
||||
import { TaxManagementIndividualCollectComponent } from './components/individual-collect/individual-collect.component';
|
||||
import { TaxManagementIndividualDeclareComponent } from './components/individual-declare/individual-declare.component';
|
||||
import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component';
|
||||
import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';
|
||||
|
||||
@ -17,6 +19,8 @@ import { TaxManagementOrderReportingComponent } from './components/order-reporti
|
||||
const routes: Routes = [
|
||||
{ path: 'orderReport', component: TaxManagementOrderReportingComponent },
|
||||
{ path: 'income', component: TaxManagementIndividualIncomeComponent },
|
||||
{ path: 'collect', component: TaxManagementIndividualCollectComponent },
|
||||
{ path: 'declare', component: TaxManagementIndividualDeclareComponent },
|
||||
];
|
||||
|
||||
|
||||
|
||||
@ -10,6 +10,8 @@
|
||||
*/
|
||||
import { NgModule, Type } from '@angular/core';
|
||||
import { SharedModule, SHARED_G2_MODULES } from '@shared';
|
||||
import { TaxManagementIndividualCollectComponent } from './components/individual-collect/individual-collect.component';
|
||||
import { TaxManagementIndividualDeclareComponent } from './components/individual-declare/individual-declare.component';
|
||||
import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component';
|
||||
import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component';
|
||||
import { TaxManagementUploadSettingComponent } from './components/order-reporting/upload-setting/upload-setting.component';
|
||||
@ -21,7 +23,9 @@ const COMPONENTS: Type<void>[] = [
|
||||
TaxManagementOrderReportingComponent,
|
||||
TaxManagementOrderVerifyResultComponent,
|
||||
TaxManagementUploadSettingComponent,
|
||||
TaxManagementIndividualIncomeComponent
|
||||
TaxManagementIndividualIncomeComponent,
|
||||
TaxManagementIndividualCollectComponent,
|
||||
TaxManagementIndividualDeclareComponent
|
||||
]
|
||||
|
||||
|
||||
|
||||
@ -685,6 +685,14 @@
|
||||
{
|
||||
"text": "个税明细",
|
||||
"link": "/tax/income"
|
||||
},
|
||||
{
|
||||
"text": "个税汇总",
|
||||
"link": "/tax/collect"
|
||||
},
|
||||
{
|
||||
"text": "税务申报",
|
||||
"link": "/tax/declare"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user