From 5b43e43f4a1ad12d8f6725d35a6bc77a385ac289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Thu, 21 Sep 2023 15:20:59 +0800 Subject: [PATCH] hotfix/2.9.42309.01 --- .../standingBookDetail/components/adjustTable.js | 8 +++++++- .../components/adjustmentDefaultSlide.js | 2 +- .../standingBookDetail/components/adjustmentSlide.js | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js index 2a1b9c6d..4d7a3bf8 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js @@ -410,7 +410,13 @@ class AdjustTable extends Component { this.setState({ dataSource: _.map(this.state.dataSource, it => { if (record.target === it.target && record.uuid === it.uuid) { - return { ...it, status: true, id: successIds[0] }; + return { + ...it, status: true, id: successIds[0], + targetOptions: _.map([_.find(targetOptions, o => o.employeeId == target)], v => ({ + key: v.target.toString(), + showname: v.username + })) + }; } return { ...it }; }) diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js index 5651926e..47542d39 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentDefaultSlide.js @@ -69,7 +69,7 @@ class AdjustmentDefaultSlide extends Component { dataIndex: "categoryType", title: "统计调差福利类型(单位)", render: (text, record) => { return ( - {_.map(record.categoryTypeOptions, it => it.showname).join(",")} + {_.map(_.filter(record.categoryTypeOptions, o => (record.categoryType.split(",").includes(o.key))), it => it.showname).join(",")} ); } }, diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js index 2fb3f37c..94c8d72d 100644 --- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js +++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustmentSlide.js @@ -83,6 +83,7 @@ class AdjustmentSlide extends Component { }; handleSetasDefault = () => { const { adjustDefSlide } = this.state; + console.log(this.adjustTableRef.state.dataSource); this.setState({ adjustDefSlide: { ...adjustDefSlide,