This commit is contained in:
Taric Xin
2022-05-06 15:21:45 +08:00
parent 9f8a79bde2
commit 5527688b10
12 changed files with 282 additions and 556 deletions

View File

@ -9,25 +9,9 @@
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
<!-- 搜索表单 --> <!-- 搜索表单 -->
<page-header-wrapper [title]="''"> </page-header-wrapper> <!-- <page-header-wrapper [title]="''"> </page-header-wrapper>
<nz-card> <nz-card>
<div nz-row nzGutter="8"> <div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="false"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
</div>
<!-- 查询字段大于3个时根据展开状态调整布局 -->
<ng-container *ngIf="queryFieldCount > 4">
<div nz-col [nzSpan]="_$expand ? 24 : 18"> <div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div> </div>
@ -40,11 +24,12 @@
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i> <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button> </button>
</div> </div>
</ng-container>
</div> </div>
</nz-card> </nz-card> -->
<nz-card> <nz-card class="table-box">
<div class="tab_header">
<label class="page_title"> <label class="driver">|</label> 保险列表</label>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate"> <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab> <nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab>
<nz-tab [nzTitle]="'待投保(' + tabs?.receivedQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'待投保(' + tabs?.receivedQuantity + ')'"></nz-tab>
@ -52,18 +37,10 @@
<nz-tab [nzTitle]="'投保失败(' + tabs?.GoingQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'投保失败(' + tabs?.GoingQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已取消(' + tabs?.cancelQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'已取消(' + tabs?.cancelQuantity + ')'"></nz-tab>
</nz-tabset> </nz-tabset>
<div style="margin-top: 15px"> </div>
<st
#st <st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_premiumInfo_list"
[bordered]="true" [columns]="columns" [req]="{ params: reqParams }" [page]="{ }" [loading]="false">
[scroll]="{ x: '2000px' }"
[data]="service.$api_premiumInfo_list"
[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, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="false"
>
<ng-template st-row="resourceCode" let-item let-index="index"> <ng-template st-row="resourceCode" let-item let-index="index">
{{ item.resourceCode | currency }} {{ item.resourceCode | currency }}
</ng-template> </ng-template>
@ -123,11 +100,14 @@
</div> </div>
</ng-template> </ng-template>
</st> </st>
</div>
</nz-card> </nz-card>
<ng-template #extraTemplate> <ng-template #extraTemplate>
<div> <div class="mr-sm">
<button nz-button nzType="primary" (click)="changeOrder()" acl [acl-ability]="['INSURANCE-LIST-insuranceConfig']"> 保险配置 </button> <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
[acl-ability]="['INSURANCE-LIST-search']">筛选</button>
<button nz-button nzDanger acl [acl-ability]="['INSURANCE-LIST-export']" (click)="exprot()"> 导出</button>
<button nz-button nzType="primary" (click)="changeOrder()" acl [acl-ability]="['INSURANCE-LIST-insuranceConfig']">
保险配置 </button>
</div> </div>
</ng-template> </ng-template>

View File

@ -1,13 +0,0 @@
:host {
p{
margin-bottom: 0
}
.left_btn {
width: 50px;
height: 32px;
padding-left: 8px;
line-height:32px;
background-color: #d7d7d7;
}
}

View File

@ -1,35 +0,0 @@
/*
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-06 20:03:28
* @LastEditors : Shiming
* @LastEditTime : 2022-01-25 17:22:11
* @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\list\\list.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { insuranceManagementListComponent } from './list.component';
describe('insuranceManagementListComponent', () => {
let component: insuranceManagementListComponent;
let fixture: ComponentFixture<insuranceManagementListComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ insuranceManagementListComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(insuranceManagementListComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -5,31 +5,26 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { ShipperBaseService } from '@shared'; import { SearchDrawerService, ShipperBaseService } from '@shared';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { InsuranceManagementService } from '../../services/insurance-management.service'; import { InsuranceManagementService } from '../../services/insurance-management.service';
import { VehicleImgViewComponent } from 'src/app/routes/vehicle/components/list/img-view/img-view.component'; import { BasicTableComponent } from 'src/app/routes/commom';
import { ImageViewComponent } from 'src/app/shared/components/imagelist';
@Component({ @Component({
selector: 'app-insurance-management-list', selector: 'app-insurance-management-list',
templateUrl: './list.component.html', templateUrl: './list.component.html',
styleUrls: ['./list.component.less'] styleUrls: ['../../../commom/less/commom-table.less']
}) })
export class insuranceManagementListComponent implements OnInit { export class insuranceManagementListComponent extends BasicTableComponent implements OnInit {
ui: SFUISchema = {};
uiView: SFUISchema = {}; uiView: SFUISchema = {};
schema: SFSchema = {};
schemaView: SFSchema = {}; schemaView: SFSchema = {};
auditMany = false; auditMany = false;
isVisibleView = false; isVisibleView = false;
isVisibleEvaluate = false; isVisibleEvaluate = false;
isVisible = false; isVisible = false;
_$expand = false;
@ViewChild('st') private readonly st!: STComponent; @ViewChild('st') private readonly st!: STComponent;
@ViewChild('stFloat') private readonly stFloat!: STComponent; @ViewChild('stFloat') private readonly stFloat!: STComponent;
@ViewChild('stFloatView') private readonly stFloatView!: STComponent; @ViewChild('stFloatView') private readonly stFloatView!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfFre', { static: false }) sfFre!: SFComponent; @ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
@ViewChild('sfView', { static: false }) sfView!: SFComponent; @ViewChild('sfView', { static: false }) sfView!: SFComponent;
columns: STColumn[] = []; columns: STColumn[] = [];
@ -63,8 +58,10 @@ export class insuranceManagementListComponent implements OnInit {
private modal: NzModalService, private modal: NzModalService,
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
private router: Router, private router: Router,
private modale: ModalHelper, public searchDrawerService: SearchDrawerService
) { } ) {
super(searchDrawerService);
}
/** /**
* 查询参数 * 查询参数
@ -90,7 +87,7 @@ export class insuranceManagementListComponent implements OnInit {
insureTime: { insureTime: {
start: this.sf?.value?.insureTime?.[0] || '', start: this.sf?.value?.insureTime?.[0] || '',
end: this.sf?.value?.insureTime?.[1] || '' end: this.sf?.value?.insureTime?.[1] || ''
}, }
}; };
} }
get selectedRows() { get selectedRows() {
@ -164,11 +161,7 @@ export class insuranceManagementListComponent implements OnInit {
policyNo: { policyNo: {
type: 'string', type: 'string',
title: '保单号', title: '保单号',
ui: { ui: {}
visibleIf: {
_$expand: (value: boolean) => value
},
}
}, },
insureType: { insureType: {
title: '类型', title: '类型',
@ -176,29 +169,18 @@ export class insuranceManagementListComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'insure:type' }, params: { dictKey: 'insure:type' },
containsAllLabel: true, containsAllLabel: true
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
startAddress: { startAddress: {
type: 'string', type: 'string',
title: '始发地', title: '始发地',
ui: { ui: {}
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
endAddress: { endAddress: {
type: 'string', type: 'string',
title: '目的地', title: '目的地',
ui: { ui: {}
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
shipperAppUserId: { shipperAppUserId: {
type: 'string', type: 'string',
@ -209,11 +191,8 @@ export class insuranceManagementListComponent implements OnInit {
searchDebounceTime: 300, searchDebounceTime: 300,
searchLoadingText: '搜索中...', searchLoadingText: '搜索中...',
allowClear: true, allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
onSearch: (q: any) => { onSearch: (q: any) => {
let str =q.replace(/^\s+|\s+$/g,""); let str = q.replace(/^\s+|\s+$/g, '');
if (str) { if (str) {
return this.service return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str }) .request(this.service.$api_enterpriceList, { enterpriseName: str })
@ -233,30 +212,19 @@ export class insuranceManagementListComponent implements OnInit {
title: '所属项目', title: '所属项目',
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请先选择货主', placeholder: '请先选择货主'
visibleIf: {
_$expand: (value: boolean) => value
},
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
driverName: { driverName: {
title: '承运司机', title: '承运司机',
type: 'string', type: 'string',
ui: { ui: {}
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
carNo: { carNo: {
title: '车牌号', title: '车牌号',
type: 'string', type: 'string',
ui: { ui: {}
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
insureStatus: { insureStatus: {
title: '投保状态', title: '投保状态',
@ -264,10 +232,7 @@ export class insuranceManagementListComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'insure:status' }, params: { dictKey: 'insure:status' },
containsAllLabel: true, containsAllLabel: true
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
insureRefundStatus: { insureRefundStatus: {
@ -276,10 +241,7 @@ export class insuranceManagementListComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'insure:refund:status' }, params: { dictKey: 'insure:refund:status' },
containsAllLable: true, containsAllLable: true
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
enterpriseInfoId: { enterpriseInfoId: {
@ -289,9 +251,6 @@ export class insuranceManagementListComponent implements OnInit {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
allowClear: true, allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
asyncData: () => this.shipperservice.getNetworkFreightForwarder() asyncData: () => this.shipperservice.getNetworkFreightForwarder()
} }
}, },
@ -302,10 +261,7 @@ export class insuranceManagementListComponent implements OnInit {
widget: 'date', widget: 'date',
mode: 'range', mode: 'range',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
allowClear: true, allowClear: true
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema } as SFDateWidgetSchema
}, },
createTime: { createTime: {
@ -315,10 +271,7 @@ export class insuranceManagementListComponent implements OnInit {
widget: 'date', widget: 'date',
mode: 'range', mode: 'range',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
allowClear: true, allowClear: true
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema } as SFDateWidgetSchema
}, },
recordTime: { recordTime: {
@ -328,17 +281,12 @@ export class insuranceManagementListComponent implements OnInit {
widget: 'date', widget: 'date',
mode: 'range', mode: 'range',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
allowClear: true, allowClear: true
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema } as SFDateWidgetSchema
}, }
}, },
type: 'object' type: 'object'
}; };
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
} }
// 获取城市列表 // 获取城市列表
getRegionCode(regionCode: any) { getRegionCode(regionCode: any) {
@ -462,14 +410,14 @@ export class insuranceManagementListComponent implements OnInit {
title: '失败原因', title: '失败原因',
width: '180px', width: '180px',
className: 'text-left', className: 'text-left',
render: 'processMessage', render: 'processMessage'
// processResult=2 // processResult=2
}, },
{ {
title: '退款状态', title: '退款状态',
width: '180px', width: '180px',
className: 'text-left', className: 'text-left',
index: 'insureRefundStatusLabel', index: 'insureRefundStatusLabel'
// processResult=2 // processResult=2
}, },
{ {
@ -504,34 +452,13 @@ export class insuranceManagementListComponent implements OnInit {
window.open(`${_record.newPolicyUrl}`); window.open(`${_record.newPolicyUrl}`);
// this.service.downloadFile(`${_record.newPolicyUrl}`) // this.service.downloadFile(`${_record.newPolicyUrl}`)
// const params = { // const params = {
// imgList: [_record.policyUrl], // imgList: [_record.policyUrl],
// index: 0 // index: 0
// }; // };
// this.modal.create({ nzContent: ImageViewComponent, nzComponentParams: { params } }); // this.modal.create({ nzContent: ImageViewComponent, nzComponentParams: { params } });
} }
/** tabChange(item: any) {}
* 查询字段个数
*/
get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length;
}
/**
* 伸缩查询条件
*/
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) { }
/**
* 重置表单
*/
resetSF(): void {
this.sf.reset();
this._$expand = false;
}
// 退保费 // 退保费
retreatPrice(value: any) { retreatPrice(value: any) {
@ -541,7 +468,7 @@ export class insuranceManagementListComponent implements OnInit {
nzContent: '退还后不可撤销,请谨慎操作!', nzContent: '退还后不可撤销,请谨慎操作!',
nzCancelText: '取消', nzCancelText: '取消',
nzOnOk: () => { nzOnOk: () => {
this.service.request(this.service.$api_get_addINPBillRefundApplication, {id: value.id}).subscribe(res => { this.service.request(this.service.$api_get_addINPBillRefundApplication, { id: value.id }).subscribe(res => {
if (res) { if (res) {
this.service.msgSrv.success('删除菜单成功'); this.service.msgSrv.success('删除菜单成功');
} }

View File

@ -1,17 +1,5 @@
<!-- <!-- <page-header-wrapper [title]="''"></page-header-wrapper>
* @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 class="search-box"> <nz-card class="search-box">
<!-- 搜索表单 -->
<div nz-row nzGutter="8"> <div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18"> <div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" <sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}"
@ -28,13 +16,18 @@
</button> </button>
</div> </div>
</div> </div>
</nz-card> </nz-card> -->
<nz-card class="content-box">
<nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length > 0"> <nz-card class="table-box">
<div class="tab_header">
<label class="page_title"> <label class="driver">|</label> 个税汇总</label>
<nz-tabset [nzTabBarExtraContent]="extraTemplate">
<nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab> <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab>
</nz-tabset> </nz-tabset>
</div>
<!-- 数据列表 --> <!-- 数据列表 -->
<st #st [scroll]="{ x: '1200px',y:'450px' }" [data]="service.$api_get_individual_collect_page" [columns]="columns" <st #st [scroll]="{ x: '1200px',y:scrollY }" [data]="service.$api_get_individual_collect_page" [columns]="columns"
[req]="{ params: reqParams }" [page]="{ }" [loading]="false" (change)="stChange($event)"> [req]="{ params: reqParams }" [page]="{ }" [loading]="false" (change)="stChange($event)">
</st> </st>
</nz-card> </nz-card>
@ -44,8 +37,23 @@
已选择 已选择
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据 <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
</div> </div>
<button nz-button nzType="primary" (click)="upload()" acl [acl-ability]="['TAX-COLLECT-report']">申报</button> <button nz-button nzDanger [nzLoading]="service.http.loading" acl [acl-ability]="['TAX-COLLECT-search']"
<button nz-button nzType="primary" (click)="recall()" acl [acl-ability]="['TAX-COLLECT-change']">更正</button> (click)="openDrawer()">筛选</button>
<button nz-button nzType="primary" (click)="uploadSetting()" acl [acl-ability]="['TAX-COLLECT-resetData']">更新数据</button> <button nz-button nzDanger acl [acl-ability]="['TAX-COLLECT-export']"> 导出</button>
<button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
<nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu>
<li nz-menu-item (click)="upload()" acl [acl-ability]="['TAX-COLLECT-report']">
申报
</li>
<li nz-menu-item (click)="recall()" acl [acl-ability]="['TAX-COLLECT-change']">
更正
</li>
<li nz-menu-item (click)="uploadSetting()" acl [acl-ability]="['TAX-COLLECT-resetData']">
更新数据
</li>
</ul>
</nz-dropdown-menu>
</div> </div>
</ng-template> </ng-template>

View File

@ -2,20 +2,19 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { STChange, 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 { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { BasicTableComponent } from 'src/app/routes/commom';
import { TaxManagementService } from '../../services/tax-management.service'; import { TaxManagementService } from '../../services/tax-management.service';
@Component({ @Component({
selector: 'app-tax-management-individual-collect', selector: 'app-tax-management-individual-collect',
templateUrl: './individual-collect.component.html', templateUrl: './individual-collect.component.html',
styleUrls: ['../../../commom/less/box.less'] styleUrls: ['../../../commom/less/commom-table.less']
}) })
export class TaxManagementIndividualCollectComponent implements OnInit { export class TaxManagementIndividualCollectComponent extends BasicTableComponent implements OnInit {
_$expand = false;
schema!: SFSchema;
columns!: STColumn[]; columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent; @ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
tabs: any[] = [ tabs: any[] = [
{ name: '待申报', value: '0' }, { name: '待申报', value: '0' },
{ name: '待审核', value: '1' }, { name: '待审核', value: '1' },
@ -26,7 +25,9 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
selectedIndex = '0'; selectedIndex = '0';
selectedRows: any[] = []; selectedRows: any[] = [];
constructor(public service: TaxManagementService, private router: Router, private ar: ActivatedRoute, private modal: NzModalService) {} constructor(public service: TaxManagementService, public searchDrawerService: SearchDrawerService) {
super(searchDrawerService);
}
/** /**
* 查询参数 * 查询参数
@ -39,14 +40,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
return { ...params }; return { ...params };
} }
/**
* 伸缩查询条件
*/
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
stChange(e: STChange): void { stChange(e: STChange): void {
switch (e.type) { switch (e.type) {
case 'checkbox': case 'checkbox':
@ -55,13 +48,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
} }
} }
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
this._$expand = false;
}
/** /**
* 程序初始化入口 * 程序初始化入口
*/ */
@ -76,7 +62,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
initSF() { initSF() {
this.schema = { this.schema = {
properties: { properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
overdueStatus: { overdueStatus: {
title: '是否逾期', title: '是否逾期',
type: 'string', type: 'string',
@ -98,7 +83,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
ui: { ui: {
widget: 'sl-from-to', widget: 'sl-from-to',
type: 'date', type: 'date',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd'
} as SFDateWidgetSchema } as SFDateWidgetSchema
}, },
sbrq: { sbrq: {
@ -108,9 +93,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
widget: 'sl-from-to', widget: 'sl-from-to',
type: 'date', type: 'date',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema } as SFDateWidgetSchema
}, },
nsrmc: { nsrmc: {
@ -120,9 +102,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
allowClear: true, allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
asyncData: () => this.service.getNetworkEnterpriseName() asyncData: () => this.service.getNetworkEnterpriseName()
} }
} }
@ -273,7 +252,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit {
this.service.msgSrv.success('更新成功'); this.service.msgSrv.success('更新成功');
this.search(); this.search();
} }
}) });
} }
search() { search() {

View File

@ -1,17 +1,5 @@
<!-- <!-- <page-header-wrapper [title]="''"></page-header-wrapper>
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-03-30 14:00:43
* @LastEditors : Shiming
* @LastEditTime : 2022-03-30 15:55:06
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-income\\individual-income.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''"></page-header-wrapper>
<nz-card class="search-box"> <nz-card class="search-box">
<!-- 搜索表单 -->
<div nz-row nzGutter="8"> <div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18"> <div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" <sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}"
@ -28,14 +16,18 @@
</button> </button>
</div> </div>
</div> </div>
</nz-card> </nz-card> -->
<nz-card class="content-box"> <nz-card class="table-box">
<nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length > 0"> <div class="tab_header">
<label class="page_title"> <label class="driver">|</label> 个税明细</label>
<nz-tabset [nzTabBarExtraContent]="extraTemplate">
<nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab> <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab>
</nz-tabset> </nz-tabset>
</div>
<!-- 数据列表 --> <!-- 数据列表 -->
<st #st [scroll]="{ x: '1200px',y:'450px' }" [data]="service.$api_get_individual_income_page" [columns]="columns" <st #st [scroll]="{ x: '1200px',y:scrollY }" [data]="service.$api_get_individual_income_page" [columns]="columns"
[req]="{ process: beforeReq }" [page]="{}" [loading]="service.http.loading" (change)="stChange($event)"> [req]="{ process: beforeReq }" [page]="{}" [loading]="service.http.loading" (change)="stChange($event)">
</st> </st>
</nz-card> </nz-card>
@ -45,10 +37,29 @@
已选择 已选择
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据 <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
</div> </div>
<button nz-button nzType="primary" (click)="upload()" acl [acl-ability]="['TAX-INCOME-declare']">申报</button> <button nz-button nzDanger [nzLoading]="isLoading && st.loading" acl [acl-ability]="['TAX-INCOME-search']"
<button nz-button nzType="primary" (click)="corrections()" acl [acl-ability]="['TAX-INCOME-change']">更正</button> (click)="openDrawer()">筛选</button>
<button nz-button nzType="primary" (click)="resetData()" acl [acl-ability]="['TAX-INCOME-threshold']">修改起征点</button> <button nz-button nzDanger acl [acl-ability]="['TAX-INCOME-export']"> 导出</button>
<button nz-button nzType="primary" (click)="uploadSetting()" acl [acl-ability]="['TAX-INCOME-resetData']">更新数据</button> <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
<nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu>
<li nz-menu-item (click)="upload()" acl [acl-ability]="['TAX-INCOME-declare']">
申报
</li>
<li nz-menu-item (click)="corrections()" acl [acl-ability]="['TAX-INCOME-change']">
更正
</li>
<li nz-menu-item (click)="resetData()" acl [acl-ability]="['TAX-INCOME-threshold']">
修改起征点
</li>
<li nz-menu-item (click)="uploadSetting()" acl [acl-ability]="['TAX-INCOME-resetData']">
更新数据
</li>
</ul>
</nz-dropdown-menu>
</div> </div>
</ng-template> </ng-template>

View File

@ -1,22 +1,18 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { SFDateWidgetSchema } from '@delon/form';
import { ShipperBaseService } from '@shared'; import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal'; import { BasicTableComponent } from 'src/app/routes/commom';
import { TaxManagementService } from '../../services/tax-management.service'; import { TaxManagementService } from '../../services/tax-management.service';
@Component({ @Component({
selector: 'app-tax-management-individual-income', selector: 'app-tax-management-individual-income',
templateUrl: './individual-income.component.html', templateUrl: './individual-income.component.html',
styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] styleUrls: ['../../../commom/less/commom-table.less']
}) })
export class TaxManagementIndividualIncomeComponent implements OnInit { export class TaxManagementIndividualIncomeComponent extends BasicTableComponent implements OnInit {
_$expand = false;
schema!: SFSchema;
columns!: STColumn[]; columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent; @ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
isLoading: boolean = false; isLoading: boolean = false;
tabs: any[] = [ tabs: any[] = [
{ name: '待申报', value: '0' }, { name: '待申报', value: '0' },
@ -30,7 +26,9 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
selectedRows: any[] = []; selectedRows: any[] = [];
constructor(public service: TaxManagementService) {} constructor(public service: TaxManagementService, public searchDrawerService: SearchDrawerService) {
super(searchDrawerService);
}
beforeReq = (requestOptions: STRequestOptions) => { beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, { declareStatus: this.selectedIndex }); Object.assign(requestOptions.body, { declareStatus: this.selectedIndex });
@ -50,22 +48,6 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
} }
} }
/**
* 伸缩查询条件
*/
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
this._$expand = false;
this.isLoading = true;
}
/** /**
* 程序初始化入口 * 程序初始化入口
*/ */
@ -80,7 +62,6 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
initSF() { initSF() {
this.schema = { this.schema = {
properties: { properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
driverName: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } }, driverName: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } },
telephone: { telephone: {
type: 'string', type: 'string',
@ -140,10 +121,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
ui: { ui: {
placeholder: '请选择', placeholder: '请选择',
widget: 'select', widget: 'select',
containsAllLabel: true, containsAllLabel: true
visibleIf: {
_$expand: (value: boolean) => value
}
}, },
default: '' default: ''
}, },
@ -153,10 +131,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
ui: { ui: {
widget: 'sl-from-to', widget: 'sl-from-to',
type: 'date', type: 'date',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd'
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema } as SFDateWidgetSchema
}, },
declareDate: { declareDate: {
@ -165,10 +140,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
ui: { ui: {
widget: 'sl-from-to', widget: 'sl-from-to',
type: 'date', type: 'date',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd'
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema } as SFDateWidgetSchema
}, },
ltdId: { ltdId: {
@ -178,9 +150,6 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
allowClear: true, allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
asyncData: () => this.service.getNetworkFreightForwarder() asyncData: () => this.service.getNetworkFreightForwarder()
} }
} }

View File

@ -1,17 +1,5 @@
<!-- <!-- <page-header-wrapper [title]="''"></page-header-wrapper>
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-03-30 14:00:43
* @LastEditors : Shiming
* @LastEditTime : 2022-04-09 14:11:01
* @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\order-reporting.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''"></page-header-wrapper>
<nz-card> <nz-card>
<!-- 搜索表单 -->
<div nz-row nzGutter="8"> <div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18"> <div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
@ -27,18 +15,20 @@
</button> </button>
</div> </div>
</div> </div>
</nz-card> </nz-card> -->
<nz-card>
<nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length>0">
<nz-card class="table-box">
<div class="tab_header">
<label class="page_title"> <label class="driver">|</label> 订单上报</label>
<nz-tabset [nzTabBarExtraContent]="extraTemplate" *ngIf="tabs.length>0">
<nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)">
</nz-tab> </nz-tab>
</nz-tabset> </nz-tabset>
</div>
<!-- 数据列表 --> <!-- 数据列表 -->
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_getTaxOrderPage_page" [columns]="columns" <st #st [scroll]="{x:'1200px',y:scrollY}" [data]="service.$api_getTaxOrderPage_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ params: reqParams }" [page]="{ }" [loading]="service.http.loading">
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
<ng-template st-row="putStatus" let-item let-index="index"> <ng-template st-row="putStatus" let-item let-index="index">
<!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> --> <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
<span *ngIf="item?.putStatus == '0'">待上传</span> <span *ngIf="item?.putStatus == '0'">待上传</span>
@ -101,11 +91,26 @@
已选择 已选择
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据 <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
</div> </div>
<button nz-button nzType="primary" (click)="upload()" acl [acl-ability]="['TAX-ORDERREPORT-upload']">上传</button> <button nz-button nzDanger [nzLoading]="isLoading && st.loading" acl [acl-ability]="['TAX-ORDERREPORT-search']"
<button nz-button nzType="primary" (click)="recall() " acl [acl-ability]="['TAX-ORDERREPORT-recall']">撤回</button> (click)="openDrawer()">筛选</button>
<button nz-button nzType="primary" (click)="resetData()" acl <button nz-button nzDanger acl [acl-ability]="['TAX-ORDERREPORT-export']"> 导出</button>
[acl-ability]="['TAX-ORDERREPORT-resetData']">更新数据</button> <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
<button nz-button nzType="primary" (click)="uploadSetting()" acl 更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
[acl-ability]="['TAX-ORDERREPORT-uploadSetting']">税务设置</button> <nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu>
<li nz-menu-item (click)="upload()" acl [acl-ability]="['TAX-ORDERREPORT-upload']">
上传
</li>
<li nz-menu-item (click)="recall() " acl [acl-ability]="['TAX-ORDERREPORT-recall']">
撤回
</li>
<li nz-menu-item (click)="resetData()" acl [acl-ability]="['TAX-ORDERREPORT-resetData']">
更新数据
</li>
<li nz-menu-item (click)="uploadSetting()" acl [acl-ability]="['TAX-ORDERREPORT-uploadSetting']">
税务设置
</li>
</ul>
</nz-dropdown-menu>
</div> </div>
</ng-template> </ng-template>

View File

@ -1,22 +0,0 @@
:host {
.text-black {
color: #000;
}
.icon {
display: inline-block;
width: 1em;
height: 1em;
stroke-width: 0;
stroke: currentColor;
/* stylelint-disable-next-line order/properties-order */
fill: currentColor;
}
::ng-deep {
.imgBox {
display: flex;
img {
width: 60px !important;
}
}
}
}

View File

@ -1,24 +0,0 @@
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { DatatableOrderReportingComponent } from './order-reporting.component';
describe('DatatableOrderReportingComponent', () => {
let component: DatatableOrderReportingComponent;
let fixture: ComponentFixture<DatatableOrderReportingComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ DatatableOrderReportingComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(DatatableOrderReportingComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -1,29 +1,24 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData } from '@delon/abc/st'; import { STColumn, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { SFDateWidgetSchema, SFSchemaEnum, SFSelectWidgetSchema } from '@delon/form';
import { ShipperBaseService } from '@shared'; import { SearchDrawerService, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { BasicTableComponent } from 'src/app/routes/commom';
import { TaxManagementService } from '../../services/tax-management.service'; import { TaxManagementService } from '../../services/tax-management.service';
import { TaxManagementUploadSettingComponent } from './upload-setting/upload-setting.component'; import { TaxManagementUploadSettingComponent } from './upload-setting/upload-setting.component';
import { TaxManagementOrderVerifyResultComponent } from './verify-result/verify-result.component'; import { TaxManagementOrderVerifyResultComponent } from './verify-result/verify-result.component';
// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component';
// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component';
@Component({ @Component({
selector: 'app-tax-management-order-reporting', selector: 'app-tax-management-order-reporting',
templateUrl: './order-reporting.component.html', templateUrl: './order-reporting.component.html',
styleUrls: ['./order-reporting.component.less'] styleUrls: ['../../../commom/less/commom-table.less']
}) })
export class TaxManagementOrderReportingComponent implements OnInit { export class TaxManagementOrderReportingComponent extends BasicTableComponent implements OnInit {
_$expand = false;
ui!: SFUISchema;
schema!: SFSchema;
columns!: STColumn[]; columns!: STColumn[];
@ViewChild('st', { static: false }) st!: STComponent; @ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
tabType!: string; tabType!: string;
isLoading: boolean = false; isLoading: boolean = false;
tabs: any[] = [ tabs: any[] = [
@ -41,15 +36,9 @@ export class TaxManagementOrderReportingComponent implements OnInit {
private ar: ActivatedRoute, private ar: ActivatedRoute,
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
private modal: NzModalService, private modal: NzModalService,
public shipperSrv: ShipperBaseService public searchDrawerService: SearchDrawerService
) { ) {
} super(searchDrawerService);
/**
* 查询字段个数
*/
get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length;
} }
/** /**
@ -57,7 +46,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
*/ */
get reqParams() { get reqParams() {
const params = Object.assign({}, this.sf?.value || {}, { const params = Object.assign({}, this.sf?.value || {}, {
putStatus: this.selectedIndex, putStatus: this.selectedIndex
}); });
delete params._$expand; delete params._$expand;
return { ...params }; return { ...params };
@ -70,22 +59,6 @@ export class TaxManagementOrderReportingComponent implements OnInit {
return this.st?.list.filter((item: any) => item.checked) || []; 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;
this.isLoading = true
}
/** /**
* 程序初始化入口 * 程序初始化入口
*/ */
@ -106,8 +79,8 @@ export class TaxManagementOrderReportingComponent implements OnInit {
type: 'string', type: 'string',
title: '运单号', title: '运单号',
ui: { ui: {
placeholder: '请输入', placeholder: '请输入'
}, }
}, },
shipperId: { shipperId: {
type: 'string', type: 'string',
@ -119,7 +92,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
searchLoadingText: '搜索中...', searchLoadingText: '搜索中...',
allowClear: true, allowClear: true,
onSearch: (q: any) => { onSearch: (q: any) => {
let str = q.replace(/^\s+|\s+$/g, ""); let str = q.replace(/^\s+|\s+$/g, '');
if (str) { if (str) {
return this.service return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str }) .request(this.service.$api_enterpriceList, { enterpriseName: str })
@ -128,17 +101,14 @@ export class TaxManagementOrderReportingComponent implements OnInit {
} else { } else {
return of([]); return of([]);
} }
}, }
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
driverName: { driverName: {
title: '承运司机', title: '承运司机',
type: 'string', type: 'string',
ui: { ui: {
placeholder: '请输入司机姓名/手机号', visibleIf: { placeholder: '请输入司机姓名/手机号'
_$expand: (value: boolean) => value,
},
} }
}, },
carNo: { carNo: {
@ -146,10 +116,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
type: 'string', type: 'string',
maxLength: 9, maxLength: 9,
ui: { ui: {
placeholder: '请输入', placeholder: '请输入'
visibleIf: {
_$expand: (value: boolean) => value,
},
} }
}, },
collectionUserName: { collectionUserName: {
@ -157,10 +124,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
type: 'string', type: 'string',
maxLength: 9, maxLength: 9,
ui: { ui: {
placeholder: '请输入', placeholder: '请输入'
visibleIf: {
_$expand: (value: boolean) => value,
},
} }
}, },
// putStatus: { // putStatus: {
@ -183,16 +147,13 @@ export class TaxManagementOrderReportingComponent implements OnInit {
title: '本地校验', title: '本地校验',
type: 'string', type: 'string',
enum: [ enum: [
{label: '校验中',value: 0}, { label: '校验中', value: 0 },
{label: '通过',value: 1}, { label: '通过', value: 1 },
{label: '不通过',value: 2}, { label: '不通过', value: 2 }
], ],
ui: { ui: {
widget:'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择'
visibleIf: {
_$expand: (value: boolean) => value,
},
} }
}, },
networkTransporter: { networkTransporter: {
@ -202,9 +163,6 @@ export class TaxManagementOrderReportingComponent implements OnInit {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
allowClear: true, allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
asyncData: () => this.shipperservice.getNetworkFreightForwarder() asyncData: () => this.shipperservice.getNetworkFreightForwarder()
} }
}, },
@ -214,11 +172,8 @@ export class TaxManagementOrderReportingComponent implements OnInit {
ui: { ui: {
widget: 'sl-from-to', widget: 'sl-from-to',
type: 'date', type: 'date',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd'
visibleIf: { } as SFDateWidgetSchema
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
}, },
orderPayTime: { orderPayTime: {
title: '结束时间', title: '结束时间',
@ -226,17 +181,10 @@ export class TaxManagementOrderReportingComponent implements OnInit {
ui: { ui: {
widget: 'sl-from-to', widget: 'sl-from-to',
type: 'date', type: 'date',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd'
visibleIf: { } as SFDateWidgetSchema
_$expand: (value: boolean) => value, }
}, }
} as SFDateWidgetSchema,
},
},
};
this.ui = {
'*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
$time: { grid: { span: 24 } },
}; };
} }
@ -245,33 +193,33 @@ export class TaxManagementOrderReportingComponent implements OnInit {
*/ */
initST() { initST() {
this.columns = [ this.columns = [
{ title: '', type: 'checkbox', className: 'text-center', width: '60px', }, { title: '', type: 'checkbox', className: 'text-center', width: '60px' },
{ title: '上传状态', render: 'putStatus', className: 'text-center', width: '120px', }, { title: '上传状态', render: 'putStatus', className: 'text-center', width: '120px' },
{ title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', }, { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px' },
{ {
title: '订单号', title: '订单号',
index: 'billCode', index: 'billCode',
className: 'text-center', className: 'text-center',
width: '150px', width: '150px'
}, },
{ title: '运单号', index: 'wayBillCode', className: 'text-center', width: '150px', }, { title: '运单号', index: 'wayBillCode', className: 'text-center', width: '150px' },
{ {
title: '网络货运人', title: '网络货运人',
index: 'networkTransporterName', index: 'networkTransporterName',
className: 'text-center', className: 'text-center',
width: '180px', width: '180px'
}, },
{ {
title: '档案编号', title: '档案编号',
index: 'archivesNo', index: 'archivesNo',
className: 'text-center', className: 'text-center',
width: '180px', width: '180px'
}, },
{ {
title: '品牌型号', title: '品牌型号',
index: 'carBrand', index: 'carBrand',
className: 'text-center', className: 'text-center',
width: '180px', width: '180px'
}, },
{ title: '装货地', index: 'loadingAddress', render: 'loadingPlace', className: 'text-center', width: '200px' }, { title: '装货地', index: 'loadingAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
{ title: '装货地详细地址', index: 'loadingDetailedAddress', render: 'loadingPlace', className: 'text-center', width: '200px' }, { title: '装货地详细地址', index: 'loadingDetailedAddress', render: 'loadingPlace', className: 'text-center', width: '200px' },
@ -301,12 +249,10 @@ export class TaxManagementOrderReportingComponent implements OnInit {
{ title: '提货单', render: 'loadingLadingBill', className: 'text-center', width: '100px' }, { title: '提货单', render: 'loadingLadingBill', className: 'text-center', width: '100px' },
{ title: '签收单', render: 'signatureForm', className: 'text-center', width: '100px' }, { title: '签收单', render: 'signatureForm', className: 'text-center', width: '100px' },
{ title: '上传次数', index: 'putNumber', className: 'text-center', width: '100px' }, { title: '上传次数', index: 'putNumber', className: 'text-center', width: '100px' },
{ title: '最近上传时间', index: 'recentlyPutTime', className: 'text-center', width: '180px' }, { title: '最近上传时间', index: 'recentlyPutTime', className: 'text-center', width: '180px' }
]; ];
} }
/** /**
*撤回 *撤回
* @param record 记录实例 * @param record 记录实例
@ -331,10 +277,9 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.service.msgSrv.success('撤销成功'); this.service.msgSrv.success('撤销成功');
this.search(); this.search();
} }
}) });
} }
}); });
} }
/** /**
*撤销 *撤销
@ -354,7 +299,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.service.msgSrv.success('更新成功'); this.service.msgSrv.success('更新成功');
this.st.load(1); this.st.load(1);
} }
}) });
} }
/** /**
*撤销 *撤销
@ -381,10 +326,9 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.service.msgSrv.success('撤销成功'); this.service.msgSrv.success('撤销成功');
this.search(); this.search();
} }
}) });
} }
}); });
} }
selectChange(item: any) { selectChange(item: any) {
@ -393,7 +337,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.selectedIndex = item?.value || ''; this.selectedIndex = item?.value || '';
setTimeout(() => { setTimeout(() => {
this.st.load(); this.st.load();
}) });
} }
/** /**
@ -403,7 +347,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
// this.router.navigate(['../view', record.uuid], { relativeTo: this.ar }); // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar });
this.router.navigate(['../detail'], { this.router.navigate(['../detail'], {
queryParams: { queryParams: {
id: record.id, id: record.id
}, },
relativeTo: this.ar relativeTo: this.ar
}); });
@ -431,17 +375,17 @@ export class TaxManagementOrderReportingComponent implements OnInit {
* 上传 * 上传
*/ */
upload() { upload() {
let status = false let status = false;
if (this.selectedRows.length === 0) { if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要上传的数据'); this.openWainingModal('请选择需要上传的数据');
return; return;
} }
this.selectedRows.forEach(item => { this.selectedRows.forEach(item => {
if (item?.putStatus != '0') { if (item?.putStatus != '0') {
status = true status = true;
} }
}); });
if(status) { if (status) {
this.service.msgSrv.warning('选择了已上传,请重新勾选!'); this.service.msgSrv.warning('选择了已上传,请重新勾选!');
return; return;
} }
@ -459,10 +403,9 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.service.msgSrv.success('上传成功'); this.service.msgSrv.success('上传成功');
this.st.load(); this.st.load();
} }
}) });
} }
/** /**
* *
* @param params 上传设置 * @param params 上传设置
@ -479,7 +422,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
if (res) { if (res) {
this.st.load(); this.st.load();
} }
}) });
} }
/** /**
@ -499,7 +442,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
if (res) { if (res) {
this.st.load(); this.st.load();
} }
}) });
} }
/** /**
@ -509,10 +452,9 @@ export class TaxManagementOrderReportingComponent implements OnInit {
if (record?.billStatus !== '2') { if (record?.billStatus !== '2') {
return; return;
} }
this.openWainingModal('监管审核结果', record?.result) this.openWainingModal('监管审核结果', record?.result);
} }
search() { search() {
this.st.load(1); this.st.load(1);
} }
@ -528,8 +470,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
this.modal.warning({ this.modal.warning({
nzMask: false, nzMask: false,
nzTitle: title, nzTitle: title,
nzContent: content, nzContent: content
}) });
} }
} }