diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html index 5834cc87..943a1e69 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html @@ -4,8 +4,8 @@ * @Author : Shiming * @Date : 2022-03-30 14:00:43 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 14:06:01 - * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\reporting\\order-reporting\\order-reporting.component.html + * @LastEditTime : 2022-03-30 14:20:03 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\order-reporting.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -62,6 +62,7 @@ - + + diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 75f60d81..1e0d1759 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -7,6 +7,7 @@ import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; import { map } from 'rxjs/operators'; import { TaxManagementService } from '../../services/tax-management.service'; +import { TaxManagementOrderVerifyResultComponent } from './verify-result/verify-result.component'; // import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; // import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; @@ -114,9 +115,6 @@ export class TaxManagementOrderReportingComponent implements OnInit { searchDebounceTime: 300, searchLoadingText: '搜索中...', allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value - }, onSearch: (q: any) => { let str =q.replace(/^\s+|\s+$/g,""); if (str) { @@ -240,10 +238,8 @@ export class TaxManagementOrderReportingComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '订单状态', render: 'orderStatus', className: 'text-center', width: '120px', }, - { title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', }, - { title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', }, - { title: '本地校验66', render: 'localValid', className: 'text-center', width: '120px', }, + { title: '上传状态', render: 'orderStatus', className: 'text-center', width: '120px', }, + { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, { title: '订单号', render: 'billComplianceVOS', @@ -251,37 +247,41 @@ export class TaxManagementOrderReportingComponent implements OnInit { width: '150px', }, { title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', }, - { title: '网络货运人', render: 'serviceType', className: 'text-center', width: '180px', }, - { title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' }, - { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' }, - { title: '发货时间', render: 'driver', className: 'text-center', width: '180px' }, - { title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' }, - { title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' }, - { title: '收货方名称', render: 'driver', className: 'text-center', width: '150px' }, - { title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '运费金额', render: 'amount', className: 'text-center', width: '250px' }, - { title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '车牌颜色', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '装货地', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '装货地详细地址', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '卸货地', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' }, + { title: '卸货地详细地址', render: 'goodsInfoVOList', className: 'text-center', width: '180px' }, + { title: '货主名称', render: 'driver', className: 'text-center', width: '180px' }, + { title: '货主纳税人识别号', render: 'payeeName', className: 'text-center', width: '180px' }, + { title: '录单时间', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '接单时间', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '发车时间', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' }, + { title: '到车时间', render: 'driver', className: 'text-center', width: '150px' }, + { title: '结束时间', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '订单金额', render: 'amount', className: 'text-center', width: '250px' }, { 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: '货物信息', 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: '车辆轨迹', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '司机轨迹', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' }, - { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '司机身份证号', render: 'transportInfo', className: 'text-center', width: '250px' }, + { 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: '装卸方式', 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: '收款人姓名', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '收款人身份证号码', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '装货照片', render: 'transportInfo', className: 'text-center', width: '150px' }, + { title: '卸货照片', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '提货单', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '签收单', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '最近上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, ]; } @@ -388,17 +388,17 @@ export class TaxManagementOrderReportingComponent implements OnInit { * 查看校验结果 */ viewResult(item: any) { - // const modalRef = this.modal.create({ - // nzTitle: '校验结果', - // nzWidth: 1200, - // nzContent: DatatableReportingVerifyResultComponent, - // nzComponentParams: { - // record: item - // }, - // nzFooter: null - // }); - // modalRef.afterClose.subscribe(res => { - // }) + const modalRef = this.modal.create({ + nzTitle: '本地校验结果', + nzWidth: 1200, + nzContent: TaxManagementOrderVerifyResultComponent, + nzComponentParams: { + record: item + }, + nzFooter: null + }); + modalRef.afterClose.subscribe(res => { + }) } /** diff --git a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html new file mode 100644 index 00000000..e155b1bd --- /dev/null +++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html @@ -0,0 +1,23 @@ +
+
+ + + +
+
+ + +
+
{{item.expenseName}}:{{item.price | currency}}
+
+ + +
+
+
+ + +
diff --git a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.spec.ts b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.spec.ts new file mode 100644 index 00000000..48b1e9e5 --- /dev/null +++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableReportingVerifyResultComponent } from './verify-result.component'; + +describe('DatatableReportingVerifyResultComponent', () => { + let component: DatatableReportingVerifyResultComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DatatableReportingVerifyResultComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableReportingVerifyResultComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts new file mode 100644 index 00000000..1d9b4d9e --- /dev/null +++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts @@ -0,0 +1,94 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-03-30 14:26:01 + * @LastEditors : Shiming + * @LastEditTime : 2022-03-30 14:28:54 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\verify-result\\verify-result.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ +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 { TaxManagementService } from '../../../services/tax-management.service'; + +@Component({ + selector: 'app-tax-management-order-reporting-verify-result', + templateUrl: './verify-result.component.html', +}) +export class TaxManagementOrderVerifyResultComponent 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' }, + { name: '订单信息', value: '4' }, + ]; + + get reqParams() { + return {}; + } + constructor(public service: TaxManagementService, private modalRef: NzModalRef, public router: Router) { + + } + + ngOnInit(): void { + this.initST(); + } + + /** + * 初始化数据列表 + */ + 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: 'orderStatus', className: 'text-center', width: '120px', }, + { title: '本地校验', index: 'orderStatus', className: 'text-center', width: '100px', }, + { title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', }, + ] + } + + + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + + selectTab(e: any) { + + } + + 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/taxmanagement.module.ts b/src/app/routes/tax-management/taxmanagement.module.ts index 9cb1ff61..a4cbfa9b 100644 --- a/src/app/routes/tax-management/taxmanagement.module.ts +++ b/src/app/routes/tax-management/taxmanagement.module.ts @@ -4,18 +4,20 @@ * @Author : Shiming * @Date : 2022-03-30 13:58:28 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 14:14:57 + * @LastEditTime : 2022-03-30 14:27:22 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\taxmanagement.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ import { NgModule, Type } from '@angular/core'; import { SharedModule, SHARED_G2_MODULES } from '@shared'; import { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component'; +import { TaxManagementOrderVerifyResultComponent } from './components/order-reporting/verify-result/verify-result.component'; import { TaxManagementModuleRoutingModule } from './tax-management-routing.module'; const COMPONENTS: Type[] = [ - TaxManagementOrderReportingComponent + TaxManagementOrderReportingComponent, + TaxManagementOrderVerifyResultComponent ]