;
+ default:
+ return ;
+ }
+ };
+ return newColumn;
+ });
+ return newColumns;
+ };
+
+ handleAdd = () => {
+ const { dataSource, selectedRowKeys } = this.state;
+ const { onAddSalaryItems, id, onCancel } = this.props;
+ let selectItems = [];
+ dataSource.map(item => {
+ item = { ...item };
+ selectedRowKeys.map(key => {
+ if (item.id === key) {
+ item.salaryItemId = item.id;
+ item.key = item.id;
+ selectItems.push(item);
+ }
+ });
+ });
+ onCancel();
+ onAddSalaryItems(id, selectItems);
+ };
+
+ render() {
+ const { onCancel, visible } = this.props;
+ const { name, selectedRowKeys, pageInfo, dataSource, loading } = this.state;
+ const pagination = {
+ ...pageInfo,
+ showTotal: total => `共 ${total} 条`,
+ showQuickJumper: true,
+ pageSizeOptions: ["10", "20", "50", "100"],
+ onChange: current => {
+ this.setState({
+ pageInfo: { ...pageInfo, current }
+ }, () => {
+ this.listSalaryItem();
+ });
+ }
+ };
+ const rowSelection = {
+ selectedRowKeys,
+ onChange: (selectedRowKeys) => {
+ this.setState({ selectedRowKeys }, () => {
+ });
+ }
+ };
+ return (
+ 添加]}
+ >
+
+ this.setState({ name })}
+ onSearch={() => this.listSalaryItem()}
+ />
+
+
+
+ );
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js
new file mode 100644
index 00000000..7d399054
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemBaseInfo.js
@@ -0,0 +1,103 @@
+/*
+ * Author: 黎永顺
+ * name: 薪资项目-员工基本信息
+ * Description:
+ * Date: 2022/12/13
+ */
+import React, { Component } from "react";
+import { WeaHelpfulTip, WeaSearchGroup, WeaSelect, WeaSortable } from "ecCom";
+import { Button, Icon } from "antd";
+import { empFieldList } from "../../../apis/ledger";
+
+class LedgerSalaryItemBaseInfo extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ empFieldListOptions: []
+ };
+ }
+
+ componentDidMount() {
+ this.empFieldList();
+ }
+
+ empFieldList = () => {
+ empFieldList().then(({ status, data }) => {
+ if (status) {
+ const dataFilter = _.filter(data, it => !["taxAgentName", "username", "departmentName"].includes(it.id));
+ this.setState({
+ empFieldListOptions: _.map(dataFilter, it => ({ key: it.id, showname: it.name }))
+ });
+ }
+ });
+ };
+
+ handleAddEmpList = (key, showname) => {
+ const { dataSource, onChangeSortableList } = this.props;
+ const obj = {
+ canDelete: true,
+ fieldId: key,
+ fieldName: showname,
+ id: dataSource.length,
+ salarySobId: "",
+ sortedIndex: dataSource.length
+ };
+ onChangeSortableList([...dataSource, obj]);
+ };
+ handleDeleteEmplist = (item) => {
+ const { dataSource, onChangeSortableList } = this.props;
+ onChangeSortableList(_.xorWith(dataSource, [item], _.isEqual));
+ };
+
+ render() {
+ const { dataSource, onChangeSortableList } = this.props;
+ const { empFieldListOptions } = this.state;
+ return (
+ }>
+
+
{
+ const { fieldName, canDelete } = item;
+ return
+ {fieldName}
+ {
+ canDelete &&
+ this.handleDeleteEmplist(item)}
+ />
+ }
+
;
+ }}
+ className="wea-sortable-grid-item"
+ />
+
+
+ {
+ _.map(dataSource, field => {
+ const { items } = field;
+ return this.setState({ addCategoryItemsVisible: { visible: true, id } })}
+ onUpgo={this.handleUpgo}
+ onDowngo={this.handleDowngo}
+ />
+ }
+ >
+ onDropCategoryItem(field, data)}
+ onHandleItemhide={(data) => onHandleItemhide(field, data)}
+ onChangeSelectedRowKeys={(data) => onChangeSelectedRowKeys(field, data)}
+ onEditFormnul={(data) => this.handleEditFormnul(field, data)}
+ />
+ ;
+ })
+ }
+ this.setState({ addCategoryItemsVisible: { visible: false, id: "" } })}
+ onAddSalaryItems={onAddSalaryItems}
+ />
+
+ {/*公式编辑*/}
+ {
+ editFormulModal.visible &&
+
+ }
+
+
+ );
+ }
+}
+
+export default LedgerSalaryItemNormal;
+const TitleNormalComp = (props) => {
+ const {
+ name, onEditCategory, onDeleteCategory,
+ sortedIndex, dataSourceLen, id, onUpgo,
+ onDowngo, selectedRowKeys = [], onDeleteCategoryItems,
+ onAddCategoryItems
+ } = props;
+ return
+
+ {name}
+ {
+ name !== "未分类" &&
+ onEditCategory(name, id)}/>
+ }
+ {
+ name !== "未分类" &&
+ onDeleteCategory(id)}/>
+ }
+ {
+ sortedIndex !== 0 &&
+ onUpgo(sortedIndex)}/>
+ }
+ {
+ sortedIndex !== dataSourceLen - 1 &&
+ onDowngo(sortedIndex)}/>
+ }
+
+
+ onDeleteCategoryItems(id, selectedRowKeys)}/>
+ onAddCategoryItems(id)}/>
+
+
+ 正常工资薪金所得
+
+
;
+};
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
new file mode 100644
index 00000000..4498a36d
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -0,0 +1,135 @@
+/*
+ * Author: 黎永顺
+ * name: 薪资项目-列表数据
+ * Description:
+ * Date: 2022/12/13
+ */
+import React, { Component } from "react";
+import { WeaCheckbox, WeaHelpfulTip, WeaTable } from "ecCom";
+
+class LedgerSalaryItemTable extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ selectedRowKeys: []
+ };
+ }
+
+ /*
+ * Author: 黎永顺
+ * Description: 列表操作隐藏复选框
+ * Params:
+ * Date: 2022/12/14
+ */
+ handleChangeItem = (value, id) => {
+ const { dataSource, onHandleItemhide } = this.props;
+ onHandleItemhide(
+ _.map([...dataSource], item => {
+ if (id === item.id) {
+ return {
+ ...item,
+ itemHide: String(value)
+ };
+ }
+ return { ...item };
+ })
+ );
+ };
+ handleChangeAllItem = (value) => {
+ const { dataSource, onHandleItemhide } = this.props;
+ onHandleItemhide(
+ _.map([...dataSource], item => {
+ return {
+ ...item,
+ itemHide: String(value)
+ };
+ })
+ );
+ };
+
+ render() {
+ const { dataSource, onDropCategoryItem, onChangeSelectedRowKeys, onEditFormnul } = this.props;
+ const { selectedRowKeys } = this.state;
+ const rowSelection = {
+ selectedRowKeys,
+ onChange: (selectedRowKeys) => this.setState({ selectedRowKeys }, () => {
+ onChangeSelectedRowKeys(this.state.selectedRowKeys);
+ }),
+ getCheckboxProps: record => ({
+ disabled: !record.canDelete
+ })
+ };
+ const checkValue = _.every(dataSource, it => it.itemHide && it.itemHide === "1") ? "1" : "0";
+ const columns = [
+ {
+ title: "名称",
+ dataIndex: "name",
+ key: "name"
+ },
+ {
+ title:
+ 核算公式
+ } placement="bottom" width={200}/>
+ ,
+ dataIndex: "formulaContent",
+ key: "formulaContent",
+ render: (text, record) => {
+ if (record.canEdit) {
+ return (
+
+ onEditFormnul(record)}> {text}
+
+ );
+ } else {
+ return {text} ;
+ }
+ }
+ },
+ {
+ title: "个税申请表对应字段",
+ dataIndex: "taxDeclarationColumn",
+ key: "taxDeclarationColumn"
+ },
+ {
+ title:
+ this.handleChangeAllItem(value)}
+ />
+ 隐藏
+ ,
+ dataIndex: "itemHide",
+ key: "itemHide",
+ render: (text, record) => this.handleChangeItem(value, record.id)}
+ />
+ }
+ ];
+ return (
+ ({
+ index,
+ moveRow: record
+ })}
+ pagination={false}
+ onDrop={onDropCategoryItem}
+ draggable={true}
+ />
+ );
+ }
+}
+
+export default LedgerSalaryItemTable;
+
+const HelpContent = () => {
+ return
+ 1、新建薪资账套时，核算公式与【薪资项目管理】菜单一致；
+ 2、取值方式为公式的薪资项目，核算公式显示为具体公式；点击公式可编辑公式，核算时，按照当前薪资项目的公式进行核算；
+ 3、薪资账套内的薪资项目的公式或SQL的修改或公式的修改，都不影响【薪资项目管理】菜单的薪资项目取值方式或公式，只对当前账套生效；
+ ;
+};
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
index 02402512..cf486f21 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
@@ -13,7 +13,8 @@ import LedgerBaseSetting from "./ledgerBaseSetting";
import LedgerAssociatedPersonnel from "./ledgerAssociatedPersonnel";
import LedgerSalaryAdjustmentRules from "./ledgerSalaryAdjustmentRules";
import LedgerBackCalculatedSalaryItem from "./ledgerBackCalculatedSalaryItem";
-import { saveAdjustmentRule, saveLedgerBasic } from "../../../apis/ledger";
+import LedgerSalaryItem from "./ledgerSalaryItem";
+import { saveAdjustmentRule, saveLedgerBasic, saveLedgerItem } from "../../../apis/ledger";
import "./index.less";
const Step = WeaSteps.Step;
@@ -34,10 +35,19 @@ class LedgerSlide extends Component {
current: 0,
loading: false,
baseSettingInfo: {},
- adjustRules: []
+ adjustRules: [],
+ empFields: [], itemGroups: [],
+ saveSalarySobId: ""
};
}
+ componentWillUnmount() {
+ alert(1111);
+ this.setState({
+ saveSalarySobId: ""
+ });
+ }
+
/*
* Author: 黎永顺
* Description: 保存基本信息
@@ -57,13 +67,13 @@ class LedgerSlide extends Component {
return false;
}
this.setState({ loading: true });
- saveLedgerBasic({ ...extra, description, id: editId }).then(({ status, errormsg }) => {
+ saveLedgerBasic({ ...extra, description, id: editId }).then(({ status, data, errormsg }) => {
this.setState({ loading: false });
if (status) {
const { onRefreshList } = this.props;
message.success("保存成功");
onRefreshList();
- !editId && this.setState({ current: current + 1 });
+ !editId && this.setState({ current: current + 1, saveSalarySobId: data });
} else {
message.error(errormsg || "保存失败");
}
@@ -76,9 +86,9 @@ class LedgerSlide extends Component {
* Date: 2022/12/12
*/
saveLedgerAdjustRule = () => {
- const { adjustRules } = this.state;
+ const { adjustRules, saveSalarySobId } = this.state;
const payload = {
- salarySobId: this.props.editId,
+ salarySobId: this.props.editId || saveSalarySobId,
ruleParams: adjustRules
};
this.setState({ loading: true });
@@ -86,12 +96,37 @@ class LedgerSlide extends Component {
this.setState({ loading: false });
if (status) {
message.success("保存成功");
+ this.handleClose();
} else {
message.success(errormsg || "保存失败");
}
}).catch(() => this.setState({ loading: false }));
- }
- ;
+ };
+ /*
+ * Author: 黎永顺
+ * Description: 薪资项目保存
+ * Params:
+ * Date: 2022/12/14
+ */
+ saveLedgerItem = () => {
+ const { empFields, itemGroups, saveSalarySobId } = this.state;
+ const { editId: salarySobId } = this.props;
+ const payload = {
+ empFields,
+ itemGroups: _.filter(itemGroups, it => it.name !== "未分类"),
+ items: _.find(itemGroups, it => it.name === "未分类").items || [],
+ salarySobId: salarySobId || saveSalarySobId
+ };
+ this.setState({ loading: true });
+ saveLedgerItem(payload).then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success("保存成功");
+ } else {
+ message.error(errormsg || "保存失败");
+ }
+ }).catch(() => this.setState({ loading: false }));
+ };
handleChangeSlideTab = (current) => {
this.setState({ current: Number(current) });
};
@@ -107,22 +142,36 @@ class LedgerSlide extends Component {
handleChangeSaveParams = (baseSettingInfo) => {
this.setState({ baseSettingInfo });
};
+ /*
+ * Author: 黎永顺
+ * Description: 薪资项目保存数据
+ * Params:
+ * Date: 2022/12/14
+ */
+ handleSaveSalaryItemParams = (empFields, itemGroups) => {
+ this.setState({ empFields, itemGroups });
+ };
renderChildren = () => {
- const { current } = this.state;
+ const { current, saveSalarySobId } = this.state;
let CurrentDom = null;
switch (current) {
case 0:
CurrentDom = ;
break;
case 1:
- CurrentDom = ;
+ CurrentDom = ;
+ break;
+ case 2:
+ CurrentDom = ;
break;
case 3:
- CurrentDom = ;
+ CurrentDom = ;
break;
case 4:
CurrentDom =
- this.setState({ adjustRules })}/>;
+ this.setState({ adjustRules })}/>;
break;
default:
CurrentDom = null;
@@ -148,23 +197,34 @@ class LedgerSlide extends Component {
break;
case 1:
CurrentDom = !editId ? [
- ,
+ ,
] : [];
break;
case 2:
CurrentDom = !editId ?
[
- ,
+ ,
,
-
- ] : [];
+
+ ] : [
+
+ ];
break;
case 3:
CurrentDom = !editId ?
[
+ ,
,
-
+
] : [];
break;
case 4:
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/config.js b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
index 6bd81428..b130f4f6 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/config.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
@@ -27,6 +27,24 @@ export const copyConditions = [
defaultshow: true
}
];
+export const categoryConditions = [
+ {
+ items: [
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["name"],
+ fieldcol: 14,
+ rules: "required|string",
+ label: "名称",
+ labelcol: 6,
+ value: "",
+ viewAttr: 3
+ }
+ ],
+ defaultshow: true
+ }
+];
export const baseSettingFormItem = [
{
key: "name",
@@ -720,7 +738,7 @@ export const roundingRules = [
key: "UP_EVEN",
selected: false,
showname: "向上求偶"
- },
+ }
];
export const keepDecimalPlaces = [
{
diff --git a/pc4mobx/hrmSalary/stores/ledger.js b/pc4mobx/hrmSalary/stores/ledger.js
index 618cae74..848c22fb 100644
--- a/pc4mobx/hrmSalary/stores/ledger.js
+++ b/pc4mobx/hrmSalary/stores/ledger.js
@@ -4,12 +4,14 @@ import { WeaForm, WeaTableNew } from "comsMobx";
import * as API from "../apis/ledger"; // 引入API接口文件
import { notNull } from "../util/validate";
+import { categoryConditions } from "../pages/ledgerPage/config";
const { TableStore } = WeaTableNew;
export class LedgerStore {
//重构薪资账套
- @observable copyForm = new WeaForm(); // nrew 一个form
+ @observable copyForm = new WeaForm(); // 复制form
+ @observable categoryForm = new WeaForm(); // 新增分类form
/*******************************************************/