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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-04-08 13:49:02 +08:00
parent 7b17286222 3cdd46cdce
commit 165f67cc5b
14 changed files with 234 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/datatable/reporting/components/fund-info/fund-info.component.html
View File

@ -3,10 +3,8 @@
<st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_fund_valid_result" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams,process: beforeReq }"
[res]="{ reName: { list: 'data' } }" [page]="{ show: false,showSize:false}" [loading]="false" [bordered]="true">
<ng-template st-row="freightDetails" let-item>
<div *ngFor="let item of item.freightDetails">
<div>{{item.expenseName}}:{{item.price | currency}} </div>
</div>
<ng-template st-row="checkStatus" let-item>
<span [ngClass]="{'text-red-dark':item?.checkStatus === 2}">{{filterCheckStatus(item?.checkStatus)}}</span>
</ng-template>
</st>
</div>

20
src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts
View File

@ -51,16 +51,17 @@ export class DatatableReportingFundInfoComponent implements OnInit {
width: '10%',
type: 'enum',
enum: {
'0': '非必填',
'1': '必填',
0: '否',
1: '是',
},
},
{ title: '上传值', index: 'fieldValue', className: 'text-center', width: '15%', },
{
title: '本地校验',
index: 'checkStatus',
render: 'checkStatus',
className: 'text-center',
type: 'enum',
enum: {
'0': '校验中',
'1': '通过',
@ -97,6 +98,19 @@ export class DatatableReportingFundInfoComponent implements OnInit {
this.modalRef.destroy();
}
filterCheckStatus(status: number) {
switch (status) {
case 0:
return '校验中';
case 1:
return '通过';
case 2:
return '不通过';
default:
return '';
}
}
}

27
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
View File

@ -116,7 +116,7 @@ export class DatatableFundReportingComponent implements OnInit {
title: '承运司机',
type: 'string',
ui: {
placeholder: '请输入司机姓名/手机号', visibleIf: {
placeholder: '请输入司机姓名', visibleIf: {
_$expand: (value: boolean) => value,
},
}
@ -146,11 +146,16 @@ export class DatatableFundReportingComponent implements OnInit {
uploadStatus: {
title: '上传状态',
type: 'string',
default: 0,
enum: [
{ label: '待上传', value: 0 },
{ label: '已上传', value: 1 },
{ label: '异常', value: 2 }
],
ui: {
placeholder: '请选择',
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLabel: true,
widget: 'select',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
@ -159,17 +164,21 @@ export class DatatableFundReportingComponent implements OnInit {
verifyStatus: {
title: '本地校验',
type: 'string',
enum: [
{ label: '校验中', value: 0 },
{ label: '通过', value: 1 },
{ label: '不通过', value: 2 }
],
ui: {
placeholder: '请选择',
widget: 'dict-select',
params: { dictKey: 'service:type' },
containsAllLabel: true,
allowClear: true,
widget: 'select',
visibleIf: {
_$expand: (value: boolean) => value,
},
}
},
enterpriseInfoId: {
ltdId: {
title: '网络货运人',
type: 'string',
ui: {
@ -242,7 +251,7 @@ export class DatatableFundReportingComponent implements OnInit {
{ title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' },
{ title: '总金额', render: 'tolalAmount', className: 'text-center', width: '120px' },
{ title: '付款方式', index: 'payTypeLabel', className: 'text-center', width: '150px' },
{ title: '付款方式', index: 'payType', className: 'text-center', width: '150px' },
{ title: '车队长', index: 'payee', className: 'text-center', width: '150px' },
{ title: '收款账户', index: 'collectionAccount', className: 'text-center', width: '180px' },

19
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
View File

@ -31,24 +31,25 @@
[page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading"
(change)="changeSt($event)">
<ng-template st-row="orderCheckStatus" let-item let-index="index">
<a (click)="viewAuditResult(item)"
*ngIf="item?.orderCheckStatus === '2'">{{filterStatus(item?.orderCheckStatus)}}</a>
<span *ngIf="item?.orderCheckStatus !== '2'">{{filterStatus(item?.orderCheckStatus)}}</span>
<a *ngIf="item?.orderCheckStatus === 2"
(click)="viewAuditResult(item)">{{filterStatus(item?.orderCheckStatus)}}</a>
<span *ngIf="item?.orderCheckStatus !== 2">{{filterStatus(item?.orderCheckStatus)}}</span>
</ng-template>
<ng-template st-row="driverCheckStatus" let-item let-index="index">
<a (click)="viewAuditResult(item)"
*ngIf="item?.driverCheckStatus === '2'">{{filterStatus(item?.driverCheckStatus)}}</a>
<span *ngIf="item?.driverCheckStatus !== '2'">{{filterStatus(item?.driverCheckStatus)}}</span>
*ngIf="item?.driverCheckStatus === 2">{{filterStatus(item?.driverCheckStatus)}}</a>
<span *ngIf="item?.driverCheckStatus !== 2">{{filterStatus(item?.driverCheckStatus)}}</span>
</ng-template>
<ng-template st-row="carCheckStatus" let-item let-index="index">
<a (click)="viewAuditResult(item)" *ngIf="item?.carCheckStatus === '2'">{{filterStatus(item?.carCheckStatus)}}</a>
<span *ngIf="item?.carCheckStatus !== '2'">{{filterStatus(item?.carCheckStatus)}}</span>
<a (click)="viewAuditResult(item)" *ngIf="item?.carCheckStatus === 2">{{filterStatus(item?.carCheckStatus)}}</a>
<span *ngIf="item?.carCheckStatus !== 2">{{filterStatus(item?.carCheckStatus)}}</span>
</ng-template>
<ng-template st-row="checkStatus" let-item let-index="index">
<a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{filterCheckStatus(item?.checkStatus)}}</a>
<span *ngIf="item?.billStatus !== '2'">{{filterCheckStatus(item?.checkStatus)}}</span>
<a *ngIf="item?.checkStatus === 2" (click)="viewResult(item)">{{filterCheckStatus(item?.checkStatus)}}</a>
<span *ngIf="item?.checkStatus !== 2">{{filterCheckStatus(item?.checkStatus)}}</span>
</ng-template>
<ng-template st-row="billCode" let-item>
<span class="text-red-dark">{{item?.billCode}}</span>
</ng-template>

18
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
View File

@ -29,8 +29,7 @@ export class DatatableOrderReportingComponent implements OnInit {
{ name: '异常', value: '4' },
{ name: '全部', value: '' }
];
selectedIndex = ''; //选择的项目
serviceTel = '';
selectedIndex = '1';
isLoading: boolean = false;
selectedRows: any[] = [];
constructor(
@ -54,7 +53,7 @@ export class DatatableOrderReportingComponent implements OnInit {
*/
get reqParams() {
const params = Object.assign({}, this.sf?.value || {}, {
representationsStatus: this.selectedIndex,
putStatus: this.selectedIndex,
});
delete params._$expand;
return { ...params };
@ -150,6 +149,7 @@ export class DatatableOrderReportingComponent implements OnInit {
putStatus: {
title: '上传状态',
type: 'string',
default: 0,
enum: [
{ label: '待上传', value: 0 },
{ label: '已上传', value: 1 },
@ -159,6 +159,7 @@ export class DatatableOrderReportingComponent implements OnInit {
ui: {
placeholder: '请选择',
widget: 'select',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
@ -175,6 +176,7 @@ export class DatatableOrderReportingComponent implements OnInit {
ui: {
placeholder: '请选择',
widget: 'select',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value,
},
@ -407,7 +409,7 @@ export class DatatableOrderReportingComponent implements OnInit {
}
selectChange(item: any) {
this.selectedIndex = item?.representationsStatus || '';
this.selectedIndex = item?.value || '';
setTimeout(() => {
this.selectedRows = [];
this.st.load(1);
@ -555,7 +557,7 @@ export class DatatableOrderReportingComponent implements OnInit {
return;
}
const ids = this.selectedRows.map(i => i?.id);
this.service.request(this.service.$api_update_fund_data, ids).subscribe(res => {
this.service.request(this.service.$api_update_order_data, ids).subscribe(res => {
if (res) {
this.selectedRows = [];
this.st.reload();
@ -567,11 +569,11 @@ export class DatatableOrderReportingComponent implements OnInit {
filterStatus(status: number) {
switch (status) {
case 0:
return '校验中';
return '待上传';
case 1:
return '通过';
return '已上传';
case 2:
return '不通过';
return '上传异常';
default:
return '';

12
src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html
View File

@ -5,14 +5,12 @@
</nz-tabset>
</div>
<div style="width: 90%;">
<st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_order_reporting_page" [columns]="columns"
<st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_order_valid_result" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false"
[bordered]="true">
<ng-template st-row="freightDetails" let-item>
<div *ngFor="let item of item.freightDetails">
<div>{{item.expenseName}}:{{item.price | currency}} </div>
</div>
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false,showSize:false}"
[loading]="false" [bordered]="true">
<ng-template st-row="checkStatus" let-item>
<span [ngClass]="{'text-red-dark':item?.checkStatus === 2}">{{filterCheckStatus(item?.checkStatus)}}</span>
</ng-template>
</st>
</div>

79
src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts
View File

@ -1,8 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFSchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { ReportingService } from '../../services/reporting.service';
@ -11,26 +9,22 @@ import { ReportingService } from '../../services/reporting.service';
templateUrl: './verify-result.component.html',
})
export class DatatableReportingVerifyResultComponent implements OnInit {
url = `/user`;
searchSchema: SFSchema = {
properties: {
no: {
type: 'string',
title: '编号'
}
}
};
@ViewChild('st') private readonly st!: STComponent;
columns: STColumn[] = [];
record: any = {}
tabs: any[] = [
{ name: '订单信息', value: '1' },
{ name: '司机信息', value: '2' },
{ name: '车辆信息', value: '3' },
];
record: any = {};
tabs: any[] = [
{ name: '订单信息', value: 3 },
{ name: '司机信息', value: 2 },
{ name: '车辆信息', value: 4 },
];
subjectType = 3;
subjectId = '';
get reqParams() {
return {};
return {
subjectType: this.subjectType,
subjectId: this.record?.id
};
}
constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) {
@ -46,13 +40,31 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
initST() {
this.columns = [
{ title: '序号', type: 'no', className: 'text-center', width: '60px', },
{ title: '监管平台字段', index: 'orderStatus', className: 'text-center', width: '120px', },
{ title: '系统字段', index: 'orderStatus', className: 'text-center', width: '100px', },
{ title: '监管平台字段', index: 'thirdPartyFieldName', className: 'text-center', width: '120px', },
{ title: '系统字段', index: 'checkFieldName', className: 'text-center', width: '100px', },
{ title: '归属模块', index: 'orderStatus', className: 'text-center', width: '120px', },
{ title: '是否必填', index: 'orderStatus', className: 'text-center', width: '100px', },
{ title: '上传值', index: 'orderStatus', className: 'text-center', width: '150px', },
{ title: '本地校验', index: 'orderStatus', className: 'text-center', width: '100px', },
{ title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', },
{
title: '是否必填',
index: 'requiredStatus',
className: 'text-center',
width: '100px',
type: 'enum',
enum: {
0: '否',
1: '是'
}
},
{ title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', },
{
title: '本地校验', index: 'checkStatus', className: 'text-center', width: '100px',
type: 'enum',
enum: {
0: '校验中',
1: '通过',
2: '不通过'
}
},
{ title: '错误内容', index: 'remark', className: 'text-center', width: '150px', },
]
}
@ -64,7 +76,10 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
}
selectTab(e: any) {
setTimeout(() => {
this.subjectType = e?.value;
this.st.load(1);
})
}
update() {
@ -77,9 +92,23 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
}
close(): void {
this.modalRef.destroy();
}
filterCheckStatus(status: number) {
switch (status) {
case 0:
return '校验中';
case 1:
return '通过';
case 2:
return '不通过';
default:
return '';
}
}
}

4
src/app/routes/datatable/reporting/services/reporting.service.ts
View File

@ -6,12 +6,14 @@ import { BaseService } from '@shared';
})
export class ReportingService extends BaseService {
$api_get_order_reporting_page = `/api/sdc/regulation/list/queryPage`; // 订单上报列表
$api_get_order_reporting_page = `/api/sdc/regulation/list/queryPage`; // 订单上报-列表
$api_upload_order_reporting = `/api/sdc/regulation/push`; // 上传订单上报
$api_recall_order_reporting = `/api/sdc/regulation/withdraw`; // 撤回上传订单上报
$api_async_export_order_reporting_list = ``; // 导出订单上报
$api_get_upload_setting = `/api/sdc/regulation/getPushConfig`; // 获取上传设置
$api_upload_setting_save = `/api/sdc/regulation/setPushConfig`; // 保存上传设置
$api_get_order_valid_result = `/api/sdc/regulation/queryPage/checkRes`;//订单上报-校验结果
$api_update_order_data = `/api/sdc/regulation/renewalOrderById`;//订单批量更新订单数据
$api_get_fund_reporting_page = `/api/fcc/fundUploadHead/list/page`; // 资金上报列表
$api_fund_reporting_upload = `/api/fcc/fundUploadHead/uploadFundNumber`; // 资金批量上传

47
src/app/routes/tax-management/components/individual-collect/individual-collect.component.html
View File

@ -10,23 +10,16 @@
-->
<page-header-wrapper [title]="''"></page-header-wrapper>
<nz-card>
<nz-card class="search-box">
<!-- 搜索表单 -->
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
<sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}"
[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]="service.http.loading"
(click)="search()"
acl
[acl-ability]="['RiskOrder-Search']"
>查询</button
>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (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()">
@ -36,34 +29,13 @@
</div>
</div>
</nz-card>
<nz-card>
<nz-card class="content-box">
<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 #st [scroll]="{ x: '1200px',y:'450px' }" [data]="service.$api_get_individual_collect_page" [columns]="columns"
[req]="{ params: reqParams }" [page]="{ }" [loading]="false" (change)="stChange($event)">
</st>
</nz-card>
<ng-template #extraTemplate>
@ -77,4 +49,3 @@
<button nz-button nzType="primary" (click)="uploadSetting()">更新数据</button>
</div>
</ng-template>

5
src/app/routes/tax-management/components/individual-collect/individual-collect.component.less
View File

@ -1,5 +0,0 @@
:host {
.text-black {
color: #000;
}
}

34
src/app/routes/tax-management/components/individual-collect/individual-collect.component.spec.ts
View File

@ -1,34 +0,0 @@
/*
* @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();
});
});

259
src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts
View File

@ -1,71 +1,44 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData } from '@delon/abc/st';
import { STChange, 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']
styleUrls: ['../../../commom/less/box.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: '0' },
{ name: '待审核', value: '1' },
{ name: '已通过', value: '2' },
{ name: '不通过', value: '3' },
{ name: '全部', value: '' }
];
selectedIndex = ''; //选择的项目
serviceTel = '';
constructor(
public service: TaxManagementService,
private router: Router,
private ar: ActivatedRoute,
public shipperservice: ShipperBaseService,
private modal: NzModalService,
public shipperSrv: ShipperBaseService
) {}
selectedIndex = '0';
/**
* 查询字段个数
*/
get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length;
}
selectedRows: any[] = [];
constructor(public service: TaxManagementService, private router: Router, private ar: ActivatedRoute, private modal: NzModalService) {}
/**
* 查询参数
*/
get reqParams() {
const params = Object.assign({}, this.sf?.value || {}, {
representationsStatus: this.selectedIndex
declareStatus: this.selectedIndex
});
delete params._$expand;
return { ...params };
}
/**
* 选中行
*/
get selectedRows() {
return this.st?.list.filter((item: any) => item.checked) || [];
}
/**
* 伸缩查询条件
*/
@ -74,6 +47,14 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
this.sf?.setValue('/_$expand', this._$expand);
}
stChange(e: STChange): void {
switch (e.type) {
case 'checkbox':
this.selectedRows = e.checkbox!;
break;
}
}
/**
* 重置表单
*/
@ -96,7 +77,26 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
billCode: { title: '申报状态', type: 'string', ui: { placeholder: '请输入' } },
declareStatus: {
title: '申报状态',
type: 'string',
enum: [
{ value: '', label: '全部' },
{ value: '0', label: '待申报' },
{ value: '1', label: '待审核' },
{ value: '2', label: '已通过' },
{ value: '3', label: '不通过' }
],
ui: {
placeholder: '请选择',
widget: 'select',
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
},
default: ''
},
resourceCode: {
type: 'string',
title: '申报结果',
@ -104,18 +104,23 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
placeholder: '请输入'
}
},
serviceType3: {
overdueStatus: {
title: '是否逾期',
type: 'string',
enum: [
{ value: '', label: '全部' },
{ value: '0', label: '否' },
{ value: '1', label: '是' }
],
ui: {
placeholder: '请选择',
widget: 'dict-select',
params: { dictKey: 'service:type' },
widget: 'select',
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
}
},
default: ''
},
createTime: {
title: '税款所属期',
@ -151,15 +156,11 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
visibleIf: {
_$expand: (value: boolean) => value
},
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
asyncData: () => this.service.getNetworkFreightForwarder()
}
}
}
};
this.ui = {
'*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
$time: { grid: { span: 24 } }
};
}
/**
@ -168,121 +169,82 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
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: '申报状态',
index: 'declareStatus',
className: 'text-center',
width: '120px',
type: 'badge',
badge: {
'0': { text: '待申报', color: 'default' },
'1': { text: '待审核', color: 'processing' },
'2': { text: '已通过', color: 'success' },
'3': { text: '不通过', color: 'error' }
}
},
{ title: '是否逾期', index: 'overdueStatus', className: 'text-center', width: '120px', type: 'enum', enum: { '0': '否', '1': '是' } },
{
title: '税款所属期起',
render: 'billComplianceVOS',
index: 'skssqq',
className: 'text-center',
width: '150px'
},
{ title: '税款所属期止', render: 'freightDetails', className: 'text-center', width: '150px' },
{ title: '税款所属期止', index: 'skssqz', className: 'text-center', width: '150px' },
{
title: '纳税人名称',
render: 'serviceType',
index: 'nsrmc',
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' },
{ title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' },
{ title: '税率', index: 'sl', className: 'text-center', width: '150px' },
{ title: '申报人数', index: 'sbrs', className: 'text-center', width: '150px' },
{ title: '应税收入', index: 'yssr', className: 'text-center', width: '150px' },
{ title: '应纳税额', index: 'ynse', className: 'text-center', width: '180px' },
{ title: '累计已缴纳税额', index: 'ljyjnse', className: 'text-center', width: '150px' },
{ title: '本期应补退税额', index: 'bqybtse', className: 'text-center', width: '150px' },
{ title: '申报日期', index: 'sbrq', className: 'text-center', width: '150px' }
];
}
/**
*撤销
*更正
* @param record 记录实例
*/
recall() {
if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要撤回的数据');
this.service.msgSrv.warning('请选择需要更正的数据');
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();
}
});
}
});
// 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 || '';
this.selectedIndex = item?.name || '';
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('请选择需要上传的数据');
this.service.msgSrv.warning('请选择需要上传的数据');
return;
}
// this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => {
@ -298,10 +260,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
* @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('更新成功');
@ -310,33 +268,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
// })
}
/**
* 查看校验结果
*/
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);
}
@ -347,12 +278,4 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
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
});
}
}

11
src/app/routes/tax-management/components/individual-income/individual-income.component.ts
View File

@ -133,15 +133,20 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
isOvertime: {
title: '是否逾期',
type: 'string',
enum: [
{ value: '', label: '全部' },
{ value: '0', label: '否' },
{ value: '1', label: '是' }
],
ui: {
placeholder: '请选择',
widget: 'dict-select',
params: { dictKey: 'service:type' },
widget: 'select',
containsAllLabel: true,
visibleIf: {
_$expand: (value: boolean) => value
}
}
},
default: ''
},
taxDate: {
title: '税款所属期',

6
src/app/routes/tax-management/services/tax-management.service.ts
View File

@ -19,6 +19,7 @@ import { ShipperBaseService } from '@shared';
export class TaxManagementService extends ShipperBaseService {
// 获取货主企业列表
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
//
public $api_order_reporting_page = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
// 查询运营报表
@ -29,6 +30,11 @@ export class TaxManagementService extends ShipperBaseService {
// 更新所有数据个税申报明细
$api_update_individual_income_page = `/api/sdc/taxIncome/updateAll`;
// 查询个税汇总
$api_get_individual_collect_page = `/api/sdc/taxSummary/list/page`;
// 更新所有数据个税汇总
$api_update_individual_collect_page = `/api/sdc/taxIncome/updateAll`;
// 订单上报列表
$api_getTaxOrderPage_page = `/api/sdc/taxOrder/getTaxOrderPage`;
// 根据订单Id更新税务订单