From 3d807a489da7c515b1033e366082047ad2046a31 Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 20 Apr 2022 17:50:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=B8=8A=E4=BC=A0=E8=81=94?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoice-reporting.component.html | 60 +------ .../invoice-reporting.component.ts | 160 +++++------------- .../upload-setting.component.html | 8 - .../upload-setting.component.ts | 110 ------------ .../verify-result.component.html | 30 ---- .../verify-result/verify-result.component.ts | 139 --------------- .../services/tax-management.service.ts | 1 + .../tax-management/taxmanagement.module.ts | 6 +- 8 files changed, 57 insertions(+), 457 deletions(-) delete mode 100644 src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.html delete mode 100644 src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.ts delete mode 100644 src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.html delete mode 100644 src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.ts 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 7bd651ef..db8b2f4e 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 @@ -19,67 +19,23 @@ - - - 待上传 - 已上传 - 上传中 - 上传异常 + 待上传 + 已上传 + 上传中 + 上传异常 - {{item.billCode}} - - - - 校验中 - 通过 - - 不通过 - - - -
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}
- - - -
-
- -
-
- - -
-
- -
-
- - -
-
- -
-
- - -
-
- -
-
+ {{item.invoiceno}}
{{item?.orderAmount | currency }}
@@ -92,7 +48,7 @@ 已选择 {{ selectedRows.length }} 条数据 - - + + 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 26de04d6..6802ebd8 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,16 +1,10 @@ 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 { SFComponent, SFDateWidgetSchema, SFSchema, 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 { TaxManagementInvoiceUploadSettingComponent } from './upload-setting/upload-setting.component'; -import { TaxManagementInvoiceVerifyResultComponent } from './verify-result/verify-result.component'; -// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; -// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; @Component({ selector: 'app-tax-management-invoice-reporting', @@ -27,13 +21,13 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { tabType!: string; isLoading: boolean = false; tabs: any[] = [ - { name: '待上传', value: '0' }, - { name: '上传中', value: '3' }, - { name: '已上传', value: '1' }, - { name: '异常', value: '2' }, + { name: '待上传', value: '1' }, + { name: '上传中', value: '2' }, + { name: '已上传', value: '3' }, + { name: '异常', value: '4' }, { name: '全部', value: '' } ]; - selectedIndex = '0'; //选择的项目 + selectedIndex = ''; //选择的项目 serviceTel = ''; constructor( public service: TaxManagementService, @@ -56,9 +50,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { * 查询参数 */ get reqParams() { - const params = Object.assign({}, this.sf?.value || {}, { - putStatus: this.selectedIndex, - }); + const params = Object.assign({}, this.sf?.value || {}); delete params._$expand; return { ...params }; } @@ -101,25 +93,25 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { this.schema = { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, - putStatus: { - title: '上传状态', - type: 'string', - default: 0, - enum: [ - { label: '全部', value: 0 }, - { label: '待上传', value: 1 }, - { label: '上传中', value: 2 }, - { label: '已上传', value: 3 }, - { label: '异常', value: 4 } - ], + // uploadSts: { + // title: '上传状态', + // type: 'string', + // default: '1', + // enum: [ + // { label: '全部', value: '' }, + // { label: '待上传', value: '1'}, + // { label: '上传中', value: '2' }, + // { label: '已上传', value: '3' }, + // { label: '异常', value: '4' } + // ], - ui: { - placeholder: '请选择', - widget: 'select', - allowClear: true - } - }, - networkTransporter: { + // ui: { + // placeholder: '请选择', + // widget: 'select', + // allowClear: true + // } + // }, + ltdId: { type: 'string', title: '网络货运人', ui: { @@ -129,7 +121,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { asyncData: () => this.shipperservice.getNetworkFreightForwarder() } }, - hrto: { + arto: { type: 'string', title: '购买方', ui: { @@ -139,14 +131,13 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { asyncData: () => this.service.getCRMCustomerId() } }, - billCode: { - title: '订单号', type: 'string', ui: { - placeholder: '请输入', visibleIf: { - _$expand: (value: boolean) => value - } + billHCode: { + title: '订单号', type: 'string', + ui: { + placeholder: '请输入' } }, - recentlyPutTime: { + invoicedate: { title: '开票日期', type: 'string', ui: { @@ -158,7 +149,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - orderPayTime: { + uoloadDate: { title: '上传日期', type: 'string', ui: { @@ -170,7 +161,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - wayBillCode: { + invoiceno: { type: 'string', title: '发票号码', ui: { @@ -180,7 +171,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { } }, }, - wayBillCode1: { + invoiceno2: { type: 'string', title: '发票代码', ui: { @@ -217,31 +208,31 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '上传状态', render: 'putStatus', className: 'text-center', width: '120px', }, + { title: '上传状态', render: 'uploadSts', className: 'text-center', width: '120px', }, { title: '发票类型', render: 'checkStatus', className: 'text-center', width: '120px', }, { title: '发票号码', - index: 'billCode', + index: 'invoiceno', render: 'invoiceNO', className: 'text-center', width: '150px', }, - { title: '发票代码', index: 'wayBillCode', className: 'text-center', width: '150px', }, + { title: '发票代码', index: 'invoiceno2', className: 'text-center', width: '150px', }, { title: '网络货运人', - index: 'networkTransporterName', + index: 'ltdName', className: 'text-center', width: '180px', }, - { title: '购买方企业名称', index: 'loadingAddress', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '购买方统一社会信用代码', index: 'loadingDetailedAddress', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '订单号', index: 'unloadAddress', render: 'dischargePlace', className: 'text-center', width: '120px' }, - { title: '货物名称', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' }, - { title: '价税合计', index: 'shipperName', className: 'text-center', width: '180px' }, - { title: '开票日期', index: 'shipperProvinceCode', className: 'text-center', width: '180px' }, - { title: '发票所属月份', index: 'recordTime', className: 'text-center', width: '250px' }, - { title: '发票状态', index: 'wayBillCreateTime', className: 'text-center', width: '200px' }, - { title: '上传日期', index: 'loadTime', className: 'text-center', width: '200px' }, + { title: '购买方企业名称', index: 'loadingAddress', render: 'artoname', className: 'text-center', width: '200px' }, + { title: '购买方统一社会信用代码', index: 'artotaxno', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '订单号', index: 'unloadAddress', render: 'billHCode', className: 'text-center', width: '120px' }, + { title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '180px' }, + { title: '价税合计', index: 'vatmoney', className: 'text-center', width: '180px' }, + { title: '开票日期', index: 'invoicedate', className: 'text-center', width: '180px' }, + { title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '250px' }, + { title: '发票状态', index: 'sts', className: 'text-center', width: '200px' }, + { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '200px' }, ]; } @@ -349,24 +340,6 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { }); } - // 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: '' }); - // } - // }) - // } - /** * 上传 */ @@ -388,45 +361,6 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { } - /** - * - * @param params 上传设置 - */ - uploadSetting() { - const modalRef = this.modal.create({ - nzTitle: '税务上传设置', - nzWidth: 600, - nzContent: TaxManagementInvoiceUploadSettingComponent, - nzComponentParams: {}, - nzFooter: null - }); - modalRef.afterClose.subscribe(res => { - if (res) { - this.st.load(); - } - }) - } - - /** - * 查看校验结果 - */ - viewResult(item: any) { - const modalRef = this.modal.create({ - nzTitle: '本地校验结果', - nzWidth: 1200, - nzContent: TaxManagementInvoiceVerifyResultComponent, - nzComponentParams: { - record: item - }, - nzFooter: null - }); - modalRef.afterClose.subscribe(res => { - if (res) { - this.st.load(); - } - }) - } - /** * 查看监管审核结果 */ diff --git a/src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.html b/src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.html deleted file mode 100644 index a4f5ae6e..00000000 --- a/src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.html +++ /dev/null @@ -1,8 +0,0 @@ - - -
- - -
- diff --git a/src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.ts b/src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.ts deleted file mode 100644 index c64f9110..00000000 --- a/src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.ts +++ /dev/null @@ -1,110 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { SFSchema, SFUISchema } from '@delon/form'; -import { NzModalRef } from 'ng-zorro-antd/modal'; -import { TaxManagementService } from '../../../services/tax-management.service'; - - -@Component({ - selector: 'app-datatable-invoice-upload-setting', - templateUrl: './upload-setting.component.html', -}) -export class TaxManagementInvoiceUploadSettingComponent implements OnInit { - record: any = {}; - i: any = {}; - schema!: SFSchema; - ui!: SFUISchema; - - constructor( - private modal: NzModalRef, - public service: TaxManagementService - ) { } - - ngOnInit(): void { - this.initSF(); - // this.loadData(); - } - - /** - * 初始化查询表单 - */ - initSF() { - this.schema = { - properties: { - no: { - type: 'string', - title: '订单数据', - enum: [ - { - label: '手动上传', - value: '1' - }, - { - label: '自动上传', - value: '2' - } - ], - description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传', - ui: { - widget: 'radio', - - } - }, - owner: { - type: 'string', - title: '资金数据', - enum: [ - { - label: '手动上传', - value: '1' - }, - { - label: '自动上传', - value: '2' - } - ], - description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传', - ui: { - widget: 'radio', - - } - }, - }, - required: ['owner', 'no'], - } - this.ui = { - '*': { - spanLabelFixed: 100, - grid: { span: 24 }, - }, - }; - } - - /** - * 获取设置数据 - */ - loadData() { - this.service.request(this.service.$api_get_upload_setting, {}).subscribe(res => { - if (res) { - this.i = res; - - } - }) - } - - /** - * 修改 - * @param value - */ - save(value: any): void { - this.service.request(this.service.$api_upload_setting_save, { ...value }).subscribe(res => { - if (res) { - this.service.msgSrv.success('保存成功'); - this.modal.close(true); - } - }) - } - - close(): void { - this.modal.destroy(); - } -} diff --git a/src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.html b/src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.html deleted file mode 100644 index f84ade19..00000000 --- a/src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.html +++ /dev/null @@ -1,30 +0,0 @@ -
-
- - - -
-
- - -
-
{{ item.expenseName }}:{{ item.price | currency }}
-
- - -
-
-
- - -
diff --git a/src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.ts b/src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.ts deleted file mode 100644 index 1442ddba..00000000 --- a/src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.ts +++ /dev/null @@ -1,139 +0,0 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { Router } from '@angular/router'; -import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; -import { SFSchema } from '@delon/form'; -import { ModalHelper, _HttpClient } from '@delon/theme'; -import { NzModalRef } from 'ng-zorro-antd/modal'; -import { TaxManagementService } from '../../../services/tax-management.service'; - -@Component({ - selector: 'app-tax-management-Invoice-reporting-verify-result', - templateUrl: './verify-result.component.html', -}) -export class TaxManagementInvoiceVerifyResultComponent implements OnInit { - searchSchema: SFSchema = { - properties: { - no: { - type: 'string', - title: '编号' - } - } - }; - @ViewChild('st') private readonly st!: STComponent; - columns: STColumn[] = []; - record: any = {} - subjectType: string = '0'; - tabs: any[] = [ - { name: '平台信息', value: '0' }, - { name: '货主信息', value: '1' }, - { name: '司机信息', value: '2' }, - { name: '订单信息', value: '3' }, - ]; - - // get reqParams() { - // console.log(this.subjectType); - // const params ={ - // subjectId: this.record?.shipperId, - // subjectType: this.subjectType, - // } - // return params; - // } - beforeReq = (requestOptions: STRequestOptions) => {let a: string = ''; - switch (this.subjectType) { - case '0': - a = this.record?.networkTransporterId; - break - case '1': - a = this.record?.shipperId; - break - case '2': - a = this.record?.driverId; - break - case '3': - a = this.record?.wayBillId; - break - } - Object.assign(requestOptions.body, { - subjectId: a , - subjectType: this.subjectType, - }); - return requestOptions; - }; - afterRes = (data: any[], rawData?: any) => { - console.log(data) - return data.map(item => ({ - ...item, - })); - }; - constructor(public service: TaxManagementService, private modalRef: NzModalRef, public router: Router) { - } - - ngOnInit(): void { - console.log(this.record); - - this.initST(); - } - - /** - * 初始化数据列表 - */ - initST() { - this.columns = [ - { title: '序号', type: 'no', className: 'text-center', width: '60px', }, - { title: '校验字段', index: 'checkFieldName', className: 'text-center', width: '120px', }, - { - 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', }, - ] - } - - - add(): void { - // this.modal - // .createStatic(FormEditComponent, { i: { id: 0 } }) - // .subscribe(() => this.st.reload()); - } - - selectTab(e: any) { - setTimeout(() => { - console.log(e?.value); - - this.subjectType = e?.value; - console.log(this.subjectType); - this.st.load(1); - }) - } - - update() { - if (this.record?.billType === '1') { - window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`) - - } else if (this.record.billType === '2') { - window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`); - } - } - close(): void { - this.modalRef.destroy(); - } - - -} diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index 5cfd0639..51f7cc45 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -56,6 +56,7 @@ export class TaxManagementService extends ShipperBaseService { $api_async_export_order_reporting_list = ``; // 导出订单上报 $api_get_upload_setting = ``; // 修改上传设置 $api_upload_setting_save = ``; // 修改上传设置 + $api_getInvoiceReport_page = '/api/sdc/invoiceUploadInfo/list/page'; constructor(public injector: Injector) { super(injector); } diff --git a/src/app/routes/tax-management/taxmanagement.module.ts b/src/app/routes/tax-management/taxmanagement.module.ts index 0c6eb02b..342b7ae6 100644 --- a/src/app/routes/tax-management/taxmanagement.module.ts +++ b/src/app/routes/tax-management/taxmanagement.module.ts @@ -14,8 +14,6 @@ import { TaxManagementIndividualCollectComponent } from './components/individual import { TaxManagementIndividualDeclareComponent } from './components/individual-declare/individual-declare.component'; import { TaxManagementIndividualIncomeComponent } from './components/individual-income/individual-income.component'; import { TaxManagementInvoiceReportingComponent } from './components/invoice-reporting/invoice-reporting.component'; -import { TaxManagementInvoiceUploadSettingComponent } from './components/invoice-reporting/upload-setting/upload-setting.component'; -import { TaxManagementInvoiceVerifyResultComponent } from './components/invoice-reporting/verify-result/verify-result.component'; import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component'; import { TaxManagementUploadSettingComponent } from './components/order-reporting/upload-setting/upload-setting.component'; import { TaxManagementOrderVerifyResultComponent } from './components/order-reporting/verify-result/verify-result.component'; @@ -29,9 +27,7 @@ const COMPONENTS: Type[] = [ TaxManagementIndividualIncomeComponent, TaxManagementIndividualCollectComponent, TaxManagementIndividualDeclareComponent, - TaxManagementInvoiceReportingComponent, - TaxManagementInvoiceUploadSettingComponent, - TaxManagementInvoiceVerifyResultComponent + TaxManagementInvoiceReportingComponent ]