diff --git a/pc4mobx/hrmSalary/pages/payroll/index.js b/pc4mobx/hrmSalary/pages/payroll/index.js
index c974b699..38a5eba4 100644
--- a/pc4mobx/hrmSalary/pages/payroll/index.js
+++ b/pc4mobx/hrmSalary/pages/payroll/index.js
@@ -64,7 +64,12 @@ export default class Payroll extends React.Component {
getReplenishForm = (isEdit = false, params = {}) => {
const { payrollStore } = this.props;
- const { templateBaseData, salaryTemplateShowSet, setReplenishSalaryTemplateSalaryItemSet } = payrollStore;
+ const {
+ templateBaseData,
+ salaryTemplateShowSet,
+ setReplenishSalaryTemplateSalaryItemSet,
+ setSalaryBillItemNameSet
+ } = payrollStore;
if (!salaryTemplateShowSet.theme && !isEdit) {
Modal.warning({
title: "信息确认",
@@ -77,10 +82,12 @@ export default class Payroll extends React.Component {
if (!isEdit) {
this.setState({ currentStep: this.state.currentStep + 1 }, () => {
setReplenishSalaryTemplateSalaryItemSet(data.replenishSalaryTemplateSalaryItemSet);
+ setSalaryBillItemNameSet(data.salaryBillItemNameSet);
window.localStorage.setItem("salary-showset", JSON.stringify(salaryTemplateShowSet));
});
} else {
setReplenishSalaryTemplateSalaryItemSet(data.replenishSalaryTemplateSalaryItemSet);
+ setSalaryBillItemNameSet(data.salaryBillItemNameSet);
window.localStorage.setItem("salary-showset", JSON.stringify(salaryTemplateShowSet));
}
}
@@ -261,7 +268,9 @@ export default class Payroll extends React.Component {
setTemplateTableSelectedRowKeys,
deletePayroll,
templateBaseData,
- setTemplateTablePageInfo
+ setTemplateTablePageInfo,
+ setSalaryBillItemNameSetting,
+ salaryBillItemNameSetting
} = payrollStore;
const { currentStep, selectedTab, templateSearchValue, templateSelect, startDate, endDate } = this.state;
if (!hasRight && !loading) { // 无权限处理
@@ -316,7 +325,7 @@ export default class Payroll extends React.Component {
{
showOperateBtn &&
}
{
@@ -465,10 +474,16 @@ export default class Payroll extends React.Component {
customOperate={
currentStep === 0 ? [
] : currentStep === 1 ? [
,
,
@@ -477,6 +492,9 @@ export default class Payroll extends React.Component {
}}>预览
] : currentStep === 2 ? [
,
@@ -506,7 +524,7 @@ export default class Payroll extends React.Component {
className="slideOuterWrapper"
visible={this.state.editSlideVisible}
top={0}
- width={50}
+ width={65}
height={100}
direction="right"
measure="%"
@@ -539,6 +557,9 @@ export default class Payroll extends React.Component {
}
subItemChange={(selectedTab) => {
this.setState({ selectedTab: Number(selectedTab) }, () => {
+ setSalaryBillItemNameSetting(_.map(salaryBillItemNameSetting, it => {
+ return { ...it, salaryTemplateId: "", itemShowNameSetting: [] };
+ }));
if (this.state.selectedTab === 2) this.getReplenishForm(true, { id: this.state.templateCurrentId });
});
}}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js
index 5c658b41..daaf7f03 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/baseForm.js
@@ -21,7 +21,7 @@ export default class BaseForm extends React.Component {
{ com: Input("岗位", position) },
{ com: Input("手机号", telephone) },
{ com: Input("入职日期", hiredate) },
- { com: Input("合同到期日期", dimissionDate) }
+ // { com: Input("合同到期日期", dimissionDate) }
];
const taxagentItems = [
{ com: Input("个税扣缴义务人", paymentOrganizationName) }