From d5bdb9ad6230f34005609cd5762ca17289a47610 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 20 Apr 2022 17:03:13 +0800 Subject: [PATCH 01/35] fix bug --- .../network-freight/new/new.component.html | 10 +++++++--- .../network-freight/new/new.component.ts | 19 +++---------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.html b/src/app/routes/sys-setting/components/network-freight/new/new.component.html index 647b7798..9aabcd30 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.html +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-17 15:01:33 * @LastEditors : Shiming - * @LastEditTime : 2022-04-20 16:21:58 + * @LastEditTime : 2022-04-20 17:00:33 * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\new\\new.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -20,6 +20,11 @@
+ +
+
+
+
企业基本信息
 @@ -39,8 +44,7 @@
道运证信息
 - - + diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts index 3fbe0d7e..af2518a9 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts @@ -52,7 +52,8 @@ export class NetworkFreightNewComponent implements OnInit { sf1FormData: any = { legalPersonIdentityVO: { certificatePhotoFrontWatermark: '', - certificatePhotoBackWatermark: '' + certificatePhotoBackWatermark: '', + roadTransportPhotoWatermark: '' } }; subText = '确认新增'; @@ -85,13 +86,6 @@ export class NetworkFreightNewComponent implements OnInit { spanLabelFixed: 100, grid: { xxl: 6, xl: 6, lg: 4, md: 6 } }, - $roadTransportPhotoWatermark: { - grid: { span: 12 }, - }, - $roadImg: { - grid: { span: 4 }, - class: 'setCustom' - }, }; constructor(private router: Router, public service: SystemService, private route: ActivatedRoute) {} @@ -607,6 +601,7 @@ export class NetworkFreightNewComponent implements OnInit { }, title3: { title: '', type: 'string', ui: { widget: 'custom', offsetControl: 6 } }, roadTransportPhoto: { title: '', type: 'string', ui: { hidden: true } }, + tipsY: { title: '', type: 'string', ui: { widget: 'custom', offsetControl: 6 } }, roadTransportPhotoWatermark: { type: 'string', title: '道运证照片', @@ -623,14 +618,6 @@ export class NetworkFreightNewComponent implements OnInit { } } as SFUploadWidgetSchema }, - // roadImg: { - // title: '', - // type: 'boolean', - // // enum: [{ label: '长期', value: true }], - // ui: { - // widget: 'custom' - // } - // }, roadTransportLicenceNo: { title: '经营许可证号', type: 'string', From 035066e53197c6e9baeb324b3b1586b8fa212c31 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 20 Apr 2022 17:07:42 +0800 Subject: [PATCH 02/35] fix bug --- .../components/network-freight/new/new.component.html | 4 ++-- .../routes/vehicle/components/audit/audit.component.html | 4 ++-- .../vehicle/components/audit/detail/detail.component.html | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.html b/src/app/routes/sys-setting/components/network-freight/new/new.component.html index 9aabcd30..7b6e01f9 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.html +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-17 15:01:33 * @LastEditors : Shiming - * @LastEditTime : 2022-04-20 17:00:33 + * @LastEditTime : 2022-04-20 17:04:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\new\\new.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -21,7 +21,7 @@ -
