diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts index 3c1448fd..26545ef6 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.ts +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.ts @@ -5,7 +5,7 @@ import { map } from 'rxjs/operators'; * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-14 16:19:06 + * @LastEditTime : 2022-04-14 16:21:00 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -108,10 +108,6 @@ export class DatatableDatascreenComponent implements OnInit { } genData(): any{ let value: any = []; - console.log('9999999'); - - // let value: any = [{city: '深圳市', weight: 5070.4} - // ,{city: '济宁市', weight: 338}]; this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => { console.log(res); res.forEach((element: any) => { @@ -122,7 +118,6 @@ export class DatatableDatascreenComponent implements OnInit { }); this.salesData2 = value }); - console.log(value); } initPillarData(){ // this.curve.reRender() diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts index 65af6ff6..ce4705c0 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts @@ -24,10 +24,10 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { @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 = ''; //选择的项目 @@ -54,7 +54,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { */ get reqParams() { const params = Object.assign({}, this.sf?.value || {}, { - representationsStatus: this.selectedIndex + declareStatus: this.selectedIndex }); delete params._$expand; return { ...params }; @@ -331,7 +331,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { } selectChange(item: any) { - this.selectedIndex = item?.representationsStatus || ''; + this.selectedIndex = item?.value || ''; setTimeout(() => { this.st.load(1); }); @@ -390,7 +390,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { */ resetData() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要上传的数据'); + this.openWainingModal('请选择需要更新的数据'); return; } let params: any[] = []; diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index 6f5d861b..b49c9148 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -1,7 +1,7 @@