diff --git a/pc4mobx/hrmSalary/apis/payroll.js b/pc4mobx/hrmSalary/apis/payroll.js
index c4182a0a..80011331 100644
--- a/pc4mobx/hrmSalary/apis/payroll.js
+++ b/pc4mobx/hrmSalary/apis/payroll.js
@@ -315,6 +315,29 @@ export const grantProxy = params => {
}).then(res => res.json());
};
+// 工资单发放-新建时获取补发工资单模板薪资项目设置
+export const getReplenishForm = params => {
+ return fetch("/api/bs/hrmsalary/salaryBill/template/getReplenishForm", {
+ method: "POST",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ },
+ body: JSON.stringify(params)
+ }).then(res => res.json());
+};
+
+// 工资单发放-获取规则设置下拉框
+export const getReplenishRuleSetOptions = ({ salarySobId }) => {
+ return fetch(`/api/bs/hrmsalary/salaryBill/template/getReplenishRuleSetOptions?salarySobId=${salarySobId}`, {
+ method: "GET",
+ mode: "cors",
+ headers: {
+ "Content-Type": "application/json"
+ }
+ }).then(res => res.json());
+};
+
//添加发送和撤回人员范围列表
export const sendRangeList = (params) => {
return postFetch('/api/bs/hrmsalary/salaryBill/send/range/list', params);
diff --git a/pc4mobx/hrmSalary/components/stepSlide/stepSlideHeader.js b/pc4mobx/hrmSalary/components/stepSlide/stepSlideHeader.js
index 4a4918d9..35d4ac22 100644
--- a/pc4mobx/hrmSalary/components/stepSlide/stepSlideHeader.js
+++ b/pc4mobx/hrmSalary/components/stepSlide/stepSlideHeader.js
@@ -1,28 +1,29 @@
-import React from 'react';
-import { WeaSteps } from 'ecCom'
+import React from "react";
+import { WeaSteps } from "ecCom";
+import "./index.less";
+
const Step = WeaSteps.Step;
-import "./index.less"
export default class StepSlideHeader extends React.Component {
- render() {
- return (
-
-
-
- {
- this.props.steps && this.props.steps.map(item =>
- (
-
- )
- )
- }
-
-
-
- {this.props.children}
-
-
+
+
+ {
+ this.props.steps && this.props.steps.map(item =>
+ (
+
+ )
+ )
+ }
+
+
+
+ {this.props.children}
+
+
{
- selectedTab === "0" &&
-
+ selectedTab === 0 &&
+ this.handleBaseInfoChange(request)}/>
}
{
- selectedTab === "1" &&
+ selectedTab === 1 &&
+ }
+ {
+ selectedTab === 2 &&
}
}
- onClose={() => this.setState({ editSlideVisible: false }, () => this.setState({ selectedTab: 0 }))}
- showMask={true}
- closeMaskOnClick={() => this.setState({ editSlideVisible: false }, () => this.setState({ selectedTab: 0 }))}/>
+ onClose={() => this.setState({ editSlideVisible: false }, () => {
+ window.localStorage.removeItem("templateBaseData");
+ window.localStorage.removeItem("salaryTemplateShowSet");
+ this.setState({ selectedTab: 0 });
+ })}
+ />
}
{
this.state.copyModalVisible &&
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
index ad172aed..6fe0892b 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
@@ -1,6 +1,7 @@
import React from "react";
import { WeaFormItem, WeaInput, WeaSearchGroup, WeaSelect } from "ecCom";
import { inject, observer } from "mobx-react";
+import { getReplenishRuleSetOptions } from "../../../apis/payroll";
import { toJS } from "mobx";
@inject("payrollStore")
@@ -11,6 +12,7 @@ export default class BaseInformForm extends React.Component {
this.state = {
inited: false,
options: [],
+ replenishRuleOptions: [],
request: {}
};
}
@@ -18,37 +20,60 @@ export default class BaseInformForm extends React.Component {
componentWillMount() {
const { payrollStore } = this.props;
const { getPayrollBaseForm } = payrollStore;
+ const templateBaseData = window.localStorage.getItem("templateBaseData") || "{}";
getPayrollBaseForm(this.props.id).then(data => {
this.setState(
{
+ replenishRuleOptions: _.map(data.replenishRuleSetOption, it => ({ key: it.id, showname: it.content })),
options: _.isEmpty(toJS(data.salarySobOptions)) ? [{ key: "", showname: "" }] : [{
key: "",
showname: ""
}, ...toJS(data.salarySobOptions)],
- request: data.templateBaseData
- },
- () => {
+ request: {
+ ...data.templateBaseData,
+ reissueRule: data.templateBaseData.replenishRule ? "1" : "0",
+ ...JSON.parse(templateBaseData)
+ }
+ }, () => {
+ this.props.onChange && this.props.onChange(this.state.request);
this.setState({
inited: true
});
}
);
});
+ JSON.parse(templateBaseData).salarySob && this.getReplenishRuleSetOptions({ salarySobId: JSON.parse(templateBaseData).salarySob });
}
- hanldeChange(params) {
+ hanldeChange = (params) => {
let request = { ...this.state.request, ...params };
this.setState({
request
+ }, () => {
+ if (this.state.request.reissueRule === "1" && this.state.request.salarySob) {
+ // TODO：获取规则设置枚举项
+ this.getReplenishRuleSetOptions();
+ }
});
this.props.onChange && this.props.onChange(request);
- }
+ };
+ getReplenishRuleSetOptions = (params = {}) => {
+ const { request } = this.state;
+ getReplenishRuleSetOptions({ salarySobId: request.salarySob, ...params }).then(({ status, data }) => {
+ if (status && !_.isEmpty(data)) {
+ this.setState({
+ replenishRuleOptions: _.map(data, it => ({ key: it.id, showname: it.content }))
+ });
+ }
+ });
+ };
render() {
- const { request, options } = this.state;
- const { salarySob, name, description } = request;
+ const { request, options, replenishRuleOptions } = this.state;
+ const { salarySob, name, description, replenishName, replenishRule, reissueRule } = request;
+
return (
-
+
this.hanldeChange({ name: value })}
/>
+
+ this.hanldeChange({ replenishName: value })}
+ />
+
+
+ this.hanldeChange({ reissueRule: value })}
+ />
+
+ {
+ reissueRule !== "0" &&
+
+ this.hanldeChange({ replenishRule: value })}
+ />
+
+ }
{
const { payrollStore: { salaryTemplateShowSet, setSalaryTemplateShowSet } } = this.props;
let request = { ...salaryTemplateShowSet, ...params };
setSalaryTemplateShowSet(request);
- }
+ };
// 工资单主题 插入变量
- handleThemeNameCllck(param) {
+ handleThemeNameCllck = (param) => {
const { payrollStore } = this.props;
const { salaryTemplateShowSet, setSalaryTemplateShowSet } = payrollStore;
let request = { ...salaryTemplateShowSet };
request.theme = (request.theme ? request.theme : "") + param;
setSalaryTemplateShowSet(request);
- }
+ };
- handleDownClick(index) {
+ handleDownClick = (index) => {
const { payrollStore: { salaryItemSet, setSalaryItemSet } } = this.props;
let downItem = salaryItemSet[index + 1];
let thisItem = salaryItemSet[index];
@@ -40,9 +40,9 @@ export default class ShowSettingForm extends React.Component {
resultSet[index] = downItem;
resultSet[index + 1] = thisItem;
setSalaryItemSet(resultSet);
- }
+ };
- handleUpClick(index) {
+ handleUpClick = (index) => {
const { payrollStore: { salaryItemSet, setSalaryItemSet } } = this.props;
let upItem = salaryItemSet[index - 1];
let thisItem = salaryItemSet[index];
@@ -50,11 +50,10 @@ export default class ShowSettingForm extends React.Component {
resultSet[index] = upItem;
resultSet[index - 1] = thisItem;
setSalaryItemSet(resultSet);
- }
+ };
- handleDeleteItem(group, item) {
+ handleDeleteItem = (group, item) => {
const { payrollStore: { salaryItemSet, setSalaryItemSet } } = this.props;
- console.log("item:", item);
let resultSalaryItemSet = [...salaryItemSet];
resultSalaryItemSet.map(sourceGroup => {
if (sourceGroup.id == group.id) {
@@ -66,9 +65,9 @@ export default class ShowSettingForm extends React.Component {
}
});
setSalaryItemSet(resultSalaryItemSet);
- }
+ };
- handleDeleteClick(index) {
+ handleDeleteClick = (index) => {
Modal.confirm({
title: "信息确认",
content: "确认删除",
@@ -77,14 +76,13 @@ export default class ShowSettingForm extends React.Component {
let resultSalaryItemSet = [...salaryItemSet];
resultSalaryItemSet.splice(index, 1);
setSalaryItemSet(resultSalaryItemSet);
- },
- onCancel: () => {
}
});
- }
+ };
render() {
- const { payrollStore } = this.props;
+ const { payrollStore, id } = this.props;
+ const salaryTemplateShowSetStorage = id ? "{}" : window.localStorage.getItem("salaryTemplateShowSet") || "{}";
const { salaryTemplateShowSet } = payrollStore;
const { salaryItemSet } = payrollStore;
const {
@@ -94,7 +92,7 @@ export default class ShowSettingForm extends React.Component {
textContentPosition,
salaryItemNullStatus,
salaryItemZeroStatus
- } = salaryTemplateShowSet;
+ } = { ...salaryTemplateShowSet, ...JSON.parse(salaryTemplateShowSetStorage) };
return (
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js b/pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js
new file mode 100644
index 00000000..af2ea5de
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/tmplateSettingForm.js
@@ -0,0 +1,121 @@
+import React from "react";
+import { Icon, Modal } from "antd";
+import { WeaSearchGroup } from "ecCom";
+import { inject, observer } from "mobx-react";
+import { toJS } from "mobx";
+import "./index.less";
+
+
+@inject("payrollStore")
+@observer
+export default class TemplateSettingForm extends React.Component {
+
+ handleDownClick = (index) => {
+ const { payrollStore: { replenishSalaryTemplateSalaryItemSet, setReplenishSalaryTemplateSalaryItemSet } } = this.props;
+ let downItem = replenishSalaryTemplateSalaryItemSet[index + 1];
+ let thisItem = replenishSalaryTemplateSalaryItemSet[index];
+ let resultSet = [...replenishSalaryTemplateSalaryItemSet];
+ resultSet[index] = downItem;
+ resultSet[index + 1] = thisItem;
+ setReplenishSalaryTemplateSalaryItemSet(resultSet);
+ };
+
+ handleUpClick = (index) => {
+ const { payrollStore: { replenishSalaryTemplateSalaryItemSet, setReplenishSalaryTemplateSalaryItemSet } } = this.props;
+ let upItem = replenishSalaryTemplateSalaryItemSet[index - 1];
+ let thisItem = replenishSalaryTemplateSalaryItemSet[index];
+ let resultSet = [...replenishSalaryTemplateSalaryItemSet];
+ resultSet[index] = upItem;
+ resultSet[index - 1] = thisItem;
+ setReplenishSalaryTemplateSalaryItemSet(resultSet);
+ };
+
+ handleDeleteItem = (group, item) => {
+ const { payrollStore: { replenishSalaryTemplateSalaryItemSet, setReplenishSalaryTemplateSalaryItemSet } } = this.props;
+ let resultSalaryItemSet = [...replenishSalaryTemplateSalaryItemSet];
+ resultSalaryItemSet.map(sourceGroup => {
+ if (sourceGroup.id === group.id) {
+ sourceGroup.items.map((sourceItem, index) => {
+ if (sourceItem.id === item.id) {
+ sourceGroup.items.splice(index, 1);
+ }
+ });
+ }
+ });
+ setReplenishSalaryTemplateSalaryItemSet(resultSalaryItemSet);
+ };
+
+ handleDeleteClick = (index) => {
+ Modal.confirm({
+ title: "信息确认",
+ content: "确认删除",
+ onOk: () => {
+ const { payrollStore: { replenishSalaryTemplateSalaryItemSet, setReplenishSalaryTemplateSalaryItemSet } } = this.props;
+ let resultSalaryItemSet = [...replenishSalaryTemplateSalaryItemSet];
+ resultSalaryItemSet.splice(index, 1);
+ setReplenishSalaryTemplateSalaryItemSet(resultSalaryItemSet);
+ },
+ onCancel: () => {
+ }
+ });
+ };
+
+ render() {
+ const { payrollStore } = this.props;
+ const { replenishSalaryTemplateSalaryItemSet } = payrollStore;
+ return (
+
+
+ {
+ !_.isEmpty(toJS(replenishSalaryTemplateSalaryItemSet)) &&
+ replenishSalaryTemplateSalaryItemSet.map((group, index) => (
+
+
{group.groupName}
+ {
+ index < replenishSalaryTemplateSalaryItemSet.length - 1 &&
+ {
+ this.handleDownClick(index);
+ }}
+ />
+ }
+ {
+ index > 0 &&
+ {
+ this.handleUpClick(index);
+ }}
+ />
+ }
+ {
+ this.handleDeleteClick(index);
+ }}
+ />
+
+
+ {group.items.map(item => (
+ {item.name}
+ {
+ this.handleDeleteItem(group, item);
+ }}
+ />
+
+ ))}
+
+
+