From 11546c1ff10156b03c50f86e2df8b7e90fee9157 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 16:11:41 +0800 Subject: [PATCH 1/4] fix bug --- .../operationtable.component.ts | 2 + .../add-partnerlist.component.ts | 16 ++++- .../rebate-setting/add/add.component.html | 4 +- .../rebate-setting/add/add.component.ts | 59 +++++++++++-------- 4 files changed, 54 insertions(+), 27 deletions(-) diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.ts b/src/app/routes/datatable/components/operationtable/operationtable.component.ts index aa8b8e33..d315545d 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.ts +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.ts @@ -86,6 +86,8 @@ export class DatatableOperationtableComponent implements OnInit { this.service.request(this.service.$api_operationalReportHistogram, params).subscribe(res => { if (res) { this.chartData = res + this.pillar.reRender() + this.curve.reRender() if(flag) { // 除第一次加载外 this.pillar.reRender() this.curve.reRender() diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts index 4acbe111..c8f5b08e 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts @@ -54,12 +54,24 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { buttons: [ { text: '添加', + iifBehavior: 'disabled', + iif: (item:any) => { + return this.filterArr(item) + }, click: _record => this.add(_record), } ] } ]; - + filterArr (item: { id: any; }) { + let real = true + this.i.forEach((element:any) => { + if(element.id == item.id) { + real = false + } + }); + return real + } get reqParams() { // signStatus固定传20 代表签约完成 signStatus: 20 let params: any = { ...this.sf?.value, }; @@ -78,6 +90,8 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { ) {} ngOnInit(): void { + console.log(this.i); + this.initSF(); } initSF() { 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 bff494dd..8abf1189 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,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-05-05 17:04:31 + * @LastEditTime : 2022-05-07 15:42:10 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -58,7 +58,7 @@ - 添加 + 添加 { this.partnerId.push(ele?.id); }); } else { this.partnerPeopleList = this.partnerPeopleList.concat(res); + this.partnerPeopleList = [...this.setArr(this.partnerPeopleList, 'id')]; this.partnerId.push(res?.id); } } }); } + // 数组去重 + setArr(arr: any[], id: string) { + let obj: any = {}; + const arrays = arr.reduce((setArr, item) => { + obj[item[id]] ? '' : (obj[item[id]] = true && setArr.push(item)); + return setArr; + }, []); + return arrays; + } delete(item: any) { this.partnerPeopleList = this.partnerPeopleList.filter((d: any, i: any) => { return item.id != d.id; }); } save() { - if(!this.configName) { + if (!this.configName) { this.service.msgSrv.warning('请输入配置名称！'); - return + return; } - if(!this.accountingRate) { + if (!this.accountingRate) { this.service.msgSrv.warning('请输入固定结算费率！'); - return + return; } - if(!this.partnerType) { + if (!this.partnerType) { this.service.msgSrv.warning('请选择合伙人范围！'); - return + return; } - if(!this.priority) { + if (!this.priority) { this.service.msgSrv.warning('请选择优先级！'); - return + return; } - if(!this.sf?.value.ruleDescription) { + if (!this.sf?.value.ruleDescription) { this.service.msgSrv.warning('请输入规则说明！'); - return + return; } - if(!this.remark) { + if (!this.remark) { this.service.msgSrv.warning('请输入备注！'); - return + return; } - if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) { + if (this.partnerType == '3' && this.partnerPeopleList?.length == 0) { this.service.msgSrv.warning('请选择合伙人！'); - return + return; } let real = false; - if(this.configType == '2') { - this.table.data.forEach((element: any) => { - if (element.startAmount > element.endAmount) { - real = true; - return; - } - }); - } + if (this.configType == '2') { + this.table.data.forEach((element: any) => { + if (element.startAmount > element.endAmount) { + real = true; + return; + } + }); + } if (real) { this.service.msgSrv.warning('初始业务量不能超过到达业务量！'); return; @@ -197,7 +208,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { partnerType: this.partnerType }; console.log(params); - + this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('新增成功！'); From 3ccb1610152e03313e17cc31ba20b2e249da4fae Mon Sep 17 00:00:00 2001 From: weiyu Date: Sat, 7 May 2022 16:45:12 +0800 Subject: [PATCH 2/4] =?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/billing-order/billing-order.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html index f23247bb..c4db52cd 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html @@ -31,7 +31,7 @@ + [loading]="false" [scroll]="{ x:'1200px', y: scrollY }"> {{item.billTypeLabel + item.serviceTypeLabel}} From 5206b4a0c273db09576f6e0f93fc43b02c2d022b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 7 May 2022 17:23:01 +0800 Subject: [PATCH 3/4] fix bug --- .../voucher-summary.component.html | 13 ++++++++++++- .../bulk-publish/bulk-publish.component.html | 4 ++-- .../bulk-publish/bulk-publish.component.ts | 18 ++++++++++++++++-- .../bulk-release-publish.component.html | 2 +- .../bulk-release-publish.component.ts | 15 ++++++++++++--- .../onecar-publish/onecar-publish.component.ts | 16 +++++++++++++--- .../release-publish.component.ts | 10 +++++----- 7 files changed, 61 insertions(+), 17 deletions(-) diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html index 7380f466..4e14b673 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html @@ -1,3 +1,13 @@ + @@ -50,11 +50,11 @@ --> - + - {{ item.hrmoney | currency }} + {{ item.armoeny ? (item.armoeny| currency ): '--' }} / {{ item.hrmoney? (item.hrmoney | currency) : '--'}} {{ item.cnoCode }}/{{ item.cnoName }} diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts index 7c913644..3a064c06 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts @@ -252,8 +252,8 @@ export class CostManagementComponent extends BasicTableComponent implements OnIn { title: '结算客户', render: 'artocode', width: 200, className: 'text-left' }, { title: '应收对象', index: 'artoname', width: 200, className: 'text-left' }, { title: '应付对象', index: 'hrtoname', width: 200, className: 'text-left' }, - { title: '应收金额', render: 'armoeny', width: 150, className: 'text-right' }, - { title: '应付金额', render: 'hrmoney', width: 150, className: 'text-right' }, + { title: '应收/应付金额', render: 'hrmoney', width: 150, className: 'text-right' }, + // { title: '应付金额', render: 'hrmoney', width: 150, className: 'text-right' }, { title: '收/付款金额', render: 'hrpaymoney', width: 150, className: 'text-right' }, { title: '开/收票金额', render: 'hrvatmoney', width: 150, className: 'text-right' }, { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-center' },