diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempReissueSet/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempReissueSet/index.js
new file mode 100644
index 00000000..ea4c59cb
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempReissueSet/index.js
@@ -0,0 +1,91 @@
+/*
+ * Author: 黎永顺
+ * name:工资单发放-重构页面补发工资单模板
+ * Description:
+ * Date: 2023/10/17
+ */
+import React, { Component } from "react";
+import { toJS } from "mobx";
+import { WeaButtonIcon, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
+import SalaryItemSettings from "../../../payroll/stepForm/salaryItemSettings";
+import { getReplenishForm } from "../../../../apis/payroll";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class Index extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ replenishSalaryTemplateSalaryItemSet: [], salaryBillItemNameSet: {}
+ };
+ }
+
+ componentDidMount() {
+ this.getReplenishForm();
+ }
+
+ getReplenishForm = () => {
+ const { payrollStore: { tmplDataSource, setTmplDataSource }, tmplId: id } = this.props;
+ const salarySobId = toJS(tmplDataSource).salarySob;
+ getReplenishForm({ salarySobId, id }).then(({ status, data }) => {
+ if (status) {
+ const { replenishSalaryTemplateSalaryItemSet, salaryBillItemNameSet } = data;
+ this.setState({
+ replenishSalaryTemplateSalaryItemSet, salaryBillItemNameSet
+ }, () => {
+ // setTmplDataSource({
+ // ...toJS(tmplDataSource),
+ // replenishSalaryItemSetting: replenishSalaryTemplateSalaryItemSet
+ // });
+ });
+ }
+ });
+ };
+
+ handleChangeSalaryItem = (resultSet) => {
+ const { payrollStore: { setTmplDataSource, tmplDataSource } } = this.props;
+ this.setState({ replenishSalaryTemplateSalaryItemSet: resultSet }, () => {
+ setTmplDataSource({
+ ...toJS(tmplDataSource),
+ replenishSalaryItemSetting: resultSet
+ });
+ });
+ };
+ handleChangeSalaryItemShowNamesetting = (itemShowNamesetting) => {
+ const { payrollStore: { setSalaryBillItemNameSetting, salaryBillItemNameSetting } } = this.props;
+ setSalaryBillItemNameSetting(_.map(salaryBillItemNameSetting, it => {
+ if (it.salaryBillType === 1) {
+ return { ...it, salaryTemplateId: this.props.tmplId, itemShowNameSetting: itemShowNamesetting };
+ }
+ return { ...it, salaryTemplateId: this.props.tmplId };
+ }));
+ };
+
+ render() {
+ const { payrollStore: { tmplDataSource } } = this.props;
+ const { replenishSalaryTemplateSalaryItemSet, salaryBillItemNameSet } = this.state;
+ return (
+
+ {getLabel(543593, "薪资项目设置")}
+ this.salaryItemSettingsRef.handleOpenModal(toJS(tmplDataSource).salarySob, getLabel(543594, "添加分类"))}/>
+
+ }
+ items={[]} needTigger showGroup>
+ this.salaryItemSettingsRef = dom}
+ dataSource={replenishSalaryTemplateSalaryItemSet}
+ onChangeSalaryItem={this.handleChangeSalaryItem}
+ onChangeSalaryItemShowNamesetting={this.handleChangeSalaryItemShowNamesetting}
+ salarySobId={toJS(tmplDataSource).salarySob}
+ salaryTemplateId={this.props.tmplId || ""}
+ isReplenish={true} salaryBillItemNameSet={salaryBillItemNameSet}
+ />
+
+ );
+ }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js
index 3ab5f52c..085d6e9d 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/updatePayrollTemplateSlide/index.js
@@ -11,6 +11,7 @@ import { WeaLocaleProvider, WeaSlideModal, WeaSteps } from "ecCom";
import { Button, message } from "antd";
import PayrollTempBaseSet from "../payrollTempBaseSet";
import PayrollTempNormalSet from "../payrollTempNormalSet";
+import PayrollTempReissueSet from "../payrollTempReissueSet";
import { savePayroll } from "../../../../apis/payroll";
const Step = WeaSteps.Step;
@@ -87,7 +88,11 @@ class Index extends Component {
}
});
};
- savePayroll = (payload) => {
+ savePayroll = () => {
+ const { payrollStore: { tmplDataSource, salaryBillItemNameSetting } } = this.props;
+ const payload = { ...toJS(tmplDataSource), salaryBillItemNameSetting: toJS(salaryBillItemNameSetting) };
+ console.log(payload, tmplDataSource, toJS(salaryBillItemNameSetting));
+ return;
this.setState({ loading: true });
savePayroll(payload).then(({ status, errormsg }) => {
this.setState({ loading: false });
@@ -108,7 +113,7 @@ class Index extends Component {
{
current === 0 ?
- :
+ :
current === 1 ?
}
@@ -133,7 +138,10 @@ class Index extends Component {
dom = this.tmpBaseSetRef = dom}/>;
break;
case 1:
- dom = this.tmpNormalSetRef = dom}/>;
+ dom = ;
+ break;
+ case 2:
+ dom = ;
break;
default:
break;
diff --git a/pc4mobx/hrmSalary/stores/payroll.js b/pc4mobx/hrmSalary/stores/payroll.js
index fa5a56e1..35bb7e2f 100644
--- a/pc4mobx/hrmSalary/stores/payroll.js
+++ b/pc4mobx/hrmSalary/stores/payroll.js
@@ -21,6 +21,20 @@ export class payrollStore {
@observable payrollTempNormalForm = new WeaForm(); //新建编辑工资单模板-主题设置form
@action initPayrollTempNormalForm = () => this.payrollTempNormalForm = new WeaForm();
+ @observable salaryBillItemNameSetting = [
+ {
+ salaryTemplateId: "",
+ salaryBillType: 0,
+ itemShowNameSetting: []
+ },
+ {
+ salaryTemplateId: "",
+ salaryBillType: 1,
+ itemShowNameSetting: []
+ }
+ ]; // 工资单模板薪资项目名称修改列表
+ @action
+ setSalaryBillItemNameSetting = salaryBillItemNameSetting => (this.salaryBillItemNameSetting = salaryBillItemNameSetting);
@observable tableStore = new TableStore(); // new table
@@ -40,18 +54,7 @@ export class payrollStore {
@observable salaryTemplateShowSet = {}; // 显示设置基础表单
@observable replenishSalaryTemplateSalaryItemSet = []; // 补发工资单模版基础表单
@observable salaryItemSet = []; // 显示设置薪资项
- @observable salaryBillItemNameSetting = [
- {
- salaryTemplateId: "",
- salaryBillType: 0,
- itemShowNameSetting: []
- },
- {
- salaryTemplateId: "",
- salaryBillType: 1,
- itemShowNameSetting: []
- }
- ]; // 工资单模板薪资项目名称修改列表
+
@observable salaryBillItemNameSet = {}; // 工资单模板薪资项目名称修改列表
// **** 工资单页面 ****
@@ -116,8 +119,6 @@ export class payrollStore {
setSalaryItemSet = salaryItemSet => (this.salaryItemSet = salaryItemSet);
@action
setSalaryBillItemNameSet = salaryBillItemNameSet => (this.salaryBillItemNameSet = salaryBillItemNameSet);
- @action
- setSalaryBillItemNameSetting = salaryBillItemNameSetting => (this.salaryBillItemNameSetting = salaryBillItemNameSetting);
@action("工资单模板分页信息修改")
setTemplateTablePageInfo = (pageInfo, callback) => {