From e4d30233589e5aa04451f9fcc564b472d498de3a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 10:48:37 +0800 Subject: [PATCH 1/4] fix bug --- .../withdrawals-record/withdrawals-record.component.ts | 6 ++++-- .../withdrawals-record/withdrawals-record.component.ts | 9 +++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 8491ea1d..68c2c5c8 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -59,7 +59,9 @@ export class WithdrawalsRecordComponent extends BasicTableComponent { }; afterRes = (data: any[], rawData?: any) => { - data = data.map(node => ({ ...node, disabled: node.refundStatus !== '1' })); + data = data.map(node => ({ ...node, + disabled: node.refundStatus !== '1' + })); return data; }; @@ -84,7 +86,7 @@ export class WithdrawalsRecordComponent extends BasicTableComponent { params = [item.id]; } else { console.log(this.selectedRows); - + if (this.selectedRows.length <= 0) { this.service.msgSrv.error('请选择提现单！'); return; diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts index 4b48ec35..22e65c7f 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts @@ -47,7 +47,9 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni }; afterRes = (data: any[], rawData?: any) => { - data = data.map(node => ({ ...node, disabled: node.refundStatus !== '1' })); + data = data.map(node => ({ ...node, + // disabled: node.refundStatus !== '1' + })); return data; }; @@ -74,16 +76,19 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni const stList = this.st.list; stList.forEach(item => { if (!item.checked) { + const index = this.selectedRows.findIndex(_item => item.id === _item.id); if (index !== -1) this.selectedRows.splice(index, 1); } }) } let totalCallNo = 0; + this.totalCallNo = 0; this.selectedRows.forEach((item => { totalCallNo = new Big(this.totalCallNo).plus(item?.amount).parse(); - })); this.totalCallNo = totalCallNo; + })); + } else if (e.type === 'loaded') { // 页面加载时勾选 (e?.loaded || []).forEach((r) => { From 3aef27290daf86e2b67fae289288e75d5592c2e6 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 10:49:26 +0800 Subject: [PATCH 2/4] fix bug --- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index afdba959..d8652768 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -46,12 +46,12 @@
  • 新增企业
    • -
  • + diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 020eb8c4..8ec7d565 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -469,14 +469,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服
    ', click: item => this.showService(item) }, - { - text: '修改合伙人', - click: item => this.editPartner(item) - }, - { - text: '修改渠道销售', - click: item => this.editSale(item) - } + // { + // text: '修改合伙人', + // click: item => this.editPartner(item) + // }, + // { + // text: '修改渠道销售', + // click: item => this.editSale(item) + // } ] } ]; From 57dfb24ff6457f198c063e134ba392df12b13e8a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 10:50:04 +0800 Subject: [PATCH 3/4] fix bug --- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index d8652768..afdba959 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -46,12 +46,12 @@
  • 新增企业
    • - + diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 8ec7d565..020eb8c4 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -469,14 +469,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服
    ', click: item => this.showService(item) }, - // { - // text: '修改合伙人', - // click: item => this.editPartner(item) - // }, - // { - // text: '修改渠道销售', - // click: item => this.editSale(item) - // } + { + text: '修改合伙人', + click: item => this.editPartner(item) + }, + { + text: '修改渠道销售', + click: item => this.editSale(item) + } ] } ]; From c36d7f442ce217fdfc7c6bb1f6f5d11bdf89e4a2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 9 May 2022 11:05:31 +0800 Subject: [PATCH 4/4] fix bug --- .../withdrawals-record/withdrawals-record.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts index 22e65c7f..f7320059 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts @@ -48,7 +48,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni afterRes = (data: any[], rawData?: any) => { data = data.map(node => ({ ...node, - // disabled: node.refundStatus !== '1' + disabled: node.refundStatus !== '1' })); return data; };