diff --git a/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js
index 1632940f..51fdc5d0 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/salaryStatisticsDetailShareLogDialog.js
@@ -158,9 +158,9 @@ class SalaryStatisticsDetailShareLogDialog extends Component {
title={
{getLabel(111, "1、分享状态为成功且撤回状态为空时,可操作撤回;")}
-
{getLabel(111, "2、撤回后不可重新分享;")}
-
{getLabel(111, "3、分享状态为失败,可操作重新分享;")}
-
{getLabel(111, "4、重新分享:以当前分享记录的分享报表、有效时间、渠道和说明重新分享,分享后自动刷新分享时间和分享状态")}
+ {/*
{getLabel(111, "2、撤回后不可重新分享;")}
*/}
+ {/*
{getLabel(111, "3、分享状态为失败,可操作重新分享;")}
*/}
+ {/*
{getLabel(111, "4、重新分享:以当前分享记录的分享报表、有效时间、渠道和说明重新分享,分享后自动刷新分享时间和分享状态")}
*/}
}
/>
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index c2c63718..a4ffcd0a 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -384,7 +384,7 @@ export default class SalaryItem extends React.Component {
onCancel={() => this.setState({
syncSalarySetDialog: {
...this.state.syncSalarySetDialog,
- visible: false, id: "", title: ""
+ visible: false, title: ""
}
})}
/>
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
index 2a1b9c6d..45023dba 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/adjustTable.js
@@ -409,8 +409,14 @@ class AdjustTable extends Component {
if (_.isEmpty(errorMessage)) {
this.setState({
dataSource: _.map(this.state.dataSource, it => {
- if (record.target === it.target && record.uuid === it.uuid) {
- return { ...it, status: true, id: successIds[0] };
+ if (record.id === it.id || (!it.id && record.uuid === it.uuid)) {
+ 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 (
-