+
+ );
+ }
+}
+
+export default CustomBrowserMutiRight;
diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserOperation.js b/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserOperation.js
new file mode 100644
index 00000000..ab56ef02
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserOperation.js
@@ -0,0 +1,64 @@
+/*
+ * 自定义浏览框组件
+ * 弹框操作栏
+ * @Author: 黎永顺
+ * @Date: 2024/8/30
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import { Button } from "antd";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class CustomBrowserOperation extends Component {
+ render() {
+ const {
+ moveToLeft,
+ moveToRight,
+ leftArrowText,
+ rightArrowText,
+ leftActive,
+ rightActive,
+ className,
+ leftAllActive,
+ moveAllToLeft,
+ rightAllActive,
+ moveAllToRight
+ } = this.props;
+
+ const moveToLeftButton = (
+
+ );
+ const moveToRightButton = (
+
+ );
+
+ const moveAllToLeftButton = (
+
+ );
+ const moveAllToRightButton = (
+
+ );
+ return (
+
+
+
+ {this.generateTreeNodes()}
+
+
+
+
+ {moveToLeftButton}
+ {moveToRightButton}
+ {moveAllToLeftButton}
+ {moveAllToRightButton}
+
+ );
+ }
+}
+
+export default CustomBrowserOperation;
diff --git a/pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js b/pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js
new file mode 100644
index 00000000..5714241e
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/CustomBrowser/components/customTransferDialog.js
@@ -0,0 +1,245 @@
+/*
+ * 自定义穿梭框组件
+ * 弹框选择
+ * @Author: 黎永顺
+ * @Date: 2024/8/30
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { WeaDialog, WeaInputSearch, WeaLocaleProvider, WeaNewScroll, WeaTable } from "ecCom";
+import { Button, Col, Row, Spin } from "antd";
+import CustomBrowserMutiLeft from "./customBrowserMutiLeft";
+import CustomBrowserMutiRight from "./customBrowserMutiRight";
+import CustomBrowserOperation from "./customBrowserOperation";
+import { postFetch } from "../../../util/request";
+import "../index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class CustomTransferDialog extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ loading: false, listDatas: [], columns: [], selectedRowKeys: [], pageInfo: { current: 1, pageSize: 10, total: 0 },
+ query: props.searchParamsKey ? { [props.searchParamsKey]: "" } : {},
+ leftListSelectedKeys: [], // 左侧table选择的keys
+ leftListSelectedData: [], // 左侧table选择的数据
+ rightCheckedKeys: [], //右侧选择的keys
+ rightDatas: [] // 右侧展示的数据
+ };
+ this.selectedData = {};
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) {
+ this.getData(true, nextProps);
+ if (nextProps.datas) {
+ this.setState({
+ leftListSelectedData: _.values(nextProps.datas), rightDatas: _.values(nextProps.datas)
+ });
+ }
+ } else if (nextProps.visible !== this.props.visible && !nextProps.visible) {
+ this.setState({
+ query: { [this.props.searchParamsKey]: "" }, selectedRowKeys: [],
+ rightDatas: [], rightCheckedKeys: [], leftListSelectedData: [], leftListSelectedKeys: [],
+ pageInfo: { current: 1, pageSize: 10, total: 0 }
+ });
+ this.selectedData = {};
+ }
+ }
+
+ getData = (init = false, props) => {
+ const { query, pageInfo } = this.state;
+ const { completeURL, convertDatasource, dataParams = {}, dialogType } = props || this.props;
+ let payload = { ...dataParams, ...query };
+ dialogType === "table" && (payload = { ...payload, ...pageInfo });
+ this.setState({ loading: true });
+ postFetch(completeURL, payload).then(({ status, data }) => {
+ this.setState({ loading: false });
+ if (status && data.list) {
+ const { pageNum: current, pageSize, total } = data;
+ this.setState({
+ listDatas: convertDatasource ? convertDatasource(data.list) : data.list, columns: data.columns,
+ pageInfo: { ...pageInfo, current, pageSize, total }
+ });
+ } else {
+ this.setState({
+ listDatas: convertDatasource ? convertDatasource(data).listDatas : [],
+ leftListSelectedData: (init && convertDatasource) ? convertDatasource(data).checked : this.state.leftListSelectedData,
+ rightDatas: (init && convertDatasource) ? convertDatasource(data).checked : this.state.rightDatas
+ });
+ }
+ });
+ };
+ handleOk = () => {
+ const { rightDatas } = this.state;
+ this.props.onChange && this.props.onChange(rightDatas);
+ };
+ onLeftListCheck = (keys, datas) => {
+ const { leftListSelectedData } = this.state;
+ let targets = leftListSelectedData.concat(datas);
+ targets = _.uniqBy(targets, "id");
+ targets = targets.filter((t) => keys.indexOf(t["id"]) > -1);
+ this.setState({ leftListSelectedKeys: keys, leftListSelectedData: targets });
+ };
+ onleftDoubleClick = (data) => {
+ const { rightDatas } = this.state;
+ this.setState({
+ rightDatas: rightDatas.concat(data),
+ rightCheckedKeys: [],
+ leftListSelectedData: [],
+ leftListSelectedKeys: []
+ });
+ };
+ onRightDoubleClick = (key) => {
+ const { rightDatas } = this.state;
+ const newRightDatas = rightDatas.filter(item => String(item.id) !== key);
+ this.setState({ rightDatas: newRightDatas, rightCheckedKeys: [] });
+ };
+ moveTo = (direction) => {
+ const { rightDatas, rightCheckedKeys, listDatas, leftListSelectedData } = this.state;
+ if (direction === "right") {
+ this.setState({
+ rightDatas: rightDatas.concat(leftListSelectedData),
+ leftListSelectedData: [],
+ leftListSelectedKeys: []
+ });
+ } else if (direction === "left") {
+ this.setState({
+ rightDatas: rightDatas.filter(item => !rightCheckedKeys.some(checkedKey => String(item.id) === checkedKey)),
+ rightCheckedKeys: []
+ });
+ } else if (direction === "allToLeft") {
+ this.setState({ rightDatas: [], rightCheckedKeys: [] });
+ } else if (direction === "allToRight") {
+ if (this.leftListAllActive()) {
+ this.setState({
+ rightDatas: rightDatas.concat(listDatas),
+ rightCheckedKeys: [],
+ leftListSelectedData: [],
+ leftListSelectedKeys: []
+ });
+ }
+ }
+ };
+ leftListAllActive = () => {
+ const { rightDatas, listDatas } = this.state;
+ let bool = true;
+ if (_.isEmpty(listDatas)) bool = false;
+ if (!_.isEmpty(listDatas) && !_.isEmpty(rightDatas)) {
+ bool = listDatas.filter((l) => !rightDatas.some(r => l.id === r.id)).length !== 0;
+ }
+ return bool;
+ };
+ renderTitle = () => {
+ return (
+ {this.props.title || getLabel(111, "数据选择")}
+
);
+ };
+
+ render() {
+ const {
+ loading, listDatas, query, leftListSelectedKeys, rightDatas, rightCheckedKeys, pageInfo, selectedRowKeys,
+ columns
+ } = this.state;
+ const {
+ searchParamsKey, saveLoading, dialogType = "", rowKey, tableOpts = {}, buttons = [
+ ,
+
+ ]
+ } = this.props;
+ let rightActive = false, leftActive = false, rightAllActive = false;
+ if (leftListSelectedKeys && leftListSelectedKeys.length > 0) rightActive = true;
+ if (rightCheckedKeys && rightCheckedKeys.length > 0) leftActive = true;
+ if (rightDatas && rightDatas.length > 0) rightAllActive = true;
+ let dom = {this.props.titleOptsComs}
+
+
+
+
+ this.getData()}
+ onChange={value => this.setState({ query: { ...query, [searchParamsKey]: value } })}
+ />
+
+
+
+
+
+
+
+
+ this.moveTo("right")}
+ moveToLeft={() => this.moveTo("left")}
+ moveAllToRight={() => this.moveTo("allToRight")}
+ moveAllToLeft={() => this.moveTo("allToLeft")}
+ />
+
+
+ this.setState({ rightCheckedKeys })}
+ onDoubleClick={this.onRightDoubleClick}
+ onDrag={(data) => {
+ this.setState({ rightDatas: data });
+ }}
+ />
+
+
+ {this.props.children}
+
;
+ }
+ return (
+
+
);
+ };
+ renderMult = () => {
+ const { fieldConfig } = this.props;
+ const { browserConditionParam = {} } = fieldConfig || {};
+ const { selectedData, searchKeys } = this.state;
+ return (
+ {
+ browserConditionParam.treeSelect ?
+
);
+ };
+ onBrowerChangeHandler = (values, datas) => {
+ const { form, fieldConfig, isSingle } = this.props;
+ const { browserConditionParam = {} } = fieldConfig || {};
+ this.setState({
+ searchKeys: (isSingle || browserConditionParam.isSingle) ? values.slice(-1) : values,
+ selectedData: ((isSingle || browserConditionParam.isSingle) && !_.isEmpty(values)) ? { [_.last(values)]: datas[_.last(values)] } : datas
+ }, () => {
+ this.props.onChange && this.props.onChange(values.join(","));
+ this.props.onCustomChange && this.props.onCustomChange(this.state.selectedData);
+ if (form) {
+ form.updateFields({
+ [getKey(fieldConfig)]: { value: this.state.searchKeys.join(",") }
+ });
+ }
+ });
+ };
+ onBrowerClick = (keys, selectedObj) => {
+ if (_.isEmpty(keys)) {
+ this.setState({ searchKeys: [], selectedData: {}, rightDatas: [] });
+ }
+ this.setState({ browserDialog: { visible: true } });
+ };
+
+ render() {
+ const { browserDialog, selectedData, searchKeys } = this.state;
+ const { isSingle, viewAttr, fieldConfig = {} } = this.props;
+ const { browserConditionParam = {} } = fieldConfig || {};
+ const className = classNames({
+ "wea-browser": true,
+ "wea-field-readonly": viewAttr === "1" || fieldConfig.viewAttr === "1"
+ });
+ const browser = (isSingle || browserConditionParam.isSingle) ? this.renderSingle() : this.renderMult();
+ const style = {};
+ if (this.props.resize) style.visibility = "hidden";
+ return ({browser}
+
+ this.setState({ targetTypeIds: val, targetTypeIdsNames: val })}/>
+ }/>
+
;
default:
break;
}
return
+
;
+};
diff --git a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
index 8b38ba01..5faaf8a9 100644
--- a/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
+++ b/pc4mobx/hrmSalary/components/PersonalScopeTable/index.js
@@ -59,7 +59,10 @@ class PersonalScopeTable extends Component {
columns: _.map(columns, item => {
return {
...item,
- render: (text) => {
+ render: (text, record) => {
+ if (item.dataIndex === "targetName") {
+ return this.props.onEditScope(record)}>{text};
+ }
return {text};
}
};
diff --git a/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js b/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
index 209125fb..b2ac42b0 100644
--- a/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
+++ b/pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
@@ -33,7 +33,8 @@ class ImpStep1 extends Component {
multiple: false,
action: "/api/doc/upload/uploadFile",
fileList,
- onChange: this.handleChange
+ onChange: this.handleChange,
+ ...this.props.customDragger
};
return (
{getLabel(111, "注意事项：")}
+{getLabel(111, "1、sql需返回人员id")}
+{getLabel(111, "2、sql结尾不需要 ; go /等符号")}
+{getLabel(111, "使用例子：定义获取岗位是开发的人员")}
+{getLabel(111, "select id from hrmresource where JOBTITLE = 17")}
+
@@ -45,7 +46,7 @@ class ImpStep1 extends Component {
{this.props.importParams}
}
- {getLabel(543202, "导入Excel")}
+ {_.isEmpty(this.props.customDragger) && {getLabel(543202, "导入Excel")}
}
@@ -56,36 +57,39 @@ class ImpStep1 extends Component {
+
- {getLabel(27577, "操作步骤")}
+ + {`1. ${getLabel(30907, "第一步")},${getLabel(543205, "请选择导出的Excel文件或")}`} + { + typeof this.props.link === "string" ? + {getLabel(543207, "点击这里下载模板")} : + {getLabel(543207, "点击这里下载模板")} + } + + {this.props.exportDataDom} +
+{`2. ${getLabel(543211, "第二步")},${getLabel(543212, "请一定要确定Excel文档中的格式是模板中的格式")},${getLabel(543213, "没有被修改掉")}；`}
+{`3. ${getLabel(543216, "第三步")},${getLabel(543215, "选择填写好的Excel文档")},${getLabel(543214, "点击“下一步”按钮进行数据预览")}；`}
++ {`4. ${getLabel(543217, "第四步")},${getLabel(543218, "如果以上步骤和Excel文档正确的话")},${getLabel(543219, "导入成功会有提示")},${getLabel(543220, "数据会被正确导入")}。${getLabel(543221, "如果有问题")},${getLabel(543222, "则会提示Excel文档的错误之处")}。`} +
+
-
-
- {getLabel(27577, "操作步骤")}
- - {`1. ${getLabel(30907, "第一步")},${getLabel(543205, "请选择导出的Excel文件或")}`} - { - typeof this.props.link === "string" ? - {getLabel(543207, "点击这里下载模板")} : - {getLabel(543207, "点击这里下载模板")} - } - - {this.props.exportDataDom} -
-{`2. ${getLabel(543211, "第二步")},${getLabel(543212, "请一定要确定Excel文档中的格式是模板中的格式")},${getLabel(543213, "没有被修改掉")}；`}
-{`3. ${getLabel(543216, "第三步")},${getLabel(543215, "选择填写好的Excel文档")},${getLabel(543214, "点击“下一步”按钮进行数据预览")}；`}
-- {`4. ${getLabel(543217, "第四步")},${getLabel(543218, "如果以上步骤和Excel文档正确的话")},${getLabel(543219, "导入成功会有提示")},${getLabel(543220, "数据会被正确导入")}。${getLabel(543221, "如果有问题")},${getLabel(543222, "则会提示Excel文档的错误之处")}。`} -
-
-
-
+ {getLabel(543223, "Excel文件说明")}
- {`1. ${getLabel(543224, "后缀名为xls或者xlsx")};`}
-{`2. ${getLabel(543225, "数据请勿放在合并的单元格中")};`}
-{`3. ${getLabel(543226, "账单月份格式必须为")}:YYYY-MM；`}
-
+
+ {getLabel(543223, "Excel文件说明")}
+ {`1. ${getLabel(543224, "后缀名为xls或者xlsx")};`}
+{`2. ${getLabel(543225, "数据请勿放在合并的单元格中")};`}
+{`3. ${getLabel(543226, "账单月份格式必须为")}:YYYY-MM；`}
+
{
- !_.isEmpty(importResult) ?
- :
+
{
- title: getLabel(25700, "错误信息"),
- dataIndex: "message"
+ !_.isEmpty(importResult) ?
+
}
);
diff --git a/pc4mobx/hrmSalary/components/importDialog/components/moveInResult.js b/pc4mobx/hrmSalary/components/importDialog/components/moveInResult.js
new file mode 100644
index 00000000..2a6358a6
--- /dev/null
+++ b/pc4mobx/hrmSalary/components/importDialog/components/moveInResult.js
@@ -0,0 +1,56 @@
+/*
+ * 薪酬迁入结果展示
+ *
+ * @Author: 黎永顺
+ * @Date: 2024/8/16
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { WeaLocaleProvider, WeaTable } from "ecCom";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class MoveInResult extends Component {
+ downloadTxtfile = (value, type) => {
+ if (!value) return;
+ const element = document.createElement("a");
+ const file = new Blob([value], { type: "text/plain" });
+ element.href = URL.createObjectURL(file);
+ element.download = `导入${type}信息.txt`;
+ document.body.appendChild(element);
+ element.click();
+ };
+
+ render() {
+ const { dataSource } = this.props;
+ return (
+
-
:
- - {getLabel(389249, "已导入")} - {importResult.successCount} - {`${getLabel(30690, "条数据")},${getLabel(25009, "失败")}`} - {importResult.errorCount} {getLabel(30690, "条数据")} -
-
-
- }
- {
- (!_.isEmpty(importResult.errorNotice) || !_.isEmpty(importResult.errorData)) &&
- {getLabel(111, "导入失败")}
-
+
:
+ + {getLabel(389249, "已导入")} + {importResult.successCount} + {`${getLabel(30690, "条数据")},${getLabel(25009, "失败")}`} + {importResult.errorCount} {getLabel(30690, "条数据")} +
+ } +
+
}
- ]}
- dataSource={importResult.errorData || importResult.errorNotice} pagination={false}
- scroll={{ y: `calc(100vh - 387px)` }}
- />
+ {
+ !_.isEmpty(importResult) && (!_.isEmpty(importResult.errorNotice) || !_.isEmpty(importResult.errorData)) &&
+ {getLabel(111, "导入失败")}
+{getLabel(111, "暂无数据")}
:
+ _.isEmpty(dataSource) ? 暂无数据
+
-
-
-
-
+ const {
+ loading, dataSource, transferDialog, tempDialog, tempPageList, templateId, tempManageDialog, tempManageQuery
+ } = this.state;
+ const { dateRange, showSearchAd } = this.props;
+ const { dialogType } = transferDialog;
+ return (
+
+
+
+
+
+
+
+
+
+
+ {/* this.transferRef = dom}
+ onCancel={() => this.setState({
+ transferDialog: { ...transferDialog, completeURL: "", visible: false }
+ })}
+ buttons={
+ dialogType === "temp" ? [
+ ,
+
+ ] : []
+ }
+ titleOptsComs={
+ dialogType === "temp" ?
+ : null
+ }/>
+ {/*薪资明细模板设置*/}
+ this.setState({
+ tempDialog: { ...tempDialog, visible: false, setting: [] }
+ }, () => callback && callback())}
+ onSuccess={this.getPageListTemplatelist}/>
+ {/*薪资明细自定义列模板管理*/}
+ this.setState({
+ tempManageDialog: { ...tempManageDialog, completeURL: "", visible: false }
+ })}/>
+
+ {getSearchs(tempForm, conditions, 1, false, this.formFieldChange)}
+
+ this.handleTempAdminCols()}/>
+ this.props.onDelete(selectedRowKeys)} disabled={_.isEmpty(selectedRowKeys)}/>
+
+ {/*模板管理*/}
+
- this.setState({ showSearchAd: false })} onAdSearch={this.onAdSearch}/>
-
+ showDropIcon={selectedKey !== "detail"} onDropMenuClick={this.onDropMenuClick} dropMenuDatas={dropMenuDatas}>
{
selectedKey === "statistics" ?
@@ -166,13 +171,16 @@ class EditCalcTable extends Component {
}, 500);
});
const { routeParams: { salaryAcctRecordId } } = this.props;
- updateLockEmpStatus({ ...payload, salaryAcctRecordId }).then(({ status, errormsg }) => {
+ const params = salaryItemId ? payload : { ...payload, salaryAcctRecordId };
+ const APIFunction = salaryItemId ? updateLockEmpCellStatus : updateLockEmpStatus;
+ APIFunction(params).then(({ status, errormsg }) => {
+ clearInterval(this.timerLock);
+ this.setState({
+ progressVisible: false,
+ progress: 0
+ });
if (status) {
- clearInterval(this.timerLock);
- this.setState({
- progressVisible: false,
- progress: 0
- }, () => this.queryCalcResultList());
+ this.queryCalcResultList();
} else {
message.error(errormsg);
}
@@ -224,8 +232,8 @@ class EditCalcTable extends Component {
"点击锁定所有解锁的项目值": getLabel(543649, "点击锁定所有解锁的项目值"),
"点击解锁所有锁定的项目值": getLabel(543648, "点击解锁所有锁定的项目值"),
"锁定的项目值": getLabel(543647, "锁定的项目值"),
- "当前状态锁定，点击解锁": getLabel(111, "当前状态锁定，点击解锁"),
- "当前状态未锁定，点击锁定": getLabel(111, "当前状态未锁定，点击锁定"),
+ "当前状态锁定，右击解锁": getLabel(111, "当前状态锁定，右击解锁"),
+ "当前状态未锁定，右击锁定": getLabel(111, "当前状态未锁定，右击锁定"),
"共": getLabel(18609, "共"), "条": getLabel(18256, "条"),
"总计": getLabel(523, "总计"), "批量解锁": getLabel(111, "批量解锁"),
"批量锁定": getLabel(111, "批量锁定"), "批量更新": getLabel(111, "批量更新"),
@@ -272,6 +280,9 @@ class EditCalcTable extends Component {
}
}).catch(() => this.setState({ loading: false }));
};
+ handleQuery = () => {
+ this.setState({ pageInfo: { ...this.state.pageInfo, current: 1 } }, () => this.queryCalcResultList());
+ };
handleBatchEditing = () => {
};
@@ -322,7 +333,7 @@ const traverse = (arr, calcDetail) => {
return _.map(arr, item => {
if (!_.isEmpty(item.children)) {
return {
- title: item.text, width: item.width + "px", ellipsis: true,
+ title: item.text, width: item.width + "px", ellipsis: true, calcDetail,
dataIndex: item.column, children: traverse(item.children, calcDetail),
fixed: item.fixed || false, dataType: item.dataType, align: "center"
};
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
index 16cacd2c..235bac13 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editSalaryCalcSlide.js
@@ -5,7 +5,7 @@
* Date: 2023/9/25
*/
import React, { Component } from "react";
-import { Button, message } from "antd";
+import { Button, message, Modal } from "antd";
import { WeaLocaleProvider, WeaSlideModal, WeaTab } from "ecCom";
import EditSalaryBaseInfo from "./baseInfo";
import PayrollItemsTable from "../../../../calculateDetail/payrollItemsTable";
@@ -87,9 +87,16 @@ class EditSalaryCalcSlide extends Component {
};
save = () => {
const { id: salaryAcctEmpId } = this.props;
- const { issuedAndReissueItems, itemsByGroup } = this.state;
+ const { issuedAndReissueItems, itemsByGroup, baseInfo } = this.state;
+ if (_.every(baseInfo, it => !it.canEdit || (it.canEdit && !it.fieldValue))) {
+ Modal.warning({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(518702, "必要信息不完整，红色*为必填项！")
+ });
+ return;
+ }
const payload = {
- salaryAcctEmpId,
+ salaryAcctEmpId, employeeInfos: baseInfo,
items: [
..._.reduce(itemsByGroup, (pre, cur) => {
return [
@@ -97,14 +104,14 @@ class EditSalaryCalcSlide extends Component {
..._.map(cur.salaryItems, it => {
return {
salaryItemId: it.salaryItemId,
- resultValue: (it.dataType === "number" && !!it.resultValue) ? toDecimal_n(it.resultValue, it.pattern || 2) : it.resultValue
+ resultValue: (it.dataType === "number" && !!it.resultValue) ? toDecimal_n(it.resultValue, !_.isNil(it.pattern) ? it.pattern : 2) : it.resultValue
};
})
];
}, []),
...issuedAndReissueItems.map(item => ({
salaryItemId: item.salaryItemId,
- resultValue: (item.dataType === "number" && !!item.resultValue) ? toDecimal_n(item.resultValue, item.pattern || 2) : item.resultValue
+ resultValue: (item.dataType === "number" && !!item.resultValue) ? toDecimal_n(item.resultValue, !_.isNil(item.pattern) ? item.pattern : 2) : item.resultValue
}))
]
};
@@ -133,7 +140,8 @@ class EditSalaryCalcSlide extends Component {
top={0} width={60} height={100} measure={"%"}
direction={"right"} title={this.renderTitle()}
content={
this.calc.openAdvanceSearch()}
onAdvanceSearch={() => this.calc.onAdSearch(false)}/>
];
+ !canEdit && reqBtns.splice(0, 1);
+ isOpenApproval && reqBtns.unshift();
accountExceptInfo && reqBtns.unshift( this.downloadTxtfile(accountExceptInfo)}/>);
@@ -172,14 +201,15 @@ class Index extends Component {
element.click();
};
renderContent = () => {
- const { selectedKey } = this.state;
+ const { selectedKey, approvalInfo } = this.state;
+ const { canEdit } = approvalInfo;
let dom = null;
switch (selectedKey) {
case "person":
- dom = this.calc = dom}/>;
+ dom = this.calc = dom}/>;
break;
default:
break;
@@ -195,7 +225,7 @@ class Index extends Component {
const { calculateStore: { setOtherConditions } } = this.props;
const { selectedKey, progressVisible, progress, customExpDialog, salaryImpDialog, sxwzVisible } = this.state;
return (
-
+
onChangeIssueReissueValue(record.salaryItemId, value, "itemsByGroup", salarySobItemGroupId)}
/> :
- {getSearchs(form, condition)}
+
}
/>
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js
index 14de4956..c8fdb4b9 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceRefrenceDataModal.js
@@ -55,7 +55,7 @@ class AttendanceRefrenceDataModal extends Component {
...item,
items: _.map(items, child => {
const { domkey } = child;
- if (domkey[0] === "salarySobId") {
+ if (domkey[0] === "salarySobIds") {
return { ...child, options: _.map(data, it => ({ key: it.id, showname: it.content })) };
}
return { ...child };
@@ -77,19 +77,23 @@ class AttendanceRefrenceDataModal extends Component {
refenceform.validateForm().then(f => {
if (f.isValid) {
const payload = refenceform.getFormParams();
- const checkPayload = { salaryYearMonthStr: payload.salaryYearMonth, salarySobId: payload.salarySobId };
+ const checkPayload = {
+ salaryYearMonthStr: payload.salaryYearMonth,
+ salarySobIds: payload.salarySobIds.split(",")
+ };
this.setState({ loading: true });
checkOperation(checkPayload).then(({ status, errormsg: errormessage }) => {
if (status) {
- syncAttendanceRefer(payload).then(({ status, errormsg }) => {
- this.setState({ loading: false });
- if (status) {
- message.success("同步成功");
- onCancel(true);
- } else {
- message.error(errormsg || "同步失败");
- }
- }).catch(() => this.setState({ loading: false }));
+ syncAttendanceRefer({ ...payload, salarySobIds: payload.salarySobIds.split(",") })
+ .then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success("同步成功");
+ onCancel(true);
+ } else {
+ message.error(errormsg || "同步失败");
+ }
+ }).catch(() => this.setState({ loading: false }));
} else {
this.setState({ loading: false });
message.error(errormessage);
@@ -212,9 +216,9 @@ class AttendanceRefrenceDataModal extends Component {
];
return (
-
+
div:first-child {
+ height: 47px !important;
+ line-height: 47px;
+ }
+
+ & > div:last-child {
+
+ .wea-form-item-wrapper {
+ display: flex !important;
+ align-items: center;
+
+ .to {
+ padding: 0 10px;
+ }
+ }
+ }
+ }
+
.accumulated {
.wea-form-cell-wrapper {
& > div:first-child {
- height: 46px !important;
- line-height: 46px;
+ height: 47px !important;
+ line-height: 47px;
}
& > div:nth-child(2) {
- //width: 40% !important;
.wea-form-item-wrapper {
display: flex !important;
@@ -18,10 +46,6 @@
}
}
}
-
- & > div:last-child {
- //width: 40% !important;
- }
}
}
}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
index 9db08fac..4bba03cd 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/components/tableRecord.js
@@ -5,8 +5,7 @@
* Date: 2023/2/20
*/
import React, { Component } from "react";
-import { WeaSearchGroup } from "ecCom";
-import UnifiedTable from "../../../components/UnifiedTable";
+import { WeaSearchGroup, WeaTable } from "ecCom";
import { getTableRecordDate } from "../../../apis/cumDeduct";
import { DataCollectionDateRangePick, DataCollectionSelect, Input } from "../cumDeduct";
import "./index.less";
@@ -87,9 +86,22 @@ class TableRecord extends Component {
if (status) {
const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
this.setState({
- pageInfo: { ...pageInfo, current, pageSize, total },
- dataSource,
- columns
+ pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
+ columns: _.map(columns, (o, i) => {
+ let col = {
+ ...o, width: 110,
+ render: text => ({text})
+ };
+ switch (o.dataIndex) {
+ case "taxAgentName":
+ col = { ...col, width: 180 };
+ break;
+ default:
+ col = { ...col };
+ break;
+ }
+ return i === 0 ? { ...col, fixed: "left" } : col;
+ })
});
}
}).catch(() => this.setState({ loading: { ...loading, query: false } }));
@@ -161,14 +173,6 @@ class TableRecord extends Component {
{
com: Input({ value: record.username })
},
- {
- com: DataCollectionDateRangePick({
- label: "税款所属期",
- range: recordPayload[screenParams[screenParams.length - 1]] || [],
- onChange: this.handleTablerecordScreen,
- key: screenParams[screenParams.length - 1]
- })
- },
{
com: DataCollectionSelect({
label: "个税扣缴义务人",
@@ -177,28 +181,26 @@ class TableRecord extends Component {
onChange: this.handleTablerecordScreen,
key: "taxAgentId"
})
+ },
+ {
+ com: DataCollectionDateRangePick({
+ label: "税款所属期",
+ range: recordPayload[screenParams[screenParams.length - 1]] || [],
+ onChange: this.handleTablerecordScreen,
+ key: screenParams[screenParams.length - 1]
+ })
}
];
return (
+
+ );
+ }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryMonthHelpfulTip.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryMonthHelpfulTip.js
new file mode 100644
index 00000000..91654775
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryMonthHelpfulTip.js
@@ -0,0 +1,37 @@
+/*
+ *
+ * 薪资所属月-提示框
+ * @Author: 黎永顺
+ * @Date: 2024/7/15
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { WeaHelpfulTip, WeaLocaleProvider } from "ecCom";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class SalaryMonthHelpfulTip extends Component {
+ render() {
+ const { salarySendDetailBaseInfo = {} } = this.props;
+ const { salarySobCycle: { salaryCycle, taxCycle, attendCycle, socialSecurityCycle } } = salarySendDetailBaseInfo;
+ const { fromDate, endDate } = salaryCycle;
+ const { fromDate: aFromDate, endDate: aEndDate } = attendCycle;
+ return (
+
+
}/>
+ );
+ }
+}
+
+export default SalaryMonthHelpfulTip;
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.less b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.less
index 01a180a0..c78ed091 100644
--- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.less
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/index.less
@@ -31,3 +31,75 @@
}
}
}
+
+//查看工资单详情-重构
+.salary-payroll-details-layout {
+ .ant-spin-nested-loading, .ant-spin-container {
+ height: 100%;
+ }
+
+ .salary-payroll-details {
+ padding: 0 16px 16px;
+
+ .salary-tb-tip {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ height: 40px;
+ }
+
+ .salary-payroll-template-name {
+ vertical-align: middle;
+ margin-left: 40px;
+ }
+
+ .label {
+ margin-right: 10px;
+ }
+
+ }
+
+ .searchAdvanced-condition-hide {
+ display: none;
+ }
+
+ .searchAdvanced-condition-container {
+ background: #FFF;
+ margin-bottom: 10px;
+ border: 1px solid #e5e5e5;
+
+ .wea-search-buttons {
+ border-top: 1px solid #dadada;
+ padding: 15px 0;
+ }
+
+ .wea-advanced-searchsAd {
+ height: 246px;
+ overflow: hidden auto;
+
+ .formItem-delete {
+ position: absolute;
+ top: 0;
+ right: -40px;
+ }
+
+ .searchAdvanced-commonSelect {
+ border-top: 1px solid #ebebeb;
+ margin: 0 25px;
+ padding: 10px 0;
+ }
+
+ .custom-advance-largeSpacing {
+ padding-left: 26px;
+
+ .link {
+ border: none;
+ border-radius: 0;
+ padding: 12px 10px 12px 26px;
+ color: #2db7f5
+ }
+ }
+
+ }
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js
new file mode 100644
index 00000000..a0c9e495
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollDetail.js
@@ -0,0 +1,113 @@
+/*
+ *
+ * 查看工资单详情-重构页面
+ * @Author: 黎永顺
+ * @Date: 2024/7/15
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { toJS } from "mobx";
+import { WeaLoadingGlobal, WeaLocaleProvider, WeaTop } from "ecCom";
+import { Button } from "antd";
+import AdvanceInputBtn from "./components/advanceInputBtn";
+import SalaryMonthHelpfulTip from "./components/salaryMonthHelpfulTip";
+import SalaryDetailSearchPannel from "./components/salaryDetailSearchPannel";
+import SalaryDetailList from "./components/salaryDetailList";
+import { getQueryString } from "../../../util/url";
+import { removePropertyCondition } from "../../../util/response";
+import { sysConfCodeRule } from "../../../apis/ruleconfig";
+import * as API from "../../../apis/payroll";
+import cs from "classnames";
+import "./index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("taxAgentStore", "payrollStore")
+@observer
+class PayrollDetail extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ salarySendDetailBaseInfo: {}, showSearchAd: false, isQuery: false, conditions: [],
+ showTotalCell: false
+ };
+ this.listRef = null;
+ }
+
+ async componentDidMount() {
+ const id = getQueryString("id");
+ const { payrollStore: { detailListConditionForm } } = this.props;
+ const [{ data: salarySendDetailBaseInfo }, { data }, { data: confCode }] = await Promise.all([
+ API.getPayrollInfo({ id }), API.getPayrollDetailSa(),
+ sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" })
+ ]);
+ this.setState({
+ salarySendDetailBaseInfo, showTotalCell: confCode === "1",
+ conditions: removePropertyCondition(data.condition)
+ }, () => detailListConditionForm.initFormFields(this.state.conditions));
+ }
+
+ handleExportAll = () => {
+ const { payrollStore: { salaryTableStore } } = this.props;
+ const columns = _.filter(toJS(salaryTableStore.columns), (item) => item.display === "true");
+ WeaLoadingGlobal.start();
+ const salarySendId = getQueryString("id");
+ const promise = API.exportDetailList_reconfig({ salarySendId, columns: _.map(columns, it => it.dataIndex) });
+ };
+
+ render() {
+ const { salarySendDetailBaseInfo, showSearchAd, conditions, isQuery, showTotalCell } = this.state;
+ const { taxAgentStore: { showOperateBtn } } = this.props;
+ const { salaryMonth, template } = salarySendDetailBaseInfo;
+ const dropMenuDatas = [
+ {
+ key: "BTN_COLUMN",
+ icon: ,
+ content: getLabel(111, "显示列定制"),
+ onClick: () => this.listRef.wrappedInstance.handleSetCustomCols()
+ }
+ ];
+ const btns = [
+ ,
+
-
+ this.setState({ baseInfo })}/>
this.setState({ selectedKey: v })}
datas={!_.isEmpty(issuedAndReissueItems) ? topTab : topTab.slice(0, 1)}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
index 06d06229..0921deef 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
@@ -34,7 +34,7 @@ class Index extends Component {
openAdvanceSearch = () => this.setState({ showSearchAd: !this.state.showSearchAd });
onAdSearch = (bool = true) => {
- this.calcTableRef.wrappedInstance.queryCalcResultList();
+ this.calcTableRef.wrappedInstance.handleQuery();
bool && this.openAdvanceSearch();
};
init = async (isRefresh) => {
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
index 469c5240..08270783 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.less
@@ -34,6 +34,15 @@
display: flex;
align-items: center;
width: 100%;
+
+ & > span:first-child {
+ display: inline-block;
+ min-width: 44px;
+ }
+
+ & > span:last-child {
+ flex: 1;
+ }
}
}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
index ce58c616..901cb803 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalcImport/index.js
@@ -156,7 +156,7 @@ class Index extends Component {
}
}, () => {
const { selectItems: salaryItems } = this.state.headerFieldsDialog;
- cacheImportField({ salaryItems: salaryItems ? salaryItems.split(",") : [] })
+ cacheImportField({ salaryAcctRecordId, salaryItemIds: salaryItems ? salaryItems.split(",") : [] })
.then(({ status, errormsg }) => {
if (status) {
const payload = {
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryMonthTip/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryMonthTip/index.js
index a230b83e..e9eb34c9 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryMonthTip/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryMonthTip/index.js
@@ -12,7 +12,7 @@ const getLabel = WeaLocaleProvider.getLabel;
class Index extends Component {
render() {
- const { attendCycle, salaryCycle, salaryMonth, socialSecurityCycle } = this.props;
+ const { attendCycle, salaryCycle, taxCycle, salaryMonth, socialSecurityCycle } = this.props;
const { fromDate: attendFromDate, endDate: attendEndDate } = attendCycle,
{ fromDate: salaryFromDate, endDate: salaryEndDate } = salaryCycle;
return (
@@ -23,7 +23,7 @@ class Index extends Component {
{getLabel(542240, "税款所属期")}
- {salaryMonth}
+ {taxCycle || salaryMonth}
{getLabel(543475, "考勤取值周期")}
diff --git a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
index 733ed366..f77d09aa 100644
--- a/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
+++ b/pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
@@ -9,7 +9,12 @@ import { WeaLocaleProvider, WeaReqTop } from "ecCom";
import { Button, Dropdown, Menu, message, Modal } from "antd";
import { inject, observer } from "mobx-react";
import Layout from "./layout";
-import { acctresultAccounting, getCalculateProgress, getExportField } from "../../../apis/calculate";
+import {
+ acctresultAccounting,
+ getApprovalInfoByRecordId,
+ getCalculateProgress,
+ getExportField
+} from "../../../apis/calculate";
import AdvanceInputBtn from "./components/advanceInputBtn";
import SalaryCalcPersonConfirm from "./components/salaryCalcPersonConfirm";
import SalaryEditCalc from "./components/salaryEditCalc";
@@ -30,12 +35,19 @@ class Index extends Component {
selectedKey: "person", progressVisible: false, progress: 0,
customExpDialog: { visible: false, salaryAcctRecordId: "", checkItems: [], itemsByGroup: [] },
salaryImpDialog: { visible: false, title: "", salaryAcctRecordId: "" },
+ approvalInfo: {},//审批信息,
accountExceptInfo: "" //核算报错信息,
};
this.calc = null;
this.timer = null;
}
+ init = () => {
+ const { routeParams: { salaryAcctRecordId } } = this.props;
+ getApprovalInfoByRecordId({ salaryAcctRecordId }).then(({ status, data: approvalInfo }) => {
+ if (status) this.setState({ approvalInfo });
+ });
+ };
handleMenuClick = ({ key }) => {
switch (key) {
case "calc_selected":
@@ -124,12 +136,23 @@ class Index extends Component {
case "offlineCompare":
window.open(`/spa/hrmSalary/static/index.html#/main/hrmSalary/calcOc/${salaryAcctRecordId}`, "_blank");
break;
+ case "LOCK":
+ case "UNLOCK":
+ const { selectedRowKeys } = this.calc.calcTableRef.wrappedInstance.state;
+ if (_.isEmpty(selectedRowKeys)) {
+ message.warning(getLabel(543303, "请选择表格数据！"));
+ return;
+ }
+ this.calc.calcTableRef.wrappedInstance.updateEmpLockStatus({ lockStatus: key, acctEmpIds: selectedRowKeys });
+ break;
default:
break;
}
};
renderReqBtns = () => {
- const { selectedKey, accountExceptInfo } = this.state;
+ const { routeParams: { salaryAcctRecordId } } = this.props;
+ const { selectedKey, accountExceptInfo, approvalInfo } = this.state;
+ const { isOpenApproval, approvalWorkflowUrl, canEdit } = approvalInfo;
let reqBtns = [];
switch (selectedKey) {
case "calc":
@@ -140,10 +163,12 @@ class Index extends Component {
);
const moreMenu = (
);
reqBtns = [
@@ -154,6 +179,10 @@ class Index extends Component {
+ {getSearchs(form, condition, 2, false)}
若此员工数据已存在在同期列表中，则当前数据保存后会覆盖列表数据
);
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
index dc082d76..658d0808 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/columns.js
@@ -128,7 +128,7 @@ export const conditions = [
isQuickSearch: false,
label: "类型",
labelcol: 6,
- valueList:[],
+ valueList: [],
options: [
{
key: "NUMBER",
@@ -185,13 +185,14 @@ export const reFrenceConditions = [
{
colSpan: 1,
conditionType: "SELECT",
- domkey: ["salarySobId"],
+ domkey: ["salarySobIds"],
fieldcol: 18,
isQuickSearch: false,
label: "薪资账套",
labelcol: 6,
- valueList:[],
+ valueList: [],
options: [],
+ multiple: true,
rules: "required|string",
viewAttr: 3
},
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
index 634d36fe..be64c8e8 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataViewSlide.js
@@ -27,6 +27,7 @@ class AttendanceDataViewSlide extends Component {
this.viewAttendQuote({}, nextProps);
} else if (nextProps.visible !== this.props.visible && !nextProps.visible) {
document.querySelector(".attendanceRefWrapper").classList.remove("zIndex0-attendance");
+ this.setState({ pageInfo: { current: 1, pageSize: 10, total: 0 } });
}
}
@@ -40,8 +41,7 @@ class AttendanceDataViewSlide extends Component {
const { columns, list: dataSource, pageNum: current, pageSize, total } = data.pageInfo;
this.setState({
pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
- // o.dataIndex === "username" ? "left" :
- columns: _.map(columns, o => ({ ...o, width: 150, fixed: null }))
+ columns: _.map(columns, (o, i) => ({ ...o, width: 150, fixed: i === 0 ? "left" : null }))
});
}
}).catch(() => this.setState({ loading: { ...loading, query: false } }));
@@ -102,7 +102,7 @@ class AttendanceDataViewSlide extends Component {
- {getSearchs(refenceform, condition, 1)}
+ {getSearchs(refenceform, condition, 1, false, null, "", "multiple_select")}
{/* 表头设置 */}
{
!_.isEmpty(screenParams) &&
- 1280 ? 3 : 2}/>
+ ({
- ...item,
- render: (text) => {
- return {text} ;
- }
- }))}
- dataSource={dataSource}
- pagination={pagination}
- loading={loading.query}
- xWidth={columns.length * 180}
- />
+
);
}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
index 742d1573..fb50fd4c 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
@@ -1,400 +1,3 @@
-export const columns = [
- {
- title: "姓名",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "个税扣缴义务人",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "部门",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "手机号",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "工号",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "证件号码",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "入职日期",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "累计子女教育",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "累计继续教育",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "累计住房贷款利息",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "累计住房租金",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "累计赡养老人",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "操作",
- dataIndex: "title",
- key: "title"
- }
-];
-
-
-export const modalColumns = [
- {
- title: "姓名",
- dataIndex: "username",
- key: "username"
- },
- {
- title: "个税扣缴义务人",
- dataIndex: "taxAgentName",
- key: "taxAgentName"
- },
- {
- title: "部门",
- dataIndex: "departmentName",
- key: "departmentName"
- },
- {
- title: "手机号",
- dataIndex: "mobile",
- key: "mobile"
- },
- {
- title: "工号",
- dataIndex: "jobNum",
- key: "jobNum"
- },
- {
- title: "证件号码",
- dataIndex: "idNo",
- key: "idNo"
- },
- {
- title: "入职日期",
- dataIndex: "hiredate",
- key: "hiredate"
- },
- {
- title: "累计子女教育",
- dataIndex: "addUpChildEducation",
- key: "addUpChildEducation"
- },
- {
- title: "累计继续教育",
- dataIndex: "addUpContinuingEducation",
- key: "addUpContinuingEducation"
- },
- {
- title: "累计住房贷款利息",
- dataIndex: "addUpHousingLoanInterest",
- key: "addUpHousingLoanInterest"
- },
- {
- title: "累计住房租金",
- dataIndex: "addUpHousingRent",
- key: "addUpHousingRent"
- },
- {
- title: "累计赡养老人",
- dataIndex: "addUpSupportElderly",
- key: "addUpSupportElderly"
- },
- {
- title: "累计婴幼儿照护",
- dataIndex: "addUpInfantCare",
- key: "addUpInfantCare"
- },
- {
- title: "累计大病医疗",
- dataIndex: "addUpIllnessMedical",
- key: "addUpIllnessMedical"
- }
-];
-export const specialModalColumns = [
- {
- title: "姓名",
- dataIndex: "username",
- key: "username"
- },
- {
- title: "个税扣缴义务人",
- dataIndex: "taxAgentName",
- key: "taxAgentName"
- },
- {
- title: "部门",
- dataIndex: "departmentName",
- key: "departmentName"
- },
- {
- title: "手机号",
- dataIndex: "mobile",
- key: "mobile"
- },
- {
- title: "工号",
- dataIndex: "jobNum",
- key: "jobNum"
- },
- {
- title: "证件号码",
- dataIndex: "idNo",
- key: "idNo"
- },
- {
- title: "入职日期",
- dataIndex: "hiredate",
- key: "hiredate"
- },
- {
- title: "子女教育",
- dataIndex: "childrenEducation",
- key: "childrenEducation"
- },
- {
- title: "继续教育",
- dataIndex: "continuingEducation",
- key: "continuingEducation"
- },
- {
- title: "住房贷款利息",
- dataIndex: "housingLoanInterest",
- key: "housingLoanInterest"
- },
- {
- title: "住房租金",
- dataIndex: "housingRent",
- key: "housingRent"
- },
- {
- title: "赡养老人",
- dataIndex: "supportingElder",
- key: "supportingElder"
- },
- {
- title: "婴幼儿照护",
- dataIndex: "infantCare",
- key: "infantCare"
- },
- {
- title: "大病医疗",
- dataIndex: "seriousIllnessTreatment",
- key: "seriousIllnessTreatment"
- }
-];
-export const otherModalColumns = [
- {
- title: "姓名",
- dataIndex: "username",
- key: "username"
- },
- {
- title: "个税扣缴义务人",
- dataIndex: "taxAgentName",
- key: "taxAgentName"
- },
- {
- title: "部门",
- dataIndex: "departmentName",
- key: "departmentName"
- },
- {
- title: "手机号",
- dataIndex: "mobile",
- key: "mobile"
- },
- {
- title: "工号",
- dataIndex: "jobNum",
- key: "jobNum"
- },
- {
- title: "证件号码",
- dataIndex: "idNo",
- key: "idNo"
- },
- {
- title: "入职日期",
- dataIndex: "hiredate",
- key: "hiredate"
- },
- {
- title: "商业健康保险",
- dataIndex: "businessHealthyInsurance",
- key: "businessHealthyInsurance"
- },
- {
- title: "税延养老保险",
- dataIndex: "taxDelayEndowmentInsurance",
- key: "taxDelayEndowmentInsurance"
- },
- {
- title: "其他",
- dataIndex: "otherDeduction",
- key: "otherDeduction"
- },
- {
- title: "准予扣除的捐赠额",
- dataIndex: "deductionAllowedDonation",
- key: "deductionAllowedDonation"
- }
-];
-export const situationModalColumns = [
- {
- title: "姓名",
- dataIndex: "username",
- key: "username"
- },
- {
- title: "个税扣缴义务人",
- dataIndex: "taxAgentName",
- key: "taxAgentName"
- },
- {
- title: "部门",
- dataIndex: "departmentName",
- key: "departmentName"
- },
- {
- title: "手机号",
- dataIndex: "mobile",
- key: "mobile"
- },
- {
- title: "工号",
- dataIndex: "jobNum",
- key: "jobNum"
- },
- {
- title: "证件号码",
- dataIndex: "idNo",
- key: "idNo"
- },
- {
- title: "入职日期",
- dataIndex: "hiredate",
- key: "hiredate"
- },
- {
- title: "累计收入额",
- dataIndex: "addUpIncome",
- key: "addUpIncome"
- },
- {
- title: "累计减除费用",
- dataIndex: "addUpSubtraction",
- key: "addUpSubtraction"
- },
- {
- title: "累计社保个人合计",
- dataIndex: "addUpSocialSecurityTotal",
- key: "addUpSocialSecurityTotal"
- },
- {
- title: "累计公积金个人合计",
- dataIndex: "addUpAccumulationFundTotal",
- key: "addUpAccumulationFundTotal"
- },
- {
- title: "累计子女教育",
- dataIndex: "addUpChildEducation",
- key: "addUpChildEducation"
- },
- {
- title: "累计继续教育",
- dataIndex: "addUpContinuingEducation",
- key: "addUpContinuingEducation"
- },
- {
- title: "累计住房贷款利息",
- dataIndex: "addUpHousingLoanInterest",
- key: "addUpHousingLoanInterest"
- },
- {
- title: "累计住房租金",
- dataIndex: "addUpHousingRent",
- key: "addUpHousingRent"
- },
- {
- title: "累计赡养老人",
- dataIndex: "addUpSupportElderly",
- key: "addUpSupportElderly"
- },
- {
- title: "累计企业（职业）年金及其他福利",
- dataIndex: "addUpEnterpriseAndOther",
- key: "addUpEnterpriseAndOther"
- },
- {
- title: "累计其他免税扣除",
- dataIndex: "addUpOtherDeduction",
- key: "addUpOtherDeduction"
- },
- {
- title: "累计免税收入",
- dataIndex: "addUpTaxExemptIncome",
- key: "addUpTaxExemptIncome"
- },
- {
- title: "累计准予扣除的捐赠额",
- dataIndex: "addUpAllowedDonation",
- key: "addUpAllowedDonation"
- },
- {
- title: "累计减免税额",
- dataIndex: "addUpTaxSavings",
- key: "addUpTaxSavings"
- },
- {
- title: "累计已预扣预缴税额",
- dataIndex: "addUpAdvanceTax",
- key: "addUpAdvanceTax"
- },
- {
- title: "累计婴幼儿照护",
- dataIndex: "addUpInfantCare",
- key: "addUpInfantCare"
- },
- {
- title: "累计大病医疗",
- dataIndex: "addUpIllnessMedical",
- key: "addUpIllnessMedical"
- }
-
-];
-
-
-export const dataSource = [];
-
export const dataCollectCondition = [
{
items: [
@@ -404,7 +7,7 @@ export const dataCollectCondition = [
fieldcol: 12,
label: "税款所属期",
lanId: 542240,
- labelcol: 4,
+ labelcol: 8,
value: "",
rules: "required|string",
viewAttr: 3
@@ -414,7 +17,7 @@ export const dataCollectCondition = [
domkey: ["taxAgentId"],
fieldcol: 12,
label: "个税扣缴义务人",
- labelcol: 4,
+ labelcol: 8,
lanId: 537996,
value: "",
options: [],
@@ -448,7 +51,7 @@ export const dataCollectCondition = [
isQuickSearch: false,
label: "人员",
lanId: 30042,
- labelcol: 4,
+ labelcol: 8,
rules: "required",
viewAttr: 3
}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
index 9f1e481f..867c8423 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
@@ -28,6 +28,7 @@ import TableRecord from "../components/tableRecord";
import { dataCollectCondition } from "./columns";
import { removePropertyCondition } from "../../../util/response";
import { convertToUrlString } from "../../../util/url";
+import { getDomkes } from "../../../util";
import Layout from "../layout";
import moment from "moment";
@@ -239,6 +240,7 @@ class Index extends Component {
addForm.validateForm().then(f => {
if (f.isValid) {
const payload = {
+ ..._.reduce(getDomkes(dataCollectCondition), (pre, cur) => ({ ...pre, [cur]: "" }), {}),
...addForm.getFormParams(),
taxAgentName: _.find(taxAgentOption, it => it.key === addForm.getFormParams().taxAgentId).showname
};
@@ -332,7 +334,7 @@ class Index extends Component {
...slidePayload,
visible: false,
title: "",
- chidren: null,
+ children: null,
data: {}
}
});
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
index 197463bb..4fb2d80f 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/columns.js
@@ -1,70 +1,3 @@
-export const columns = [
- {
- title: "姓名",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "个税扣缴义务人",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "部门",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "手机号",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "工号",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "证件号码",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "入职日期",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "累计子女教育",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "累计继续教育",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "累计住房贷款利息",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "累计住房租金",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "累计赡养老人",
- dataIndex: "title",
- key: "title"
- },
- {
- title: "操作",
- dataIndex: "title",
- key: "title"
- }
-];
export const dataCollectCondition = [
{
items: [
@@ -74,7 +7,7 @@ export const dataCollectCondition = [
fieldcol: 12,
label: "税款所属期",
lanId: 542240,
- labelcol: 4,
+ labelcol: 8,
value: "",
rules: "required|string",
viewAttr: 3
@@ -84,7 +17,7 @@ export const dataCollectCondition = [
domkey: ["taxAgentId"],
fieldcol: 12,
label: "个税扣缴义务人",
- labelcol: 4,
+ labelcol: 8,
lanId: 537996,
value: "",
options: [],
@@ -133,7 +66,7 @@ export const dataCollectCondition = [
isQuickSearch: false,
label: "人员",
lanId: 30042,
- labelcol: 4,
+ labelcol: 8,
rules: "required",
viewAttr: 3
}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
index dd32ab7c..64cdd59e 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
@@ -27,6 +27,7 @@ import { dataCollectCondition, taxOptions } from "./columns";
import AddItems from "../addItems";
import TableRecord from "../components/tableRecord";
import { convertToUrlString } from "../../../util/url";
+import { getDomkes } from "../../../util";
const getKey = WeaTools.getKey;
const getLabel = WeaLocaleProvider.getLabel;
@@ -379,7 +380,7 @@ class Index extends Component {
...slidePayload,
visible: false,
title: "",
- chidren: null,
+ children: null,
data: {}
}
});
@@ -392,6 +393,7 @@ class Index extends Component {
addForm.validateForm().then(f => {
if (f.isValid) {
const payload = {
+ ..._.reduce(getDomkes(dataCollectCondition), (pre, cur) => ({ ...pre, [cur]: "" }), {}),
...addForm.getFormParams(),
taxAgentName: _.find(taxAgentOption, it => it.key === addForm.getFormParams().taxAgentId).showname
};
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
index e677d531..dc5d395d 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
@@ -5,9 +5,8 @@
* Date: 2023/2/17
*/
import React, { Component } from "react";
-import UnifiedTable from "../../components/UnifiedTable";
import { getTableDate } from "../../apis/cumDeduct";
-import { Menu, Popover } from "antd";
+import { Spin } from "antd";
import { WeaLocaleProvider } from "ecCom";
const getLabel = WeaLocaleProvider.getLabel;
@@ -16,25 +15,53 @@ class DataTables extends Component {
constructor(props) {
super(props);
this.state = {
- loading: {
- query: false
- },
- dataSource: [],
- columns: [],
- selectedRowKeys: [],
- pageInfo: {
- current: 1, pageSize: 10, total: 0
- }
+ loading: { query: false }, dataSource: [], columns: [], selectedRowKeys: [],
+ pageInfo: { current: 1, pageSize: 10, total: 0 }
};
}
componentDidMount() {
- this.getTableDate();
+ window.addEventListener("message", this.handleReceive, false);
}
+ componentWillUnmount() {
+ window.removeEventListener("message", this.handleReceive, false);
+ }
+
+ handleReceive = async ({ data }) => {
+ const { type, payload: { id, params } = {} } = data;
+ if (type === "init") {
+ this.getTableDate();
+ } else if (type === "turn") {
+ switch (id) {
+ case "PAGEINFO":
+ this.setState({ pageInfo: { ...this.state.pageInfo, ...params } }, () => this.getTableDate());
+ break;
+ case "CHECKBOX":
+ const { selectedRowKeys } = params;
+ this.setState({ selectedRowKeys });
+ break;
+ case "DEL":
+ this.props.onTableOperate({ key: "deleteSelectAddUpDeduction" }, params);
+ break;
+ case "EDIT":
+ this.props.onTableOperate({ key: "handleAddData" }, params);
+ break;
+ case "VIEW":
+ this.props.onViewDetails(params);
+ break;
+ case "log":
+ this.props.onTableOperate({ key: "log" }, params);
+ break;
+ default:
+ break;
+ }
+ }
+ };
+
getTableDate = (extraPayload = {}) => {
- const { loading, pageInfo } = this.state;
- const { url, payload } = this.props;
+ const { loading, pageInfo, selectedRowKeys } = this.state;
+ const { url, payload, isSpecial } = this.props;
const module = {
...pageInfo, url, ...payload, ...extraPayload,
departmentIds: extraPayload.departmentIds ? extraPayload.departmentIds.split(",") : []
@@ -45,10 +72,12 @@ class DataTables extends Component {
if (status) {
const { columns, list: dataSource, pageNum: current, pageSize, total } = data;
this.setState({
- pageInfo: { ...pageInfo, current, pageSize, total },
- dataSource,
- columns
- });
+ pageInfo: { ...pageInfo, current, pageSize, total }, dataSource, columns
+ }, () => this.postMessageToChild({
+ dataSource: this.state.dataSource, scrollHeight: 103, selectedRowKeys, isSpecial,
+ pageInfo: this.state.pageInfo, unitTableType: "dataAcquisition",
+ columns: this.state.columns
+ }));
}
}).catch(() => this.setState({ loading: { ...loading, query: false } }));
};
@@ -59,124 +88,34 @@ class DataTables extends Component {
* Date: 2023/2/20
*/
handleClearRows = () => this.setState({ selectedRowKeys: [] });
+ postMessageToChild = (payload = {}) => {
+ const i18n = {
+ "操作": getLabel(30585, "操作"), "编辑": getLabel(111, "编辑"), "共": getLabel(18609, "共"),
+ "条": getLabel(18256, "条"), "删除": getLabel(111, "删除"), "查看明细": getLabel(111, "查看明细"),
+ "操作日志": getLabel(545781, "操作日志")
+ };
+ const childFrameObj = document.getElementById("unitTable");
+ childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
+ };
render() {
- const { columns, dataSource, loading, selectedRowKeys, pageInfo } = this.state;
- const { showOperateBtn, onTableOperate, onViewDetails, isSpecial = false, form } = this.props;
- const rowSelection = {
- selectedRowKeys,
- onChange: (selectedRowKeys) => this.setState({ selectedRowKeys })
- };
- const pagination = {
- ...pageInfo,
- showTotal: (total) => `共 ${total} 条`,
- pageSizeOptions: ["10", "20", "50", "100"],
- showSizeChanger: true,
- showQuickJumper: true,
- onShowSizeChange: (current, pageSize) => {
- this.setState({
- pageInfo: { ...pageInfo, current, pageSize }
- }, () => {
- this.getTableDate({ ...form.getFormParams() });
- });
- },
- onChange: (current) => {
- this.setState({
- pageInfo: { ...pageInfo, current }
- }, () => {
- this.getTableDate({ ...form.getFormParams() });
- });
- }
- };
- const getColumns = _.map(columns, item => {
- const { dataIndex } = item;
- if (dataIndex === "username") {
- return {
- ...item,
- render: (text, record) => {
- return window.pointerXY(e)}
- title={text}
- >
- {text}
- ;
- }
- };
- } else if (dataIndex === "operate") {
- return {
- ...item,
- width: 150,
- render: (text, record) => (
-
+
+
}
-
- {
- !isSpecial &&
-
- onTableOperate({ key: "handleAddData" }, record)}>编辑
- onViewDetails(record)}>查看明细
- {
- showOperateBtn &&
- onTableOperate(e, record)}>
- 删除
- {getLabel(545781, "操作日志")}
- } title="">
-
-
- }
-
- }
- {
- isSpecial &&
-
- {
- showOperateBtn &&
-
- onTableOperate({ key: "handleAddData" }, record)}>编辑
- onTableOperate({ key: "deleteSelectAddUpDeduction" }, record)}>删除
- {
- showOperateBtn &&
- onTableOperate(e, record)}>
- {getLabel(545781, "操作日志")}
- } title="">
-
-
- }
-
- }
-
- }
-
- )
- };
- } else {
- return {
- ...item,
- render: (text) => {
- return {text} ;
- }
- };
- }
- });
- return
+
+
+
+
);
}
}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
index f5272aed..8b4093da 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/index.less
@@ -23,33 +23,17 @@
}
.addItemsWrapper {
+ padding-bottom: 8px;
+
.baseForm {
.wea-form-cell {
padding-right: 20% !important;
}
}
- .wea-search-group {
- .wea-form-cell-wrapper {
- border: 1px solid #e5e5e5;
-
- & > div:last-child {
- border-bottom: none
- }
-
- .wea-form-cell {
- padding: 4px 16px;
- border-bottom: 1px solid #e5e5e5;
-
- .wea-form-item-wrapper {
- line-height: 30px;
- }
-
- .wea-form-item {
- padding: 0;
- }
- }
- }
+ .tipWrapper {
+ background: #FFF;
+ margin: 0 16px;
}
}
@@ -57,6 +41,15 @@
height: 100%;
display: flex;
flex-direction: column;
+ background: #F6F6F6;
+
+ .wea-new-top-wapper, .wea-tab {
+ background: #FFF;
+ }
+
+ .wea-tab {
+ margin: 8px 16px;
+ }
.wea-tab-left {
min-width: 600px !important;
@@ -114,6 +107,68 @@
.dataContent {
flex: 1;
overflow: hidden;
+ padding: 0 16px;
+
+ .wea-new-table {
+ background: #FFF;
+
+ .dataAc-ellipsis {
+ display: inline-block;
+ width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+ }
+
+ .wea-slide-modal .wea-slide-modal-content {
+ background: #f6f6f6;
+ height: 100%;
+ }
+
+ .ant-spin-nested-loading, .ant-spin-container {
+ height: 100% !important;
+ }
+
+ .titleDialog {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 8px 46px 8px 16px;
+ background: #fff;
+
+ .titleCol {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ }
+
+ .titleLeftBox {
+ .titleIcon {
+ color: #fff;
+ margin: 0;
+ width: 40px;
+ height: 40px;
+ line-height: 40px;
+ font-size: 22px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: #F14A2D;
+ border-radius: 50%;
+ }
+
+ .title {
+ font-size: 14px;
+ color: #333;
+ padding-left: 6px;
+ }
+ }
+
+ .titleRightBox {
+ justify-content: flex-end;
+ }
+ }
}
}
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
index 9337f5f9..a36aa418 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
@@ -7,10 +7,10 @@
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { toJS } from "mobx";
-import { WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTab, WeaTop } from "ecCom";
+import { WeaLocaleProvider, WeaSlideModal, WeaTab, WeaTop } from "ecCom";
+import { Button } from "antd";
import ImportModal from "./importDialog";
import LogDialog from "../../components/logViewModal";
-import SlideModalTitle from "../../components/slideModalTitle";
import { getSearchs } from "../../util";
import "./index.less";
@@ -73,15 +73,29 @@ class Layout extends Component {
break;
}
};
+ renderTitle = () => {
+ const { slidePayload, slideLoading, detailOptBtns, onSave } = this.props;
+ const { title } = slidePayload;
+ return
+
;
+ };
render() {
const { showSearchAd, logDialogVisible, filterConditions } = this.state;
const {
title, btns, leftComp, children, taxAgentStore: { showOperateBtn },
- slidePayload, onClose, onSave, slideLoading, form, condition, onImportFile,
- onAdSearch, onCancel, importPayload, detailOptBtns, logFunction, onClearTargrtid
+ slidePayload, onClose, form, condition, onImportFile,
+ onAdSearch, onCancel, importPayload, logFunction, onClearTargrtid
} = this.props;
- const { visible, title: subtitle, children: slideChildren } = slidePayload;
+ const { visible, children: slideChildren } = slidePayload;
const {
visible: importVisiable, importFormComponent, importOpts,
importResult, templateLink, previewUrl
@@ -99,6 +113,7 @@ class Layout extends Component {
]}
/>
+
+
+
{title}
+
+ {(slidePayload.children && slidePayload.children.props.className) ? [...detailOptBtns] :
+ }
+
+
- {children}
+ {children}
{/*导入弹框*/}
this.handleDeleteField([record.id])}
+ onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}/>
+ this.setState({
+ slideparams: {
+ ...slideparams,
+ record: { ...slideparams.record, ...record }
+ }
+ })}
+ onCancel={this.handleResetField}
+ onRefreshList={() => this.setState({ doSearch: !doSearch })}
+ />
+ {/*操作日志*/}
+ this.setState({ logDialogVisible: false })}/>
);
}
diff --git a/pc4mobx/hrmSalary/pages/fieldManagement/index.less b/pc4mobx/hrmSalary/pages/fieldManagement/index.less
index 4053721e..3fefa7cc 100644
--- a/pc4mobx/hrmSalary/pages/fieldManagement/index.less
+++ b/pc4mobx/hrmSalary/pages/fieldManagement/index.less
@@ -1,3 +1,15 @@
+
+.fieldManageWrapper {
+ .wea-new-top-content {
+ background: #F6F6F6;
+ padding: 8px 16px 0 16px;
+ }
+
+ .wea-new-table {
+ background: #FFF;
+ }
+}
+
.slideOuterWrapper {
.wea-form-item-group {
margin: 16px;
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
index c69cd5cc..76985bd3 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less
@@ -254,7 +254,7 @@
padding: 0;
background: transparent;
border: none;
- font-size: 20px;
+ font-size: 20px!important;
line-height: 20px;
}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRule.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRule.js
new file mode 100644
index 00000000..1a19b304
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRule.js
@@ -0,0 +1,162 @@
+/*
+ * Author: 黎永顺
+ * name: 薪资核算规则配置
+ * Description:
+ * Date: 2024/4/24
+ */
+import React, { Component } from "react";
+import { WeaSwitch } from "comsMobx";
+import { inject, observer } from "mobx-react";
+import { WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
+import LedgerAccountSalaryItemsSet from "./ledgerAccountSalaryItemsSet";
+import * as API from "../../../apis/ledger";
+import { acctApprRulesConditions } from "../config";
+
+const getLabel = WeaLocaleProvider.getLabel;
+const getKey = WeaTools.getKey;
+
+@inject("ledgerStore")
+@observer
+class LedgerAccountApprRule extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ conditions: [], approvalId: "", approvalItemGroup: []
+ };
+ }
+
+ componentDidMount() {
+ this.init();
+ }
+
+ init = () => {
+ const { saveSalarySobId, editId } = this.props;
+ API.getSalaryApprovalForm({ salarySobId: editId || saveSalarySobId }).then(({ status, data }) => {
+ if (status) {
+ this.setState({
+ approvalId: data.id,
+ approvalItemGroup: _.map(data.approvalItemGroup, item => ({
+ ...item, id: String(item.sorted),
+ approvalItems: _.map(item.approvalItems, o => ({ ...o, id: `${String(item.sorted)}-${String(o.sorted)}` }))
+ })),
+ conditions: _.map(acctApprRulesConditions, item => ({
+ ...item, items: _.map(item.items, o => ({
+ ...o, value: getKey(o) === "isOpenApproval" ? (data[getKey(o)] ? "1" : "0") : data[getKey(o)],
+ viewAttr: getKey(o) === "approvalWorkflowUrl" ? (data["isOpenApproval"] ? 3 : 2) : o.viewAttr,
+ hide: getKey(o) !== "isOpenApproval" ? !data["isOpenApproval"] : false,
+ label: getLabel(o.lanId, o.label)
+ }))
+ }))
+ }, () => {
+ const { ledgerStore: { AARForm } } = this.props;
+ AARForm.initFormFields(this.state.conditions);
+ });
+ }
+ });
+ };
+
+ componentWillUnmount() {
+ const { ledgerStore: { initAARForm } } = this.props;
+ initAARForm();
+ }
+
+ renderForm = (form, conditions) => {
+ const { saveSalarySobId, editId } = this.props;
+ const { approvalItemGroup } = this.state;
+ const { isFormInit } = form;
+ const formParams = form.getFormParams();
+ let group = [];
+ isFormInit && conditions && conditions.map(c => {
+ let items = [];
+ c.items.map(fields => {
+ if (getKey(fields) !== "approvalItemGroup") {
+ items.push({
+ com: (
+
+
+ ),
+ hide: fields.hide
+ });
+ } else {
+ items.push({
+ com: (
+
+ this.setState({
+ approvalItemGroup: _.map(approvalItemGroup, o => ({
+ ...o,
+ approvalItems: (groupId === o.id && !_.isEmpty(items)) ? [...o.approvalItems, ..._.map(items, (k, ki) => ({
+ salaryItemId: k.id, salaryItemName: k.name,
+ id: `${String(o.sorted)}-${String(o.approvalItems.length + ki)}`
+ }))] : o.approvalItems
+ }))
+ }, () => form.updateFields({ approvalItemGroup: { value: this.state.approvalItemGroup } }))}
+ onEdit={(groupName, groupId) => this.setState({
+ approvalItemGroup: groupId ? _.map(approvalItemGroup, o => ({
+ ...o, groupName: groupId === o.id ? groupName : o.groupName
+ })) : [{
+ approvalItems: [], groupName, id: String(approvalItemGroup.length)
+ }, ...approvalItemGroup]
+ }, () => form.updateFields({ approvalItemGroup: { value: this.state.approvalItemGroup } }))}
+ onDelete={(group, item) => this.setState({
+ approvalItemGroup: _.isEmpty(item) ? _.filter(approvalItemGroup, o => o.id !== group.id) :
+ _.map(approvalItemGroup, o => ({
+ ...o,
+ approvalItems: _.filter(o.approvalItems, oo => oo.id !== item.id)
+ }))
+ }, () => form.updateFields({ approvalItemGroup: { value: this.state.approvalItemGroup } }))}
+ onChange={datas => this.setState({
+ approvalItemGroup: datas
+ }, () => form.updateFields({ approvalItemGroup: { value: datas } }))}/>
+ ),
+ hide: fields.hide
+ });
+ }
+ });
+ group.push();
+ });
+ return group;
+ };
+ convertFormItemViewAttr = (viewAttr) => {
+ const { ledgerStore: { AARForm } } = this.props;
+ const { isOpenApproval } = AARForm.getFormParams();
+ this.setState({
+ conditions: _.map(this.state.conditions, item => ({
+ ...item, items: _.map(item.items, o => {
+ if (getKey(o) === "approvalWorkflowUrl") {
+ return { ...o, viewAttr, hide: isOpenApproval === "0" };
+ } else if (getKey(o) === "approvalItemGroup") {
+ return { ...o, viewAttr, hide: isOpenApproval === "0" };
+ }
+ return { ...o };
+ })
+ }))
+ });
+ };
+ handleFormItemChange = (value) => {
+ const { ledgerStore: { AARForm } } = this.props;
+ const { isOpenApproval } = AARForm.getFormParams();
+ if (_.keys(value)[0] === "isOpenApproval") {
+ this.convertFormItemViewAttr(isOpenApproval === "1" ? 3 : 2);
+ }
+ };
+
+ render() {
+ const { conditions } = this.state;
+ const { ledgerStore: { AARForm } } = this.props;
+ return (
+ {getLabel(537558, "保存")}
+ ]}
+ >
+
+ );
+ }
+}
+
+export default LedgerAccountApprRuleClassifyNameEditDialog;
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountSalaryItemsSet.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountSalaryItemsSet.js
new file mode 100644
index 00000000..1f53c37b
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountSalaryItemsSet.js
@@ -0,0 +1,147 @@
+/*
+ * Author: 黎永顺
+ * name: 薪资核算规则配置-审批薪资项目
+ * Description:
+ * Date: 2024/4/24
+ */
+import React, { Component } from "react";
+import { WeaButtonIcon, WeaLocaleProvider, WeaSortable, WeaTransfer } from "ecCom";
+import LedgerAccountApprRuleClassifyNameEditDialog from "./ledgerAccountApprRuleClassifyNameEditDialog";
+import * as API from "../../../apis/ledger";
+import { Icon, Modal } from "antd";
+import cs from "classnames";
+import SalaryItemModal from "../../payroll/stepForm/salaryItemModal";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class LedgerAccountSalaryItemsSet extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ editDialog: { visible: false, groupName: "", groupId: "", title: "" },
+ salaryItemDialog: { visible: false, title: getLabel(111, "薪资项目项"), options: [], groupId: "" }
+ };
+ }
+
+ handleDeleteClick = (group, item = {}) => {
+ Modal.confirm({
+ title: getLabel(131329, "信息确认"),
+ content: getLabel(543231, "确认删除本条数据吗?"),
+ onOk: () => this.props.onDelete(group, item)
+ });
+ };
+ handleAddSalaryItems = (group) => {
+ const { salaryItemDialog } = this.state;
+ const { salarySobId, datas } = this.props;
+ const payload = {
+ salarySobId, excludeIds: _.reduce(datas, (pre, cur) => {
+ return pre.concat(_.map(cur.approvalItems, o => o.salaryItemId));
+ }, [])
+ };
+ API.getListSalaryItem(payload).then(({ status, data }) => {
+ if (status) this.setState({
+ salaryItemDialog: {
+ ...salaryItemDialog, visible: true, options: data, groupId: group.id
+ }
+ });
+ });
+ };
+ handleConfirm = () => {
+ const { salaryItemDialog } = this.state;
+ this.setState({
+ salaryItemDialog: { ...salaryItemDialog, visible: false }
+ }, () => this.props.onAddItems(salaryItemDialog.groupId, _.filter(this.state.salaryItemDialog.options, g => g.checkedSalaryItem)));
+ };
+
+ render() {
+ const { editDialog, salaryItemDialog } = this.state;
+ const { datas } = this.props;
+ return (
+ ,
+ this.handleAddPersonal()}/>,
this.setState({ rowKeys })}
+ onEditScope={this.handleAddPersonal}
/>
{/*关联人员范围导入*/}
{importParams.visible && (
@@ -336,9 +340,7 @@ class LedgerAssociatedPersonnel extends Component {
onCancel={() =>
this.setState({
personalAddModal: {
- ...personalAddModal,
- visible: false,
- includeType: ""
+ ...personalAddModal, record: {}, includeType: "", visible: false
}
})
}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
index 774269f5..663aff22 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
@@ -114,13 +114,17 @@ export default class LedgerSalaryItemAddModal extends React.Component {
...pageInfo,
showTotal: total => `共 ${total} 条`,
showQuickJumper: true,
+ showSizeChanger: true,
pageSizeOptions: ["10", "20", "50", "100"],
+ onShowSizeChange: (current, pageSize) => {
+ this.setState({
+ pageInfo: { ...pageInfo, current, pageSize }
+ }, () => this.listSalaryItem());
+ },
onChange: current => {
this.setState({
pageInfo: { ...pageInfo, current }
- }, () => {
- this.listSalaryItem();
- });
+ }, () => this.listSalaryItem());
}
};
const rowSelection = {
@@ -133,7 +137,11 @@ export default class LedgerSalaryItemAddModal extends React.Component {
return (
添加]}
>
-
- ),
- colSpan: 2
+ com: (
+ ), colSpan: 2
});
});
- group.push(
- );
+ group.push();
});
return group;
};
@@ -82,12 +75,7 @@ class LedgerSearchComp extends Component {
render() {
const { conditions } = this.state;
const { ledgerStore: { searchForm } } = this.props;
- return (
- this.setState({ doSearch: !doSearch })}/>
];
return (
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/index.less
index 182042bf..6ad92082 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/index.less
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/index.less
@@ -1,5 +1,11 @@
.ledgerWrapper {
height: 100%;
+ padding: 8px 16px 0 16px;
+ background: #F6F6F6;
+
+ .wea-new-table {
+ background: #FFF;
+ }
.tdEllipsis {
display: inline-block;
@@ -12,8 +18,6 @@
.ledgerSearch-Wrapper {
min-width: 350px;
- margin-top: 5px;
- margin-right: 70px;
position: relative;
& > button {
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index 2fa560c3..1b598371 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -73,7 +73,11 @@ export default class MobilePayroll extends React.Component {
});
} else {
const params = this.getUrlkey();
- const { data } = await salaryBillGetToken({ uid: _.pick(params, ["recipient"]).recipient });
+ const { data } = await salaryBillGetToken({
+ id: _.pick(params, ["id"]).id,
+ recipient: _.pick(params, ["recipient"]).recipient,
+ salaryCode: _.pick(params, ["salaryCode"]).salaryCode
+ });
this.setState({ salaryBillToken: data }, () => {
API.isNeedSecondPwdVerify({ mouldCode: "HRM", itemCode: "SALARY" }, this.state.salaryBillToken)
.then(({ status, isNeedSecondAuth }) => {
diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js
index 4e746a70..16f992b3 100644
--- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js
+++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/components/payrollTable/index.js
@@ -46,7 +46,7 @@ class Index extends Component {
if (it.column === "salaryYearMonth" || it.column === "sendTime") {
return {
dataIndex: it.column, title: it.text, width: it.width,
- render: (__, record) => ({moment(record[it["column"]]).format("YYYY-MM")})
+ render: (__, record) => ({record[it["column"]]})
};
}
return {
diff --git a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.less b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.less
index 52e92374..721202f8 100644
--- a/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.less
+++ b/pc4mobx/hrmSalary/pages/mySalaryBenefits/index.less
@@ -1,4 +1,8 @@
.mySalary_wrapper {
+ .wea-new-top-req-content {
+ padding: 8px 16px;
+ }
+
.wea-transfer-list-wrapper {
border: none;
}
diff --git a/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js
index 69bac121..78a2c045 100644
--- a/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js
+++ b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/payrollList/index.js
@@ -28,7 +28,7 @@ class Index extends Component {
{moment(it.sendTime).format("YYYY-MM")}
{`${getLabel(33564, "查看")}>`}
diff --git a/pc4mobx/hrmSalary/pages/payroll/index.less b/pc4mobx/hrmSalary/pages/payroll/index.less
index e0f417dd..f3809e53 100644
--- a/pc4mobx/hrmSalary/pages/payroll/index.less
+++ b/pc4mobx/hrmSalary/pages/payroll/index.less
@@ -26,6 +26,11 @@
padding: 5px 16px;
border-bottom: 1px solid #e5e5e5;
+ .wea-select {
+ width: 120px !important;
+ margin-left: 10px;
+ }
+
.wea-input-number {
width: 80px !important;
margin: 0 10px;
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/advanceInputBtn/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/advanceInputBtn/index.js
new file mode 100644
index 00000000..82c06533
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/advanceInputBtn/index.js
@@ -0,0 +1,27 @@
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { Button } from "antd";
+import { WeaInputSearch, WeaLocaleProvider } from "ecCom";
+import "./index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("payrollStore")
+@observer
+class Index extends Component {
+ render() {
+ const { payrollStore: { detailListConditionForm } } = this.props;
+ return (
+
- this.handleDeleteField([record.id])}
- onFilterLog={(type, targetid) => this.onDropMenuClick(type, targetid)}
- />
- this.setState({
- slideparams: {
- ...slideparams,
- record: { ...slideparams.record, ...record }
- }
- })}
- onCancel={this.handleResetField}
- onRefreshList={() => this.setState({ doSearch: !doSearch })}
- />
- {/*操作日志*/}
- this.setState({ logDialogVisible: false })}/>
-
+
+ {this.renderForm(AARForm, conditions)}
+
+ );
+ }
+}
+
+export default LedgerAccountApprRule;
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRuleClassifyNameEditDialog.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRuleClassifyNameEditDialog.js
new file mode 100644
index 00000000..9958b727
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAccountApprRuleClassifyNameEditDialog.js
@@ -0,0 +1,70 @@
+/*
+ * Author: 黎永顺
+ * name:审批规则分类编辑
+ * Description:
+ * Date: 2024/4/25
+ */
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
+import { Button } from "antd";
+import { getSearchs } from "../../../util";
+import { classifyConditions } from "../config";
+
+const getKey = WeaTools.getKey;
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("ledgerStore")
+@observer
+class LedgerAccountApprRuleClassifyNameEditDialog extends Component {
+ constructor(props) {
+ super(props);
+ this.state = { conditions: [] };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) this.init(nextProps);
+ if (nextProps.visible !== this.props.visible && !nextProps.visible) this.props.ledgerStore.initAARClassifyForm();
+ }
+
+ init = (props) => {
+ const { ledgerStore: { AARClassifyForm }, groupName, groupId } = props;
+ this.setState({
+ conditions: _.map(classifyConditions, item => ({
+ ...item,
+ items: _.map(item.items, o => ({ ...o, label: getLabel(o.lanId, o.label) }))
+ }))
+ }, () => {
+ AARClassifyForm.initFormFields(this.state.conditions);
+ groupId && AARClassifyForm.updateFields({ groupName });
+ });
+ };
+ save = () => {
+ const { ledgerStore: { AARClassifyForm }, groupId } = this.props;
+ AARClassifyForm.validateForm().then(f => {
+ if (f.isValid) {
+ this.props.onCancel();
+ this.props.onEdit(AARClassifyForm.getFormParams().groupName, groupId);
+ } else {
+ f.showErrors();
+ }
+ });
+ };
+
+ render() {
+ const { conditions } = this.state;
+ const { ledgerStore: { AARClassifyForm } } = this.props;
+ return (
+ {getSearchs(AARClassifyForm, conditions, 1, false)}
+
+
+ );
+ }
+}
+
+export default LedgerAccountSalaryItemsSet;
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
index 8b7af5a4..0b71af53 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAssociatedPersonnel.js
@@ -13,6 +13,7 @@ import PersonalScopeModal from "../../../components/PersonalScopeModal";
import {
deleteLedgerPersonExtRange,
deleteLedgerPersonRange,
+ editLedgerPersonRange,
getLedgerPersonRangeExclude,
getLedgerPersonRangeExtList,
getLedgerPersonRangeInclude,
@@ -32,7 +33,8 @@ const APIFox = {
externalList: getLedgerPersonRangeExtList
};
const APISaveFox = {
- save: saveLedgerPersonRange
+ save: saveLedgerPersonRange,
+ edit: editLedgerPersonRange
};
@inject("taxAgentStore")
@@ -55,7 +57,8 @@ class LedgerAssociatedPersonnel extends Component {
personalAddModal: {
visible: false,
title: "关联人员",
- includeType: ""
+ includeType: "",
+ record: {}
},
extEmpsWitch: "1" //非系统人员开关， 1： 开启， 0：关闭
};
@@ -157,7 +160,7 @@ class LedgerAssociatedPersonnel extends Component {
* Params:
* Date: 2022/11/30
*/
- handleAddPersonal = () => {
+ handleAddPersonal = (record = {}) => {
const { personalAddModal, selectedKey } = this.state;
if (selectedKey === "externalList") {
this.setState({ externalPersonModalVisible: true });
@@ -165,7 +168,7 @@ class LedgerAssociatedPersonnel extends Component {
this.setState({
personalAddModal: {
...personalAddModal,
- visible: true,
+ visible: true, record,
includeType: selectedKey === "listInclude" ? 1 : 0
}
});
@@ -256,7 +259,7 @@ class LedgerAssociatedPersonnel extends Component {
disabled={_.isEmpty(rowKeys)}
onClick={this.taxAgentRangeDelete}
/>,
-
+ this.setState({
+ editDialog: { visible: true, title: getLabel(111, "添加分类") }
+ })}/>
+
+
+
+ this.props.onChange(list)}
+ renderNodeItem={(item) => {
+ return this.setState({
+ editDialog: { ...editDialog, visible: false }
+ })}/>
+ this.setState({
+ salaryItemDialog: { ...salaryItemDialog, visible: false }
+ })} onConfirm={this.handleConfirm}>
+
+
+
+
;
+ }}
+ className="wea-sortable-salary-item"
+ />
+
+
+ {item.groupName}
+
+ this.setState({
+ editDialog: {
+ visible: true, groupName: item.groupName, groupId: item.id, title: getLabel(111, "分类名称编辑")
+ }
+ })}/>
+ this.handleDeleteClick(item)}/>
+
+
+ this.handleAddSalaryItems(item)}/>
+
+
+ {
+ !_.isEmpty(item.approvalItems) ?
+ this.props.onChange(
+ _.map(datas, child => {
+ if (child.id === item.id) {
+ return { ...child, approvalItems: items };
+ }
+ return { ...child };
+ })
+ )}
+ renderNodeItem={(filed) => {
+ return
+
+
;
+ }}
+ className="wea-sortable-salary-item"
+ /> :
+
+ this.handleDeleteClick(item, filed)}/>
+
+ {filed.salaryItemName}
+ 暂无数据
+ }
+
+ g.checkedSalaryItem), o => o.id)}
+ onChange={v => {
+ this.setState({
+ salaryItemDialog: {
+ ...salaryItemDialog,
+ options: _.map(salaryItemDialog.options, o => ({ ...o, checkedSalaryItem: _.includes(v, o.id) }))
+ }
+ });
+ }}
+ />
+
+
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
index 2e48ba54..1c176f06 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
@@ -232,11 +232,11 @@ const TitleNormalComp = (props) => {
onDeleteCategory(uuid)}/>
}
{
- sortedIndex !== 0 && showOperateBtn &&
+ name !== getLabel(111, "未分类") && sortedIndex !== 0 && showOperateBtn &&
onUpgo(sortedIndex)}/>
}
{
- sortedIndex !== dataSourceLen - 1 && showOperateBtn &&
+ name !== getLabel(111, "未分类") && sortedIndex !== dataSourceLen - 2 && showOperateBtn &&
onDowngo(sortedIndex)}/>
}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index 31e850c1..ca7772b4 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -178,7 +178,7 @@ class LedgerSalaryItemTable extends Component {
this.setState({
editFormulModal: {
...editFormulModal, visible: true, valueType, dataType, name: salaryItemName,
- formulaId: ((valueType.toString() === "2" && (originFormulaContent || originFormulaContent !== " ")) || valueType.toString() === "3" && (originSqlContent || originSqlContent === " ")) ? formulaId : ""
+ formulaId: ((valueType.toString() === "2" && (originFormulaContent || originFormulaContent !== " ")) || valueType.toString() === "3" && (originSqlContent || originSqlContent !== " ")) ? formulaId : ""
}
});
};
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
index a95d9048..821ba416 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
@@ -15,8 +15,7 @@ import { getTaxAgentSelectList } from "../../../apis/taxAgent";
const getKey = WeaTools.getKey;
const getLabel = WeaLocaleProvider.getLabel;
-@inject("ledgerStore")
-@observer
+@inject("ledgerStore") @observer
class LedgerSearchComp extends Component {
constructor(props) {
super(props);
@@ -36,14 +35,11 @@ class LedgerSearchComp extends Component {
this.setState({
conditions: _.map(searchConditions, o => {
return {
- ...o,
- items: _.map(o.items, j => {
+ ...o, items: _.map(o.items, j => {
if (getKey(j) === "taxAgentId") {
return {
- ...j,
- options: [{ key: "", showname: getLabel(332, "全部") }, ..._.map(data, g => ({
- key: g.id,
- showname: g.content
+ ...j, options: [{ key: "", showname: getLabel(332, "全部") }, ..._.map(data, g => ({
+ key: g.id, showname: g.content
}))]
};
}
@@ -62,19 +58,16 @@ class LedgerSearchComp extends Component {
let items = [];
c.items.map(fields => {
items.push({
- com: (
-
- {this.formRender(searchForm, conditions)}
-
-
- );
+ return ({this.formRender(searchForm, conditions)}
);
}
}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
index d7229b5d..2529bce9 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
@@ -13,9 +13,11 @@ import LedgerAssociatedPersonnel from "./ledgerAssociatedPersonnel";
import LedgerSalaryAdjustmentRules from "./ledgerSalaryAdjustmentRules";
import LedgerBackCalculatedSalaryItem from "./ledgerBackCalculatedSalaryItem";
import LedgerSalaryItem from "./ledgerSalaryItem";
+import LedgerAccountApprRule from "./ledgerAccountApprRule";
import WeaTopTitle from "../../../components/custom-title/weaTopTitle";
import WeaReqTitle from "../../../components/custom-title/weaReqTitle";
-import { saveAdjustmentRule, saveLedgerBasic, saveLedgerItem } from "../../../apis/ledger";
+import { salaryApprovalSaveForm, saveAdjustmentRule, saveLedgerBasic, saveLedgerItem } from "../../../apis/ledger";
+import { sysConfCodeRule } from "../../../apis/ruleconfig";
import "./index.less";
const { getLabel } = WeaLocaleProvider;
@@ -28,10 +30,18 @@ class LedgerSlide extends Component {
super(props);
this.state = {
current: 0, loading: false, baseSettingInfo: {}, adjustRules: [],
- empFields: [], itemGroups: [], saveSalarySobId: ""
+ empFields: [], itemGroups: [], saveSalarySobId: "",
+ salaryApprovalStatus: false
};
}
+ async componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) {
+ const { data } = await sysConfCodeRule({ code: "SALARY_APPROVAL_STATUS" });
+ this.setState({ salaryApprovalStatus: data === "1" });
+ }
+ }
+
componentWillUnmount() {
this.setState({
saveSalarySobId: ""
@@ -86,7 +96,6 @@ class LedgerSlide extends Component {
this.setState({ loading: false });
if (status) {
message.success("保存成功");
- this.handleClose();
} else {
message.success(errormsg || "保存失败");
}
@@ -106,11 +115,12 @@ class LedgerSlide extends Component {
if (!it.salarySobId) delete it.id;
return { ...it };
}),
- itemGroups: _.map(_.filter(itemGroups, it => it.name !== "未分类"), item => {
+ itemGroups: _.map(_.filter(itemGroups, it => it.name !== "未分类"), (item, index) => {
return {
- ...item,
+ ...item, sortedIndex: index,
items: _.map(item.items, it => {
- // delete it.formulaContent;
+ delete it.originFormulaContent;
+ delete it.originSqlContent;
// if (it.id && it.id.length > 4) delete it.id;
return { ...it };
})
@@ -118,7 +128,8 @@ class LedgerSlide extends Component {
}),
items: _.map(_.find(itemGroups, it => it.name === "未分类").items, child => {
// if (child.id && child.id.length > 4) delete child.id;
- // delete child.formulaContent;
+ delete child.originFormulaContent;
+ delete child.originSqlContent;
return { ...child };
}) || [],
salarySobId: salarySobId || saveSalarySobId
@@ -149,9 +160,45 @@ class LedgerSlide extends Component {
*/
handleSaveSalaryItemParams = (empFields, itemGroups) => this.setState({ empFields, itemGroups });
+ handleDefaultSave = () => {
+ const { saveSalarySobId } = this.state;
+ const { state: { approvalId } } = this.approRef.wrappedInstance;
+ const { ledgerStore: { AARForm } } = this.props;
+ const { approvalItemGroup, isOpenApproval, ...extra } = AARForm.getFormParams();
+ const group = _.map(approvalItemGroup, (item, index) => ({
+ groupName: item.groupName, sorted: index,
+ approvalItems: _.map(item.approvalItems, (o, oi) => ({
+ salaryItemId: o.salaryItemId, sorted: oi,
+ salaryItemName: o.salaryItemName
+ }))
+ }));
+ if (isOpenApproval === "1" && _.isEmpty(extra.approvalWorkflowUrl)) {
+ AARForm.showError("approvalWorkflowUrl", getLabel(111, "\"审批流程地址\"未填写"));
+ return;
+ } else if (isOpenApproval === "1" && _.isEmpty(group)) {
+ AARForm.showError("approvalItemGroup", getLabel(111, "\"审批薪资项目\"未填写"));
+ return;
+ }
+ const payload = {
+ ...extra, isOpenApproval: isOpenApproval === "1", id: approvalId,
+ salarySobId: this.props.editId || saveSalarySobId,
+ approvalItemGroup: group
+ };
+ this.setState({ loading: true });
+ salaryApprovalSaveForm(payload).then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success(getLabel(111, "保存成功！"));
+ saveSalarySobId && this.handleClose();
+ } else {
+ message.error(errormsg);
+ }
+ });
+ };
+
render() {
const { visible, editId, taxAgentStore: { showOperateBtn } } = this.props;
- const { current, saveSalarySobId, loading } = this.state;
+ const { current, saveSalarySobId, loading, salaryApprovalStatus } = this.state;
let tabs = [
{
key: 0, title: getLabel(82751, "基础设置"),
@@ -208,9 +255,11 @@ class LedgerSlide extends Component {
{
key: 4, title: getLabel(543469, "调薪计薪规则"),
createBtns: [
+ ,
,
-
+
],
editBtns: [
,
+ ,
+ detailListConditionForm.updateFields({ username: v })}
+ onSearch={this.props.onAdvanceSearch}
+ />
+
+
+ );
+ }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/advanceInputBtn/index.less b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/advanceInputBtn/index.less
new file mode 100644
index 00000000..1a3d7283
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/advanceInputBtn/index.less
@@ -0,0 +1,28 @@
+.advance-search {
+ display: flex;
+ align-items: center;
+ position: relative;
+ top: -2.5px;
+
+ .wea-advanced-search {
+ top: 2px;
+ left: -1px;
+ height: 28px;
+ line-height: 1;
+ border-radius: 0;
+ position: relative;
+ color: #474747;
+ padding: 4px 15px;
+ }
+
+ .wea-advanced-search:hover {
+ border: 1px solid #dadada;
+ color: #474747;
+ }
+
+ .text-elli {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailList/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailList/index.js
new file mode 100644
index 00000000..3c5e23b5
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailList/index.js
@@ -0,0 +1,145 @@
+/*
+ *
+ * 查看工资单详情-列表
+ * @Author: 黎永顺
+ * @Date: 2024/7/15
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { toJS } from "mobx";
+import { WeaLocaleProvider } from "ecCom";
+import { Spin } from "antd";
+import { WeaTableNew } from "comsMobx";
+import * as API from "../../../../../apis/payroll";
+import { getQueryString } from "../../../../../util/url";
+
+const getLabel = WeaLocaleProvider.getLabel;
+const WeaTableComx = WeaTableNew.WeaTable;
+
+@inject("payrollStore")
+@observer
+class Index extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ loading: false, dataSource: [], visible: false, updateSum: true, payload: {},
+ pageInfo: { current: 1, pageSize: 10, total: 0 }
+ };
+ }
+
+ componentDidMount() {
+ window.addEventListener("message", this.handleReceive, false);
+ }
+
+ componentWillUnmount() {
+ window.removeEventListener("message", this.handleReceive, false);
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.isQuery !== this.props.isQuery) this.setState({ updateSum: true }, () => this.getPayrollDetailList());
+ }
+
+ handleReceive = async ({ data }) => {
+ const { type, payload: { id, params } = {} } = data;
+ if (type === "init") {
+ this.getPayrollDetailList();
+ } else if (type === "turn") {
+ switch (id) {
+ case "PAGEINFO":
+ const { pageNum: current, size: pageSize } = params;
+ this.setState({
+ pageInfo: { ...this.state.pageInfo, current, pageSize },
+ updateSum: false
+ }, () => this.getPayrollDetailList());
+ break;
+ default:
+ break;
+ }
+ }
+ };
+ getPayrollDetailList = () => {
+ const { pageInfo } = this.state;
+ const salarySendId = getQueryString("id");
+ const { payrollStore: { detailListConditionForm: form, salaryTableStore } } = this.props;
+ const payload = {
+ salarySendId, ...pageInfo, ...form.getFormParams(),
+ departmentIds: form.getFormParams().departmentIds ? form.getFormParams().departmentIds.split(",") : [],
+ subCompanyIds: form.getFormParams().subCompanyIds ? form.getFormParams().subCompanyIds.split(",") : []
+ };
+ this.setState({ loading: true });
+ API.getPayrollDetailList(payload).then(({ status, data }) => {
+ this.setState({ loading: false });
+ if (status) {
+ const { dataKey, pageInfo: pageResult, datas: dataSource } = data;
+ const { datas } = dataKey;
+ const { pageNum: current, pageSize, total } = pageResult;
+ salaryTableStore.getDatas(datas);
+ this.setState({ payload, dataSource, pageInfo: { ...pageInfo, current, pageSize, total } });
+ }
+ });
+ };
+ getColumns = () => {
+ const { payrollStore: { salaryTableStore }, showTotalCell } = this.props;
+ const { dataSource, pageInfo, selectedRowKeys, payload, updateSum } = this.state;
+ const columns = _.filter(toJS(salaryTableStore.columns), (item) => item.display === "true");
+ const sumRowlistUrl = showTotalCell ? "/api/bs/hrmsalary/salaryBill/send/sum" : "";
+ if (!_.isEmpty(columns)) {
+ this.postMessageToChild({
+ dataSource, pageInfo, selectedRowKeys, showTotalCell, calcDetail: true,
+ tableScrollHeight: pageInfo.total === 0 ? 90 : 156,
+ sumRowlistUrl, payload: { ...payload, updateSum },
+ columns: _.map(columns, (it, idx) => ({
+ ...it, width: it.oldWidth, fixed: (idx === 1 || idx === 0 || idx === 2) ? "left" : "",
+ ellipsis: true
+ }))
+ });
+ }
+ return [];
+ };
+ postMessageToChild = (payload) => {
+ const i18n = {
+ "共": getLabel(18609, "共"), "条": getLabel(18256, "条"),
+ "总计": getLabel(523, "总计")
+ };
+ const childFrameObj = document.getElementById("atdTable");
+ childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
+ };
+ handleSetCustomCols = () => {
+ const { payrollStore: { salaryTableStore } } = this.props;
+ this.setState({ updateSum: true }, () => {
+ salaryTableStore.setColSetVisible(true);
+ salaryTableStore.tableColSet(true);
+ });
+ };
+
+
+ render() {
+ const { payrollStore: { salaryTableStore } } = this.props;
+ const { loading, pageInfo } = this.state;
+ const { pageSize, total } = pageInfo;
+ const columnNum = total > 10 ? pageSize + 1 : total + 1;
+ return (
+
+
+
+
+
+
+ );
+ }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailSearchPannel/index.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailSearchPannel/index.js
new file mode 100644
index 00000000..8d1243f7
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/components/salaryDetailSearchPannel/index.js
@@ -0,0 +1,37 @@
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaLocaleProvider } from "ecCom";
+import { getSearchs } from "../../../../../util";
+import { Button } from "antd";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("payrollStore")
+@observer
+class Index extends Component {
+ render() {
+ const { payrollStore: { detailListConditionForm }, conditions } = this.props;
+ return (
+
+ {getSearchs(detailListConditionForm, conditions, 2, false)}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {getLabel(111, "薪资周期")}
+ {fromDate}{getLabel(111, "至")}{endDate}
+ {getLabel(111, "税款所属期")}
+ {taxCycle}
+ {getLabel(111, "考勤取值周期")}
+ {aFromDate}{getLabel(111, "至")}{aEndDate}
+ {getLabel(111, "福利台账月份")}
+ {`${getLabel(111, "引用")}${socialSecurityCycle}${getLabel(111, "的福利台账数据")}`}
+
+ this.listRef = dom}/>
+
+
+ );
+ }
+}
+
+export default PayrollDetail;
diff --git a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollGrantDetail.js b/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollGrantDetail.js
deleted file mode 100644
index abe3003f..00000000
--- a/pc4mobx/hrmSalary/pages/payroll/payrollDetail/payrollGrantDetail.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import React from 'react'
-import { payrollGrantDetailColumns, dataSource} from '../columns'
-
-export default class PayrollGrantDeatail extends React.Component {
-
-
- render() {
- const handleMenuClick = () => {
-
- }
- const menu = (
-
- );
- const renderRightOperation = () => {
- return (
-
+
+
+ {getLabel(111, "薪资所属月")}：{salaryMonth}
+ {
+ !_.isEmpty(salarySendDetailBaseInfo) &&
+
+ }
+ {getLabel(111, "工资单模板")}：{template}
+
+
+ this.setState({ showSearchAd: false })}
+ onAdSearch={() => this.setState({ isQuery: !isQuery })}
+ conditions={conditions}/>
+
+ {/*列表*/}
+
- 导出全部
-
- )
- }
- return (
-
-
- )
- }
-}
\ No newline at end of file
diff --git a/pc4mobx/hrmSalary/pages/payroll/stepForm/index.less b/pc4mobx/hrmSalary/pages/payroll/stepForm/index.less
index ebcbbe4c..ad636d55 100644
--- a/pc4mobx/hrmSalary/pages/payroll/stepForm/index.less
+++ b/pc4mobx/hrmSalary/pages/payroll/stepForm/index.less
@@ -96,6 +96,10 @@
& > ul {
border: 1px solid #e5e5e5;
+ .sortable-handle {
+ display: none;
+ }
+
.wea-sortable-salary-item {
padding: 0;
margin: 0;
diff --git a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
index 9eaa2ece..7d2edc9c 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templateBaseSettings.js
@@ -106,7 +106,7 @@ class TemplateBaseSettings extends Component {
render() {
const { watermarkStatus, watermark, watermarkSet, ackFeedbackSetting, salaryBillViewingLimitSetting } = this.state;
const { ackStatus, feedbackStatus, autoAckDays, feedBackUrl, mobileFeedbackUrl } = ackFeedbackSetting;
- const { limitMonth, burningAfterReadingMin } = salaryBillViewingLimitSetting;
+ const { monthType = "SALARY_DATE", limitMonth, burningAfterReadingMin } = salaryBillViewingLimitSetting;
return (
-
-
-
- 薪资所属月：2021-11
-
-
-
- 已发放：111/1111
- 未确认：111
-
-
-
-
-
{getLabel(111, "仅可查看")}
+ this.setState({
+ salaryBillViewingLimitSetting: { ...salaryBillViewingLimitSetting, monthType }
+ })}
+ options={[
+ { key: "SALARY_DATE", showname: getLabel(111, "薪资所属月"), selected: true },
+ { key: "SEND_DATE", showname: getLabel(111, "发放日期") }
+ ]}/>
this.setState({
salaryBillViewingLimitSetting: {
diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js b/pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js
index d6d410d1..90db1ebb 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/tmpPreview.js
@@ -37,7 +37,8 @@ class TmpPreview extends Component {
}
const data = JSON.parse(dataStr);
let theme = data.theme || "";
- theme = theme.replaceAll("${salaryMonth}", moment().format("YYYY-MM"));
+ theme = theme.replaceAll("${salaryMonth}", moment().format("YYYY年MM月"));
+ theme = theme.replaceAll("${salaryYear}", moment().format("YYYY年"));
this.setState({
theme, tip: data.textContent || "",
background: data.background || "",
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js
index efe2605b..24f3cd63 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js
@@ -150,7 +150,7 @@ class Index extends Component {
"操作日志": getLabel(545781, "操作日志")
};
const childFrameObj = document.getElementById("atdTable");
- childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
+ childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({ ...payload, i18n }), "*");
};
getSalaryFileList = (props, init = false) => {
const { pageInfo } = this.state;
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
index e1ee1288..ce378ee6 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
@@ -358,6 +358,15 @@ export const salaryFileSearchConditions = [
labelcol: 8,
value: "",
viewAttr: 2
+ },
+ {
+ conditionType: "RANGEPICKER",
+ domkey: ["adjustSalaryStartDate", "adjustSalaryEndDate"],
+ fieldcol: 16,
+ label: getLabel(111, "调薪日期"),
+ labelcol: 8,
+ value: "",
+ viewAttr: 2
}
],
defaultshow: true,
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
index 1bbae152..30c63a43 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
@@ -253,7 +253,7 @@ export const tempNormalSetConditions = [
colSpan: 1,
conditionType: "INPUT",
domkey: ["theme"],
- fieldcol: 10,
+ fieldcol: 8,
label: "工资单标题",
lanId: 543588,
labelcol: 6,
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js
index 7774309e..339429a8 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempBaseSet/index.js
@@ -56,7 +56,7 @@ class Index extends Component {
});
};
getPayrollBaseForm = (props) => {
- const { tmplId: id, payrollStore: { payrollTempForm, payrollTempFeedbackForm, tmplDataSource } } = props;
+ const { detail, tmplId: id, payrollStore: { payrollTempForm, payrollTempFeedbackForm, tmplDataSource } } = props;
getPayrollBaseForm({ id }).then(async ({ status, data }) => {
if (status) {
const { salaryTemplateBaseSet: { salarySobOptions, data: result } } = data;
@@ -84,7 +84,7 @@ class Index extends Component {
};
} else if (getKey(o) === "reissueRule") {
return {
- ...o, options: [
+ ...o, viewAttr: !detail ? o.viewAttr : 1, options: [
{ key: "0", showname: getLabel(332, "全部") },
{ key: "1", showname: getLabel(542696, "按规则") }
]
@@ -92,10 +92,11 @@ class Index extends Component {
} else if (getKey(o) === "replenishRule") {
return {
...o, hide: (_.isNil(fieldsEchoData["reissueRule"]) || fieldsEchoData["reissueRule"] === "0"),
- options: _.map(replenishRuleOptions, t => ({ key: t.id, showname: t.content }))
+ options: _.map(replenishRuleOptions, t => ({ key: t.id, showname: t.content })),
+ viewAttr: !detail ? o.viewAttr : 1
};
}
- return { ...o };
+ return { ...o, viewAttr: !detail ? o.viewAttr : 1 };
})
};
} else if (it.title === "sendSet") {
@@ -104,16 +105,16 @@ class Index extends Component {
items: _.map(it.items, o => {
if (getKey(o) === "autoSendStatus") {
return {
- ...o,
+ ...o, viewAttr: !detail ? o.viewAttr : 1,
helpfulTitle: getLabel(544272, "开启后，还需在计划任务中配置定时任务，执行工资单定时发送任务；")
};
} else if (getKey(o) === "smsSetting") {
return {
- ...o,
+ ...o, viewAttr: !detail ? o.viewAttr : 1,
hide: _.isNil(fieldsEchoData["smsStatus"]) || !fieldsEchoData["smsStatus"] || (!_.isNil(fieldsEchoData["smsStatus"]) && (fieldsEchoData["smsStatus"].toString() === "0"))
};
}
- return { ...o };
+ return { ...o, viewAttr: !detail ? o.viewAttr : 1 };
})
};
}
@@ -125,17 +126,17 @@ class Index extends Component {
items: _.map(it.items, o => {
if (getKey(o) === "autoAckDays") {
return {
- ...o,
+ ...o, viewAttr: !detail ? o.viewAttr : 1,
hide: _.isNil(fieldsEchoData["ackFeedbackStatus"]) ? o.hide : !fieldsEchoData["ackFeedbackStatus"],
helpfulTitle: getLabel(544273, "开启后，还需在计划任务中配置定时任务，执行自动确认任务；邮箱端查看工资单暂不支持确认及反馈；")
};
} else if (getKey(o) === "feedbackUrl" || getKey(o) === "mobileFeedbackUrl") {
return {
- ...o,
+ ...o, viewAttr: !detail ? o.viewAttr : 1,
hide: _.isNil(fieldsEchoData["feedbackStatus"]) ? o.hide : !fieldsEchoData["feedbackStatus"]
};
}
- return { ...o };
+ return { ...o, viewAttr: !detail ? o.viewAttr : 1 };
})
};
}
@@ -174,7 +175,7 @@ class Index extends Component {
if (it === "ackFeedbackStatus" || it === "feedbackStatus") {
payrollTempFeedbackForm.updateFields({ [it]: fieldsEchoData[it] ? "1" : "0" });
} else {
- payrollTempFeedbackForm.updateFields({ [it]: !_.isEmpty(fieldsEchoData[it]) ? fieldsEchoData[it].toString() : "/" });
+ payrollTempFeedbackForm.updateFields({ [it]: (!_.isNil(fieldsEchoData[it]) && fieldsEchoData[it]) ? fieldsEchoData[it].toString() : "/" });
}
});
this.setState({
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
index f3734cbc..b004e177 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/formRender.js
@@ -1,3 +1,4 @@
+import React from "react";
import { WeaSwitch } from "comsMobx";
import { WeaButtonIcon, WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
@@ -40,11 +41,13 @@ export const payrollTempNormalSetForm = (form, condition, background, onChange =
/>
}
{
- getKey(fields) === "theme" &&
+ getKey(fields) === "theme" && c.viewAttr === 3 &&
{!_.isEmpty(conditions) && payrollTempNormalSetForm(payrollTempNormalForm, conditions, toJS(tmplDataSource).background, this.handleChange, this.handleInsertVar)}
@@ -158,20 +161,22 @@ class Index extends Component {
title={
this.salaryItemSettingsRef = dom}
- dataSource={salaryItemSet} salaryTemplateId={this.props.tmplId || ""}
- onChangeSalaryItem={this.handleChangeSalaryItem}
- onChangeSalaryItemShowNamesetting={this.handleChangeSalaryItemShowNamesetting}
- salarySobId={toJS(tmplDataSource).salarySob}
- isReplenish={false} salaryBillItemNameSet={salaryBillItemNameSet}
- />
+ {
+ detail ? : this.salaryItemSettingsRef = dom}
+ dataSource={salaryItemSet} salaryTemplateId={this.props.tmplId || ""}
+ onChangeSalaryItem={this.handleChangeSalaryItem}
+ onChangeSalaryItemShowNamesetting={this.handleChangeSalaryItemShowNamesetting}
+ salarySobId={toJS(tmplDataSource).salarySob}
+ isReplenish={false} salaryBillItemNameSet={salaryBillItemNameSet}
+ />
+ }
);
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/salaryItems.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/salaryItems.js
new file mode 100644
index 00000000..90698f4f
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/salaryItems.js
@@ -0,0 +1,57 @@
+/*
+ * 工资单模板设置
+ * 薪资项目查看
+ * @Author: 黎永顺
+ * @Date: 2024/11/12
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { toJS } from "mobx";
+import { WeaLocaleProvider, WeaSortable } from "ecCom";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class SalaryItems extends Component {
+ render() {
+ const { dataSource } = this.props;
+ const dataList = _.map(toJS(dataSource), item => ({ ...item, id: item.groupId }));
+ return (
+
{getLabel(543593, "薪资项目设置")}
- this.salaryItemSettingsRef.handleOpenModal(toJS(tmplDataSource).salarySob, getLabel(543594, "添加分类"))}/>
}
items={[]} needTigger showGroup>
-
{getLabel(500143, "插入变量")}：
insertVar("theme", "${companyName}")}>{getLabel(1976, "公司名称")}
+ insertVar("theme", "${salaryYear}")}>{getLabel(111, "薪资所属年")}
insertVar("theme", "${salaryMonth}")}>{getLabel(542604, "薪资所属月")}
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/index.js
index 6de4485a..19a55b79 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempNormalSet/index.js
@@ -12,6 +12,7 @@ import { getPayrollItemList, getPayrollShowForm } from "../../../../apis/payroll
import { tempNormalSetConditions } from "../conditions";
import { payrollTempNormalSetForm } from "./formRender";
import SalaryItemSettings from "../../../payroll/stepForm/salaryItemSettings";
+import SalaryItems from "./salaryItems";
const getKey = WeaTools.getKey;
const getLabel = WeaLocaleProvider.getLabel;
@@ -36,7 +37,9 @@ class Index extends Component {
}
getPayrollShowForm = () => {
- const { tmplId: id, payrollStore: { payrollTempNormalForm, tmplDataSource, setTmplDataSource } } = this.props;
+ const {
+ detail, tmplId: id, payrollStore: { payrollTempNormalForm, tmplDataSource, setTmplDataSource }
+ } = this.props;
getPayrollShowForm({ id }).then(async ({ status, data }) => {
if (status) {
const { salaryTemplateShowSet, salaryTemplateSalaryItemSet: salaryItemSet, salaryBillItemNameSet } = data;
@@ -69,7 +72,7 @@ class Index extends Component {
items: _.map(it.items, o => {
if (getKey(o) === "textContentPosition") {
return {
- ...o, label: getLabel(o.lanId, o.label),
+ ...o, label: getLabel(o.lanId, o.label), viewAttr: !detail ? o.viewAttr : 1,
options: [
{ key: "1", showname: getLabel(542697, "薪资项目前") },
{ key: "2", showname: getLabel(542698, "薪资项目后") }
@@ -77,10 +80,10 @@ class Index extends Component {
};
} else if (getKey(o) === "background") {
return {
- ...o, title: getLabel(20001, "上传图片")
+ ...o, viewAttr: !detail ? o.viewAttr : 1, title: getLabel(20001, "上传图片")
};
}
- return { ...o, label: getLabel(o.lanId, o.label) };
+ return { ...o, viewAttr: !detail ? o.viewAttr : 1, label: getLabel(o.lanId, o.label) };
})
};
}
@@ -150,7 +153,7 @@ class Index extends Component {
render() {
const { conditions, salaryBillItemNameSet, salaryItemSet } = this.state;
- const { payrollStore: { payrollTempNormalForm, tmplDataSource } } = this.props;
+ const { detail, payrollStore: { payrollTempNormalForm, tmplDataSource } } = this.props;
return (
{getLabel(543593, "薪资项目设置")}
- this.salaryItemSettingsRef.handleOpenModal(toJS(tmplDataSource).salarySob, getLabel(543594, "添加分类"))}/>
}
items={[]} needTigger showGroup
>
-
+ {
+ return
+ );
+ }
+}
+
+export default SalaryItems;
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempReissueSet/index.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempReissueSet/index.js
index fd443897..5a22198d 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempReissueSet/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTempReissueSet/index.js
@@ -8,6 +8,7 @@ import React, { Component } from "react";
import { toJS } from "mobx";
import { WeaButtonIcon, WeaLocaleProvider, WeaSearchGroup } from "ecCom";
import SalaryItemSettings from "../../../payroll/stepForm/salaryItemSettings";
+import SalaryItems from "../payrollTempNormalSet/salaryItems";
import { getReplenishForm } from "../../../../apis/payroll";
const getLabel = WeaLocaleProvider.getLabel;
@@ -68,27 +69,30 @@ class Index extends Component {
};
render() {
- const { payrollStore: { tmplDataSource } } = this.props;
+ const { payrollStore: { tmplDataSource }, detail } = this.props;
const { replenishSalaryTemplateSalaryItemSet, salaryBillItemNameSet } = this.state;
return (
+
;
+ }}
+ className="wea-sortable-salary-item"
+ />
+
+
+ {item.groupName}
+
+
+
+
+ {
+ !_.isEmpty(item.items) ?
+ {
+ return
+
+
;
+ }}
+ className="wea-sortable-salary-item"
+ /> :
+
+
+ {filed.name}
+ 暂无数据
+ }
+
@@ -156,7 +156,11 @@ class Index extends Component {
-
+ {
+ !detail &&
+
+ }
}
@@ -185,8 +189,29 @@ class Index extends Component {
payrollStore: {
initPayrollTempForm, initPayrollTempFeedbackForm, setSalaryBillItemNameSetting,
initPayrollTempNormalForm, setTmplDataSource, hasBeenModify
- }, onClose
+ }, onClose, detail
} = this.props;
+ if (detail) {
+ initPayrollTempForm();
+ initPayrollTempFeedbackForm();
+ initPayrollTempNormalForm();
+ setTmplDataSource({});
+ setSalaryBillItemNameSetting([
+ {
+ salaryTemplateId: "",
+ salaryBillType: 0,
+ itemShowNameSetting: []
+ },
+ {
+ salaryTemplateId: "",
+ salaryBillType: 1,
+ itemShowNameSetting: []
+ }
+ ]);
+ this.setState({ current: 0 });
+ onClose(type);
+ return;
+ }
if (hasBeenModify) {
Modal.confirm({
title: getLabel(131329, "信息确认"),
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/index.less b/pc4mobx/hrmSalary/pages/payrollRelease/index.less
index 245c991f..634a44e4 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/index.less
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/index.less
@@ -27,6 +27,7 @@
.salary-payroll-content {
padding: 8px 16px;
height: 100%;
+ overflow-y: auto;
& > .wea-search-group {
background: #FFF;
@@ -157,7 +158,7 @@
margin-left: 10px;
position: absolute;
top: 25%;
- right: -208px;
+ right: -262px;
margin-top: -2px;
.sftv-item {
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/condition.js b/pc4mobx/hrmSalary/pages/reportView/components/condition.js
index d6668459..0cda350a 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/condition.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/condition.js
@@ -91,36 +91,36 @@ export const condition = [
labelcol: 6,
viewAttr: 2
},
- // {
- // browserConditionParam: {
- // completeParams: {},
- // conditionDataParams: {},
- // dataParams: {},
- // destDataParams: {},
- // hasAddBtn: false,
- // hasAdvanceSerach: true,
- // idSeparator: ",",
- // isAutoComplete: 1,
- // isDetail: 0,
- // isMultCheckbox: false,
- // isSingle: false,
- // linkUrl: "",
- // pageSize: 10,
- // quickSearchName: "",
- // replaceDatas: [],
- // title: getLabel(111, "岗位"),
- // type: "278",
- // viewAttr: 2
- // },
- // colSpan: 2,
- // conditionType: "BROWSER",
- // domkey: ["position"],
- // fieldcol: 18,
- // isQuickSearch: false,
- // label: getLabel(111, "岗位"),
- // labelcol: 6,
- // viewAttr: 2
- // },
+ {
+ browserConditionParam: {
+ completeParams: {},
+ conditionDataParams: {},
+ dataParams: {},
+ destDataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ idSeparator: ",",
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: false,
+ linkUrl: "",
+ pageSize: 10,
+ quickSearchName: "",
+ replaceDatas: [],
+ title: getLabel(111, "岗位"),
+ type: "278",
+ viewAttr: 2
+ },
+ colSpan: 2,
+ conditionType: "BROWSER",
+ domkey: ["position"],
+ fieldcol: 18,
+ isQuickSearch: false,
+ label: getLabel(111, "岗位"),
+ labelcol: 6,
+ viewAttr: 2
+ },
{
browserConditionParam: {
completeParams: {},
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
index 6a80e8fb..aa5f1bed 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/povitpivotChartModal.js
@@ -36,8 +36,8 @@ class PovitpivotChartModal extends Component {
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.visible !== this.props.visible && nextProps.visible) {
- const { id, dimensionId, dimensionValue, isShare } = nextProps;
- this.getDataPerspective({ id, dimensionId, dimensionValue, isShare });
+ const { id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth } = nextProps;
+ this.getDataPerspective({ id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth });
} else {
this.setState({
dataSource: [],
@@ -64,11 +64,11 @@ class PovitpivotChartModal extends Component {
});
} else if (type === "turn") {
if (id === "PAGEINFO") {
- const { id, dimensionId, dimensionValue, isShare } = this.props;
+ const { id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth } = this.props;
const { pageNum: current, size: pageSize } = params;
this.setState({ pageInfo: { ...pageInfo, current, pageSize } }, () =>
this.getDataPerspective({
- id, dimensionId, dimensionValue, isShare
+ id, dimensionId, dimensionValue, isShare, salaryStartMonth, salaryEndMonth
}));
}
}
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
index a7808410..9716234a 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/reportContent.js
@@ -5,8 +5,8 @@
* Date: 2023/4/21
*/
import React, { Component } from "react";
-import { Spin } from "antd";
-import { WeaEchart } from "ecCom";
+import { message, Spin } from "antd";
+import { WeaEchart, WeaLocaleProvider } from "ecCom";
import RightOptions from "./rightOptions";
import ChartsRangeSettingsModal from "./chartsRangeSettingsModal";
import { mapBarOptions, mapLineOptions, mapPieOptions } from "./condition";
@@ -15,6 +15,8 @@ import PovitpivotChartModal from "./povitpivotChartModal";
import { getSalaryMonthValue } from "./statisticalMicroSettingsSlide";
import "../index.less";
+const getLabel = WeaLocaleProvider.getLabel;
+
class ReportContent extends Component {
constructor(props) {
super(props);
@@ -27,13 +29,14 @@ class ReportContent extends Component {
chartsType: "0",
chartsInfo: {},
povitView: {
- visible: false, id: "", isShare: false,
- dimensionId: "", dimensionValue: ""
+ visible: false, id: "", isShare: false, dimensionId: "", dimensionValue: "", salaryStartMonth: "",
+ salaryEndMonth: ""
},
rangSet: {
visible: false, reportId: "",
rangeVal: {}
- }
+ },
+ pageInfo: { current: 1, pageSize: 10, total: 0 }
};
}
@@ -56,9 +59,9 @@ class ReportContent extends Component {
handleReceive = ({ data }) => {
const { type, payload: { id, params } = {} } = data;
if (type === "init") {
- const { columns, countResult, dataSource } = this.state;
+ const { columns, countResult, dataSource, pageInfo } = this.state;
this.postMessageToChild({
- columns, countResult, dataSource,
+ columns, countResult, dataSource, pageInfo,
showSum: !_.isEmpty(countResult)
});
} else if (type === "turn") {
@@ -66,36 +69,49 @@ class ReportContent extends Component {
if (id === "PIVOTCHART") {
const { record } = params;
const { dimension: dimensionValue } = record;
- const { id: pivotId, dimensionId, isShare } = this.props.report;
+ const {
+ id: pivotId, dimensionId, isShare, timeType, salaryEndMonth: end, salaryStartMonth: start
+ } = this.props.report;
+ const [salaryStartMonth, salaryEndMonth] = getSalaryMonthValue(timeType);
+
this.setState({
povitView: {
- visible: true, id: pivotId, dimensionId, dimensionValue, isShare
+ visible: true, id: pivotId, dimensionId, dimensionValue, isShare,
+ salaryStartMonth: (salaryStartMonth || start) + "-01", salaryEndMonth: (salaryEndMonth || end) + "-01"
}
});
+ } else if (id === "PAGEINFO_REPORT") {
+ this.setState({ pageInfo: { ...this.state.pageInfo, ...params } }, () => this.reportStatisticsReportGetData(this.props.report));
}
}
};
postMessageToChild = (payload) => {
+ const i18n = {
+ "共": getLabel(18609, "共"), "条": getLabel(18256, "条"),
+ "总计": getLabel(523, "总计")
+ };
const childFrameObj = document.getElementById("atdTable");
- const { dataSource, columns, showSum, countResult } = payload;
+ const { dataSource, columns, showSum, countResult, pageInfo } = payload;
childFrameObj && childFrameObj.contentWindow.postMessage(JSON.stringify({
- dataSource, columns, showSum, countResult
+ dataSource, columns, showSum, countResult, i18n, pageInfo
}), "*");
};
reportStatisticsReportGetData = (params) => {
- const { id, dimensionId, isShare, timeType, salaryEndMonth: end, salaryStartMonth: start } = params;
+ const { pageInfo } = this.state;
+ const { id, dimension, dimensionId, isShare, timeType, salaryEndMonth: end, salaryStartMonth: start } = params;
const [salaryStartMonth, salaryEndMonth] = getSalaryMonthValue(timeType);
const payload = {
- id, dimensionId, isShare,
+ id, dimensionId, isShare, ...pageInfo,
salaryStartMonth: (salaryStartMonth || start) + "-01", salaryEndMonth: (salaryEndMonth || end) + "-01"
};
this.setState({ loading: true });
reportStatisticsReportGetData(payload).then(({ status, data }) => {
this.setState({ loading: false });
if (status && id.toString() === data.reportId.toString()) {
- const { countResult, columns, pageInfo: { list } } = data;
+ const { countResult, columns, pageInfo: { list, pageNum, pageSize, total } } = data;
this.setState({
- countResult,
+ countResult, dataSource: list || [],
+ pageInfo: dimension === getLabel(111, "人员") ? { ...pageInfo, current: pageNum, pageSize, total } : null,
columns: _.map(columns, it => ({
...it,
dataIndex: it.column, width: it.width ? it.width + "px" : 150,
@@ -105,12 +121,11 @@ class ReportContent extends Component {
dataIndex: child.column, width: child.width ? child.width + "px" : 150,
title: child.text, align: "center"
})) : []
- })),
- dataSource: list || []
+ }))
}, () => {
this.postMessageToChild({
columns: this.state.columns, countResult: this.state.countResult,
- dataSource: this.state.dataSource,
+ dataSource: this.state.dataSource, pageInfo: this.state.pageInfo,
showSum: !_.isEmpty(this.state.countResult)
});
});
@@ -195,6 +210,11 @@ class ReportContent extends Component {
}).catch(() => this.setState({ loading: false }));
};
handleChangeChartOpts = (chartsType, viewType) => {
+ const { loading } = this.state;
+ if (loading) {
+ message.info(getLabel(111, "列表正在加载中，请稍后"));
+ return;
+ }
this.setState({ chartsInfo: {} });
if (this.refs.chart && viewType !== "setting" && viewType !== "dataView" && !this.state.rangSet.visible) this.refs.chart.clear();
const { report: { id: reportId } } = this.props;
@@ -267,7 +287,7 @@ class ReportContent extends Component {
onCancel={() => this.setState({
povitView: {
visible: false, id: "", dimensionId: "", dimensionValue: "",
- isShare: false
+ isShare: false, salaryStartMonth: "", salaryEndMonth: ""
}
})}
/>
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
index 6b2e496c..45ee98bb 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/statisticalMicroSettingsSlide.js
@@ -71,7 +71,7 @@ class StatisticalMicroSettingsSlide extends Component {
getTaxAgentSelectList = async (props) => {
const [salarySobList, empStatusList] = await Promise.all([getSalarysobListAll(), commonEnumList({ enumClass: "com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum" })]);
- getTaxAgentSelectList(true).then(({ status, data }) => {
+ getTaxAgentSelectList(props.isShare).then(({ status, data }) => {
if (status) {
const conditions = _.map(condition, item => {
return {
@@ -149,7 +149,7 @@ class StatisticalMicroSettingsSlide extends Component {
hiredate: extra["hiredate1__hiredate2"].value || [],
department: _.map(department.valueObj, it => ({ id: it.id, name: it.name })),
employee: _.map(employee.valueObj, it => ({ id: it.id, name: it.name })),
- // position: _.map(position.valueObj, it => ({ id: it.id, name: it.name })),
+ position: _.map(position.valueObj, it => ({ id: it.id, name: it.name })),
subCompany: _.map(subCompany.valueObj, it => ({ id: it.id, name: it.name })),
taxAgent: value ? _.map(value.split(","), (it, idx) => ({ id: it, name: valueSpan.split(",")[idx] })) : [],
status: statusVal ? _.map(statusVal.split(","), (it, idx) => ({
@@ -412,7 +412,10 @@ const StatisticalScopePicker = (props) => {
this.setState({ visible: true })}/>
+ }
+ {
+ fields.tip && );
+ });
+ return group;
+ };
+ renderTitle = () => {
+ const { title, buttons } = this.props;
+ return onClose()}
+ content={
- this.onEditItem(record, true)}>{(showSalaryItemBtn || showOperateBtn) ? "编辑" : "查看"}
- {
- (record.canDelete && (showSalaryItemBtn || showOperateBtn)) &&
- this.handleDeleteItem(record)}
- >{getLabel(535052, "删除")}
- }
-
-
- this.onDropMenuClick("log", record.id)}>{getLabel(545781, "操作日志")}
-
-
- }>
-
-
-
- );
- }
- });
- return [
- // {
- // title: "序号",
- // dataIndex: "index",
- // align: "left",
- // width: 60,
- // render: (text, record, index) => {
- // const { current, pageSize } = this.state.searchParams;
- // return (current - 1) * pageSize + index + 1;
- // }
- // },
- ...columns];
};
+ handleValidateForm = () => {
+ return new Promise((resolve) => {
+ const { salaryItemStore: { itemsForm: form } } = this.props;
+ const { formulaId, valueType, sharedType, taxAgentIds } = form.getFormParams();
+ let taxAgentValidate = true, formulaValidate = true;
+ if (sharedType === "1" && !taxAgentIds) taxAgentValidate = false;
+ if (valueType !== "1" && !formulaId) formulaValidate = false;
+ resolve({ taxAgentValidate, formulaValidate });
+ });
+ };
+ handleSalaryItem = (type) => {
+ const { customItemDialog: { id }, isQuery } = this.state;
+ const { salaryItemStore: { itemsForm: form } } = this.props;
+ Promise.all([form.validateForm(), this.handleValidateForm()])
+ .then(([f1, f2]) => {
+ if (f1.isValid && f2.taxAgentValidate && f2.formulaValidate) {
+ const { formulaContent, valueType, dataType, defaultValue, pattern, ...formData } = form.getFormParams();
+ const key = valueType === "2" ? "originFormulaContent" : valueType === "3" ? "originSqlContent" : "formulaContent";
+ this.setState({ loading: true });
+ API.saveItem({
+ ...formData, valueType, dataType, pattern, [key]: formulaContent, id,
+ defaultValue: dataType === "number" ? toDecimal_n(defaultValue, parseInt(pattern)) : defaultValue
+ }).then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ this.setState({ isQuery: !isQuery }, () => {
+ message.success(getLabel(111, "操作成功"));
+ type === "SAVECREATE" && form.updateFields({
+ name: { value: "" }, formulaContent: { value: "" }, formulaId: { value: "" }
+ });
+ type !== "SAVECREATE" && this.setState({
+ customItemDialog: { ...this.state.customItemDialog, visible: false, id: "" }
+ });
+ });
- handleSearch(value) {
- const { salaryItemStore: { getTableDatas } } = this.props;
- getTableDatas({ ...this.state.searchParams, current: 1, name: value }).then(res => {
- this.setState({
- searchParams: {
- ...this.state.searchParams,
- current: 1,
- total: res.total
+ } else {
+ message.error(errormsg);
+ }
+ });
+ } else {
+ !f1.isValid && f1.showErrors();
+ !f2.taxAgentValidate && f1.showError("taxAgentIds", getLabel(111, "\"可见性范围\"未填写"));
+ !f2.formulaValidate && f1.showError("formulaContent", getLabel(111, `\"${form.getFormDatas().valueType.valueSpan}\"未填写`));
+ this.forceUpdate();
}
});
- });
- }
-
- handlePageChange(value) {
- const { salaryItemStore: { getTableDatas } } = this.props;
- getTableDatas({ ...this.state.searchParams, name: this.state.searchValue, current: value }).then(res => {
- this.setState({
- searchParams: {
- ...this.state.searchParams,
- current: value,
- total: res.total
- }
- });
- });
- }
-
- handleShowSizeChange(searchParams) {
- const { salaryItemStore: { getTableDatas } } = this.props;
- getTableDatas({ ...searchParams });
- }
-
-
+ };
onDropMenuClick = (key, targetid = "") => {
switch (key) {
case "log":
@@ -213,271 +104,114 @@ export default class SalaryItem extends React.Component {
filterConditions: targetid ? `[{\"connectCondition\":\"AND\",\"columIndex\":\"targetid\",\"type\":\"=\",\"value\":\"${targetid}\"}]` : "[]"
});
break;
+ case "export":
+ WeaLoadingGlobal.start();
+ const { selectedRowKeys } = this.state;
+ const promise = API.exportSalaryitem({ ids: selectedRowKeys });
+ WeaLoadingGlobal.destroy();
+ break;
+ case "import":
+ this.setState({
+ salaryItemImpDialog: {
+ ...this.state.salaryItemImpDialog, visible: true
+ }
+ });
+ break;
+ case "customAdd":
+ case "edit":
+ const { taxAgentStore: { showOperateBtn } } = this.props;
+ const { loading } = this.state;
+ const editTitle = !showOperateBtn ? getLabel(111, "查看自定义薪资项目") : getLabel(111, "修改自定义薪资项目");
+ const title = key === "edit" ? editTitle : getLabel(111, "新建自定义薪资项目");
+ const buttons = key === "edit" ? [
+ ,
+
+ ] : [
+ ,
+
+ ];
+ this.setState({
+ customItemDialog: {
+ visible: true, title, buttons: showOperateBtn ? buttons : [], id: targetid
+ }
+ });
+ break;
+ case "delete":
+ this.handleDeleteItem(targetid);
+ break;
+ case "sysAdd":
+ this.setState({ sysVisible: true });
+ break;
default:
break;
}
};
render() {
+ const { taxAgentStore: { showOperateBtn } } = this.props;
const {
- salaryItemStore,
- salaryFileStore,
- taxAgentStore: { showOperateBtn, showSalaryItemBtn, taxAgentOption }
- } = this.props;
- const { userStatusList } = salaryFileStore;
- const { selectedRowKeys, logDialogVisible, filterConditions } = this.state;
- const { loading, deleteItemRequest, getTableDatas } = salaryItemStore;
- const {
- tableDataSource,
- tableColumns,
- systemItemVisible,
- setSystemItemVisible,
- editSlideVisible,
- setEditSlideVisible,
- request
- } = salaryItemStore;
- if (this.getColumns().length === 2) { // 无权限处理
- return renderLoading();
- }
-
- const handleMenuClick = (e) => {
- const { salaryItemStore: { setEditSlideVisible, initRequest } } = this.props;
- if (e.key === "1") {
- this.setState({ editable: true, isAdd: true });
- initRequest();
- setEditSlideVisible(true);
- } else if (e.key === "2") {
- setSystemItemVisible(true);
- }
- };
-
+ selectedRowKeys, logDialogVisible, filterConditions, name, isQuery, customItemDialog, sysVisible,
+ salaryItemImpDialog
+ } = this.state;
const menu = (
-
*/}
+
;
+ };
render() {
- const { request } = this.props;
- const { valueType, dataType, formulaId } = request;
- const { formalModalVisible, salaryItemName } = this.state;
- return (
-
+
+
+
{title}
+ {buttons}
+
-
- {formalModalVisible &&
- {
- this.handleSaveFormal(data);
- }}
- onCancel={() =>
- this.setState({
- formalModalVisible: false,
- salaryItemName: ""
- })}
- />}
-
+ const { onClose, salaryItemStore: { itemsForm: form } } = this.props;
+ const { visible } = this.state;
+ return (
+ {this.renderForm()}
+ {visible &&
+ this.setState({ visible: false })}
+ />
+ }
+
}/>
);
}
}
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index 09875add..6a9c5f1f 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -1,17 +1,16 @@
import React from "react";
import { inject, observer } from "mobx-react";
-import { Button, Dropdown, Menu, message, Modal, Switch } from "antd";
-import { WeaInputSearch, WeaLocaleProvider, WeaNewScroll, WeaSlideModal, WeaTop } from "ecCom";
-import { renderLoading, toDecimal_n } from "../../util";
-import CustomTab from "../../components/customTab";
+import { Button, Dropdown, Menu, message, Modal } from "antd";
+import { WeaInputSearch, WeaLoadingGlobal, WeaLocaleProvider, WeaTop } from "ecCom";
+import * as API from "../../apis/item";
+import SalaryItemsTable from "./salaryItemsTable";
+import { toDecimal_n } from "../../util";
import SystemSalaryItemModal from "./systemSalaryItemModal";
-import { columns } from "./columns";
-import SlideModalTitle from "../../components/slideModalTitle";
import CustomSalaryItemSlide from "./customSalaryItemSlide";
-import CustomPaginationTable from "../../components/customPaginationTable";
import SyncToSalaryAccountSetDialog from "./syncToSalaryAccountSetDialog";
-import "../socialSecurityBenefits/programme/index.less";
import LogDialog from "../../components/logViewModal";
+import SalaryItemImportDialog from "./salaryItemImport";
+import "./index.less";
const { getLabel } = WeaLocaleProvider;
@inject("salaryItemStore", "taxAgentStore", "salaryFileStore")
@@ -20,191 +19,83 @@ export default class SalaryItem extends React.Component {
constructor(props) {
super(props);
this.state = {
- value: "",
- selectedKey: "0",
- editable: false,
- isAdd: false,
- searchValue: "",
- formalModalVisible: false,
- searchParams: { current: 1, pageSize: 10, total: 0 },
- selectedRowKeys: [],
- syncSalarySetDialog: { visible: false, title: "", id: "" },
- logDialogVisible: false, filterConditions: "[]"
+ name: "", isQuery: false, loading: false, sysVisible: false,
+ customItemDialog: { visible: false, title: "", buttons: [] },// 自定义薪资项弹窗
+ syncSalarySetDialog: { visible: false, id: "" }, // 同步到薪资账套弹窗
+ logDialogVisible: false, filterConditions: "[]", selectedRowKeys: [],
+ salaryItemImpDialog: { visible: false, title: getLabel(24023, "数据导入") }
};
- columns.map(item => {
- if (item.dataIndex == "refere") {
- item.render = () => {
- return (
-
- {
+ return {
+ ...o, render: (text, record) => {
+ if (o.dataIndex === "targetName") {
+ return {
+ const key = includeType === "2" ? "externalPersonModalVisible" : "addTaxagentModalVisible";
+ this.setState({ [key]: true, scopeRecord: record });
+ }}>{text};
+ }
+ return {text};
+ }
+ };
+ })}/>
+ VSalryForm.updateFields({ username: v })}
+ onSearch={this.props.onAdvanceSearch}
+ />
+ {
+ searchType === "advance" &&
+ }
+
+ );
+ }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/advanceInputBtn/index.less b/pc4mobx/hrmSalary/pages/variableSalary/components/advanceInputBtn/index.less
new file mode 100644
index 00000000..f301e571
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/advanceInputBtn/index.less
@@ -0,0 +1,28 @@
+.variable-advance-search {
+ display: flex;
+ align-items: center;
+ position: relative;
+ top: -1.5px;
+
+ .wea-advanced-search {
+ top: 1px;
+ left: -1px;
+ height: 28px;
+ line-height: 1;
+ border-radius: 0;
+ position: relative;
+ color: #474747;
+ padding: 4px 15px;
+ }
+
+ .wea-advanced-search:hover {
+ border: 1px solid #dadada;
+ color: #474747;
+ }
+
+ .text-elli {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
new file mode 100644
index 00000000..8e9d740e
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
@@ -0,0 +1,147 @@
+/*
+ * 浮动薪酬
+ * 新建编辑薪资档案
+ * @Author: 黎永顺
+ * @Date: 2024/8/8
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaLocaleProvider, WeaSlideModal, WeaTools } from "ecCom";
+import { Button, message } from "antd";
+import { getSearchs } from "../../../../util";
+import { salaryFileConditions } from "../../conditions";
+import * as API from "../../../../apis/variableSalary";
+
+const getKey = WeaTools.getKey;
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("baseTableStore") @observer
+class Index extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ conditions: [], loading: false
+ };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) {
+ document.querySelector(".variable_salary_wrapper").classList.add("zIndex0-weaslide-title");
+ this.initForm(nextProps);
+ } else if (nextProps.visible !== this.props.visible && !nextProps.visible) {
+ document.querySelector(".variable_salary_wrapper").classList.remove("zIndex0-weaslide-title");
+ this.props.baseTableStore.initVSSalaryFileForm();
+ }
+ }
+
+ initForm = async (props) => {
+ const { baseTableStore: { VSSalaryFileForm }, detail } = props;
+ const { data: taxAgentOption } = await API.getAdminTaxAgentList();
+ API.getCreateForm().then(({ data }) => {
+ this.setState({
+ conditions: [..._.map(salaryFileConditions, item => ({
+ ...item, items: _.map(item.items, o => {
+ if (getKey(o) === "taxAgentIds") {
+ return {
+ ...o, viewAttr: !_.isEmpty(detail) ? 1 : 3, label: getLabel(o.lanId, o.label),
+ value: detail[getKey(o)] || "",
+ options: _.map(taxAgentOption, (o, i) => ({ key: o.id, showname: o.content }))
+ };
+ }
+ return {
+ ...o, viewAttr: !_.isEmpty(detail) ? 1 : 3, label: getLabel(o.lanId, o.label),
+ value: detail[getKey(o)] || ""
+ };
+ })
+ })), {
+ items: _.map(data, o => ({
+ conditionType: "INPUT", domkey: [String(o.id)], fieldcol: 14, label: o.name, labelcol: 6,
+ value: detail[`${String(o.id)}_variableItem`] || "", viewAttr: 2, dataType: o.dataType
+ })), title: "", col: 2, defaultshow: true
+ }]
+ }, () => {
+ VSSalaryFileForm.initFormFields(this.state.conditions);
+ if (!_.isEmpty(detail)) {
+ VSSalaryFileForm.updateFields({
+ employeeId: {
+ value: detail["employeeId"], valueSpan: detail["username"],
+ valueObj: [{ id: detail["employeeId"], name: detail["username"] }]
+ }
+ });
+ }
+ });
+ });
+ };
+ convertPayload = (payload) => {
+ const itemValueList = [];
+ return _.reduce(_.keys(payload), (pre, cur) => {
+ if (!_.isNaN(parseInt(cur))) {
+ itemValueList.push({ variableItemId: cur, itemValue: payload[cur] });
+ return { ...pre, itemValueList };
+ }
+ return { ...pre, [cur]: payload[cur] };
+ }, {});
+ };
+ save = () => {
+ const { baseTableStore: { VSSalaryFileForm }, onSearch, detail: { id } } = this.props;
+ VSSalaryFileForm.validateForm().then(f => {
+ if (f.isValid) {
+ const payload = VSSalaryFileForm.getFormParams();
+ this.setState({ loading: true });
+ API.createVariableSalary({ ...this.convertPayload(payload), id })
+ .then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success(getLabel(30700, "操作成功"));
+ this.props.onClose(onSearch());
+ } else {
+ message.error(errormsg);
+ }
+ }).catch(() => this.setState({ loading: false }));
+ } else {
+ f.showErrors();
+ }
+ });
+ };
+ renderTitle = () => {
+ const { loading } = this.state, { title } = this.props;
+ return
+
;
+ };
+ handleChange = (formVal) => {
+ const key = _.keys(formVal)[0], value = formVal[key].value;
+ const [__, fields] = this.state.conditions, { items } = fields;
+ _.forEach(items, o => {
+ if (getKey(o) === key && o.dataType === "number") {
+ if (_.isNaN(Number(value)) || value.indexOf(" ") !== -1) {
+ const { baseTableStore: { VSSalaryFileForm } } = this.props;
+ message.warning(getLabel(111, "数值类型有误！"));
+ VSSalaryFileForm.updateFields({ [getKey(o)]: { value: "" } });
+ }
+ }
+ });
+ };
+
+ render() {
+ const { conditions } = this.state;
+ const { baseTableStore: { VSSalaryFileForm }, onClose } = this.props;
+ return (
+
+
+
{title}
+
+
+
+ {getSearchs(VSSalaryFileForm, conditions, 2, false, this.handleChange)}
}
+ />);
+ }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileImportDialog/index.js b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileImportDialog/index.js
new file mode 100644
index 00000000..415f7e33
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileImportDialog/index.js
@@ -0,0 +1,130 @@
+/*
+ * 浮动薪酬
+ * 薪资档案导入
+ * @Author: 黎永顺
+ * @Date: 2024/8/8
+ * @Wechat:
+ * @Email: 971387674@qq.com
+ * @description:
+*/
+import React, { Component } from "react";
+import { WeaCheckbox, WeaDatePicker, WeaFormItem, WeaLocaleProvider } from "ecCom";
+import ImportDialog from "../../../../components/importDialog";
+import * as API from "../../../../apis/variableSalary";
+import { convertToUrlString } from "../../../../util/url";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class Index extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ importDialog: {
+ nextloading: false, link: "/api/bs/hrmsalary/variableSalary/downloadTemplate",
+ importResult: {}, imageId: "", hasData: false, salaryMonth: "",
+ previewUrl: "/api/bs/hrmsalary/variableSalary/preview"
+ }
+ };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ const { importDialog } = this.state;
+ if (nextProps.visible !== this.props.visible && nextProps.visible) {
+ const { baseTableStore: { VSalryForm, VExtraSalryForm } } = nextProps;
+ const payload = {
+ ...VSalryForm.getFormParams(), ...VExtraSalryForm.getFormParams(), hasData: importDialog.hasData
+ };
+ this.setState({
+ importDialog: {
+ ...importDialog, salaryMonth: VExtraSalryForm.getFormParams().salaryMonth,
+ link: `${importDialog.link}?${convertToUrlString(payload)}`
+ }
+ });
+ } else {
+ this.setState({
+ importDialog: {
+ nextloading: false, link: "/api/bs/hrmsalary/variableSalary/downloadTemplate", hasData: false,
+ importResult: {}, imageId: "", previewUrl: "/api/bs/hrmsalary/variableSalary/preview", salaryMonth: ""
+ }
+ });
+ }
+ }
+
+ handleImport = (payload) => {
+ const { baseTableStore: { VExtraSalryForm } } = this.props;
+ const { importDialog } = this.state;
+ const { salaryMonth } = importDialog;
+ const { taxAgentIds } = VExtraSalryForm.getFormParams();
+ this.setState({ importDialog: { ...importDialog, nextloading: true } });
+ API.importVariableSalary({
+ ...payload, salaryMonth, taxAgentIds: _.isEmpty(taxAgentIds) ? [] : taxAgentIds.split(",")
+ }).then(({ data, status }) => {
+ this.setState({ importDialog: { ...importDialog, nextloading: false } });
+ if (status) {
+ this.setState({
+ importDialog: { ...importDialog, ...payload, importResult: data }
+ });
+ }
+ }).catch(() => this.setState({ importDialog: { ...importDialog, nextloading: false } }));
+ };
+ renderFormComponent = () => {
+ const { baseTableStore: { VSalryForm, VExtraSalryForm } } = this.props;
+ const { importDialog } = this.state;
+ const { salaryMonth: month, hasData } = importDialog;
+ return
+
+ {
+ const payload = {
+ ...VSalryForm.getFormParams(), ...VExtraSalryForm.getFormParams(),
+ salaryMonth: val, hasData
+ };
+ this.setState({
+ importDialog: {
+ ...importDialog, salaryMonth: val,
+ link: `/api/bs/hrmsalary/variableSalary/downloadTemplate?${convertToUrlString(payload)}`
+ }
+ });
+ }}/>
+
+
;
+ };
+
+ render() {
+ const { importDialog } = this.state;
+ return (
+
+ {getSearchs(VExtraSalryForm, condtions, 2, false, () => this.getVariableSalaryList())}
+ this.openAdvanceSearch()}
+ onAdvanceSearch={this.getVariableSalaryList}/>
+
+
+ this.setState({ showSearchAd: false })}
+ onAdSearch={() => {
+ this.openAdvanceSearch();
+ this.getVariableSalaryList();
+ }}/>
+
+
+
+
+
+
+ {getSearchs(VSSalaryItemForm, conditions, 1, false)}
+
+ {getSearchs(VSalryForm, searchConditions, 2, false)}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+