From cddcc53a0cb745afe65aa0de3b0a83600760b0bf Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 6 May 2022 15:45:47 +0800 Subject: [PATCH] UI --- .../individual-collect.component.ts | 8 +- .../individual-declare.component.html | 61 ++++--- .../individual-declare.component.less | 5 - .../individual-declare.component.spec.ts | 34 ---- .../individual-declare.component.ts | 75 ++------- .../invoice-reporting.component.html | 68 ++++---- .../invoice-reporting.component.ts | 152 ++++++------------ 7 files changed, 137 insertions(+), 266 deletions(-) delete mode 100644 src/app/routes/tax-management/components/individual-declare/individual-declare.component.less delete mode 100644 src/app/routes/tax-management/components/individual-declare/individual-declare.component.spec.ts diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index c36afa1a..a006411a 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -1,9 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { STChange, STColumn, STComponent, STData } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { STChange, STColumn, STComponent } from '@delon/abc/st'; +import { SFDateWidgetSchema } from '@delon/form'; 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'; @@ -92,7 +90,7 @@ export class TaxManagementIndividualCollectComponent extends BasicTableComponent ui: { widget: 'sl-from-to', type: 'date', - format: 'yyyy-MM-dd', + format: 'yyyy-MM-dd' } as SFDateWidgetSchema }, nsrmc: { diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html index cd3d1cbb..daee8554 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html @@ -1,17 +1,5 @@ - - - +
@@ -27,16 +15,19 @@
- - - - - + --> + + +
+ + + + +
+ - + {{ item?.billStatusLabel }} {{ item?.billStatusLabel }} @@ -58,10 +49,28 @@ 已选择 {{ selectedRows.length }} 条数据 - - - - + + + + +
    +
  • + 申报 +
    • +
  • + 更正 +
    • +
  • + 修改起征点 +
    • +
  • + 更新数据 +
    • +
+ + diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.less b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.less deleted file mode 100644 index 43a47df4..00000000 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.less +++ /dev/null @@ -1,5 +0,0 @@ -:host { - .text-black { - color: #000; - } -} diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.spec.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.spec.ts deleted file mode 100644 index 23f9fc25..00000000 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* - * @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; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ TaxManagementIndividualDeclareComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(TaxManagementIndividualDeclareComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); 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 703a2fa2..75be4b4c 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 @@ -1,27 +1,20 @@ 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 { SFDateWidgetSchema } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { of } from 'rxjs'; -import { map } from 'rxjs/operators'; +import { BasicTableComponent } from 'src/app/routes/commom'; 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'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class TaxManagementIndividualDeclareComponent implements OnInit { - _$expand = false; - ui!: SFUISchema; - schema!: SFSchema; +export class TaxManagementIndividualDeclareComponent extends BasicTableComponent implements OnInit { columns!: STColumn[]; @ViewChild('st', { static: false }) st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; tabType!: string; tabs: any[] = [ { name: '待申报', value: '0' }, @@ -37,16 +30,10 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { 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; + public searchDrawerService: SearchDrawerService + ) { + super(searchDrawerService); } /** @@ -70,21 +57,6 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { 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; - } /** * 程序初始化入口 */ @@ -134,13 +106,10 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { placeholder: '请选择', widget: 'dict-select', params: { dictKey: 'taxincome:declare:status' }, - containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } + containsAllLabel: true } }, - + isOvertime: { title: '是否逾期', type: 'string', @@ -152,10 +121,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', - containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } + containsAllLabel: true }, default: '' }, @@ -165,10 +131,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { ui: { widget: 'sl-from-to', type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value - } + format: 'yyyy-MM-dd' } as SFDateWidgetSchema }, declareDate: { @@ -177,10 +140,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { ui: { widget: 'sl-from-to', type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value - } + format: 'yyyy-MM-dd' } as SFDateWidgetSchema }, ltdId: { @@ -190,18 +150,11 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { widget: 'select', placeholder: '请选择', allowClear: true, - 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 } } - }; } /** diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html index 2f59f9a9..b7fc6428 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html @@ -1,13 +1,12 @@ - - +
- +
- - - - - + --> + +
+ + + + +
+ - + 待上传 @@ -52,23 +47,30 @@ + -
+
已选择 {{ selectedRows.length }} 条数据
- - + + + + +
    +
  • + 上传 +
    • +
  • + 撤回 +
    • +
+
- + \ No newline at end of file diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts index 4bf92d71..8b2cf608 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts @@ -1,23 +1,19 @@ 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, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { ShipperBaseService } from '@shared'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFDateWidgetSchema, SFSelectWidgetSchema } from '@delon/form'; +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'; @Component({ selector: 'app-tax-management-invoice-reporting', templateUrl: './invoice-reporting.component.html', - styleUrls: ['./invoice-reporting.component.less'] + styleUrls: ['../../../commom/less/commom-table.less'] }) -export class TaxManagementInvoiceReportingComponent implements OnInit { - _$expand = false; - ui!: SFUISchema; - schema!: SFSchema; +export class TaxManagementInvoiceReportingComponent extends BasicTableComponent implements OnInit { columns!: STColumn[]; @ViewChild('st', { static: false }) st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; tabType!: string; isLoading: boolean = false; tabs: any[] = [ @@ -29,21 +25,8 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { ]; selectedIndex = '1'; //选择的项目 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; + constructor(public service: TaxManagementService, private modal: NzModalService, public searchDrawerService: SearchDrawerService) { + super(searchDrawerService); } /** @@ -62,22 +45,6 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { 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 - } /** * 程序初始化入口 */ @@ -92,7 +59,6 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { initSF() { this.schema = { properties: { - _$expand: { type: 'boolean', ui: { hidden: true } }, // uploadSts: { // title: '上传状态', // type: 'string', @@ -118,7 +84,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.shipperservice.getNetworkFreightForwarder() + asyncData: () => this.service.getNetworkFreightForwarder() } }, arto: { @@ -132,7 +98,8 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { } }, billHCode: { - title: '订单号', type: 'string', + title: '订单号', + type: 'string', ui: { placeholder: '请输入' } @@ -143,11 +110,8 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { ui: { widget: 'sl-from-to', type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema }, uoloadDate: { title: '上传日期', @@ -155,31 +119,22 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { ui: { widget: 'sl-from-to', type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema }, invoiceno: { type: 'string', title: '发票号码', ui: { - placeholder: '请输入', - visibleIf: { - _$expand: (value: boolean) => value - } - }, + placeholder: '请输入' + } }, invoiceno2: { type: 'string', title: '发票代码', ui: { - placeholder: '请输入', - visibleIf: { - _$expand: (value: boolean) => value - } - }, + placeholder: '请输入' + } }, sts: { title: '发票状态', @@ -188,17 +143,10 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { widget: 'dict-select', containsAllLabel: true, params: { dictKey: 'vatinv:status' }, - containAllLable: true, - visibleIf: { - _$expand: (value: boolean) => value - } + containAllLable: true } as SFSelectWidgetSchema - }, - }, - }; - this.ui = { - '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() }, - $time: { grid: { span: 24 } }, + } + } }; } @@ -207,9 +155,9 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { */ initST() { this.columns = [ - { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '上传状态', render: 'uploadSts', className: 'text-center', width: '120px', }, - { title: '发票类型', render: 'invoiceType', className: 'text-center', width: '180px', }, + { title: '', type: 'checkbox', className: 'text-center', width: '60px' }, + { title: '上传状态', render: 'uploadSts', className: 'text-center', width: '120px' }, + { title: '发票类型', render: 'invoiceType', className: 'text-center', width: '180px' }, { title: '发票号码', index: 'invoiceno', @@ -217,27 +165,35 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { width: '120px', type: 'link', click: item => { - window.open(`/#/ticket/invoice-list/detail/${item.vatinvHId}?type=${item.invoiceType}`, '_blank', 'noopener') + window.open(`/#/ticket/invoice-list/detail/${item.vatinvHId}?type=${item.invoiceType}`, '_blank', 'noopener'); } }, - { title: '发票代码', index: 'invoiceno2', className: 'text-center', width: '150px', }, + { title: '发票代码', index: 'invoiceno2', className: 'text-center', width: '150px' }, { title: '网络货运人', index: 'ltdName', className: 'text-center', - width: '180px', + width: '180px' }, { - title: '购买方企业名称', index: 'artoname', className: 'text-center', width: '200px', type: 'link', + title: '购买方企业名称', + index: 'artoname', + className: 'text-center', + width: '200px', + type: 'link', click: item => { - window.open(`/#/usercenter/freight/list/detail/${item.arto}`, '_blank', 'noopener') + window.open(`/#/usercenter/freight/list/detail/${item.arto}`, '_blank', 'noopener'); } }, { title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' }, { - title: '订单号', index: 'billHCode', className: 'text-center', width: '180px', type: 'link', + title: '订单号', + index: 'billHCode', + className: 'text-center', + width: '180px', + type: 'link', click: item => { - window.open(`/#/order-management/vehicle/vehicle-detail/${item.ltdId}`, '_blank', 'noopener') + window.open(`/#/order-management/vehicle/vehicle-detail/${item.ltdId}`, '_blank', 'noopener'); } }, { title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '120px' }, @@ -245,12 +201,10 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { { title: '开票日期', index: 'invoicedate', className: 'text-center', width: '180px' }, { title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '140px' }, { title: '发票状态', index: 'sts', render: 'sts', className: 'text-center', width: '120px' }, - { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '180px' }, + { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '180px' } ]; } - - /** *撤回 * @param record 记录实例 @@ -276,10 +230,9 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { this.service.msgSrv.success('撤销成功'); this.search(); } - }) + }); } }); - } /** @@ -307,10 +260,9 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { this.service.msgSrv.success('撤销成功'); this.search(); } - }) + }); } }); - } selectChange(item: any) { @@ -318,10 +270,9 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { setTimeout(() => { this.st.load(); - }) + }); } - /** * 上传 */ @@ -340,10 +291,9 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { this.service.msgSrv.success('上传成功'); this.st.load(); } - }) + }); } - /** * 查看监管审核结果 */ @@ -351,17 +301,16 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { if (record?.billStatus !== '2') { return; } - this.openWainingModal('监管审核结果', record?.result) + this.openWainingModal('监管审核结果', record?.result); } - search() { this.st.load(1); } /** - * 异步导出 - */ + * 异步导出 + */ export() { this.service.exportStart(this.reqParams, this.service.$api_invoiceUpload_export); } @@ -370,8 +319,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { this.modal.warning({ nzMask: false, nzTitle: title, - nzContent: content, - }) + nzContent: content + }); } - }