From 12d57e131f965d6f4f168d89c925bb7ec14a5bde Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 20 Apr 2022 10:02:43 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoice-reporting.component.html | 96 ++++ .../invoice-reporting.component.less | 22 + .../invoice-reporting.component.ts | 459 ++++++++++++++++++ .../upload-setting.component.html | 8 + .../upload-setting.component.ts | 110 +++++ .../verify-result.component.html | 30 ++ .../verify-result/verify-result.component.ts | 139 ++++++ .../tax-management-routing.module.ts | 2 + .../tax-management/taxmanagement.module.ts | 10 +- src/assets/mocks/menu-data.json | 4 + 10 files changed, 878 insertions(+), 2 deletions(-) create mode 100644 src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html create mode 100644 src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.less create mode 100644 src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts create mode 100644 src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.html create mode 100644 src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.ts create mode 100644 src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.html create 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 new file mode 100644 index 00000000..e1635dc7 --- /dev/null +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html @@ -0,0 +1,96 @@ + + + + +
+
+ +
+
+ + + + +
+
+ + + + + + + + + + + + 待上传 + 已上传 + 上传中 + 上传异常 + + + + + 校验中 + 通过 + + 不通过 + + + +
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}
+ + + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
{{item?.orderAmount | currency }}
+ + + + +
+
+ 已选择 + {{ selectedRows.length }} 条数据 +
+ + +
+ diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.less b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.less new file mode 100644 index 00000000..94ec07e0 --- /dev/null +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.less @@ -0,0 +1,22 @@ +:host { + .text-black { + color: #000; + } + .icon { + display: inline-block; + width: 1em; + height: 1em; + stroke-width: 0; + stroke: currentColor; + /* stylelint-disable-next-line order/properties-order */ + fill: currentColor; + } + ::ng-deep { + .imgBox { + display: flex; + img { + width: 60px !important; + } + } + } +} 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 new file mode 100644 index 00000000..4eb8aaaf --- /dev/null +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts @@ -0,0 +1,459 @@ +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 { 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', + templateUrl: './invoice-reporting.component.html', + styleUrls: ['./invoice-reporting.component.less'] +}) +export class TaxManagementInvoiceReportingComponent implements OnInit { + _$expand = false; + ui!: SFUISchema; + schema!: SFSchema; + columns!: STColumn[]; + @ViewChild('st', { static: false }) st!: STComponent; + @ViewChild('sf', { static: false }) sf!: SFComponent; + tabType!: string; + isLoading: boolean = false; + tabs: any[] = [ + { name: '待上传', value: '0' }, + { name: '上传中', value: '3' }, + { name: '已上传', value: '1' }, + { name: '异常', value: '2' }, + { name: '全部', value: '' } + ]; + selectedIndex = '0'; //选择的项目 + 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; + } + + /** + * 查询参数 + */ + get reqParams() { + const params = Object.assign({}, this.sf?.value || {}, { + putStatus: this.selectedIndex, + }); + delete params._$expand; + return { ...params }; + } + + /** + * 选中行 + */ + get selectedRows() { + 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 + } + /** + * 程序初始化入口 + */ + ngOnInit() { + this.initSF(); + this.initST(); + } + + /** + * 初始化查询表单 + */ + initSF() { + 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 } + ], + + ui: { + placeholder: '请选择', + widget: 'select', + allowClear: true + } + }, + networkTransporter: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + asyncData: () => this.shipperservice.getNetworkFreightForwarder() + } + }, + hrto: { + type: 'string', + title: '购买方', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + asyncData: () => this.service.getCRMCustomerId() + } + }, + billCode: { + title: '订单号', type: 'string', ui: { + placeholder: '请输入', visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + recentlyPutTime: { + title: '开票日期', + type: 'string', + ui: { + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFDateWidgetSchema, + }, + orderPayTime: { + title: '上传日期', + type: 'string', + ui: { + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFDateWidgetSchema, + }, + wayBillCode: { + type: 'string', + title: '发票号码', + ui: { + placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value + } + }, + }, + wayBillCode1: { + type: 'string', + title: '发票代码', + ui: { + placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value + } + }, + }, + sts: { + title: '发票状态', + type: 'string', + ui: { + widget: 'dict-select', + containsAllLabel: true, + params: { dictKey: 'vatinv:status' }, + containAllLable: true, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, + }, + }; + this.ui = { + '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() }, + $time: { grid: { span: 24 } }, + }; + } + + /** + * 初始化数据列表 + */ + initST() { + this.columns = [ + { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, + { title: '上传状态', render: 'putStatus', className: 'text-center', width: '120px', }, + { title: '发票类型', render: 'checkStatus', className: 'text-center', width: '120px', }, + { + title: '发票号码', + index: 'billCode', + className: 'text-center', + width: '150px', + }, + { title: '发票代码', index: 'wayBillCode', className: 'text-center', width: '150px', }, + { + title: '网络货运人', + index: 'networkTransporterName', + 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' }, + ]; + } + + + + /** + *撤回 + * @param record 记录实例 + */ + recall() { + if (this.selectedRows.length === 0) { + this.openWainingModal('请选择需要撤回的数据'); + return; + } + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); + this.modal.confirm({ + nzTitle: '撤回提示', + nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', + nzOkText: '确定', + nzCancelText: '取消', + nzOnOk: () => { + this.service.request(this.service.$api_get_recessionTaxOrder, params).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('撤销成功'); + this.search(); + } + }) + } + }); + + } + /** + *撤销 + * @param record 记录实例 + */ + resetData() { + if (this.selectedRows.length === 0) { + this.openWainingModal('请选择需要更新的数据！'); + return; + } + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.billId); + }); + this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('更新成功'); + this.st.load(1); + } + }) + } + /** + *撤销 + * @param record 记录实例 + */ + unnormal(value: any) { + // if (this.selectedRows.length === 0) { + // this.openWainingModal('请选择需要更新的数据！'); + // return; + // } + console.log(this.selectedRows); + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); + this.modal.confirm({ + nzTitle: '税务审核结果', + nzContent: '订单结算时间所在月份与申报月份不一致', + nzOkText: '确定', + nzCancelText: '', + nzOnOk: () => { + this.service.request(this.service.$api_get_recessionTaxOrder, params).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('撤销成功'); + this.search(); + } + }) + } + }); + + } + + selectChange(item: any) { + console.log(item); + + this.selectedIndex = item?.value || ''; + setTimeout(() => { + this.st.load(); + }) + } + + /** + * 查看当行数据 + */ + view(record: STData) { + // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar }); + this.router.navigate(['../detail'], { + queryParams: { + id: record.id, + }, + relativeTo: this.ar + }); + } + + // 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: '' }); + // } + // }) + // } + + /** + * 上传 + */ + upload() { + if (this.selectedRows.length === 0) { + this.openWainingModal('请选择需要上传的数据'); + return; + } + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); + this.service.request(this.service.$api_get_uploadingTaxOrder, params).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('上传成功'); + this.st.load(); + } + }) + } + + + /** + * + * @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(); + } + }) + } + + /** + * 查看监管审核结果 + */ + viewAuditResult(record: any) { + if (record?.billStatus !== '2') { + return; + } + this.openWainingModal('监管审核结果', record?.result) + } + + + search() { + this.st.load(1); + } + + /** + * 异步导出 + */ + export() { + this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list); + } + + openWainingModal(content: string, title = '提示') { + this.modal.warning({ + nzMask: false, + nzTitle: title, + nzContent: content, + }) + } + +} 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 new file mode 100644 index 00000000..a4f5ae6e --- /dev/null +++ b/src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.html @@ -0,0 +1,8 @@ + + +
+ + +
+ 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 new file mode 100644 index 00000000..c64f9110 --- /dev/null +++ b/src/app/routes/tax-management/components/invoice-reporting/upload-setting/upload-setting.component.ts @@ -0,0 +1,110 @@ +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 new file mode 100644 index 00000000..f84ade19 --- /dev/null +++ b/src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.html @@ -0,0 +1,30 @@ +
+
+ + + +
+
+ + +
+
{{ 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 new file mode 100644 index 00000000..1442ddba --- /dev/null +++ b/src/app/routes/tax-management/components/invoice-reporting/verify-result/verify-result.component.ts @@ -0,0 +1,139 @@ +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/tax-management-routing.module.ts b/src/app/routes/tax-management/tax-management-routing.module.ts index 84b09d08..ce7b3f5f 100644 --- a/src/app/routes/tax-management/tax-management-routing.module.ts +++ b/src/app/routes/tax-management/tax-management-routing.module.ts @@ -13,6 +13,7 @@ import { RouterModule, Routes } from '@angular/router'; import { TaxManagementIndividualCollectComponent } from './components/individual-collect/individual-collect.component'; 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 { TaxManagementOrderReportingComponent } from './components/order-reporting/order-reporting.component'; @@ -21,6 +22,7 @@ const routes: Routes = [ { path: 'income', component: TaxManagementIndividualIncomeComponent }, { path: 'collect', component: TaxManagementIndividualCollectComponent }, { path: 'declare', component: TaxManagementIndividualDeclareComponent }, + { path: 'invoiceReport', component: TaxManagementInvoiceReportingComponent }, ]; diff --git a/src/app/routes/tax-management/taxmanagement.module.ts b/src/app/routes/tax-management/taxmanagement.module.ts index 92dbda10..0c6eb02b 100644 --- a/src/app/routes/tax-management/taxmanagement.module.ts +++ b/src/app/routes/tax-management/taxmanagement.module.ts @@ -13,6 +13,9 @@ import { SharedModule, SHARED_G2_MODULES } from '@shared'; import { TaxManagementIndividualCollectComponent } from './components/individual-collect/individual-collect.component'; 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'; @@ -25,9 +28,12 @@ const COMPONENTS: Type[] = [ TaxManagementUploadSettingComponent, TaxManagementIndividualIncomeComponent, TaxManagementIndividualCollectComponent, - TaxManagementIndividualDeclareComponent + TaxManagementIndividualDeclareComponent, + TaxManagementInvoiceReportingComponent, + TaxManagementInvoiceUploadSettingComponent, + TaxManagementInvoiceVerifyResultComponent ] - + @NgModule({ imports: [ diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 1aee4bad..c3b4f30f 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -693,6 +693,10 @@ { "text": "税务申报", "link": "/tax/declare" + }, + { + "text": "发票上传", + "link": "/tax/invoiceReport" } ] } From 664ee868edaca327826948fa6ada4a3a76b522b2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 20 Apr 2022 15:15:55 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E8=BF=94=E4=BD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../freight/user/detail/detail.component.html | 20 +++++++++++++++++-- .../freight/user/detail/detail.component.ts | 15 ++++++++++---- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/user/detail/detail.component.html b/src/app/routes/usercenter/components/freight/user/detail/detail.component.html index 42bfb9b9..65315746 100644 --- a/src/app/routes/usercenter/components/freight/user/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/user/detail/detail.component.html @@ -35,7 +35,7 @@ @@ -80,7 +80,23 @@ - + + + + - + + + + + + + + + +
diff --git a/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts index 67e0fe6d..edefc189 100644 --- a/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts @@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router'; import { apiConf } from '@conf/api.conf'; import { STColumn, STComponent } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; -import { ModalHelper, _HttpClient } from '@delon/theme'; +import { ModalHelper, _HttpClient, DatePipe } from '@delon/theme'; import { NzImageService } from 'ng-zorro-antd/image'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; @@ -13,7 +13,8 @@ import { UsermanageService } from '../../../../services/usercenter.service'; @Component({ selector: 'app-supplier-components-list-view', templateUrl: './detail.component.html', - styleUrls: ['./detail.component.less'] + styleUrls: ['./detail.component.less'], + providers:[DatePipe] }) export class FreightComponentsUserDetailComponent implements OnInit { @ViewChild('redectModal', { static: false }) @@ -39,7 +40,8 @@ export class FreightComponentsUserDetailComponent implements OnInit { private nzModalService: NzModalService, public service: UsermanageService, public route: ActivatedRoute, - private nzImageService: NzImageService + private nzImageService: NzImageService, + private datePipe: DatePipe ) {} ngOnInit() { @@ -154,7 +156,12 @@ export class FreightComponentsUserDetailComponent implements OnInit { } saveUser() { - const params = { ...this.userIdentityDetail }; + const params = {...this.userIdentityDetail}; + Object.assign(params, { + ...this.userIdentityDetail, + validStartTime: this.datePipe.transform(this.userIdentityDetail?.validStartTime, 'yyyy-MM-dd'), + validEndTime: this.datePipe.transform(this.userIdentityDetail?.validEndTime, 'yyyy-MM-dd'), + }); this.service.request(this.service.$api_update_driver_identity, params).subscribe(res => { if (res) { this.service.msgSrv.success('修改成功'); From 0710e2cca2f7780ba6a91b9d72756561526fcf04 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 20 Apr 2022 15:46:26 +0800 Subject: [PATCH 03/11] merge 1.0.0 --- proxy.conf.js | 2 +- .../dataindex/dataindex.component.html | 51 +-- .../dataindex/dataindex.component.ts | 365 ++++++++++++------ .../routes/datatable/services/data.service.ts | 10 +- .../invoice-requested.component.ts | 35 +- 5 files changed, 309 insertions(+), 154 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 3639702c..5abf24b2 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/datatable/components/dataindex/dataindex.component.html b/src/app/routes/datatable/components/dataindex/dataindex.component.html index 3f148bfd..f1f4a0b5 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.html +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.html @@ -2,33 +2,41 @@
- - - + + +
- - - + + +
- + - +
- - - + + + @@ -37,32 +45,29 @@
- +
- + +
- - + +
- +
diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.ts b/src/app/routes/datatable/components/dataindex/dataindex.component.ts index 0881c73c..62bd3816 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.ts +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectorRef, Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core'; import { ModalHelper, _HttpClient } from '@delon/theme'; import { G2MiniAreaClickItem, G2MiniAreaData } from '@delon/chart/mini-area'; import { G2PieClickItem, G2PieComponent, G2PieData } from '@delon/chart/pie'; @@ -6,119 +6,119 @@ import { format } from 'date-fns'; import { DataService } from '../../services/data.service'; import { Chart, registerShape, Util } from '@antv/g2'; import { G2TimelineClickItem, G2TimelineData } from '@delon/chart/timeline'; +import { CurrencyPipe } from '@angular/common'; +import { LOGS } from '_mock'; +import { G2CustomComponent } from '@delon/chart/custom'; @Component({ selector: 'app-datatable-dataindex', templateUrl: './dataindex.component.html', - styleUrls: ['./dataindex.component.less'] + styleUrls: ['./dataindex.component.less'], + providers: [CurrencyPipe] }) export class DatatableDataindexComponent implements OnInit { - @ViewChild('pie', { static: false }) pie!: G2PieComponent; - chartData: G2TimelineData[] = []; - visitData = this.genData(); - salesData = this.genData(); - salesPieData: G2PieData[] = []; - total = ''; + @ViewChild('g2custom', { static: false }) g2custom!: G2CustomComponent; + @ViewChild('RegionalPerforman', { static: false }) RegionalPerforman!: G2CustomComponent; + @ViewChild('BillDirectProportion', { static: false }) BillDirectProportion!: G2CustomComponent; + salesData: any[] = []; - constructor(private service: DataService, private ngZone: NgZone) { + totalAdvanceDeposit: { totalAmount: string; list: G2MiniAreaData[] } = { totalAmount: '0', list: this.genData() }; + totalPerformanceVolume: { totalAmount: string; list: G2MiniAreaData[] } = { totalAmount: '0', list: this.genData() }; + totalFreight: { totalAmount: string; list: G2MiniAreaData[] } = { totalAmount: '0', list: this.genData() }; + totalSurcharge: { totalAmount: string; list: G2MiniAreaData[] } = { totalAmount: '0', list: this.genData() }; - } + billTypeDatas: any = [ + { item: '货源单', count: 0, percent: 0 }, + { item: '合同单', count: 0, percent: 0 } + ]; + + regionalPerformanceCompletion: DataPerformanceTrendVO[] = []; + + constructor(private service: DataService, private currency: CurrencyPipe) {} ngOnInit(): void { - this.refreshPie(); - this.initLineData() - } - initLineData(){ - for (let i = 0; i < 20; i += 1) { - this.chartData.push({ - time: new Date().getTime() + 1000 * 60 * 60 * 24 * i, - y1: Math.floor(Math.random() * 100) + 1000, - y2: Math.floor(Math.random() * 100) + 10, - }); - } - } - private genData(): G2MiniAreaData[] { - const beginDay = new Date().getTime(); - const res: G2MiniAreaData[] = []; - for (let i = 0; i < 20; i += 1) { - res.push({ - x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'yyyy-MM-dd'), - y: Math.floor(Math.random() * 100) + 10, - }); - } - return res; + this.initMiniAreaData(); + this.initOthersData(); } - refresh(): void { - this.visitData = this.genData(); + private initMiniAreaData() { + // 客户预存款总额 + this.service.request(this.service.$api_total_advance_deposit).subscribe((res: DataTotalVO) => { + if (res) { + this.totalAdvanceDeposit = this.formatMiniAreaData(res); + } + }); + // 业绩量总额 + this.service.request(this.service.$api_total_performance_volume).subscribe((res: DataTotalVO) => { + if (res) { + this.totalPerformanceVolume = this.formatMiniAreaData(res); + } + }); + // 司机应付总额 + this.service.request(this.service.$api_total_freight).subscribe((res: DataTotalVO) => { + if (res) { + this.totalFreight = this.formatMiniAreaData(res); + } + }); + // 业绩量总额 + this.service.request(this.service.$api_total_surcharge).subscribe((res: DataTotalVO) => { + if (res) { + this.totalSurcharge = this.formatMiniAreaData(res); + } + }); } - refreshPie(): void { - const rv = (min: number = 0, max: number = 5000) => Math.floor(Math.random() * (max - min + 1) + min); - this.salesPieData = [ - { - x: '家用电器', - y: rv(), - }, - { - x: '食用酒水', - y: rv(), - }, - { - x: '个护健康', - y: rv(), - }, - { - x: '服饰箱包', - y: rv(), - }, - { - x: '母婴产品', - y: rv(), - }, - ]; - if (Math.random() > 0.5) { - this.salesPieData.push({ - x: '其他', - y: rv(), - }); - } - this.total = `¥ ${this.salesPieData.reduce((pre, now) => now.y + pre, 0).toFixed(2)}`; - if (this.pie) { - // 等待组件渲染 - setTimeout(() => { - console.log('a') - this.pie.changeData() - }); - } + + private initOthersData() { + // 订单类型比例 + this.service.request(this.service.$api_getBillTypeProportion).subscribe(res => { + if (res) { + this.billTypeDatas = this.formatCoordinateData(res); + this.initBillChart(this.g2custom['el'].nativeElement as any); + } + }); + // 大区业绩完成情况 + this.service.request(this.service.$api_getBillAmount).subscribe((res: DataPerformanceTrendVO[]) => { + if (res) { + this.regionalPerformanceCompletion = res.map(item => ({ ...item, time: new Date(item.time)?.getTime() })); + this.initRegionalPerformanceChart(this.RegionalPerforman['el'].nativeElement as any, this.regionalPerformanceCompletion); + } + }); + // 订单类型比例 + this.service.request(this.service.$api_getWayBillDirectProportion).subscribe(res => { + if (res) { + const billTypeDatas = this.formatCoordinateData(res.map((item: any) => ({ ...item, billType: item.wayBillType }))); + this.initBillChart(this.BillDirectProportion['el'].nativeElement as any, billTypeDatas); + } + }); + // 统计订单结算金额-趋势 + this.service.request(this.service.$api_get_bill_payment_amount).subscribe(res => { + if (res) { + this.salesData = this.formatBarData(res); + } + }); } handleClick(data: G2MiniAreaClickItem): void { this.service.msgSrv.info(`${data.item.x} - ${data.item.y}`); } - format(val: number): string { - return `¥ ${val.toFixed(2)}`; - } - render(el: ElementRef): void { - this.ngZone.runOutsideAngular(() => this.init(el.nativeElement)); - } - private init(el: HTMLElement): void { - const data = [ - { item: '货源单', count: 40, percent: 0.4 }, - { item: '合同单', count: 21, percent: 0.21 }, - { item: '事例三', count: 17, percent: 0.17 }, - { item: '事例四', count: 13, percent: 0.13 }, - { item: '事例五', count: 9, percent: 0.09 }, - ]; + + /** + * 构建订单类型秘鲁图 + * @param el + */ + private initBillChart(el: HTMLElement, datas?: any[]): void { + const data = datas || this.billTypeDatas; + const chart = new Chart({ container: el, autoFit: true, - height: 400, + height: 400 }); // 新建一个 view 用来单独渲染Annotation const innerView = chart.createView(); chart.coordinate('theta', { radius: 0.6, - innerRadius: 0.7, + innerRadius: 0.7 }); chart.data(data); @@ -127,34 +127,34 @@ export class DatatableDataindexComponent implements OnInit { formatter: val => { val = val * 100 + '%'; return val; - }, + } }); chart.tooltip(false); // 声明需要进行自定义图例字段： 'item' chart.legend('item', { - position: 'right', // 配置图例显示位置 - custom: true, // 关键字段，告诉 G2，要使用自定义的图例 - items: data.map((obj, index) => { + position: 'right', // 配置图例显示位置 + custom: true, // 关键字段，告诉 G2，要使用自定义的图例 + items: data.map((obj: any, index: any) => { return { - name: obj.item, // 对应 itemName - value: obj.percent, // 对应 itemValue + name: obj.item, // 对应 itemName + value: obj.percent, // 对应 itemValue marker: { - symbol: 'square', // marker 的形状 + symbol: 'square', // marker 的形状 style: { - r: 5, // marker 图形半径 - fill: chart.getTheme().colors10[index], // marker 颜色，使用默认颜色，同图形对应 - }, - }, // marker 配置 + r: 5, // marker 图形半径 + fill: chart.getTheme().colors10[index] // marker 颜色，使用默认颜色，同图形对应 + } + } // marker 配置 }; }), itemValue: { style: { - fill: '#999', - }, // 配置 itemValue 样式 - formatter: (val: any) => `${val * 100}%` // 格式化 itemValue 内容 - }, + fill: '#999' + }, // 配置 itemValue 样式 + formatter: (val: any) => `${val * 100}%` // 格式化 itemValue 内容 + } }); chart @@ -165,7 +165,7 @@ export class DatatableDataindexComponent implements OnInit { .style({ fillOpacity: 1, stroke: 'white', - lineWidth: 8, + lineWidth: 8 }) .state({ active: { @@ -174,12 +174,36 @@ export class DatatableDataindexComponent implements OnInit { return { lineWidth: 1, stroke: 'white', - strokeOpacity: shape.attr('fillOpacity'), + strokeOpacity: shape.attr('fillOpacity') }; - }, - }, + } + } }); + innerView + .annotation() + .text({ + position: ['50%', '50%'], + content: data[0].item, + style: { + fontSize: 20, + fill: '#8c8c8c', + textAlign: 'center' + }, + offsetY: -20 + }) + .text({ + position: ['50%', '50%'], + content: data[0].count, + style: { + fontSize: 28, + fill: '#8c8c8c', + textAlign: 'center' + }, + offsetY: 20 + }); + innerView.render(true); + // 移除图例点击过滤交互 chart.removeInteraction('legend-filter'); chart.interaction('element-active'); @@ -198,7 +222,7 @@ export class DatatableDataindexComponent implements OnInit { updateAnnotation(data); } else { // 隐藏 Annotation - clearAnnotation(); + // clearAnnotation(); } } }); @@ -216,9 +240,9 @@ export class DatatableDataindexComponent implements OnInit { style: { fontSize: 20, fill: '#8c8c8c', - textAlign: 'center', + textAlign: 'center' }, - offsetY: -20, + offsetY: -20 }) .text({ position: ['50%', '50%'], @@ -226,11 +250,10 @@ export class DatatableDataindexComponent implements OnInit { style: { fontSize: 28, fill: '#8c8c8c', - textAlign: 'center', + textAlign: 'center' }, - offsetX: -10, - offsetY: 20, - }) + offsetY: 20 + }); innerView.render(true); lastItem = data.item; } @@ -242,8 +265,122 @@ export class DatatableDataindexComponent implements OnInit { innerView.render(true); lastItem = null; } + } + private initRegionalPerformanceChart(el: HTMLElement, data: DataPerformanceTrendVO[]) { + const chart = new Chart({ + container: el, + autoFit: true, + height: 400 + }); + + chart.data(data); + chart.scale({ + time: { + alias: '日期', + type: 'time' + }, + quantity: { + alias: '金额', + min: 0, + sync: true, // 将 pv 字段数值同 time 字段数值进行同步 + nice: true + } + }); + + chart.axis('quantity', { + title: {} + }); + + chart.tooltip({ + showCrosshairs: true, + shared: true + }); + + // 声明需要进行自定义图例字段： 'item' + chart.legend({ + offsetY: 10, + position: 'bottom', // 配置图例显示位置 + custom: true, // 关键字段，告诉 G2，要使用自定义的图例 + items: [ + { + name: '订单金额 （元）', // 对应 itemName + value: '' // 对应 itemValue + } + ], + itemValue: { + style: { + fill: '#999' + } // 配置 itemValue 样式 + } + }); + + chart.line().position('time*quantity').color('#4FAAEB'); + chart.render(); + } + + private formatMiniAreaData(data: DataTotalVO) { + return { + totalAmount: `${this.currency.transform(data.totalAmount || 0)}万`, + list: data.list?.map(item => ({ + x: item.time, + y: item.quantity + })) + }; + } + + private formatCoordinateData(data: DataBillTypeProportion[]): any[] { + const total = data.map(item => item.quantity).reduce((pre, next) => pre + next); + const rs: any[] = []; + data.forEach(item => { + rs.push({ + item: (BILLTYPE as any)[item.billType], + count: item.quantity, + percent: Number((item.quantity / total).toFixed(2)) + }); + }); + return rs; + } + + private formatBarData(data: DataPerformanceTrendVO[]): any[] { + return data.map(item => ({ + x: item.time, + y: item.quantity, + color: '#f50' + })); + } + + private genData(): G2MiniAreaData[] { + const beginDay = new Date().getTime(); + const res: G2MiniAreaData[] = []; + for (let i = 0; i < 20; i += 1) { + res.push({ + x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'yyyy-MM-dd'), + y: Math.floor(Math.random() * 100) + 10 + }); + } + return res; } } +interface DataTotalVO { + totalAmount: number; + list: DataPerformanceTrendVO[]; +} +interface DataPerformanceTrendVO { + quantity: number; + time: number; +} + +interface DataBillTypeProportion { + billType: BILLTYPE; + quantity: number; +} + +enum BILLTYPE { + 'HY' = '货源单', + 'HT' = '合同单', + 'ZF' = '直付', + 'CDZ' = '车队长' +} diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index 609ed1b6..0b22f9bd 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -100,7 +100,15 @@ export class DataService extends BaseService { // 数据报表-统计订单金额-趋势 $api_getBillAmount = `/api/sdc/reportData/getBillAmount`; // // 数据报表-统计订单金额-趋势 - // $api_getBillAmount = `/api/sdc/reportData/getBillAmount`; + $api_get_bill_payment_amount = `/api/sdc/reportData/getBillPaymentAmount`; + // 客户预存款总额 + $api_total_advance_deposit = `/api/sdc/reportData/getTotalAdvanceDeposit`; + // 业绩量总额 + $api_total_performance_volume = `/api/sdc/reportData/getTotalPerformanceVolume`; + // 运费总额 + $api_total_freight = `/api/sdc/reportData/getTotalFreight`; + // 附加费总额 + $api_total_surcharge = `/api/sdc/reportData/getTotalSurcharge`; diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index f36ec08c..cc4b83dc 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -8,6 +8,8 @@ import { ShipperBaseService } from '@shared'; import { isTemplateRef } from 'ng-zorro-antd/core/util'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { delay } from 'q'; +import { pipe } from 'rxjs'; import { TicketService } from '../../services/ticket.service'; import { PrintOrderModalComponent } from './print-order-modal/print-order-modal.component'; @@ -278,22 +280,25 @@ export class InvoiceRequestedComponent { } downloadPdf(item: any) { - this.service.request(this.service.$api_downloadPdf, { vatappHId: item.id }).subscribe(res => { - if (res?.reconciliationUrl) { - this.service.reviewPDF(res.reconciliationUrl); - } else { - this.service - .request(this.service.$api_download_Reconciliatio_pdf, { vatappHId: item.id, esignFlowId: res.esignFlowId }) - .subscribe(rs => { - if (rs?.reconciliationUrl) { - this.service.reviewPDF(rs.reconciliationUrl); - } else { - // this.service.msgSrv.warning('获取对账单失败'); - } - }); + if (item?.reconciliationUrl) { + this.service.reviewPDF(item.reconciliationUrl); + } else { + this.service.request(this.service.$api_downloadPdf, { vatappHId: item.id }).subscribe(res => { + if (res?.esignFlowId) { + delay(3000); + this.service + .request(this.service.$api_download_Reconciliatio_pdf, { vatappHId: item.id, esignFlowId: res.esignFlowId }) + .subscribe(rs => { + if (rs?.reconciliationUrl) { + this.service.reviewPDF(rs.reconciliationUrl); + } else { + // this.service.msgSrv.warning('获取对账单失败'); + } + }); + } // this.service.msgSrv.warning('获取对账单失败'); - } - }); + }); + } } /** From 37184edfc5d634b9fbdb32bad44d082691587f3a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 20 Apr 2022 15:50:14 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=BF=94=E4=BD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../routes/partner/partner-routing.module.ts | 9 +- src/app/routes/partner/partner.module.ts | 6 +- .../components/config/config.component.html | 187 +++++++++++++ .../components/config/config.component.less | 22 ++ .../components/config/config.component.ts | 258 ++++++++++++++++++ .../system-config/services/config.service.ts | 12 + .../list/detail/detail.component.ts | 2 +- 7 files changed, 492 insertions(+), 4 deletions(-) create mode 100644 src/app/routes/partner/system-config/components/config/config.component.html create mode 100644 src/app/routes/partner/system-config/components/config/config.component.less create mode 100644 src/app/routes/partner/system-config/components/config/config.component.ts create mode 100644 src/app/routes/partner/system-config/services/config.service.ts diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts index 8c979b66..fd999157 100644 --- a/src/app/routes/partner/partner-routing.module.ts +++ b/src/app/routes/partner/partner-routing.module.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 15:07:57 * @LastEditors : Shiming - * @LastEditTime : 2022-03-11 15:22:36 + * @LastEditTime : 2022-04-20 15:42:10 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-routing.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -49,6 +49,7 @@ import { BannerComponentsAddComponent } from './knowledge/banner/components/add/ import { PersonalPartnerDetailComponent } from './partner-list/components/personal-partner-detail/personal-partner-detail.component'; import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/list/list.component'; import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component'; +import { PartnerSystemConfigComponent } from './system-config/components/config/config.component'; const routes: Routes = [ { @@ -152,6 +153,12 @@ const routes: Routes = [ { path: 'record/detail/:id', component: PartnerRecordedDetailComponent } ] }, + { + path: 'config', + children: [ + { path: '', component: PartnerSystemConfigComponent }, + ] + }, { path: 'knowledge', children: [ diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts index 3255e0c1..300a83f1 100644 --- a/src/app/routes/partner/partner.module.ts +++ b/src/app/routes/partner/partner.module.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-09 14:34:55 * @LastEditors : Shiming - * @LastEditTime : 2022-03-11 15:28:01 + * @LastEditTime : 2022-04-20 15:45:20 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -63,6 +63,7 @@ import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/ import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component'; import { ParterRebateManageMentAddPartnerListComponent } from './rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component'; import { ChannelLogModalComponent } from './partner-list/components/channel-log-modal/channel-log-modal.component'; +import { PartnerSystemConfigComponent } from './system-config/components/config/config.component'; const COMPONENTS: any[] = [ PartnerBusinessStatisticsIndexComponent, @@ -115,7 +116,8 @@ const COMPONENTS: any[] = [ ParterAdviceFeedbackListComponent, ParterAdviceFeedbackDetailComponent, ParterRebateManageMentAddPartnerListComponent, - ChannelLogModalComponent + ChannelLogModalComponent, + PartnerSystemConfigComponent ]; @NgModule({ diff --git a/src/app/routes/partner/system-config/components/config/config.component.html b/src/app/routes/partner/system-config/components/config/config.component.html new file mode 100644 index 00000000..9606bc20 --- /dev/null +++ b/src/app/routes/partner/system-config/components/config/config.component.html @@ -0,0 +1,187 @@ + +
+
+
    +
  • + {{ item.name }} +
    • +
+
+ +
+ +

货主端配置

+

图片配置

+ + + + + +
可输入字符
+ + + +

短信配置

+
+
+ +

配置用户端登陆页注册帐号、修改密码、修改手机号时的短信内容

+ + +
+
+

通知配置

+
+
+ + + + +
+
+

客服电话配置

+
+
+ + + +
+
+ + + +

司机端配置

+

图片配置

+ + + + + +
可输入字符
+ + + +

短信配置

+
+
+ +

配置用户端登陆页注册帐号、修改密码、修改手机号时的短信内容

+ + +
+
+

通知配置

+
+
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+

客服电话配置

+
+
+ + + +
+
+

证件提醒配置

+
+
+ + 距离到期时间 + + 天开始提醒，每隔 + + 天提醒一次 + +
+
+ + +
+ + +
+
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ +
+ \ No newline at end of file diff --git a/src/app/routes/partner/system-config/components/config/config.component.less b/src/app/routes/partner/system-config/components/config/config.component.less new file mode 100644 index 00000000..09e68362 --- /dev/null +++ b/src/app/routes/partner/system-config/components/config/config.component.less @@ -0,0 +1,22 @@ +:host { + ::ng-deep { + .card-height { + min-height: 600px; + } + + .save-btn { + width : 100%; + text-align: right; + } + + .block-radio { + display : flex; + min-height : 32px; + } + + input { + width : 100px; + margin-left: 10px; + } + } + } \ No newline at end of file diff --git a/src/app/routes/partner/system-config/components/config/config.component.ts b/src/app/routes/partner/system-config/components/config/config.component.ts new file mode 100644 index 00000000..27a32a88 --- /dev/null +++ b/src/app/routes/partner/system-config/components/config/config.component.ts @@ -0,0 +1,258 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { SFComponent, SFSchema, SFUploadWidgetSchema } from '@delon/form'; +import { Observable, Observer } from 'rxjs'; +import { ConfigService } from '../../services/config.service'; + +@Component({ + selector: 'app-config', + templateUrl: './config.component.html', + styleUrls: ['./config.component.less'] +}) +export class PartnerSystemConfigComponent implements OnInit { + @ViewChild('sf', { static: false }) sf!: SFComponent; + formDate: any = { + isAudit: false, + isEveryDay: false, + isEveryWeek: false + }; + tabs = [ + { + name: '货主端配置' + }, + { + name: '司机端配置' + } + ]; + selectedTab = 0; + + checkOptionsOne = [ + { label: '周一', value: '周一', checked: true }, + { label: '周二', value: '周二' }, + { label: '周三', value: '周三' }, + { label: '周四', value: '周四' }, + { label: '周五', value: '周五' }, + { label: '周六', value: '周六' }, + { label: '周日', value: '周日' } + ]; + + i: any; + schema!: SFSchema; + schema2!: SFSchema; + + imageConfig = { + widget: 'upload', + action: `/scm/cms/cms/upload/multipartFile/fileModel`, + limit: 1, + limitFileCount: 1, + resReName: 'url', + urlReName: 'url', + data: { + appId: this.service.envSrv.getEnvironment().appId + }, + multiple: false, + listType: 'picture-card', + showRequired: true + }; + constructor(private service: ConfigService) {} + + ngOnInit() { + this.initSF(); + } + + changeType(type: number): void { + this.selectedTab = type; + } + + initSF() { + this.schema = { + properties: { + sysMinLogo: { + type: 'string', + title: '系统LOGO（大）', + // enum: [], + ui: { + ...this.imageConfig, + descriptionI18n: '大尺寸logo，支持JPG、PNG格式，文件小于2M（建议尺寸300*170px）。', + change: args => { + if (args.type === 'success') { + const avatar = this.getImageModel(args, 'sysMinLogo'); + this.sf?.setValue('/sysMinLogo', avatar); + this.i.sysMinLogo = avatar; + } + }, + beforeUpload: this.uploadBefore + } as SFUploadWidgetSchema + }, + sysMaxLogo: { + type: 'string', + title: '用户默认头像', + ui: { + ...this.imageConfig, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸60*60px）。', + change: args => { + if (args.type === 'success') { + const avatar = this.getImageModel(args, -1); + this.sf?.setValue('/sysMaxLogo', avatar); + this.i.sysMaxLogo = avatar; + } + }, + beforeUpload: this.uploadBefore + } as SFUploadWidgetSchema + }, + sysMaxLogo1: { + type: 'string', + title: '用户默认头像', + ui: { + ...this.imageConfig, + descriptionI18n: '支持JPG、PNG格式，文件小于5M（建议尺寸375*773px）。', + change: args => { + if (args.type === 'success') { + const avatar = this.getImageModel(args, -1); + this.sf?.setValue('/sysMaxLogo1', avatar); + this.i.sysMaxLogo1 = avatar; + } + }, + beforeUpload: this.uploadBefore + } as SFUploadWidgetSchema + }, + }, + required: ['sysMinLogo', 'sysMaxLogo', 'sysMaxLogo1'] + }; + this.schema2 = { + properties: { + sysMinLogo: { + type: 'string', + title: '系统LOGO(小)', + // enum: [], + ui: { + ...this.imageConfig, + descriptionI18n: '小尺寸logo，支持JPG、PNG格式，文件小于2M（建议尺寸32*32px）。', + change: args => { + if (args.type === 'success') { + const avatar = this.getImageModel(args, 'sysMinLogo'); + this.sf?.setValue('/sysMinLogo', avatar); + this.i.sysMinLogo = avatar; + } + }, + beforeUpload: this.uploadBefore + } as SFUploadWidgetSchema + }, + sysMaxLogo: { + type: 'string', + title: '系统LOGO(大)', + ui: { + ...this.imageConfig, + descriptionI18n: '小尺寸logo，支持JPG、PNG格式，文件小于2M（建议尺寸32*32px）。', + change: args => { + if (args.type === 'success') { + const avatar = this.getImageModel(args, -1); + this.sf?.setValue('/sysMaxLogo', avatar); + this.i.sysMaxLogo = avatar; + } + }, + beforeUpload: this.uploadBefore + } as SFUploadWidgetSchema + }, + sysMaxLogo1: { + type: 'string', + title: '用户默认头像', + ui: { + ...this.imageConfig, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸60*60px）。', + change: args => { + if (args.type === 'success') { + const avatar = this.getImageModel(args, -1); + this.sf?.setValue('/sysMaxLogo1', avatar); + this.i.sysMaxLogo1 = avatar; + } + }, + beforeUpload: this.uploadBefore + } as SFUploadWidgetSchema + }, + sysMaxLogo2: { + type: 'string', + title: '企业默认头像', + ui: { + ...this.imageConfig, + descriptionI18n: '支持JPG、PNG格式，文件小于2M（建议尺寸60*60px）。', + change: args => { + if (args.type === 'success') { + const avatar = this.getImageModel(args, -1); + this.sf?.setValue('/sysMaxLogo2', avatar); + this.i.sysMaxLogo2 = avatar; + } + }, + beforeUpload: this.uploadBefore + } as SFUploadWidgetSchema + }, + sysMaxLogo3: { + type: 'string', + title: '货主PC端登陆页海报', + ui: { + ...this.imageConfig, + descriptionI18n: '支持JPG、PNG格式，文件小于5M（建议尺寸1920*630px）。', + change: args => { + if (args.type === 'success') { + const avatar = this.getImageModel(args, -1); + this.sf?.setValue('/sysMaxLogo3', avatar); + this.i.sysMaxLogo3 = avatar; + } + }, + beforeUpload: this.uploadBefore + } as SFUploadWidgetSchema + }, + sysMaxLogo4: { + type: 'string', + title: 'APP开屏海报', + ui: { + ...this.imageConfig, + descriptionI18n: '支持JPG、PNG格式，文件小于5M（建议尺寸375*773px）。', + change: args => { + if (args.type === 'success') { + const avatar = this.getImageModel(args, -1); + this.sf?.setValue('/sysMaxLogo4', avatar); + this.i.sysMaxLogo4 = avatar; + } + }, + beforeUpload: this.uploadBefore + } as SFUploadWidgetSchema + }, + }, + required: ['sysMinLogo', 'sysMaxLogo', 'sysMaxLogo1', 'sysMaxLogo2', 'sysMaxLogo3', 'sysMaxLogo4'] + }; + } + + private uploadBefore = (file: any, fileList: any) => { + return new Observable((observer: Observer) => { + const isLt1M = file.size / 1024 / 1024 < 2; + const fileType = 'image/png,image/jpeg'; + if (fileType.indexOf(file.type) === -1) { + this.service.msgSrv.warning('图片格式不正确！'); + observer.complete(); + return; + } + if (!isLt1M) { + // this.service.msgSrv.warning('图片需小于1M'); + this.service.msgSrv.warning('图片大小超过2M!'); + observer.complete(); + return; + } + observer.next(isLt1M); + observer.complete(); + }); + }; + + private getImageModel(args: any, key: any) { + return [ + { + uid: key, + name: 'LOGO', + status: 'done', + url: args.fileList[0].response.url, + response: { + url: args.fileList[0].response.url + } + } + ]; + } +} diff --git a/src/app/routes/partner/system-config/services/config.service.ts b/src/app/routes/partner/system-config/services/config.service.ts new file mode 100644 index 00000000..0b79dfd0 --- /dev/null +++ b/src/app/routes/partner/system-config/services/config.service.ts @@ -0,0 +1,12 @@ +import { Injectable, Injector } from '@angular/core'; +import { BaseService } from '@shared'; + +@Injectable({ + providedIn: 'root', +}) +export class ConfigService extends BaseService { + + constructor(public injector: Injector) { + super(injector); + } +} diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts index a07c9e7d..6cdb9990 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts @@ -107,7 +107,7 @@ export class VehicleComponentsListDetailComponent implements OnInit { { text: '上传协议', click: _record => this.updateEvaluate(_record), - iif: item => item.auditStatusEnum == -1 + // iif: item => item.auditStatusEnum == -1 } ] } From d3362c9023155676531cedd41678d061f8a67038 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 20 Apr 2022 15:50:50 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=BF=94=E4=BD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/routes/vehicle/components/list/edit/edit.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/vehicle/components/list/edit/edit.component.ts b/src/app/routes/vehicle/components/list/edit/edit.component.ts index ef6b14f3..0de6585d 100644 --- a/src/app/routes/vehicle/components/list/edit/edit.component.ts +++ b/src/app/routes/vehicle/components/list/edit/edit.component.ts @@ -100,7 +100,7 @@ export class VehicleComponentsListEditComponent implements OnInit { }; this.ui = { '*': { - spanLabelFixed: 120, + spanLabelFixed: 200, grid: { span: 24 }, }, }; From 6b590c6021bb61ac07ebd3bbdd3a96f2095e4d5f Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 20 Apr 2022 15:55:36 +0800 Subject: [PATCH 06/11] merge 1.0.0 --- proxy.conf.js | 2 +- .../invoice-requested.component.ts | 35 ++++++++++--------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 00392e43..eb92fbd4 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index cc4b83dc..2c33527f 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -8,8 +8,8 @@ import { ShipperBaseService } from '@shared'; import { isTemplateRef } from 'ng-zorro-antd/core/util'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { delay } from 'q'; import { pipe } from 'rxjs'; +import { delay } from 'rxjs/operators'; import { TicketService } from '../../services/ticket.service'; import { PrintOrderModalComponent } from './print-order-modal/print-order-modal.component'; @@ -283,21 +283,24 @@ export class InvoiceRequestedComponent { if (item?.reconciliationUrl) { this.service.reviewPDF(item.reconciliationUrl); } else { - this.service.request(this.service.$api_downloadPdf, { vatappHId: item.id }).subscribe(res => { - if (res?.esignFlowId) { - delay(3000); - this.service - .request(this.service.$api_download_Reconciliatio_pdf, { vatappHId: item.id, esignFlowId: res.esignFlowId }) - .subscribe(rs => { - if (rs?.reconciliationUrl) { - this.service.reviewPDF(rs.reconciliationUrl); - } else { - // this.service.msgSrv.warning('获取对账单失败'); - } - }); - } - // this.service.msgSrv.warning('获取对账单失败'); - }); + this.service + .request(this.service.$api_downloadPdf, { vatappHId: item.id }) + .pipe(delay(3000)) + .subscribe(res => { + if (res?.esignFlowId) { + this.service + .request(this.service.$api_download_Reconciliatio_pdf, { vatappHId: item.id, esignFlowId: res.esignFlowId }) + .subscribe(rs => { + if (rs?.reconciliationUrl) { + this.service.reviewPDF(rs.reconciliationUrl); + } else { + // this.service.msgSrv.warning('获取对账单失败'); + } + this.st.load(1); + }); + } + // this.service.msgSrv.warning('获取对账单失败'); + }); } } From 008f5d88daf71b1029b5edb235ff241db8f3deca Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 20 Apr 2022 15:56:10 +0800 Subject: [PATCH 07/11] edit --- .../invoice-requested/invoice-requested.component.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 2c33527f..09aa5176 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -4,11 +4,7 @@ import { Component, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form'; -import { ShipperBaseService } from '@shared'; -import { isTemplateRef } from 'ng-zorro-antd/core/util'; -import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { pipe } from 'rxjs'; import { delay } from 'rxjs/operators'; import { TicketService } from '../../services/ticket.service'; From 73a834b91b25a96eb567bb57a99f0ae13b2a9ab1 Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 20 Apr 2022 16:10:21 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sms-template/sms-template.component.html | 31 ++++ .../sms-template/sms-template.component.less | 6 + .../sms-template/sms-template.component.ts | 144 ++++++++++++++++++ .../sys-setting/services/system.service.ts | 70 +++++---- .../sys-setting/sys-setting-routing.module.ts | 4 +- .../routes/sys-setting/sys-setting.module.ts | 4 +- .../invoice-reporting.component.html | 4 +- .../invoice-reporting.component.ts | 1 + 8 files changed, 229 insertions(+), 35 deletions(-) create mode 100644 src/app/routes/sys-setting/components/sms-template/sms-template.component.html create mode 100644 src/app/routes/sys-setting/components/sms-template/sms-template.component.less create mode 100644 src/app/routes/sys-setting/components/sms-template/sms-template.component.ts diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.html b/src/app/routes/sys-setting/components/sms-template/sms-template.component.html new file mode 100644 index 00000000..06e3616b --- /dev/null +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.html @@ -0,0 +1,31 @@ + + + +
+ +
+ + + + +
+ +
+ + +
+ + +
+ + + + + + + + \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.less b/src/app/routes/sys-setting/components/sms-template/sms-template.component.less new file mode 100644 index 00000000..12fe08a6 --- /dev/null +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.less @@ -0,0 +1,6 @@ +:host::ng-deep { + .filter-wrap { + margin-bottom: 20px; + text-align: right; + } +} \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts new file mode 100644 index 00000000..2cf92a0e --- /dev/null +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts @@ -0,0 +1,144 @@ + +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; +import { SFComponent, SFSchema } from '@delon/form'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { SystemService } from '../../services/system.service'; + +@Component({ + selector: 'app-sms-template', + templateUrl: './sms-template.component.html', + styleUrls: ['./sms-template.component.less'] +}) +export class SmsTemplateComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + @ViewChild('sfEdit', { static: false }) + sfEdit!: SFComponent; + visible = false; + isVisible = false; + tempData = {}; + + searchSchema: SFSchema = { + properties: { + templateCode: { + type: 'string', + title: '模板编码', + ui: { placeholder: '请输入模板编码' } + }, + templateContent: { + type: 'string', + title: '模板内容', + ui: { placeholder: '请输入模板内容' } + } + } + }; + + editSchema: SFSchema = { + properties: { + templateCode: { + type: 'string', + title: '模板编码', + ui: { placeholder: '请输入模板编码' } + }, + templateContent: { + type: 'string', + title: '模板内容', + ui: { placeholder: '请输入模板内容' } + }, + templateName: { + type: 'string', + title: '模板名称', + ui: { placeholder: '请输入模板名称' } + } + } + } + + columns: STColumn[] = [ + { title: '模板编码', className: 'text-center', index: 'templateCode' }, + { title: '模板内容', className: 'text-center', index: 'templateContent' }, + // { + // title: '创建人', className: 'text-center', index: 'content', + // }, + { + title: '更新时间', + index: 'modifyTime', + type: 'date', + className: 'text-center' + }, + { + title: '操作', + buttons: [ + { + text: '编辑', + click: i => this.edit(i), + } + ] + } + ]; + + constructor(public service: SystemService, private nzModalService: NzModalService, private route: ActivatedRoute) { + } + + ngOnInit(): void { } + + beforeReq = (requestOptions: STRequestOptions) => { + if (this.sf) { + Object.assign(requestOptions.body, { ...this.sf.value }); + } + return requestOptions; + }; + + edit(item: any) { + // console.log(item); + this.tempData = item; + this.isVisible = true; + } + + search() { + this.st.reload(1); + this.visible = false; + } + + open(): void { + this.visible = true; + } + + close(): void { + this.visible = false; + } + + handleOk(): void { + const value = this.sfEdit.value; + const { id, templateCode, templateName, templateContent } = value + const params = { + id, + templateCode, + templateName, + templateContent + } + + this.service.request(this.service.$api_smsTemplate_edit, params).subscribe(res => { + // console.log(res); + if (res) { + this.isVisible = false; + this.st.reload(); + } + }) + + } + + handleCancel(): void { + this.isVisible = false; + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + } +} diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index 208ea905..1277fe8b 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -112,12 +112,12 @@ export class SystemService extends BaseService { public $api_remove_config = '/api/mdc/pbc/sysConfig/deletebatch'; // 查询系统配置项 public $api_get_config_item_page = '/api/mdc/pbc/sysConfigItem/list/page'; - // 新增系统配置项 - public $api_add_config_item = '/api/mdc/pbc/sysConfigItem/save'; - // 更新系统配置项 - public $api_update_config_item = '/api/mdc/pbc/sysConfigItem/update'; - // 批量更新系统配置项 - public $api_update_config_batch = '/api/mdc/pbc/sysConfigItem/updateBatch'; + // 新增系统配置项 + public $api_add_config_item = '/api/mdc/pbc/sysConfigItem/save'; + // 更新系统配置项 + public $api_update_config_item = '/api/mdc/pbc/sysConfigItem/update'; + // 批量更新系统配置项 + public $api_update_config_batch = '/api/mdc/pbc/sysConfigItem/updateBatch'; // 更新系统配置项排序 public $api_update_config_item_sort = '/api/mdc/pbc/sysConfigItem/updateSort'; // 删除系统配置项 @@ -128,12 +128,12 @@ export class SystemService extends BaseService { public $api_getTicketByNetworkTransporterId = '/api/mdc/cuc/networkTransporterTicket/getTicketByNetworkTransporterId'; // 保存票务信息 public $api_networkTransporterTicket_save = '/api/mdc/cuc/networkTransporterTicket/save'; - // 根据地区code查询列表 - $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode'; + // 根据地区code查询列表 + $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode'; // 根据地区code查询地区详情 $api_getRegionDetailByCode = '/api/mdc/pbc/region/getRegionDetailByCode'; - + // 分页查询按钮列表 $api_getButtonInfoPage = '/api/mdc/cuc/buttonInfo/getButtonInfoPage'; // 新增编辑按钮信息 @@ -154,29 +154,29 @@ export class SystemService extends BaseService { $api_modifyAnnouncementInfo = '/api/mdc/pbc/announcementInfo/modifyAnnouncementInfo'; // 新增公告信息 $api_addAnnouncementInfo = '/api/mdc/pbc/announcementInfo/addAnnouncementInfo'; - - - // 查询保险配置 - $api_insuranceConfig_list = '/api/mdc/cuc/insuranceConfig/list'; - // 获取保险配置费率 - $api_getInsuranceRate = '/api/mdc/cuc/insuranceConfig/getInsuranceRate'; - // 获取保险配置(id) - $api_getInsuranceRate_get = '/api/mdc/cuc/insuranceConfig/get'; - // 删除保险配置(id) - $api_getInsuranceRate_deletebatch = '/api/mdc/cuc/insuranceConfig/deletebatch'; - // 批量保存保险配置 - $api_getInsuranceRate_saveBatch = '/api/mdc/cuc/insuranceConfig/saveBatch'; - - // 营业执照识别 - $api_ocr_recognize_business_license = '/api/mdc/pbc/hwc/ocr/recognizeBusinessLicense'; - // 短信发送列表 - $api_listSmsSendLog = '/api/mdc/pbc/smsSend/listSmsSendLog'; - // 身份证识别 - $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard'; - // 获取字典 - $api_getDictValue = '/api/mdc/pbc/dictItems/getDictValue'; - // 设置crm客户 - $api_setCrmCustomer = '/api/mdc/cuc/networkTransporter/setCrmCustomer'; + + + // 查询保险配置 + $api_insuranceConfig_list = '/api/mdc/cuc/insuranceConfig/list'; + // 获取保险配置费率 + $api_getInsuranceRate = '/api/mdc/cuc/insuranceConfig/getInsuranceRate'; + // 获取保险配置(id) + $api_getInsuranceRate_get = '/api/mdc/cuc/insuranceConfig/get'; + // 删除保险配置(id) + $api_getInsuranceRate_deletebatch = '/api/mdc/cuc/insuranceConfig/deletebatch'; + // 批量保存保险配置 + $api_getInsuranceRate_saveBatch = '/api/mdc/cuc/insuranceConfig/saveBatch'; + + // 营业执照识别 + $api_ocr_recognize_business_license = '/api/mdc/pbc/hwc/ocr/recognizeBusinessLicense'; + // 短信发送列表 + $api_listSmsSendLog = '/api/mdc/pbc/smsSend/listSmsSendLog'; + // 身份证识别 + $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard'; + // 获取字典 + $api_getDictValue = '/api/mdc/pbc/dictItems/getDictValue'; + // 设置crm客户 + $api_setCrmCustomer = '/api/mdc/cuc/networkTransporter/setCrmCustomer'; // 获取一、二、三级地区详情 $api_getRegionToThree = '/api/mdc/pbc/region/getRegionToThree'; $api_getRoleTemplateInfo: string = ''; @@ -185,6 +185,12 @@ export class SystemService extends BaseService { $api_getAppList: string = ''; $api_getRoleTemplateListByAppId: string = ''; $api_updateRoleInfo: string = ''; + + // 短信模板list + $api_smsTemplate_page = '/api/mdc/pbc/smsTemplate/list/page'; + // 短信模板编辑 + $api_smsTemplate_edit = '/api/mdc/pbc/smsTemplate/save'; + constructor(public injector: Injector) { super(injector); } diff --git a/src/app/routes/sys-setting/sys-setting-routing.module.ts b/src/app/routes/sys-setting/sys-setting-routing.module.ts index 7be49b35..f0670f64 100644 --- a/src/app/routes/sys-setting/sys-setting-routing.module.ts +++ b/src/app/routes/sys-setting/sys-setting-routing.module.ts @@ -25,6 +25,7 @@ import { AnnouncementMessageComponent } from './components/announcement-message/ import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component'; import { NetworkFreightNewComponent } from './components/network-freight/new/new.component'; import { NoTeManagementComponent } from './components/note-management/note-management.component'; +import { SmsTemplateComponent } from './components/sms-template/sms-template.component'; const routes: Routes = [ { path: 'staff-management', component: StaffManagementComponent }, @@ -44,7 +45,8 @@ const routes: Routes = [ { path: 'close-account', component: CloseAccountComponent }, // { path: 'btn-management', component: BtnManagementComponent }, { path: 'announcement-message', component: AnnouncementMessageComponent }, - { path: 'insurance-set', component: InsuranceSetComponent } + { path: 'insurance-set', component: InsuranceSetComponent }, + { path: 'sms-template', component: SmsTemplateComponent} ]; @NgModule({ diff --git a/src/app/routes/sys-setting/sys-setting.module.ts b/src/app/routes/sys-setting/sys-setting.module.ts index ecb6d87a..2e1275c1 100644 --- a/src/app/routes/sys-setting/sys-setting.module.ts +++ b/src/app/routes/sys-setting/sys-setting.module.ts @@ -33,6 +33,7 @@ import { AnnouncementMessageComponent } from './components/announcement-message/ import { InsuranceSetComponent } from './components/insurance-set/insurance-set.component'; import { NetworkFreightNewComponent } from './components/network-freight/new/new.component'; import { NoTeManagementComponent } from './components/note-management/note-management.component'; +import { SmsTemplateComponent } from './components/sms-template/sms-template.component'; const COMPONENTS = [ StaffManagementComponent, @@ -50,7 +51,8 @@ const COMPONENTS = [ NetworkFreightNewComponent, AnnouncementMessageComponent, InsuranceSetComponent, - NoTeManagementComponent + NoTeManagementComponent, + SmsTemplateComponent ]; const NOTROUTECOMPONENTS = [ BuyerTranspowerComponent, 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 e1635dc7..7bd651ef 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 @@ -34,7 +34,9 @@ 已上传 上传中 上传异常 - + + + {{item.billCode}} 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 4eb8aaaf..26de04d6 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 @@ -222,6 +222,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { { title: '发票号码', index: 'billCode', + render: 'invoiceNO', className: 'text-center', width: '150px', }, From f96d7284f3f19ac6217d360741004b43d67074e2 Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 20 Apr 2022 16:12:22 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/sms-template/sms-template.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts index 2cf92a0e..7073d001 100644 --- a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; +import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { SystemService } from '../../services/system.service'; From 8b262bd0287e776bb14b3823c05fa06296c9d09a Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 20 Apr 2022 16:12:55 +0800 Subject: [PATCH 10/11] edit --- .../contract-frame.component.ts | 77 +++++++++++------- .../contract-list/contract-list.component.ts | 81 +++++++++++-------- .../contract-partner.component.ts | 15 +++- .../services/contract-management.service.ts | 11 +++ 4 files changed, 121 insertions(+), 63 deletions(-) diff --git a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts index 0a13f444..bf35684b 100644 --- a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts +++ b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts @@ -32,33 +32,39 @@ export class ContractManagementFrameComponent implements OnInit { private nzModalService: NzModalService, private router: Router, public shipperservice: ShipperBaseService, - private datePipe: DatePipe, - ) { } + private datePipe: DatePipe + ) {} ngOnInit(): void { this.initST(); this.initSF(); } /** -* 查询参数 -*/ + * 查询参数 + */ get reqParams() { const params = { - ...this.sf?.value, - } + ...this.sf?.value + }; delete params.signTime; delete params._$expand; - if (this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')) { + if ( + this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') && + this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss') + ) { params.signTime = { start: this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss'), - end: this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss'), - } + end: this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss') + }; } - if (this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[1], 'yyyy-MM-dd HH:mm:ss')) { + if ( + this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[0], 'yyyy-MM-dd HH:mm:ss') && + this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[1], 'yyyy-MM-dd HH:mm:ss') + ) { params.effectiveEndTime = { start: this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[0], 'yyyy-MM-dd HH:mm:ss'), - end: this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[1], 'yyyy-MM-dd HH:mm:ss'), - } + end: this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[1], 'yyyy-MM-dd HH:mm:ss') + }; } return { ...params @@ -71,7 +77,7 @@ export class ContractManagementFrameComponent implements OnInit { this.columns = [ { title: '合同编号', - width: '100px', + width: '130px', className: 'text-center', render: 'contractCode' }, @@ -122,6 +128,19 @@ export class ContractManagementFrameComponent implements OnInit { '5': { text: '已过期', color: 'warning' }, '7': { text: '已拒签', color: 'warning' } } + }, + { + title: '操作', + className: 'text-center', + fixed: 'right', + width: '80px', + buttons: [ + { + text: '签署', + iif: item => item.esignFlowStatus === '0' || item.esignFlowStatus === '1' || item.esignFlowStatus === '13', + click: item => this.service.StartTheProcessToESignById(item.id, () => this.st.load(1)) + } + ] } ]; } @@ -142,11 +161,11 @@ export class ContractManagementFrameComponent implements OnInit { enum: [ { label: '全部', value: '' }, { label: '货主', value: 1 }, - { label: '司机', value: 2 }, + { label: '司机', value: 2 } ], ui: { widget: 'select', - placeholder: '请选择', + placeholder: '请选择' } }, contractType: { @@ -157,8 +176,8 @@ export class ContractManagementFrameComponent implements OnInit { widget: 'dict-select', containsAllLable: true, params: { dictKey: 'contract:type' }, - containAllLable: true, - } as SFSelectWidgetSchema, + containAllLable: true + } as SFSelectWidgetSchema }, enterpriseInfoId: { type: 'string', @@ -178,8 +197,8 @@ export class ContractManagementFrameComponent implements OnInit { title: '合同对象', ui: { visibleIf: { - _$expand: (value: boolean) => value, - }, + _$expand: (value: boolean) => value + } } }, signTime: { @@ -188,8 +207,8 @@ export class ContractManagementFrameComponent implements OnInit { ui: { widget: 'custom', visibleIf: { - _$expand: (value: boolean) => value, - }, + _$expand: (value: boolean) => value + } } }, effectiveEndTime: { @@ -198,8 +217,8 @@ export class ContractManagementFrameComponent implements OnInit { ui: { widget: 'custom', visibleIf: { - _$expand: (value: boolean) => value, - }, + _$expand: (value: boolean) => value + } } }, esignFlowStatus: { @@ -212,10 +231,10 @@ export class ContractManagementFrameComponent implements OnInit { params: { dictKey: 'esign:flow:status' }, containAllLable: true, visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFSelectWidgetSchema, - }, + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + } }, type: 'object' }; @@ -238,9 +257,9 @@ export class ContractManagementFrameComponent implements OnInit { } } - approval(): void { } + approval(): void {} - add(): void { } + add(): void {} routeTo(item: any) { this.router.navigate(['/ticket/invoice-requested-detail/1']); diff --git a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts index f2b2d049..e811104e 100644 --- a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts +++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts @@ -27,19 +27,22 @@ export class ContractManagementContractListComponent implements OnInit { _$expand = false; isLoading: boolean = false; /** - * 查询参数 - */ + * 查询参数 + */ get reqParams() { const params = { - ...this.sf?.value, - } + ...this.sf?.value + }; delete params.signTime; delete params._$expand; - if (this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')) { + if ( + this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') && + this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss') + ) { params.signTime = { start: this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss'), - end: this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss'), - } + end: this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss') + }; } return { ...params @@ -51,12 +54,12 @@ export class ContractManagementContractListComponent implements OnInit { private nzModalService: NzModalService, public shipperservice: ShipperBaseService, private router: Router, - private datePipe: DatePipe, - ) { } + private datePipe: DatePipe + ) {} ngOnInit(): void { - this.initST() - this.initSF() + this.initST(); + this.initSF(); } /** * 初始化数据列表 @@ -65,7 +68,7 @@ export class ContractManagementContractListComponent implements OnInit { this.columns = [ { title: '合同编号', - width: '100px', + width: '130px', className: 'text-center', render: 'contractCode' }, @@ -106,22 +109,34 @@ export class ContractManagementContractListComponent implements OnInit { '3': { text: '已撤销', color: 'warning' }, '4': { text: '已作废', color: 'warning' }, '5': { text: '已过期', color: 'warning' }, - '7': { text: '已拒签', color: 'warning' }, - }, + '7': { text: '已拒签', color: 'warning' } + } }, - + { + title: '操作', + className: 'text-center', + fixed: 'right', + width: '80px', + buttons: [ + { + text: '签署', + iif: item => item.esignFlowStatus === '0' || item.esignFlowStatus === '1' || item.esignFlowStatus === '13', + click: item => this.service.StartTheProcessToESignById(item.id, () => this.st.load(1)) + } + ] + } ]; } /** -* 初始化查询表单 -*/ + * 初始化查询表单 + */ initSF() { this.schema = { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, contractCode: { type: 'string', - title: '合同编号', + title: '合同编号' }, businessCode: { type: 'string', @@ -151,7 +166,7 @@ export class ContractManagementContractListComponent implements OnInit { visibleIf: { _$expand: (value: boolean) => value }, - containAllLable: true, + containAllLable: true } as SFSelectWidgetSchema }, resourceType: { @@ -164,8 +179,8 @@ export class ContractManagementContractListComponent implements OnInit { containsAllLable: true, visibleIf: { _$expand: (value: boolean) => value - }, - } as SFSelectWidgetSchema, + } + } as SFSelectWidgetSchema }, enterpriseInfoId: { type: 'string', @@ -185,8 +200,8 @@ export class ContractManagementContractListComponent implements OnInit { title: '合同对象', ui: { visibleIf: { - _$expand: (value: boolean) => value, - }, + _$expand: (value: boolean) => value + } } }, signTime: { @@ -196,9 +211,9 @@ export class ContractManagementContractListComponent implements OnInit { widget: 'sl-from-to-search', format: 'yyyy-MM-dd', visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, + _$expand: (value: boolean) => value + } + } as SFDateWidgetSchema }, esignFlowStatus: { title: '状态', @@ -210,17 +225,17 @@ export class ContractManagementContractListComponent implements OnInit { containsAllLable: true, visibleIf: { _$expand: (value: boolean) => value - }, - } as SFSelectWidgetSchema, - }, + } + } as SFSelectWidgetSchema + } }, - type: 'object', + type: 'object' }; this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; } /** -* 查询字段个数 -*/ + * 查询字段个数 + */ get queryFieldCount(): number { return Object.keys(this.schema?.properties || {}).length; } @@ -285,7 +300,7 @@ export class ContractManagementContractListComponent implements OnInit { resetSF() { this.sf.reset(); this._$expand = false; - this.isLoading = true + this.isLoading = true; } /** * 伸缩查询条件 diff --git a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts index 5517e3f9..e1e84d62 100644 --- a/src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts +++ b/src/app/routes/contract-management/components/contract-partner/contract-partner.component.ts @@ -70,7 +70,7 @@ export class ContractManagementPartnerComponent implements OnInit { this.columns = [ { title: '合同编号', - width: '100px', + width: '130px', className: 'text-center', render: 'contractCode' }, @@ -121,6 +121,19 @@ export class ContractManagementPartnerComponent implements OnInit { '5': { text: '已过期', color: 'warning' }, '7': { text: '已拒签', color: 'warning' } } + }, + { + title: '操作', + className: 'text-center', + fixed: 'right', + width: '80px', + buttons: [ + { + text: '签署', + iif: item => item.esignFlowStatus === '0' || item.esignFlowStatus === '1' || item.esignFlowStatus === '13', + click: item => this.service.StartTheProcessToESignById(item.id, () => this.st.load(1)) + } + ] } ]; } diff --git a/src/app/routes/contract-management/services/contract-management.service.ts b/src/app/routes/contract-management/services/contract-management.service.ts index 17cc75ca..219dc75e 100644 --- a/src/app/routes/contract-management/services/contract-management.service.ts +++ b/src/app/routes/contract-management/services/contract-management.service.ts @@ -35,7 +35,18 @@ export class ContractManagementService extends BaseService { $api_listPartner_page = `/api/sdc/contract/listPartner/page`; // 获取订单合同表 $api_contract_get = `/api/sdc/contract/get`; + + // 发起E签宝跟据合同ID + $api_startTheProcessToESignById = `/api/sdc/contract/startTheProcessToESignById`; constructor(public injector: Injector) { super(injector); } + + StartTheProcessToESignById(id: string, callback: () => void) { + this.request(this.$api_startTheProcessToESignById, { id }).subscribe(res => { + if (res) { + callback(); + } + }); + } } From 58c709dc218c05a3d914e7e15216f72d61c77c43 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 20 Apr 2022 16:47:57 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E8=BF=94=E4=BD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../network-freight/new/new.component.html | 10 +- .../network-freight/new/new.component.less | 50 +++-- .../network-freight/new/new.component.ts | 212 +++++++++++++----- .../sys-setting/services/system.service.ts | 69 +++--- src/assets/images/road.png | Bin 0 -> 23557 bytes 5 files changed, 231 insertions(+), 110 deletions(-) create mode 100644 src/assets/images/road.png 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 2a2358b8..647b7798 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-11 14:50:05 + * @LastEditTime : 2022-04-20 16:21:58 * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\network-freight\\new\\new.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -36,7 +36,13 @@
营业执照法人信息
 - + +
道运证信息
+ + + + +
请上传身份证原件的高清照片，若上传复印件，则需申请人签字；
diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.less b/src/app/routes/sys-setting/components/network-freight/new/new.component.less index b1eab8b6..1a554f42 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.less +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.less @@ -1,46 +1,46 @@ :host { ::ng-deep { - nz-card { + nz-card { + .pr { position: relative; } .pa { position: absolute; - top : 50px; - left : 150px; + top: 50px; + left: 150px; } .pa2 { position: absolute; top: 28px; left: 180px; } - .tips { - display : flex; + .tips { + display: flex; margin-bottom: 0; - color : #333; + color: #333; dt { width: 150px; } dd { - width : 190px; + width: 190px; margin-bottom: 0; - text-align : center; + text-align: center; } } .form-title { margin-bottom: 10px; - padding-left : 8px; - color : #333; - font-weight : 700; - font-size : 18px; - line-height : 20px; - border-left : solid 3px #1890ff; + padding-left: 8px; + color: #333; + font-weight: 700; + font-size: 18px; + line-height: 20px; + border-left: solid 3px #1890ff; } - } .ant-form-item { @@ -51,21 +51,31 @@ nz-input-number { width: 100% !important; } - + .ant-input-borderless{ + padding: 0; + padding-top: 4px; + color: black; + resize:none; + } + .setCustom .ant-form-item-control{ + margin-left: -100px !important + } + .borderImg{ + border: solid 1px #ebf0fb; + } .input-back { nz-form-item { - margin-left: 0px; + margin-left: 0; .ant-form-item-label { flex: 0 !important; } .ant-form-item-control { - max-width : 100% !important; + max-width: 100% !important; margin-left: 20px !important; } } } - } -} \ No newline at end of file +} 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 00b3ccd8..3fbe0d7e 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 @@ -17,7 +17,6 @@ import { NzUploadFile } from 'ng-zorro-antd/upload'; import { of } from 'rxjs'; import { SystemService } from '../../../services/system.service'; - const IMAGECONFIG = { previewFile: (file: NzUploadFile) => of(file.url), action: apiConf.waterFileUpload, @@ -50,14 +49,14 @@ export class NetworkFreightNewComponent implements OnInit { sf!: SFComponent; @ViewChild('sf1', { static: false }) sf1!: SFComponent; - sf1FormData: any = { + sf1FormData: any = { legalPersonIdentityVO: { certificatePhotoFrontWatermark: '', - certificatePhotoBackWatermark: '', - }, - };; - subText = '确认新增' - TabText = '新增网络货运人' + certificatePhotoBackWatermark: '' + } + }; + subText = '确认新增'; + TabText = '新增网络货运人'; sf2FormData: any = {}; schema: SFSchema = this.initOthersSF(); schema1: SFSchema = this.initBasicInfoSF(); @@ -85,22 +84,29 @@ export class NetworkFreightNewComponent implements OnInit { $isLoingDate: { 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) {} ngOnInit() { - if(this.route.snapshot.params.id !== 'undefined') { - this.dataListInit(this.route.snapshot.params.id) - this.subText = '确认编辑' - this.TabText = '编辑网络货运人' + if (this.route.snapshot.params.id !== 'undefined') { + this.dataListInit(this.route.snapshot.params.id); + this.subText = '确认编辑'; + this.TabText = '编辑网络货运人'; } } dataListInit(id: any) { - this.service.request(this.service.$api_get_networkTransporter_getDetail,{id: id}).subscribe((res) => { + this.service.request(this.service.$api_get_networkTransporter_getDetail, { id: id }).subscribe(res => { console.log(res); - this.sf2FormData = res - this.sf1FormData = res.enterpriseInfoVO + this.sf2FormData = res; + this.sf1FormData = res.enterpriseInfoVO; this.sf1FormData.isLoingDate = this.sf1FormData.operatingEndTime !== null ? false : true; this.sf1FormData.licensePhotoWatermark = [ { @@ -109,19 +115,19 @@ export class NetworkFreightNewComponent implements OnInit { status: 'done', url: this.sf1FormData.licensePhotoWatermark, response: this.sf1FormData.licensePhotoWatermark - }, + } ]; console.log(this.sf1FormData); // 营业执照法人信息 - + this.sf1FormData.legalPersonIdentityVO.certificatePhotoFrontWatermark = [ { uid: -1, name: 'LOGO', status: 'done', - url: res.enterpriseInfoVO.legalPersonIdentityVO.certificatePhotoFrontWatermark, - response: res.enterpriseInfoVO.legalPersonIdentityVO.certificatePhotoFrontWatermark - }, + url: res.enterpriseInfoVO.legalPersonIdentityVO.certificatePhotoFrontWatermark, + response: res.enterpriseInfoVO.legalPersonIdentityVO.certificatePhotoFrontWatermark + } ]; this.sf1FormData.legalPersonIdentityVO.certificatePhotoBackWatermark = [ { @@ -129,20 +135,29 @@ export class NetworkFreightNewComponent implements OnInit { name: 'LOGO', status: 'done', url: this.sf1FormData.legalPersonIdentityVO.certificatePhotoBackWatermark, - response: this.sf1FormData.legalPersonIdentityVO.certificatePhotoBackWatermark, - }, + response: this.sf1FormData.legalPersonIdentityVO.certificatePhotoBackWatermark + } ]; - const province = this.sf1FormData.fullRegionVO.provinceCode - const city = this.sf1FormData.fullRegionVO.cityCode - const area = this.sf1FormData.fullRegionVO.areaCode + this.sf1FormData.legalPersonIdentityVO.roadTransportPhotoWatermark = [ + { + uid: -1, + name: 'LOGO', + status: 'done', + url: this.sf1FormData.legalPersonIdentityVO.roadTransportPhotoWatermark, + response: this.sf1FormData.legalPersonIdentityVO.roadTransportPhotoWatermark + } + ]; + const province = this.sf1FormData.fullRegionVO.provinceCode; + const city = this.sf1FormData.fullRegionVO.cityCode; + const area = this.sf1FormData.fullRegionVO.areaCode; this.sf1FormData.enterpriseAddressCode = [parseInt(province), parseInt(city), parseInt(area)]; this.getRegionToThree(); - }) + }); } getRegionToThree() { // 获取一、二、三级地区详情 - this.service.http.post(this.service.$api_getRegionToThree).subscribe((res) => { - if(this.sf1){ + this.service.http.post(this.service.$api_getRegionToThree).subscribe(res => { + if (this.sf1) { this.sf1.getProperty('/enterpriseAddressCode')!.schema.enum = res.data; this.sf1?.getProperty('/enterpriseAddressCode')?.widget.reset(res.data); } @@ -171,31 +186,37 @@ export class NetworkFreightNewComponent implements OnInit { if (this.sf1.value.isLoingDate) { this.sf1.value.operatingEndTime = ''; } - console.log(this.sf1.value) - console.log(this.sf1.valid) - console.log(this.sf.value) - console.log(this.sf.valid) + console.log(this.sf1.value); + console.log(this.sf1.valid); + console.log(this.sf.value); + console.log(this.sf.valid); const sfVlaue = this.sf1.value; const params: any = {}; - Object.assign( - params, - { - ...this.sf.value , - enterpriseInfoDTO: { - ...this.sf1.value, - legalPersonIdentityDTO: this.sf1.value.legalPersonIdentityVO - } - } - ); - delete params.enterpriseInfoDTO.legalPersonIdentityVO + console.log(this.sf1.value); + + Object.assign(params, { + ...this.sf.value, + enterpriseInfoDTO: { + ...this.sf1.value, + legalPersonIdentityDTO: this.sf1.value.legalPersonIdentityVO, + + }, + roadTransportAddress: this.sf1.value.legalPersonIdentityVO.roadTransportAddress, //道路运输证地址 + roadTransportEndTime: this.sf1.value.legalPersonIdentityVO.roadTransportEndTime, //道路运输许可证有效结束时间 + roadTransportStartTime: this.sf1.value.legalPersonIdentityVO.roadTransportStartTime, //道路运输许可证有效开始时间 + roadTransportPhotoWatermark: this.sf1.value.legalPersonIdentityVO.roadTransportPhotoWatermark, //带水印道路运输照片 + roadTransportPhoto: this.sf1.value.legalPersonIdentityVO.roadTransportPhoto, //经营许可证号 + roadTransportLicenceNo: this.sf1.value.legalPersonIdentityVO.roadTransportLicenceNo, //道路运输照片 + }); + delete params.enterpriseInfoDTO.legalPersonIdentityVO; console.log(params); params.enterpriseInfoDTO.enterpriseAddressCode = this.sf1.value?.enterpriseAddressCode?.[2]; - if(this.route.snapshot.params.id !== 'undefined') { - params.id = this.route.snapshot.params.id + if (this.route.snapshot.params.id !== 'undefined') { + params.id = this.route.snapshot.params.id; } this.service.request(this.service.$api_networkTransporter_save, params).subscribe(res => { if (res) { - if(this.route.snapshot.params.id !== 'undefined') { + if (this.route.snapshot.params.id !== 'undefined') { this.service.msgSrv.success('修改成功'); } else { this.service.msgSrv.success('新增成功'); @@ -252,7 +273,7 @@ export class NetworkFreightNewComponent implements OnInit { // 识别营业执照 checkBusinessLicense(imgurl: any) { console.log('触发了识别'); - + this.service.request(this.service.$api_ocr_recognize_business_license, { businessLicenseUrl: imgurl }).subscribe(res => { if (res) { if (res.registrationNumber) { @@ -313,7 +334,7 @@ export class NetworkFreightNewComponent implements OnInit { } } as SFUploadWidgetSchema }, - + enterpriseName: { title: '公司名称', type: 'string', @@ -433,7 +454,7 @@ export class NetworkFreightNewComponent implements OnInit { } } as SFDateWidgetSchema }, - + operatingStartTime: { title: '营业期限', type: 'string', @@ -583,9 +604,84 @@ export class NetworkFreightNewComponent implements OnInit { grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, placeholder: '请输入法定代表人证件号' } + }, + title3: { title: '', type: 'string', ui: { widget: 'custom', offsetControl: 6 } }, + roadTransportPhoto: { title: '', type: 'string', ui: { hidden: true } }, + roadTransportPhotoWatermark: { + type: 'string', + title: '道运证照片', + ui: { + ...IMAGECONFIG, + descriptionI18n: '请上传道运证照片，支持JPG、PNG格式，文件小于5M。蓝牌绿牌车辆，可不用传道运证', + change: args => { + if (args.type === 'success') { + console.log(args); + + this.sf1.setValue('/legalPersonIdentityVO/roadTransportPhoto', args.fileList[0].response.data.fullFilePath); + this.checkTransCard(args.fileList[0].response.data.fullFilePath); + } + } + } as SFUploadWidgetSchema + }, + // roadImg: { + // title: '', + // type: 'boolean', + // // enum: [{ label: '长期', value: true }], + // ui: { + // widget: 'custom' + // } + // }, + roadTransportLicenceNo: { + title: '经营许可证号', + type: 'string', + maxLength: 30, + ui: { + grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, + placeholder: '请输入' + } + }, + roadTransportAddress: { + title: '地址', + type: 'string', + maxLength: 30, + ui: { + grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, + placeholder: '请输入' + } + }, + roadTransportStartTime: { + title: '发证日期', + type: 'string', + format: 'date', + ui: { + grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, + placeholder: '请输入' + } + }, + roadTransportEndTime: { + title: '有效期至', + type: 'string', + format: 'date', + ui: { + grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, + placeholder: '请输入' + } } }, - required: ['certificatePhotoFront', 'certificatePhotoBack', 'name', 'certificateType', 'certificateNumber','certificatePhotoFrontWatermark','certificatePhotoBackWatermark'] + required: [ + 'certificatePhotoFront', + 'certificatePhotoBack', + 'name', + 'certificateType', + 'certificateNumber', + 'certificatePhotoFrontWatermark', + 'certificatePhotoBackWatermark', + 'roadTransportEndTime', + 'roadTransportStartTime', + 'roadTransportLicenceNo', + 'roadTransportPhotoWatermark', + 'roadTransportAddress', + ] } }, required: [ @@ -623,13 +719,25 @@ export class NetworkFreightNewComponent implements OnInit { type: 'string', addOnAfter: '%', ui: { - addOnAfter: '%', + addOnAfter: '%', grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, placeholder: '请输入成本费率' - } + } } }, required: ['website', 'costRate'] }; } + // 道路运输证识别 + checkTransCard(imgurl: any) { + const params = { + transportationLicenseUrl: imgurl + }; + this.service.request(this.service.$api_recognizeTransportationLicense, params).subscribe(res => { + if (res) { + this.sf.setValue('/roadTransportLicenceNo', res?.businessCertificate); + this.sf.setValue('/roadTransportStartTime', res?.issueDate); + } + }); + } } diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index bad5ae64..2a15a420 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-20 17:18:43 - * @LastEditTime : 2022-02-18 13:42:49 + * @LastEditTime : 2022-04-20 16:15:23 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\services\\system.service.ts @@ -30,7 +30,6 @@ export class SystemService extends BaseService { // 运营管理后台转授超管角色 $api_set_shift_admin = `/api/mdc/cuc/userAuthority/shiftAdmin`; - // 分页获取应用角色列表 $api_get_role_page = '/api/mdc/cuc/roleInfo/getAppRoleInfoList'; // 分页获取配置角色列表 @@ -112,28 +111,26 @@ export class SystemService extends BaseService { public $api_remove_config = '/api/mdc/pbc/sysConfig/deletebatch'; // 查询系统配置项 public $api_get_config_item_page = '/api/mdc/pbc/sysConfigItem/list/page'; - // 新增系统配置项 - public $api_add_config_item = '/api/mdc/pbc/sysConfigItem/save'; - // 更新系统配置项 - public $api_update_config_item = '/api/mdc/pbc/sysConfigItem/update'; - // 批量更新系统配置项 - public $api_update_config_batch = '/api/mdc/pbc/sysConfigItem/updateBatch'; + // 新增系统配置项 + public $api_add_config_item = '/api/mdc/pbc/sysConfigItem/save'; + // 更新系统配置项 + public $api_update_config_item = '/api/mdc/pbc/sysConfigItem/update'; + // 批量更新系统配置项 + public $api_update_config_batch = '/api/mdc/pbc/sysConfigItem/updateBatch'; // 更新系统配置项排序 public $api_update_config_item_sort = '/api/mdc/pbc/sysConfigItem/updateSort'; // 删除系统配置项 public $api_remove_config_item = '/api/mdc/pbc/sysConfigItem/deletebatch'; - // 根据网络货运人ID获取票务信息 public $api_getTicketByNetworkTransporterId = '/api/mdc/cuc/networkTransporterTicket/getTicketByNetworkTransporterId'; // 保存票务信息 public $api_networkTransporterTicket_save = '/api/mdc/cuc/networkTransporterTicket/save'; - // 根据地区code查询列表 - $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode'; + // 根据地区code查询列表 + $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode'; // 根据地区code查询地区详情 $api_getRegionDetailByCode = '/api/mdc/pbc/region/getRegionDetailByCode'; - // 分页查询按钮列表 $api_getButtonInfoPage = '/api/mdc/cuc/buttonInfo/getButtonInfoPage'; // 新增编辑按钮信息 @@ -143,7 +140,6 @@ export class SystemService extends BaseService { // 删除按钮信息(id) $api_deletebatchButton = '/api/mdc/cuc/buttonInfo/deletebatchButton'; - // 根据条件获取公告列表 $api_getAnnouncementInfoList_page = '/api/mdc/pbc/announcementInfo/getAnnouncementInfoList'; // 获取公告信息详情 @@ -154,31 +150,32 @@ export class SystemService extends BaseService { $api_modifyAnnouncementInfo = '/api/mdc/pbc/announcementInfo/modifyAnnouncementInfo'; // 新增公告信息 $api_addAnnouncementInfo = '/api/mdc/pbc/announcementInfo/addAnnouncementInfo'; - - - // 查询保险配置 - $api_insuranceConfig_list = '/api/mdc/cuc/insuranceConfig/list'; - // 获取保险配置费率 - $api_getInsuranceRate = '/api/mdc/cuc/insuranceConfig/getInsuranceRate'; - // 获取保险配置(id) - $api_getInsuranceRate_get = '/api/mdc/cuc/insuranceConfig/get'; - // 删除保险配置(id) - $api_getInsuranceRate_deletebatch = '/api/mdc/cuc/insuranceConfig/deletebatch'; - // 批量保存保险配置 - $api_getInsuranceRate_saveBatch = '/api/mdc/cuc/insuranceConfig/saveBatch'; - - // 营业执照识别 - $api_ocr_recognize_business_license = '/api/mdc/pbc/hwc/ocr/recognizeBusinessLicense'; - // 短信发送列表 - $api_listSmsSendLog = '/api/mdc/pbc/smsSend/listSmsSendLog'; - // 身份证识别 - $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard'; - // 获取字典 - $api_getDictValue = '/api/mdc/pbc/dictItems/getDictValue'; - // 设置crm客户 - $api_setCrmCustomer = '/api/mdc/cuc/networkTransporter/setCrmCustomer'; + + // 查询保险配置 + $api_insuranceConfig_list = '/api/mdc/cuc/insuranceConfig/list'; + // 获取保险配置费率 + $api_getInsuranceRate = '/api/mdc/cuc/insuranceConfig/getInsuranceRate'; + // 获取保险配置(id) + $api_getInsuranceRate_get = '/api/mdc/cuc/insuranceConfig/get'; + // 删除保险配置(id) + $api_getInsuranceRate_deletebatch = '/api/mdc/cuc/insuranceConfig/deletebatch'; + // 批量保存保险配置 + $api_getInsuranceRate_saveBatch = '/api/mdc/cuc/insuranceConfig/saveBatch'; + + // 营业执照识别 + $api_ocr_recognize_business_license = '/api/mdc/pbc/hwc/ocr/recognizeBusinessLicense'; + // 短信发送列表 + $api_listSmsSendLog = '/api/mdc/pbc/smsSend/listSmsSendLog'; + // 身份证识别 + $api_ocr_recognize_id_card = '/api/mdc/pbc/hwc/ocr/recognizeIdCard'; + // 获取字典 + $api_getDictValue = '/api/mdc/pbc/dictItems/getDictValue'; + // 设置crm客户 + $api_setCrmCustomer = '/api/mdc/cuc/networkTransporter/setCrmCustomer'; // 获取一、二、三级地区详情 $api_getRegionToThree = '/api/mdc/pbc/region/getRegionToThree'; + // 道路运输证识别 + $api_recognizeTransportationLicense = '/api/mdc/pbc/hwc/ocr/recognizeTransportationLicense'; $api_getRoleTemplateInfo: string = ''; $api_getFunctionButtonInfo: string = '/api/mdc/cuc/functionButton/getFunctionButtonByFunctionId'; $api_getFunctionDataInfo: string = ''; diff --git a/src/assets/images/road.png b/src/assets/images/road.png new file mode 100644 index 0000000000000000000000000000000000000000..290a1e26e4a2bb7f919fb839b8c76c4dad90313b GIT binary patch literal 23557 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 AcmMzZ literal 0 HcmV?d00001