+
diff --git a/src/app/routes/vehicle/components/audit/audit.component.html b/src/app/routes/vehicle/components/audit/audit.component.html index 2b2bfb44..34452531 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.html +++ b/src/app/routes/vehicle/components/audit/audit.component.html @@ -1,7 +1,7 @@ + Date: Wed, 20 Apr 2022 17:11:46 +0800 Subject: [PATCH 03/35] fix bug --- .../components/network-freight/new/new.component.html | 5 ++++- .../components/network-freight/new/new.component.ts | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.html b/src/app/routes/sys-setting/components/network-freight/new/new.component.html index 7b6e01f9..d509f252 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.html +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-17 15:01:33 * @LastEditors : Shiming - * @LastEditTime : 2022-04-20 17:04:46 + * @LastEditTime : 2022-04-20 17:10:30 * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\new\\new.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -22,6 +22,9 @@
+
+ 请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证 +
diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts index af2518a9..0f1bb9ff 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts @@ -607,7 +607,6 @@ export class NetworkFreightNewComponent implements OnInit { title: '道运证照片', ui: { ...IMAGECONFIG, - descriptionI18n: '请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证', change: args => { if (args.type === 'success') { console.log(args); From c432f38beada5d30132fe91de77a7a5d293b8ea7 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 20 Apr 2022 17:14:28 +0800 Subject: [PATCH 04/35] edit --- proxy.conf.js | 2 +- .../basic-setting/basic-setting.component.ts | 4 +-- .../dynamic-setting-h5.component.html | 34 +++++++++++++++++++ .../dynamic-setting-h5.component.ts | 17 +++++++++- 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index eb92fbd4..00392e43 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts index e765f3dc..bc02ace2 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.ts @@ -12,7 +12,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { dateTimePickerUtil } from '@delon/util'; import { SystemService } from '../../services/system.service'; - +const NOJSONTYPE = new Set([8, 12, 13]); @Component({ selector: 'app-basic-setting', templateUrl: './basic-setting.component.html', @@ -49,7 +49,7 @@ export class BasicSettingComponent implements OnInit { res = res.map(item => ({ ...item, remark: item.remark ? JSON.parse(item.remark) : null, - itemValue: item?.itemValue ? (item?.itemType !== 8 ? JSON.parse(item?.itemValue) : item?.itemValue) : item?.itemValue, + itemValue: item?.itemValue ? (NOJSONTYPE.has(item?.itemType) ? item?.itemValue : JSON.parse(item?.itemValue)) : item?.itemValue, itemData: item.itemData ? JSON.parse(item.itemData) : item.itemData })); const hiddenType = res.find(item => item.itemType === 7 || item.itemType === 999); diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html index 4818365b..7e86f88f 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html @@ -109,6 +109,40 @@ *ngFor="let re of item.remark"> + + +
+ + + +
上传
+ +
+ +
+ +

支持 + + {{item}}, + + 格式，文件小于{{item.remark?.size || 2}}M（建议尺寸 + {{item.remark?.width || 750}}px * {{item.remark?.height|| 1622}}px）。 + 查看示例 +

+
+ + + + + diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts index 14ba8893..544ca3bc 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts @@ -10,6 +10,9 @@ */ import { Component, OnInit, EventEmitter, Input, Output } from '@angular/core'; import { BaseService } from '@shared'; +import { NzImageService } from 'ng-zorro-antd/image'; +import { NzUploadFile } from 'ng-zorro-antd/upload'; +import { of } from 'rxjs'; const JSONTYPE = new Set([5, 6, 9, 999]); @Component({ @@ -37,7 +40,7 @@ export class DynamicSettingH5Component implements OnInit { @Input() itemValue = 'itemValue'; listUrls: any; - constructor(public service: BaseService) {} + constructor(public service: BaseService, private nzImageService: NzImageService) {} ngOnInit() {} @@ -84,5 +87,17 @@ export class DynamicSettingH5Component implements OnInit { }); this.saveEvent.emit(params); } + + uploadChange(info: { file: NzUploadFile; type?: string }, item: any): void { + switch (info.type) { + case 'success': + item.itemValue = info.file.response.data.fullFilePath; + break; + } + } + + showImg(url: any) { + this.nzImageService.preview([{ src: url }]); + } } // [0]?.response?.data.fullFilePath From 3d807a489da7c515b1033e366082047ad2046a31 Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 20 Apr 2022 17:50:35 +0800 Subject: [PATCH 05/35] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E8=81=94=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 ] From e5ecb660e1651408f0b4e618e55bde8cad8213a7 Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 20 Apr 2022 17:59:59 +0800 Subject: [PATCH 06/35] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoice-reporting/invoice-reporting.component.html | 9 +++++++++ .../invoice-reporting/invoice-reporting.component.ts | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) 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 db8b2f4e..3cafec0a 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 @@ -37,6 +37,15 @@ {{item.invoiceno}} + + {{item.artoname}} + + + {{item.billHCode}} + + + 增值税专用发票 +
{{item?.orderAmount | currency }}
 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 6802ebd8..304974d5 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 @@ -209,7 +209,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, { title: '上传状态', render: 'uploadSts', className: 'text-center', width: '120px', }, - { title: '发票类型', render: 'checkStatus', className: 'text-center', width: '120px', }, + { title: '发票类型', render: 'invoiceType', className: 'text-center', width: '120px', }, { title: '发票号码', index: 'invoiceno', @@ -224,9 +224,9 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { className: 'text-center', width: '180px', }, - { 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: 'artoname', render: 'artoname', className: 'text-center', width: '200px' }, + { title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' }, + { title: '订单号', index: 'billHCode', 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' }, From 4cab877eed2f11bd7384bea1a9a166ac83f1b23c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 21 Apr 2022 09:55:41 +0800 Subject: [PATCH 07/35] fix bug --- .../driver-account-detail.component.html | 2 +- .../driver-account-detail.component.ts | 4 ++-- .../freight-account-detail.component.html | 12 +++++++++- .../freight-account-detail.component.ts | 23 ++++++++++++++----- .../individual-collect.component.ts | 17 -------------- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html index 3bef51eb..2c6762b8 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html @@ -1,4 +1,4 @@ - + @@ -12,11 +12,13 @@
-
电子装货单
+
电子装货单 + {{datas?.loadingElectronicsLadingBillFilePath ? '已签署' :'未签署'}} +
-
电子卸货单
+
电子卸货单 {{datas?.unloadingElectronicsLadingBillFilePath ? '已签署' :'未签署'}}
 From b064621c2a14d241aa77329e9a62af2d596d32c7 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 21 Apr 2022 14:46:51 +0800 Subject: [PATCH 18/35] fix bug --- .../voucher-view/voucher-view.component.ts | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts index 5b8fa7ba..efcaeeaf 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts @@ -574,20 +574,15 @@ export class orderManagementVoucherViewComponent implements OnInit { } openlaod(value: any) { if (value === 1) { + // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 if (!this.datas?.loadingElectronicsLadingBillFilePath) { this.service.request(this.service.$api_createBillTakeGoods, [this.datas?.id]).subscribe(res => { - console.log(res); if (res) { - console.log(res[0].esignFlowStatus); - switch (res[0]?.esignFlowStatus) { case 1: case '1': - console.log(res[0]?.esignFlowStatus); - this.service.msgSrv.success('电子装货单签署中！') this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe(res => { - console.log(res); if(res[0]?.esignFlowStatus == '2') { this.service.msgSrv.success('电子装货单已生效！') this.modal.destroy(true); @@ -604,26 +599,19 @@ export class orderManagementVoucherViewComponent implements OnInit { const a = document.createElement('a'); a.href = this.datas?.loadingElectronicsLadingBillFilePath; document.body.appendChild(a); - console.log(document.body.contains(a)); a.click(); //点击下载 document.body.removeChild(a); //下载完成移除元素 } } else { - + // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 if (!this.datas?.unloadingElectronicsLadingBillFilePath) { this.service.request(this.service.$api_createBillDischargeGoods, [this.datas?.id]).subscribe(res => { - console.log(res); if (res) { - console.log(res[0].esignFlowStatus); - switch (res[0]?.esignFlowStatus) { case 1: case '1': - console.log(res[0]?.esignFlowStatus); - this.service.msgSrv.success('电子卸货单签署中！') this.service.request(this.service.$api_getBillDischargeEsignFile, [this.datas?.id]).subscribe(res => { - console.log(res); if(res[0]?.esignFlowStatus == '2') { this.service.msgSrv.success('电子卸货单已生效！') this.modal.destroy(true); @@ -639,7 +627,6 @@ export class orderManagementVoucherViewComponent implements OnInit { const a = document.createElement('a'); a.href = this.datas?.unloadingElectronicsLadingBillFilePath; document.body.appendChild(a); - console.log(document.body.contains(a)); a.click(); //点击下载 document.body.removeChild(a); //下载完成移除元素 } From 5c3556ccf4ce6b2eb9be11044c03aa22433432ce Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 21 Apr 2022 15:01:56 +0800 Subject: [PATCH 19/35] fix bug --- .../voucher-view/voucher-view.component.ts | 44 +++++++++++++++---- .../freight-config.component.ts | 22 ---------- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts index efcaeeaf..ad50160e 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts @@ -15,7 +15,7 @@ import { import { apiConf } from '@conf/api.conf'; import { _HttpClient } from '@delon/theme'; import { NzMessageService } from 'ng-zorro-antd/message'; -import { NzModalRef } from 'ng-zorro-antd/modal'; +import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { Observable, Observer } from 'rxjs'; import { EAEnvironmentService } from '@shared'; import { OrderManagementService } from '../../../services/order-management.service'; @@ -46,7 +46,8 @@ export class orderManagementVoucherViewComponent implements OnInit { public http: _HttpClient, public service: OrderManagementService, private datePipe: DatePipe, - private envSrv: EAEnvironmentService + private envSrv: EAEnvironmentService, + private modalService: NzModalService ) {} ngOnInit(): void { @@ -581,13 +582,25 @@ export class orderManagementVoucherViewComponent implements OnInit { switch (res[0]?.esignFlowStatus) { case 1: case '1': - this.service.msgSrv.success('电子装货单签署中！') + let time = 0 + setInterval (function () { + time+=1 + }, 1000); //反复执行函数本身 + const modal = this.modalService.success({ + nzTitle: '电子装货单签署中！', + nzContent: ` + 请等待${time}秒后自动关闭 + ` + }); + setTimeout(() => { this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe(res => { if(res[0]?.esignFlowStatus == '2') { this.service.msgSrv.success('电子装货单已生效！') this.modal.destroy(true); } }); + modal.destroy() + }, 5000); return ; case 2: @@ -610,13 +623,26 @@ export class orderManagementVoucherViewComponent implements OnInit { switch (res[0]?.esignFlowStatus) { case 1: case '1': - this.service.msgSrv.success('电子卸货单签署中！') - this.service.request(this.service.$api_getBillDischargeEsignFile, [this.datas?.id]).subscribe(res => { - if(res[0]?.esignFlowStatus == '2') { - this.service.msgSrv.success('电子卸货单已生效！') - this.modal.destroy(true); - } + let time = 0 + setInterval (function () { + time+=1 + }, 1000); //反复执行函数本身 + const modal = this.modalService.success({ + nzTitle: '电子卸货单签署中！', + nzContent: ` + 请等待${time}秒后自动关闭 + ` }); + setTimeout(() => { + this.service.request(this.service.$api_getBillDischargeEsignFile, [this.datas?.id]).subscribe(res => { + if(res[0]?.esignFlowStatus == '2') { + this.service.msgSrv.success('电子卸货单已生效！') + this.modal.destroy(true); + } + }); + modal.destroy() + }, 5000); + return ; case 2: return; diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts index 1f605413..7cf9162b 100644 --- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts +++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts @@ -228,25 +228,6 @@ export class FreightConfigComponent implements OnInit { asyncData: () => this.shipperservice.getNetworkFreightForwarder() } }, - goodsSurchargeRatio: { - title: '货源单费率', - type: 'string', - ui: { - placeholder: '请输入', - showRequired: false - } - }, - contractSurchargeRatio: { - title: '合同单费率', - type: 'string', - ui: { - placeholder: '请输入', - showRequired: false, - visibleIf: { - _$expand: (value: boolean) => value - } - } - }, createTime: { title: '注册时间', type: 'string', @@ -255,9 +236,6 @@ export class FreightConfigComponent implements OnInit { format: 'yyyy-MM-dd', placeholder: '请选择', nzShowTime: true, - visibleIf: { - _$expand: (value: boolean) => value - } } as SFDateWidgetSchema } } From 548ab19ae28ead8763cfd04413c7d183b2e89a03 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 21 Apr 2022 15:28:24 +0800 Subject: [PATCH 20/35] fix bug --- .../modal/audit/voucher-view/voucher-view.component.ts | 8 ++++---- .../freight/freight-config/freight-config.component.html | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts index ad50160e..da013143 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts @@ -582,9 +582,9 @@ export class orderManagementVoucherViewComponent implements OnInit { switch (res[0]?.esignFlowStatus) { case 1: case '1': - let time = 0 + let time = 5 setInterval (function () { - time+=1 + time-=1 }, 1000); //反复执行函数本身 const modal = this.modalService.success({ nzTitle: '电子装货单签署中！', @@ -623,9 +623,9 @@ export class orderManagementVoucherViewComponent implements OnInit { switch (res[0]?.esignFlowStatus) { case 1: case '1': - let time = 0 + let time = 5 setInterval (function () { - time+=1 + time-=1 }, 1000); //反复执行函数本身 const modal = this.modalService.success({ nzTitle: '电子卸货单签署中！', diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html index 05a199c9..e590f998 100644 --- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html +++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-17 20:24:17 * @LastEditors : Shiming - * @LastEditTime : 2022-02-24 17:04:41 + * @LastEditTime : 2022-04-21 15:28:21 * @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\freight\\freight-config\\freight-config.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -24,10 +24,10 @@ - + (click)="st?.load(1);">查询