From 1df272319c52672bcb8ad9be3b90328608cdfc2a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 22 Apr 2022 09:53:24 +0800 Subject: [PATCH 01/18] fix bug --- .../partner-list/components/index/partner-list.component.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 93698e61..b5aca504 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -463,18 +463,15 @@ export class PartnerListComponent { }, { text: '修改返佣模板', - iif: item => item.id, click: item => this.editTemplateAction(item) }, { text: '修改渠道销售', - iif: item => item.id, click: item => this.editCannelAction(item) }, { text: '重发CRM流程', click: item => item.id && this.reSendCRM(item), - iif: item => item.crmStatus === 10 } ] } From 08f1f7b527efdd276db0fc36a63c4613dc192f9d Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 22 Apr 2022 10:23:21 +0800 Subject: [PATCH 02/18] fix bug --- proxy.conf.js | 4 ++-- .../partner-list/components/index/partner-list.component.ts | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index eb92fbd4..c2e27015 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-20 14:18:40 + * @LastEditTime : 2022-04-22 10:05:01 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -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/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index b5aca504..93698e61 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -463,15 +463,18 @@ export class PartnerListComponent { }, { text: '修改返佣模板', + iif: item => item.id, click: item => this.editTemplateAction(item) }, { text: '修改渠道销售', + iif: item => item.id, click: item => this.editCannelAction(item) }, { text: '重发CRM流程', click: item => item.id && this.reSendCRM(item), + iif: item => item.crmStatus === 10 } ] } From b67401d311f8f2fa64855a2386843d6c802ab361 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 22 Apr 2022 10:25:57 +0800 Subject: [PATCH 03/18] fix bug --- .../components/bank-card-management/bind/bind.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts b/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts index 512d5dc1..cea027a7 100644 --- a/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts +++ b/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts @@ -57,7 +57,7 @@ export class CwcBankCardManagementBindComponent implements OnInit { bankCardNumber: { type: 'string', title: '银行卡号', - maxLength: 21, + maxLength: 30, ui: { showRequired: true, placeholder: '请输入银行卡号', From 29789d20ab4d2ba26ac95f8d9b27a1c9819b3b41 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 22 Apr 2022 14:42:08 +0800 Subject: [PATCH 04/18] edit --- proxy.conf.js | 2 +- .../dataindex/dataindex.component.html | 21 +-- .../dataindex/dataindex.component.less | 9 ++ .../dataindex/dataindex.component.ts | 138 +++++++++++++----- .../index/partner-list.component.ts | 6 +- .../partner-audit-modal.component.ts | 7 +- .../partner-detail.component.ts | 8 +- .../personal-partner-detail.component.ts | 6 + 8 files changed, 145 insertions(+), 52 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index eb92fbd4..00392e43 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.html b/src/app/routes/datatable/components/dataindex/dataindex.component.html index cdeed077..55bda674 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.html +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.html @@ -25,7 +25,7 @@ - @@ -35,7 +35,7 @@ - @@ -43,13 +43,13 @@
-
- +
+
-
- +
+ @@ -57,16 +57,17 @@
-
- +
+
-
- +
+ + diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.less b/src/app/routes/datatable/components/dataindex/dataindex.component.less index e69de29b..36153e65 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.less +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.less @@ -0,0 +1,9 @@ +.chart_title { + font-size : 16px; + font-weight : 500; + color : #1D2129; + line-height : 24px; + background-clip : text; + -webkit-background-clip: text; + position : absolute; +} \ No newline at end of file diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.ts b/src/app/routes/datatable/components/dataindex/dataindex.component.ts index 168dc88f..ab6a8528 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.ts +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.ts @@ -82,8 +82,14 @@ export class DatatableDataindexComponent implements OnInit { // 大区业绩完成情况 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.regionalPerformanceCompletion = res.map(item => ({ ...item, time: new Date(item.time)?.getTime() })); + // this.initRegionalPerformanceChart(this.RegionalPerforman['el'].nativeElement as any, this.regionalPerformanceCompletion); + this.regionalPerformanceCompletion = this.formatBarData(res); + this.initBiaxialChart(this.RegionalPerforman['el'].nativeElement as any, this.regionalPerformanceCompletion, { + y1Title: '业绩量(万)', + y2Title: '业绩完成率', + y3Title: '同期业绩完成率' + }); } }); // 订单类型比例 @@ -97,7 +103,11 @@ export class DatatableDataindexComponent implements OnInit { this.service.request(this.service.$api_get_bill_payment_amount).subscribe(res => { if (res) { this.salesData = this.formatBarData(res); - this.initBiaxialChart(this.SaleProportion['el'].nativeElement as any, this.salesData); + this.initBiaxialChart(this.SaleProportion['el'].nativeElement as any, this.salesData, { + y1Title: '业绩量(万)', + y2Title: '业绩完成率', + y3Title: '同期业绩完成率' + }); } }); } @@ -121,8 +131,8 @@ export class DatatableDataindexComponent implements OnInit { // 新建一个 view 用来单独渲染Annotation const innerView = chart.createView(); chart.coordinate('theta', { - radius: 0.6, - innerRadius: 0.7 + radius: 0.65, + innerRadius: 0.6 }); chart.data(data); @@ -138,17 +148,17 @@ export class DatatableDataindexComponent implements OnInit { // 声明需要进行自定义图例字段： 'item' chart.legend('item', { - position: 'right', // 配置图例显示位置 + position: 'bottom', // 配置图例显示位置 custom: true, // 关键字段，告诉 G2，要使用自定义的图例 items: data.map((obj: any, index: any) => { return { name: obj.item, // 对应 itemName value: obj.percent, // 对应 itemValue marker: { - symbol: 'square', // marker 的形状 + symbol: 'circle', // marker 的形状 style: { r: 5, // marker 图形半径 - fill: chart.getTheme().colors10[index] // marker 颜色，使用默认颜色，同图形对应 + fill: index === 0 ? '#E60012' : '#F09896' // marker 颜色，使用默认颜色，同图形对应 } } // marker 配置 }; @@ -165,7 +175,7 @@ export class DatatableDataindexComponent implements OnInit { .interval() .adjust('stack') .position('percent') - .color('item') + .color('item', ['#E60012', '#F09896']) .style({ fillOpacity: 1, stroke: 'white', @@ -182,6 +192,14 @@ export class DatatableDataindexComponent implements OnInit { }; } } + }) + .label('percent', percent => { + return { + content: data => { + return ` ${percent * 100}%`; + }, + style: { fontSize: 14 } + }; }); innerView @@ -201,7 +219,7 @@ export class DatatableDataindexComponent implements OnInit { content: data[0].count, style: { fontSize: 28, - fill: '#8c8c8c', + fill: '##000', textAlign: 'center' }, offsetY: 20 @@ -253,7 +271,7 @@ export class DatatableDataindexComponent implements OnInit { content: data.count, style: { fontSize: 28, - fill: '#8c8c8c', + fill: '##000', textAlign: 'center' }, offsetY: 20 @@ -271,6 +289,50 @@ export class DatatableDataindexComponent implements OnInit { } } + /** + * 构建面积图 + * @param el + */ + private initAreaMap(el: HTMLElement, datas: any[]): void { + const chart = new Chart({ + container: el, + autoFit: true, + height: 500 + }); + chart.data(datas); + chart.scale('Data', { + range: [0, 1], + tickCount: 10, + type: 'timeCat' + }); + chart.scale('sales', { + nice: true + }); + chart.axis('Data', false); + chart.axis('sales', false); + chart.tooltip({ + showCrosshairs: true + }); + + // chart.annotation().dataMarker({ + // position: ['2014-01', 1750], + // top: true, + // text: { + // content: '因政策调整导致销量下滑', + // style: { + // fontSize: 13 + // } + // }, + // line: { + // length: 30 + // } + // }); + + chart.line().position('Data*sales'); + chart.area().position('Data*sales'); + chart.render(); + } + /** * 构建大区业绩完成情况柱折双轴图 * @param el @@ -308,6 +370,7 @@ export class DatatableDataindexComponent implements OnInit { // 声明需要进行自定义图例字段： 'item' chart.legend({ + title: { text: '1111', spacing: 11 }, offsetY: 10, position: 'bottom', // 配置图例显示位置 custom: true, // 关键字段，告诉 G2，要使用自定义的图例 @@ -333,7 +396,11 @@ export class DatatableDataindexComponent implements OnInit { * @param el * @param data */ - private initBiaxialChart(el: HTMLElement, data: any[]) { + private initBiaxialChart( + el: HTMLElement, + data: any[], + { y1Title, y2Title, y3Title }: { y1Title: string; y2Title: string; y3Title: string } + ) { const chart = new Chart({ container: el, autoFit: true, @@ -342,45 +409,47 @@ export class DatatableDataindexComponent implements OnInit { chart.data(data); // 设置坐标轴 chart.scale({ - pre: { alias: '同期业绩完成率', min: 0, max: 1, formatter: val => val * 100 + '%' }, - pre2: { alias: '业绩完成率', min: 0, max: 1, formatter: val => val * 100 + '%' }, - quantity: { alias: '业绩量 (万)', min: 0, max: 1000000 } + y1: { alias: y1Title, min: 0, max: 1000000 }, + y2: { alias: y2Title, min: 0, max: 1, formatter: val => (val * 100).toFixed(0) + '%' }, + y3: { alias: y3Title, min: 0, max: 1, formatter: val => (val * 100).toFixed(0) + '%' } }); // 设置 chart.legend({ custom: true, + position: 'top-right', + padding: [10, 0, 40, 0], items: [ - { value: 'quantity', name: '业绩量 (万)', marker: { symbol: 'hyphen', style: { stroke: '#3182bd', r: 15, lineWidth: 5 } } }, - { value: 'pre2', name: '业绩完成率', marker: { symbol: 'hyphen', style: { stroke: '#fdae6b', r: 15, lineWidth: 5 } } }, - { value: 'pre', name: '同期业绩完成率', marker: { symbol: 'hyphen', style: { stroke: '#ff4d4f', r: 15, lineWidth: 5 } } } + { value: 'y1', name: y1Title, marker: { symbol: 'circle', style: { fill: '#E60012', r: 5, fontSize: 13 } } }, + { value: 'y3', name: y3Title, marker: { symbol: 'circle', style: { fill: '#6CBFFF', r: 5, fontSize: 13 } } }, + { value: 'y2', name: y2Title, marker: { symbol: 'circle', style: { fill: '#50D4AB', r: 5, fontSize: 13 } } } ] }); - chart.axis('pre', { + chart.axis('y2', { grid: null, title: null, label: { - formatter: val => +val * 100 + '%' + formatter: val => val } }); - chart.axis('pre2', false); + chart.axis('y3', false); chart.tooltip({ shared: true }); - chart.interval().position('time*quantity').label('quantity').color('#3182bd'); + chart.interval().position('x*y1').color('#E60012'); chart .line() - .position('time*pre') - .label('pre', val => ({ content: (val * 100).toFixed(0) + '%' })) - .color('#ff4d4f') + .position('x*y2') + // .label('pre', val => ({ content: (val * 100).toFixed(0) + '%' })) + .color('#6CBFFF') .size(3); - chart.point().position('time*pre').color('#ff4d4f').size(3).shape('circle'); + chart.point().position('x*y2').color('#6CBFFF').size(3).shape('circle'); chart .line() - .position('time*pre2') - .label('pre2', val => ({ content: (val * 100).toFixed(0) + '%' })) - .color('#fdae6b') + .position('x*y3') + // .label('pre2', val => ({ content: (val * 100).toFixed(0) + '%' })) + .color('#50D4AB') .size(3); - chart.point().position('time*pre2').color('#fdae6b').size(3).shape('circle'); + chart.point().position('x*y3').color('#50D4AB').size(3).shape('circle'); chart.interaction('active-region'); chart.removeInteraction('legend-filter'); // 自定义图例，移除默认的分类图例筛选交互 @@ -417,11 +486,10 @@ export class DatatableDataindexComponent implements OnInit { private formatBarData(data: DataPerformanceTrendVO[]): any[] { return data.map(item => ({ - time: item.time, - quantity: item.quantity, - color: undefined, - pre: Math.floor(Math.random() * 100) / 100, - pre2: Math.floor(Math.random() * 100) / 100 + x: item.time, + y1: item.quantity, + y2: Math.floor(Math.random() * 100) / 100, + y3: Math.floor(Math.random() * 100) / 100 })); } diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 93698e61..87ef9a27 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -25,7 +25,7 @@ export class PartnerListComponent { @ViewChild('editTemplate', { static: true }) editTemplate: any; - templateId: any; + templateId: any; templates: any[] = []; @ViewChild('editCannel', { static: true }) @@ -73,7 +73,9 @@ export class PartnerListComponent { nzFooter: null }); modal.afterClose.subscribe(res => { - modal.destroy(); + if (res) { + this.st.load(1); + } }); } diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts index f6fbcaac..1c2c4d4f 100644 --- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts @@ -1,5 +1,6 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { SFComponent, SFSchema, SFValue } from '@delon/form'; +import { ModalHelper } from '@delon/theme'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { PartnerListService } from '../../services/partner-list.service'; @@ -15,7 +16,7 @@ export class PartnerAuditModalComponent implements OnInit { info: any; schema!: SFSchema; sourcePage = ''; - constructor(private nzModalService: NzModalService, public service: PartnerListService) {} + constructor(private nzModalService: NzModalService, public service: PartnerListService, private modal: NzModalRef) {} ngOnInit(): void { this.initSF(this.info); @@ -49,7 +50,7 @@ export class PartnerAuditModalComponent implements OnInit { widget: 'radio', hidden: this.info.isPass !== undefined }, - default: true + default: this.info.isPass !== undefined ? this.info.isPass : true }, channelId: { title: '渠道销售', @@ -121,7 +122,7 @@ export class PartnerAuditModalComponent implements OnInit { .subscribe(res => { if (res) { this.service.msgSrv.success('审核成功！'); - this.close(); + this.modal.destroy(1); } }); } diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts index 80a9aa45..0df4d752 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts @@ -142,6 +142,12 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { nzComponentParams: { info: { ...this.detailData, isPass }, sourcePage: '合伙人审核详情' }, nzFooter: null }); + + modal.afterClose.subscribe(res => { + if (res) { + this.initData(); + } + }); } ratify() { @@ -370,7 +376,7 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { buttons: [ { text: '详情', - click: (item) => this.service.showChangeDetail(item.id) + click: item => this.service.showChangeDetail(item.id) } ] } diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts index ab33519c..29052c55 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts @@ -130,6 +130,12 @@ export class PersonalPartnerDetailComponent implements OnInit { }, nzFooter: null }); + + modal.afterClose.subscribe(res => { + if (res) { + this.initData(); + } + }); } ratify() { From 33963ed45d0bb6730767236c68eee450984c2ae9 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 22 Apr 2022 14:50:58 +0800 Subject: [PATCH 05/18] fix bug --- proxy.conf.js | 2 +- .../voucher-view/voucher-view.component.html | 36 +- .../voucher-view/voucher-view.component.ts | 199 ++++++----- .../services/order-management.service.ts | 7 +- .../add-partnerlist.component.html | 6 +- .../rebate-setting/add/add.component.html | 44 ++- .../rebate-setting/add/add.component.ts | 16 +- .../sys-setting/services/system.service.ts | 4 +- .../enterprise-audit/view/view.component.html | 322 +++++++++++++----- .../rebate-table/rebate-table.component.html | 30 +- .../rebate-table/rebate-table.component.less | 3 + 11 files changed, 431 insertions(+), 238 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index c2e27015..2fda5ca7 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-22 10:05:01 + * @LastEditTime : 2022-04-22 14:01:00 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html index 9133fdfa..dc423d83 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html @@ -4,27 +4,33 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-04-21 14:41:44 + * @LastEditTime : 2022-04-22 11:03:26 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\audit\\voucher-view\\voucher-view.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. -->
- - -
-
电子装货单 + + +
+
电子装货单 + +
+
+ + +
电子卸货单 + +
+ +
- - - + + +
diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts index 3bc73604..c8ae7969 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts @@ -575,99 +575,116 @@ export class orderManagementVoucherViewComponent implements OnInit { } openlaod(value: any) { if (value === 1) { - // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 - let time = 10; - setInterval(function () { - time -= 1; - }, 1000); - const modal = this.modalService.success({ - nzTitle: '电子装货单签署中！', - nzContent: ` - 请等待${time}秒后自动关闭 - ` + this.service.request(this.service.$api_getBillTakeGoods, {id:this.datas?.id}).subscribe(res => { + if (res) { + console.log(res); + window.open(res?.contractFilePath) + } }); - if (!this.datas?.loadingElectronicsLadingBillFilePath) { - this.service.request(this.service.$api_createBillTakeGoods, [this.datas?.id]).subscribe(res => { - if (res) { - switch (res[0]?.esignFlowStatus) { - case 1: - case '1': - setTimeout(() => { - this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe(res => { - if (res[0]?.esignFlowStatus == '2') { - this.service.msgSrv.success('电子装货单已生效！'); - this.modal.destroy(true); - } - }); - modal.destroy(); - }, 10000); - return; - case 2: - modal.destroy(); - return; - case '13': - case 13: - this.service.msgSrv.error('签署异常!'); - modal.destroy(); - return; - } - } - }); - } else { - const a = document.createElement('a'); - a.href = this.datas?.loadingElectronicsLadingBillFilePath; - document.body.appendChild(a); - a.click(); //点击下载 - document.body.removeChild(a); //下载完成移除元素 - } } else { - // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 - let time = 10; - setInterval(function () { - time -= 1; - }, 1000); //反复执行函数本身 - const modal = this.modalService.success({ - nzTitle: '电子卸货单签署中！', - nzContent: ` - 请等待${time}秒后自动关闭 - ` + this.service.request(this.service.$api_getBillDischargeGoods, {id:this.datas?.id}).subscribe(res => { + if (res) { + console.log(res); + window.open(res?.contractFilePath) + } }); - if (!this.datas?.unloadingElectronicsLadingBillFilePath) { - this.service.request(this.service.$api_createBillDischargeGoods, [this.datas?.id]).subscribe(res => { - if (res) { - switch (res[0]?.esignFlowStatus) { - case 1: - case '1': - setTimeout(() => { - this.service.request(this.service.$api_getBillDischargeEsignFile, [this.datas?.id]).subscribe(res => { - if (res[0]?.esignFlowStatus == '2') { - this.service.msgSrv.success('电子卸货单已生效！'); - this.modal.destroy(true); - } - }); - modal.destroy(); - }, 10000); - - return; - case 2: - modal.destroy(); - - return; - case '13': - case 13: - this.service.msgSrv.error('签署异常!'); - modal.destroy(); - return; - } - } - }); - } else { - const a = document.createElement('a'); - a.href = this.datas?.unloadingElectronicsLadingBillFilePath; - document.body.appendChild(a); - a.click(); //点击下载 - document.body.removeChild(a); //下载完成移除元素 - } - } } + } + // openlaod2(value: any) { + // if (value === 1) { + // // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 + // let time = 10; + // setInterval(function () { + // time -= 1; + // }, 1000); + // const modal = this.modalService.success({ + // nzTitle: '电子装货单签署中！', + // nzContent: ` + // 请等待${time}秒后自动关闭 + // ` + // }); + // if (!this.datas?.loadingElectronicsLadingBillFilePath) { + // this.service.request(this.service.$api_createBillTakeGoods, [this.datas?.id]).subscribe(res => { + // if (res) { + // switch (res[0]?.esignFlowStatus) { + // case 1: + // case '1': + // setTimeout(() => { + // this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe(res => { + // if (res[0]?.esignFlowStatus == '2') { + // this.service.msgSrv.success('电子装货单已生效！'); + // this.modal.destroy(true); + // } + // }); + // modal.destroy(); + // }, 10000); + // return; + // case 2: + // modal.destroy(); + // return; + // case '13': + // case 13: + // this.service.msgSrv.error('签署异常!'); + // modal.destroy(); + // return; + // } + // } + // }); + // } else { + // const a = document.createElement('a'); + // a.href = this.datas?.loadingElectronicsLadingBillFilePath; + // document.body.appendChild(a); + // a.click(); //点击下载 + // document.body.removeChild(a); //下载完成移除元素 + // } + // } else { + // // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 + // let time = 10; + // setInterval(function () { + // time -= 1; + // }, 1000); //反复执行函数本身 + // const modal = this.modalService.success({ + // nzTitle: '电子卸货单签署中！', + // nzContent: ` + // 请等待${time}秒后自动关闭 + // ` + // }); + // if (!this.datas?.unloadingElectronicsLadingBillFilePath) { + // this.service.request(this.service.$api_createBillDischargeGoods, [this.datas?.id]).subscribe(res => { + // if (res) { + // switch (res[0]?.esignFlowStatus) { + // case 1: + // case '1': + // setTimeout(() => { + // this.service.request(this.service.$api_getBillDischargeEsignFile, [this.datas?.id]).subscribe(res => { + // if (res[0]?.esignFlowStatus == '2') { + // this.service.msgSrv.success('电子卸货单已生效！'); + // this.modal.destroy(true); + // } + // }); + // modal.destroy(); + // }, 10000); + + // return; + // case 2: + // modal.destroy(); + + // return; + // case '13': + // case 13: + // this.service.msgSrv.error('签署异常!'); + // modal.destroy(); + // return; + // } + // } + // }); + // } else { + // const a = document.createElement('a'); + // a.href = this.datas?.unloadingElectronicsLadingBillFilePath; + // document.body.appendChild(a); + // a.click(); //点击下载 + // document.body.removeChild(a); //下载完成移除元素 + // } + // } + // } } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 2c7f4a05..3df90939 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-19 15:16:37 + * @LastEditTime : 2022-04-22 10:54:29 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -209,11 +209,14 @@ export class OrderManagementService extends ShipperBaseService { // 查看补充协议 public $api_getSupplementaryAgreement = `/api/sdc/billShipper/getSupplementaryAgreement`; - // 获取电子提货单签章附件 public $api_getBillTakeEsignFile = `/api/sdc/billOperate/getBillTakeEsignFile`; // 获取电子卸货单签章附件 public $api_getBillDischargeEsignFile = `/api/sdc/billOperate/getBillDischargeEsignFile`; + // 预览卸货单 + public $api_getBillDischargeGoods = `/api/sdc/billOperate/getBillDischargeGoods`; + // 预览提货单 + public $api_getBillTakeGoods = `/api/sdc/billOperate/getBillTakeGoods`; // // 生成卸货单 // public $api_createBillDischargeGoods = `/api/sdc/billOperate/createBillDischargeGoods`; diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html index a537892f..5d060bcc 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-28 14:53:52 * @LastEditors : Shiming - * @LastEditTime : 2022-03-28 17:03:21 + * @LastEditTime : 2022-04-22 10:30:33 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add-partnerlist\\add-partnerlist.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -25,6 +25,6 @@ [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false" [scroll]="{ x: '1000' }"> - + diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html index 65cd23f9..8a4b1a3f 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html @@ -4,38 +4,44 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-03-29 10:47:02 + * @LastEditTime : 2022-04-22 14:29:23 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> -
- -    + + 固定结算费率配置 -     % + +  % + 业务量和管理费比例配置 -    + + - -    - + + +
+ +
+ 关联合伙人配置 -    - + + + -   添加 + 添加 -    + + 1 2 @@ -52,19 +59,22 @@ 5 -    - + -    + + + +
-
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts index 958809db..b262eba3 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-21 09:26:45 * @LastEditors : Shiming - * @LastEditTime : 2022-03-29 10:53:39 + * @LastEditTime : 2022-04-22 14:44:12 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -26,6 +26,7 @@ import { inRange } from '@delon/util'; export class ParterRebateManageMentAddComponent implements OnInit { @ViewChild('table') table!: any; tabelData: any; + addStatus: boolean = false; configName: string = ''; partnerType: string = ''; remarke: string = ''; @@ -78,7 +79,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { widget: 'tinymce', loadingTip: 'loading...', config: { - height: 650 + height: 500, } }, // default: data?.agreementContent || '' @@ -87,6 +88,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { }; } ngOnInit() { + this.addStatus =false this.initSF(); } goBack() { @@ -123,7 +125,9 @@ export class ParterRebateManageMentAddComponent implements OnInit { }); } delete(item: any) { - console.log(item); + this.partnerPeopleList = this.partnerPeopleList.filter((d:any, i: any) => { + return item.id != d.id + }); } save () { const params = { @@ -146,4 +150,10 @@ export class ParterRebateManageMentAddComponent implements OnInit { } }) } + changePartner(value: any) { + console.log(value); + if(value) { + this.addStatus = true + } + } } diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index 9c7e7250..33c7f6e6 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-04-20 16:48:26 + * @LastEditTime : 2022-04-22 14:50:25 * @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 @@ -64,7 +64,7 @@ export class SystemService extends BaseService { $api_deletebatch_crmCustomer = '/api/mdc/cuc/crmCustomer/deletebatch'; // 获取某个应用的所有菜单 - $api_getAllFunctionInfoByAppId: string = '/api/mdc/cuc/functionInfo/getAllFunctionInfoByAppIdNoHide'; + $api_getAllFunctionInfoByAppId: string = '/api/mdc/cuc/functionInfo/getAllFunctionInfoByAppId'; // 查询网络货运信息表 $api_networkTransporter_page = '/api/mdc/cuc/networkTransporter/list/page'; diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html index 90e39e1c..fe7bd829 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html @@ -8,42 +8,30 @@