@@ -77,7 +80,7 @@ class LedgerSalaryItemBaseInfo extends Component {
/>
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
new file mode 100644
index 00000000..a95d9048
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
@@ -0,0 +1,94 @@
+/*
+ * Author: 黎永顺
+ * name: 薪资账套查询
+ * Description:
+ * Date: 2023/11/27
+ */
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { Button } from "antd";
+import { WeaSwitch } from "comsMobx";
+import { WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaTools } from "ecCom";
+import { searchConditions } from "../config";
+import { getTaxAgentSelectList } from "../../../apis/taxAgent";
+
+const getKey = WeaTools.getKey;
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("ledgerStore")
+@observer
+class LedgerSearchComp extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ conditions: []
+ };
+ }
+
+ componentDidMount() {
+ this.getTaxAgentSelectList();
+ }
+
+ getTaxAgentSelectList = () => {
+ const { ledgerStore: { searchForm } } = this.props;
+ getTaxAgentSelectList().then(({ status, data }) => {
+ if (status) {
+ this.setState({
+ conditions: _.map(searchConditions, o => {
+ return {
+ ...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
+ }))]
+ };
+ }
+ return { ...j };
+ })
+ };
+ })
+ }, () => searchForm.initFormFields(this.state.conditions));
+ }
+ });
+ };
+ formRender = (form, condition) => {
+ const { isFormInit } = form, formParams = form.getFormParams();
+ let group = [];
+ isFormInit && condition && condition.map(c => {
+ let items = [];
+ c.items.map(fields => {
+ items.push({
+ com: (
+
+
+ ),
+ colSpan: 2
+ });
+ });
+ group.push(
+
);
+ });
+ return group;
+ };
+
+ render() {
+ const { conditions } = this.state;
+ const { ledgerStore: { searchForm } } = this.props;
+ return (
+
+ {this.formRender(searchForm, conditions)}
+
+
+ );
+ }
+}
+
+export default LedgerSearchComp;
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
index 8b2e350e..36bf1bec 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
@@ -112,7 +112,7 @@ class LedgerSlide extends Component {
const { editId: salarySobId } = this.props;
const payload = {
empFields: _.map(empFields, it => {
- if (Object.prototype.toString.call(it.id) === "[object Number]") delete it.id;
+ if (!it.salarySobId) delete it.id;
return { ...it };
}),
itemGroups: _.map(_.filter(itemGroups, it => it.name !== "未分类"), item => {
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
index 38ba8a5b..9f842e24 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
@@ -12,7 +12,7 @@ import { changeLedgerStatus, deleteLedger, getLedgerList } from "../../../apis/l
import CopyLedgerModal from "./copyLedgerModal";
import "./index.less";
-@inject("taxAgentStore")
+@inject("taxAgentStore", "ledgerStore")
@observer
class LedgerTable extends Component {
constructor(props) {
@@ -42,9 +42,9 @@ class LedgerTable extends Component {
}
getLedgerList = (extra = {}) => {
- const { name } = this.props;
+ const { ledgerStore: { searchForm } } = this.props;
const { pageInfo } = this.state;
- const payload = { name, ...pageInfo, ...extra };
+ const payload = { ...searchForm.getFormParams(), ...pageInfo, ...extra };
this.setState({ loading: true });
getLedgerList(payload).then(({ status, data }) => {
this.setState({ loading: false });
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/config.js b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
index 1a9f3717..9af48b4d 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/config.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/config.js
@@ -27,6 +27,37 @@ export const copyConditions = [
defaultshow: true
}
];
+export const searchConditions = [
+ {
+ items: [
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["name"],
+ fieldcol: 24,
+ otherParams: {
+ placeholder: "请输入薪资账套名称"
+ },
+ lanId: 543431,
+ labelcol: 0,
+ value: "",
+ viewAttr: 2
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["taxAgentId"],
+ fieldcol: 24,
+ lanId: 543234,
+ label: "",
+ labelcol: 0,
+ value: "",
+ viewAttr: 2
+ }
+ ],
+ defaultshow: true
+ }
+];
export const categoryConditions = [
{
items: [
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/index.js b/pc4mobx/hrmSalary/pages/ledgerPage/index.js
index 9cef3433..c9246477 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/index.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/index.js
@@ -6,10 +6,11 @@
*/
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
-import { WeaInputSearch, WeaTop } from "ecCom";
+import { WeaTop } from "ecCom";
import { Button } from "antd";
import LedgerTable from "./components/ledgerTable";
import LedgerSlide from "./components/ledgerSlide";
+import LedgerSearchComp from "./components/ledgerSearchComp";
import "./index.less";
@inject("taxAgentStore")
@@ -60,11 +61,7 @@ class Index extends Component {
type="primary"
onClick={() => this.setState({ slideparams: { ...slideparams, visible: true } })}
>新建,
- this.setState({ searchVal })}
- onSearch={() => this.setState({ doSearch: !doSearch })}
- />
+ this.setState({ doSearch: !doSearch })}/>
];
return (
-
+
button {
+ position: absolute;
+ right: -70px;
+ top: 0;
+ }
+
+ .wea-search-group, .wea-content {
+ padding: 0;
+ }
+
+ .wea-form-cell-wrapper {
+ & > div.wea-form-cell {
+ padding: 0;
+
+ .wea-form-item {
+ padding: 0;
+
+ .ant-select-selection-selected-value {
+ width: 150px !important;
+ }
+ }
+ }
+
+ & > div.wea-form-cell:first-child {
+ padding-right: 10px;
+ }
+ }
+}
diff --git a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
index 69329ae3..2b2308d1 100644
--- a/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
+++ b/pc4mobx/hrmSalary/pages/mobilePayroll/index.js
@@ -232,7 +232,6 @@ export default class MobilePayroll extends React.Component {
diff --git a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
index 1e167175..574c315d 100644
--- a/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
+++ b/pc4mobx/hrmSalary/pages/mySalary/mySalaryView.js
@@ -94,7 +94,7 @@ class MySalaryView extends Component {
diff --git a/pc4mobx/hrmSalary/pages/mySalaryMobile/components/mobileDatePicker/index.js b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/mobileDatePicker/index.js
new file mode 100644
index 00000000..dde59609
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mySalaryMobile/components/mobileDatePicker/index.js
@@ -0,0 +1,90 @@
+/*
+ * Author: 黎永顺
+ * name: 移动端页面-日期选择组件
+ * Description:
+ * Date: 2023/11/10
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider } from "ecCom";
+import moment from "moment";
+import { Picker, Popup } from "spring-picker";
+import "spring-picker/lib/style.css";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class Index extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ visible: false,
+ salaryYearMonth: { year: "", month: "" }
+ };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ const { value } = nextProps;
+ const [year, month] = value.split("-");
+ this.setState({
+ salaryYearMonth: { year, month }
+ });
+ }
+
+ handleChangeYear = (year) => {
+ this.setState({ salaryYearMonth: { ...this.state.salaryYearMonth, year } });
+ };
+ handleChangeMonth = (month) => {
+
+ this.setState({ salaryYearMonth: { ...this.state.salaryYearMonth, month: parseInt(month).toString() } });
+ };
+ handleCancel = () => {
+ this.setState({ visible: false });
+ };
+ handleConfirm = () => {
+ const { year, month } = this.state.salaryYearMonth;
+ this.setState({ visible: false }, () => {
+ this.props.onChange(moment(new Date(`${year}- ${month}`)).format("YYYY-MM"));
+ });
+ };
+
+ render() {
+ const { value } = this.props;
+ const { visible } = this.state;
+ const [year, month] = value.split("-");
+ return (
+
+
this.setState({ visible: true })}>{value}
+
+
+
+
+
+ {
+ _.map(dataSource, it => {
+ return -
+
+ {moment(it.salaryYearMonth).format("YYYY-MM")}
+ {`${getLabel(15323, "第")}${it.acctTimes}${getLabel(18929, "次")}`}
+
+
+ {getLabel(111, "发放时间")}
+ {moment(it.sendTime).format("YYYY-MM")}
+
+ {`${getLabel(33564, "查看")}>`}
+ ;
+ })
+ }
+ {
+ loading && - {getLabel(31230, "加载中")}
+ }
+ {
+ !isMore && - {getLabel(83553, "暂无数据")}
+ }
+
+ );
+ }
+}
+
+export default Index;
diff --git a/pc4mobx/hrmSalary/pages/mySalaryMobile/index.js b/pc4mobx/hrmSalary/pages/mySalaryMobile/index.js
new file mode 100644
index 00000000..e1fade72
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/mySalaryMobile/index.js
@@ -0,0 +1,101 @@
+/*
+ * Author: 黎永顺
+ * name: 我的薪资福利-移动端列表
+ * Description:
+ * Date: 2023/11/10
+ */
+import React, { Component } from "react";
+import { WeaLocaleProvider, WeaTab } from "ecCom";
+import moment from "moment";
+import MobileDatePicker from "./components/mobileDatePicker";
+import PayrollList from "./components/payrollList";
+import { mySalaryBillList } from "../../apis/mySalaryBenefits";
+import "./index.less";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+class Index extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ dataSource: [], loading: false, pageInfo: { current: 1, pageSize: 10, total: 0 },
+ salaryYearMonth: [moment().startOf("year").format("YYYY-MM"), moment().startOf("month").format("YYYY-MM")],
+ isMore: true //是否还有更多数据
+ };
+ }
+
+ componentDidMount() {
+ this.getMySalaryBillList();
+ const mySalaryMobile = document.getElementById("mySalaryMobile");
+ mySalaryMobile.addEventListener("scroll", this.handleScroll, true);
+ }
+
+ handleScroll = () => {
+ this.isTouchBottom(this.handleLoadMore);
+ };
+
+ componentWillUnmount() {
+ const mySalaryMobile = document.getElementById("mySalaryMobile");
+ mySalaryMobile.removeEventListener("scroll", this.handleScroll, true);
+ }
+
+ getMySalaryBillList = () => {
+ const { salaryYearMonth, pageInfo } = this.state;
+ this.setState({ loading: true });
+ mySalaryBillList({ salaryYearMonth, ...pageInfo }).then(({ status, data }) => {
+ this.setState({ loading: false });
+ if (status) {
+ const { datas: dataSource, pageInfo: pageResult } = data;
+ const { pageNum: current, pageSize, total } = pageResult;
+ this.setState({
+ dataSource: [...this.state.dataSource, ...dataSource],
+ pageInfo: { ...pageInfo, current, pageSize, total }
+ }, () => this.setState({ isMore: this.state.dataSource.length < total }));
+ }
+ }).catch(() => this.setState({ loading: false }));
+ };
+ handleLoadMore = () => {
+ // 为测试效果临时使用 message
+ const { pageInfo, isMore } = this.state;
+ if (!isMore) return;
+ const { current } = pageInfo;
+ this.setState({
+ pageInfo: { ...pageInfo, current: current + 1 }
+ }, () => this.getMySalaryBillList());
+ };
+ isTouchBottom = (handler) => {
+ const div = document.getElementById("mySalaryMobile");
+ if ((div.scrollHeight - div.scrollTop) === div.clientHeight) handler();
+ };
+ handleChange = (type, val) => {
+ const { salaryYearMonth } = this.state;
+ const [salaryStartYearMonth, salaryEndYearMonth] = salaryYearMonth;
+ this.setState({
+ salaryYearMonth: type === "salaryStartYearMonth" ? [val, salaryEndYearMonth] : [salaryStartYearMonth, val]
+ }, () => this.getMySalaryBillList());
+ };
+
+ render() {
+ const { salaryYearMonth, dataSource, isMore, loading } = this.state;
+ const [salaryStartYearMonth, salaryEndYearMonth] = salaryYearMonth;
+ return (
+
+
+
+
+
+ this.handleChange("salaryStartYearMonth", v)}/>
+ {getLabel(15322, "至")}
+ this.handleChange("salaryEndYearMonth", v)}/>
+
+
+
@@ -386,6 +405,16 @@ export default class Index extends Component {
/>
+
+
+ this.setState({
+ saveParams: { ...saveParams, salaryAcctFixedColumns: v }
+ })}
+ onBlur={val => this.handleChange("salaryAcctFixedColumns", val)}
+ />
+
+
{
const { salaryItemStore: { setEditSlideVisible, initRequest } } = this.props;
if (e.key === "1") {
- setSystemItemVisible(true);
- } else if (e.key === "2") {
this.setState({ editable: true, isAdd: true });
initRequest();
setEditSlideVisible(true);
+ } else if (e.key === "2") {
+ setSystemItemVisible(true);
}
};
const menu = (
-
);
const renderRightOperation = () => {
@@ -236,7 +235,7 @@ export default class SalaryItem extends React.Component {
{
(showOperateBtn || showSalaryItemBtn) &&
handleMenuClick({ key: "1" })}
- style={{ marginRight: "10px" }}>{getLabel(111, "新增系统薪资项")}
+ style={{ marginRight: "10px" }}>{getLabel(111, "新增自定义薪资项")}
}
{
(showOperateBtn || showSalaryItemBtn) &&
@@ -265,7 +264,7 @@ export default class SalaryItem extends React.Component {
});
}
});
- }}>批量删除薪资项
+ }}>{getLabel(32136, "批量删除")}
}
{
this.setState({ searchValue: value });
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/options.js b/pc4mobx/hrmSalary/pages/salaryItem/options.js
index e80e8b89..7dbd51b4 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/options.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/options.js
@@ -1,78 +1,88 @@
export const roundingModeOptions = [
- {
- key: "1",
- selected: false,
- showname: "原始数据"
- },
- {
- key: "2",
- selected: false,
- showname: "四舍五入"
- },
- {
- key: "3",
- selected: false,
- showname: "向上舍入"
- },
- {
- key: "4",
- selected: false,
- showname: "向下舍入"
- },
- {
- key: "5",
- selected: false,
- showname: "见分进角"
- }
+ {
+ key: "1",
+ selected: false,
+ showname: "原始数据"
+ },
+ {
+ key: "2",
+ selected: false,
+ showname: "四舍五入"
+ },
+ {
+ key: "3",
+ selected: false,
+ showname: "向上舍入"
+ },
+ {
+ key: "4",
+ selected: false,
+ showname: "向下舍入"
+ },
+ {
+ key: "5",
+ selected: false,
+ showname: "见分进角"
+ }
];
export const patternOptions = [
- {
- key: "0",
- showname: "0",
- selected: false
- },
- {
- key: "1",
- showname: "1",
- selected: false
- },
- {
- key: "2",
- showname: "2",
- selected: false
- },
- {
- key: "3",
- showname: "3",
- selected: false
- },
- {
- key: "4",
- showname: "4",
- selected: false
- },
- {
- key: "5",
- showname: "5",
- selected: false
- },
- {
- key: "6",
- showname: "6",
- selected: false
- },
-]
+ {
+ key: "0",
+ showname: "0",
+ selected: false
+ },
+ {
+ key: "1",
+ showname: "1",
+ selected: false
+ },
+ {
+ key: "2",
+ showname: "2",
+ selected: false
+ },
+ {
+ key: "3",
+ showname: "3",
+ selected: false
+ },
+ {
+ key: "4",
+ showname: "4",
+ selected: false
+ },
+ {
+ key: "5",
+ showname: "5",
+ selected: false
+ },
+ {
+ key: "6",
+ showname: "6",
+ selected: false
+ },
+ {
+ key: "7",
+ showname: "7",
+ selected: false
+ },
+ {
+ key: "8",
+ showname: "8",
+ selected: false
+ }
+];
export const dataTypeOptions = [
- {
- key: "number",
- showname: "数值",
- selected: false
- },
- {
- key: "string",
- showname: "字符",
- selected: false
- },
-]
+ {
+ key: "number",
+ showname: "数值",
+ selected: false
+ },
+ {
+ key: "string",
+ showname: "字符",
+ selected: false
+ }
+];
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js
index 901517d1..ea3a33dc 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/columns.js
@@ -1,65 +1,43 @@
-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',
- }
-]
-
-
-export const dataSource = [];
-
-
-
-
-
+export const socialAccountConditions = [
+ {
+ items: [
+ {
+ colSpan: 1,
+ conditionType: "MONTHPICKER",
+ domkey: ["billMonth"],
+ fieldcol: 14,
+ label: "账单月份",
+ lanId: 542443,
+ labelcol: 6,
+ value: "",
+ rules: "required|string",
+ viewAttr: 3
+ },
+ {
+ colSpan: 1,
+ conditionType: "SELECT",
+ domkey: ["paymentOrganization"],
+ fieldcol: 14,
+ label: "个税扣缴义务人",
+ lanId: 537996,
+ labelcol: 6,
+ options: [],
+ rules: "required|string",
+ viewAttr: 3
+ },
+ {
+ colSpan: 1,
+ conditionType: "INPUT",
+ domkey: ["remarks"],
+ fieldcol: 14,
+ label: "备注",
+ lanId: 536726,
+ labelcol: 6,
+ value: "",
+ viewAttr: 2
+ }
+ ],
+ defaultshow: true,
+ title: ""
+ }
+];
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/accountDialog.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/accountDialog.js
index 6daf854d..fd21aba3 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/accountDialog.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/accountDialog.js
@@ -5,86 +5,73 @@
* LastEditTime: 2022-06-28 15:52:31
*/
import React, { Component } from "react";
-import { Button, Form, Input } from "antd";
-import { WeaDatePicker, WeaDialog, WeaSelect } from "ecCom";
+import { inject, observer } from "mobx-react";
+import { Button } from "antd";
+import { WeaDialog, WeaLocaleProvider, WeaTools } from "ecCom";
+import { socialAccountConditions } from "../columns";
+import { getSearchs } from "../../../../util";
import "./index.less";
-const createForm = Form.create;
-const FormItem = Form.Item;
+const getLabel = WeaLocaleProvider.getLabel;
+const getKey = WeaTools.getKey;
+@inject("standingBookStore")
+@observer
class Accountdialog extends Component {
constructor(props) {
super(props);
- this.state = {};
+ this.state = { conditions: [] };
}
- handleSubmit = e => {
- const { onOk } = this.props;
- e.preventDefault();
- this.props.form.validateFields((errors, values) => {
- if (!!errors) {
- return;
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) this.init(nextProps);
+ if (nextProps.visible !== this.props.visible && !nextProps.visible) nextProps.standingBookStore.initAccountForm();
+ }
+
+ init = (props) => {
+ this.setState({
+ conditions: _.map(socialAccountConditions, item => ({
+ ...item, items: _.map(item.items, o => {
+ if (getKey(o) === "paymentOrganization") {
+ return {
+ ...o, label: getLabel(o.lanId, o.label),
+ options: this.props.options
+ };
+ }
+ return { ...o, label: getLabel(o.lanId, o.label) };
+ })
+ }))
+ }, () => props.standingBookStore.accountForm.initFormFields(this.state.conditions));
+ };
+
+ handleSubmit = () => {
+ const { onOk, standingBookStore: { accountForm } } = this.props;
+ accountForm.validateForm().then(f => {
+ if (f.isValid) {
+ onOk(accountForm.getFormParams());
+ } else {
+ f.showErrors();
}
- onOk(values);
});
};
render() {
- const { getFieldProps } = this.props.form;
- const formItemLayout = {
- labelCol: { span: 7 },
- wrapperCol: { span: 12 }
- };
+ const { conditions } = this.state;
+ const { standingBookStore: { accountForm }, loading } = this.props;
return (
+
]}>
-
+ {getSearchs(accountForm, conditions, 1, false)}
);
}
}
-export default createForm()(Accountdialog);
+export default Accountdialog;
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/index.less
index c53709c0..2567a013 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/index.less
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/index.less
@@ -22,12 +22,38 @@
}
}
-.accountDialogWrapper{
- .wea-select,.ant-select,.ant-select-selection{
+.accountDialogWrapper {
+ .wea-dialog-body {
+ background: #f6f6f6;
+ padding: 16px;
+
+ .wea-search-group {
+ padding: 0;
+ background: #fff;
+ border: 1px solid #e5e5e5;
+ border-bottom: none;
+
+ .wea-form-item {
+ padding: 5px 16px;
+ border-bottom: 1px solid #e5e5e5;
+ }
+
+ .wea-content, .wea-form-cell {
+ padding: 0;
+ }
+ }
+ }
+
+ .wea-select, .ant-select, .ant-select-selection {
width: 100%;
}
- .ant-select-selection{
+
+ .ant-select-selection {
height: 30px;
border-radius: 0;
+
+ .ant-select-selection-selected-value {
+ max-width: 238px !important;
+ }
}
}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
index 7e8a8af8..3c130802 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
@@ -1,7 +1,7 @@
import React from "react";
import { inject, observer } from "mobx-react";
import { Button, DatePicker, Dropdown, Menu, message, Modal } from "antd";
-import { WeaLocaleProvider, WeaNewScroll, WeaTop } from "ecCom";
+import { WeaLocaleProvider, WeaNewScroll, WeaSelect, WeaTop } from "ecCom";
import { renderNoright } from "../../../util";
import Accountdialog from "./components/accountDialog";
import AbnormalDrawer from "./components/abnormalDrawer";
@@ -25,7 +25,8 @@ export default class StandingBook extends React.Component {
selectedKey: "0",
tableParams: {
startTime: moment(new Date()).startOf("year").format("YYYY-MM"),
- endTime: moment(new Date()).startOf("month").format("YYYY-MM")
+ endTime: moment(new Date()).startOf("month").format("YYYY-MM"),
+ paymentOrganization: ""
},
current: 1,
dialogProps: {
@@ -344,6 +345,7 @@ export default class StandingBook extends React.Component {
progressVisible: false,
progress: 0
});
+ message.error(data.message);
return;
}
if (this.state.progress !== 100) {
@@ -423,7 +425,7 @@ export default class StandingBook extends React.Component {
tableStore
} = standingBookStore;
const { list, columns, total } = this.state.tableData;
- const { startTime, endTime } = this.state.tableParams;
+ const { startTime, endTime, paymentOrganization } = this.state.tableParams;
const { dialogProps, drawerProps } = this.state;
const abnormalColumns = _.map(
_.filter(tableStore.columns, (it) => it.hide && it.hide === "false"),
@@ -465,31 +467,32 @@ export default class StandingBook extends React.Component {
return (
-
} // 左侧图标
- iconBgcolor="#F14A2D" // 左侧图标背景色
- buttons={showOperateBtn ? rightBtns : []}
+
}
+ iconBgcolor="#F14A2D" buttons={showOperateBtn ? rightBtns : []}
>
-
-
账单月份：
-
{
- return current && endTime && current.getTime() > new Date(endTime).getTime();
- }}
- onChange={(val) => this.handleChangeMonth("startTime", val)}
- />
- 至
- {
- return current && startTime && current.getTime() < new Date(startTime).getTime();
- }}
- onChange={(val) => this.handleChangeMonth("endTime", val)}
- />
+
+
+
账单月份：
+
(current && endTime && current.getTime() > new Date(endTime).getTime())}
+ onChange={(val) => this.handleChangeMonth("startTime", val)}
+ />
+ 至
+ (current && startTime && current.getTime() < new Date(startTime).getTime())}
+ onChange={(val) => this.handleChangeMonth("endTime", val)}
+ />
+
+
+ {getLabel(537996, "个税扣缴义务人")}：
+ this.setState({
+ tableParams: { ...this.state.tableParams, paymentOrganization: val }
+ }, () => {
+ this.getCommonList({ ...this.state.tableParams, ...this.pageInfo });
+ })}
+ />
+
@@ -522,15 +525,7 @@ export default class StandingBook extends React.Component {
/>
-
- {dialogProps.visible && (
- this.handleClose()}
- onOk={this.handleOk}
- loading={loading}
- />
- )}
+ this.handleClose()} onOk={this.handleOk} loading={loading}/>
{/*核算进度条*/}
{
this.state.progressVisible &&
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less
index e36a4664..f306bdf9 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.less
@@ -38,14 +38,19 @@
}
}
- .billDateWrapper {
+ .filterWrapper {
display: flex;
align-items: center;
- height: 46px;
- padding: 0 16px;
- .to {
- padding: 0 8px;
+ .billDateWrapper {
+ display: flex;
+ align-items: center;
+ height: 46px;
+ padding: 0 16px;
+
+ .to {
+ padding: 0 8px;
+ }
}
}
}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/addCompensationPersonnelDialog.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/addCompensationPersonnelDialog.js
new file mode 100644
index 00000000..34b7edb4
--- /dev/null
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/addCompensationPersonnelDialog.js
@@ -0,0 +1,223 @@
+/*
+ * Author: 黎永顺
+ * name: 添加补差人员
+ * Description:
+ * Date: 2023/11/28
+ */
+import React, { Component } from "react";
+import { inject, observer } from "mobx-react";
+import { WeaDialog, WeaInputNumber, WeaLocaleProvider, WeaSearchGroup, WeaTableEdit } from "ecCom";
+import * as API from "../../../../apis/standingBook";
+import { Button, message } from "antd";
+import { addPersonConditions } from "../constant";
+import { getSearchs, toDecimal_n } from "../../../../util";
+import { convertData } from "./supplementarySlide";
+
+const getLabel = WeaLocaleProvider.getLabel;
+
+@inject("standingBookStore")
+@observer
+class AddCompensationPersonnelDialog extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ conditions: [], paymentList: [
+ { title: getLabel(538967, "社保"), titleSign: "social", payment: [] },
+ { title: getLabel(538969, "公积金"), titleSign: "fund", payment: [] },
+ { title: getLabel(542518, "企业年金及其它福利"), titleSign: "other", payment: [] }
+ ], loading: false
+ };
+ }
+
+ componentWillReceiveProps(nextProps, nextContext) {
+ if (nextProps.visible !== this.props.visible && nextProps.visible) {
+ const { standingBookStore: { addCPForm } } = nextProps;
+ this.setState({
+ conditions: _.map(addPersonConditions, o => {
+ return {
+ ...o,
+ items: _.map(o.items, g => ({
+ ...g, label: getLabel(g.lanId, g.label)
+ })),
+ title: getLabel(111, "补差人员")
+ };
+ })
+ }, () => addCPForm.initFormFields(this.state.conditions));
+ }
+ if (nextProps.visible !== this.props.visible && !nextProps.visible) nextProps.standingBookStore.initAddCPForm();
+ }
+
+ getBalancePaymentGroup = () => {
+ const { standingBookStore: { addCPForm }, paymentOrganization } = this.props;
+ const payload = { ...addCPForm.getFormParams(), paymentOrganization };
+ API.getBalancePaymentGroup(payload).then(({ status, data }) => {
+ if (status && !_.isEmpty(data)) {
+ this.setState({
+ paymentList: [
+ {
+ title: getLabel(538967, "社保"), titleSign: "social",
+ payment: convertData(_.filter(data, it => it.titleSign === "social"))
+ },
+ {
+ title: getLabel(538969, "公积金"), titleSign: "fund",
+ payment: convertData(_.filter(data, it => it.titleSign === "fund"))
+ },
+ {
+ title: getLabel(542518, "企业年金及其它福利"), titleSign: "other",
+ payment: convertData(_.filter(data, it => it.titleSign === "other"))
+ }
+ ]
+ });
+ } else {
+ message.error(getLabel(111, "数据不存在！"));
+ this.setState({
+ paymentList: [
+ { title: getLabel(538967, "社保"), titleSign: "social", payment: [] },
+ { title: getLabel(538969, "公积金"), titleSign: "fund", payment: [] },
+ { title: getLabel(542518, "企业年金及其它福利"), titleSign: "other", payment: [] }
+ ]
+ });
+ }
+ });
+ };
+ renderColumns = () => {
+ return [
+ {
+ title: getLabel(543262, "福利项"),
+ dataIndex: "insuranceName",
+ key: "insuranceName",
+ com: [
+ { label: "", type: "INPUT", viewAttr: 1, key: "insuranceName" }
+ ],
+ colSpan: 1,
+ width: "33%"
+ },
+ {
+ title: getLabel(543263, "个人缴纳金额"),
+ dataIndex: "custom",
+ key: "custom",
+ com: [
+ {
+ type: "custom",
+ key: "custom",
+ render: (text, record, index, onEdit) => (
+ onEdit({
+ record: { ...record, [`${record.insuranceId}_per`]: v },
+ index, key: "per", value: v
+ })}
+ />
+ )
+ }
+ ],
+ colSpan: 1,
+ width: "33%"
+ },
+ {
+ title: getLabel(543264, "单位缴纳金额"),
+ dataIndex: "custom",
+ key: "custom",
+ com: [
+ {
+ type: "custom",
+ key: "custom",
+ render: (text, record, index, onEdit) => (
+ onEdit({
+ record: { ...record, [`${record.insuranceId}_com`]: v },
+ index, key: "com", value: v
+ })}
+ />
+ )
+ }
+ ],
+ colSpan: 1,
+ width: "33%"
+ }
+ ];
+ };
+ save = () => {
+ const { standingBookStore: { addCPForm }, paymentOrganization, billMonth } = this.props;
+ const { paymentList } = this.state;
+ addCPForm.validateForm().then(f => {
+ if (f.isValid) {
+ const payload = {
+ billMonth, paymentOrganization, ...addCPForm.getFormParams(),
+ ...this.convertItemJSON(_.find(paymentList, i => i.titleSign === "social").payment, "social"),
+ ...this.convertItemJSON(_.find(paymentList, i => i.titleSign === "fund").payment, "fund"),
+ ...this.convertItemJSON(_.find(paymentList, i => i.titleSign === "other").payment, "other")
+ };
+ this.setState({ loading: true });
+ API.addNewBalance(payload).then(({ status, errormsg }) => {
+ this.setState({ loading: false });
+ if (status) {
+ message.success(getLabel(30700, "操作成功！"));
+ this.props.onCancel(true);
+ } else {
+ message.error(errormsg);
+ }
+ }).catch(() => this.setState({ loading: false }));
+ } else {
+ f.showErrors();
+ }
+ });
+ };
+ convertItemJSON = (list, type) => {
+ let perJson = {}, comJson = {};
+ _.forEach(list, o => {
+ if (!_.isNil(o.per)) {
+ perJson = _.assign(perJson, { [o.insuranceId]: toDecimal_n(o.per, 2) });
+ }
+ if (!_.isNil(o.com)) {
+ comJson = _.assign(comJson, { [o.insuranceId]: toDecimal_n(o.com, 2) });
+ }
+ });
+ return { [`${type}PerJson`]: JSON.stringify(perJson), [`${type}ComJson`]: JSON.stringify(comJson) };
+ };
+ getRowSelection = (rowSelection) => {
+ let sel = { ...rowSelection };
+ sel.getCheckboxProps = (record) => {
+ return { disabled: true };
+ };
+ return sel;
+ };
+
+ render() {
+ const { conditions, paymentList, loading } = this.state;
+ const { standingBookStore: { addCPForm } } = this.props;
+ return (
+ {getLabel(826, "确定")}]}
+ style={{
+ width: 800, height: 600, minHeight: 200, minWidth: 380, maxHeight: "90%",
+ maxWidth: "90%", overflow: "hidden", transform: "translate(0px, 0px)"
+ }}
+ >
+
+
{getSearchs(addCPForm, conditions, 1, false, this.getBalancePaymentGroup)}
+ {
+ _.map(paymentList, item => (
+
+ this.setState({
+ paymentList: _.map(paymentList, o => {
+ if (o.titleSign === item.titleSign) {
+ return { ...o, payment };
+ }
+ return { ...o };
+ })
+ })}
+ />
+
+ ))
+ }
+
{/*编辑弹框*/}
+ {/*添加补差人员*/}
+ this.setState({
+ addPersonalDialog: {
+ ...addPersonalDialog,
+ visible: false
+ }
+ }, () => isRefresh && this.diffListRef.recessionList())}
+ />
{/*导入补差*/}
{
importDiffModal.visible &&
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
index e904adb9..ef41880a 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regEditDetial.js
@@ -5,11 +5,14 @@
* Date: 2022/11/23
*/
import React, { Component } from "react";
-import { WeaInputNumber, WeaSearchGroup, WeaSlideModal, WeaTable } from "ecCom";
+import { WeaInputNumber, WeaLocaleProvider, WeaSearchGroup, WeaSlideModal, WeaTable } from "ecCom";
import { message } from "antd";
import * as API from "../../../../apis/standingBook";
import SlideModalTitle from "../../../../components/slideModalTitle";
import { regColumns } from "../constant";
+import { toDecimal_n } from "../../../../util";
+
+const getLabel = WeaLocaleProvider.getLabel;
class RegEditDetial extends Component {
constructor(props) {
@@ -111,26 +114,26 @@ class RegEditDetial extends Component {
};
_.forEach(socialData.dataSource, item => {
if (item.personalPaymentAmount) {
- payload["socialPerJson"][item["insuranceId"]] = item.personalPaymentAmount;
+ payload["socialPerJson"][item["insuranceId"]] = toDecimal_n(item.personalPaymentAmount, 2);
}
if (item.companyPaymentAmount) {
- payload["socialComJson"][item["insuranceId"]] = item.companyPaymentAmount;
+ payload["socialComJson"][item["insuranceId"]] = toDecimal_n(item.companyPaymentAmount, 2);
}
});
_.forEach(foundData.dataSource, item => {
if (item.personalPaymentAmount) {
- payload["fundPerJson"][item["insuranceId"]] = item.personalPaymentAmount;
+ payload["fundPerJson"][item["insuranceId"]] = toDecimal_n(item.personalPaymentAmount, 2);
}
if (item.companyPaymentAmount) {
- payload["fundComJson"][item["insuranceId"]] = item.companyPaymentAmount;
+ payload["fundComJson"][item["insuranceId"]] = toDecimal_n(item.companyPaymentAmount, 2);
}
});
_.forEach(otherData.dataSource, item => {
if (item.personalPaymentAmount) {
- payload["otherPerJson"][item["insuranceId"]] = item.personalPaymentAmount;
+ payload["otherPerJson"][item["insuranceId"]] = toDecimal_n(item.personalPaymentAmount, 2);
}
if (item.companyPaymentAmount) {
- payload["otherComJson"][item["insuranceId"]] = item.companyPaymentAmount;
+ payload["otherComJson"][item["insuranceId"]] = toDecimal_n(item.companyPaymentAmount, 2);
}
});
_.forEach(Object.keys(payload), item => {
@@ -198,13 +201,13 @@ class RegEditDetial extends Component {
let socialSecurity = [], accumulationFund = [], otherBenefits = [];
const { data: result } = data;
_.map(result, it => {
- if (it.title.indexOf("社保") !== -1) {
+ if (it.titleSign === "social") {
socialSecurity.push(it);
}
- if (it.title.indexOf("公积金") !== -1) {
+ if (it.titleSign === "fund") {
accumulationFund.push(it);
}
- if (it.title.indexOf("其他") !== -1) {
+ if (it.titleSign === "other") {
otherBenefits.push(it);
}
});
@@ -226,9 +229,9 @@ class RegEditDetial extends Component {
result = _.map(_.uniqWith(fieldItems, _.isEqual), item => {
let obj = { benefits: item };
_.forEach(data, it => {
- if (item === it.insuranceName && it.paymentScope === "个人") {
+ if (item === it.insuranceName && it.paymentScopeSign === "per") {
obj = _.assign(obj, { ...it, personalPaymentAmount: it.insuranceValue });
- } else if (item === it.insuranceName && it.paymentScope === "公司") {
+ } else if (item === it.insuranceName && it.paymentScopeSign === "com") {
obj = _.assign(obj, { ...it, companyPaymentAmount: it.insuranceValue });
}
});
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
index 8971946d..72acc3f1 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regTop.js
@@ -1,8 +1,10 @@
import React, { Component } from "react";
import { Button } from "antd";
-import { WeaFormItem, WeaHelpfulTip, WeaInput, WeaSearchGroup, WeaTab } from "ecCom";
+import { WeaFormItem, WeaHelpfulTip, WeaInput, WeaLocaleProvider, WeaSearchGroup, WeaTab } from "ecCom";
import { getQueryString } from "../../../../util/url";
+const getLabel = WeaLocaleProvider.getLabel;
+
class RegTop extends Component {
constructor(props) {
super(props);
@@ -38,13 +40,16 @@ class RegTop extends Component {
if (!type) {
const [dom1, ...extra] = dom;
const domBtn = regtopType === "regression" ?
- :
- ;
+ [] :
+ [
+ ,
+
+ ];
dom = [
dom1,
, domBtn, ...extra
+ , ...domBtn, ...extra
];
}
return dom;
@@ -69,7 +74,7 @@ class RegTop extends Component {
{
title: `账单月份: ${billMonth}`,
viewcondition: "1"
- },
+ }
]}
keyParam="viewcondition" selectedKey="" advanceHeight={200} searchsAd={this.getSearchs()}
searchType={["base", "advanced"]} showSearchAd={showSearchAd}
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js
index 4beb586f..8881cc39 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/supplementarySlide.js
@@ -7,7 +7,7 @@
import React, { Component } from "react";
import { inject, observer } from "mobx-react";
import { message, Modal } from "antd";
-import { WeaFormItem, WeaSearchGroup, WeaSelect, WeaSlideModal } from "ecCom";
+import { WeaFormItem, WeaLocaleProvider, WeaSearchGroup, WeaSelect, WeaSlideModal } from "ecCom";
import SlideModalTitle from "../../../../components/slideModalTitle";
import { Picker, SelectWithAll } from "./regAddEmployee";
import { Browser } from "../../../dataAcquisition/addItems";
@@ -15,6 +15,9 @@ import { getPaymentGroup, getSupplementPaymentForm, siaccountSupplementarySave }
import "./index.less";
import BusinessAccounting from "./businessAccounting";
import InputPaymentAmount from "./inputPaymentAmount";
+import { toDecimal_n } from "../../../../util";
+
+const getLabel = WeaLocaleProvider.getLabel;
@inject("taxAgentStore")
@observer
@@ -88,8 +91,12 @@ class SupplementarySlide extends Component {
_.map(inputPaymentAmount[item], child => {
const key = child.insuranceId, valuePer = child[`${child.insuranceId}_per`],
valueCom = child[`${child.insuranceId}_com`];
- _.assign(payload[`${item}PerString`], { [key]: valuePer ? valuePer.toString() : "0" });
- _.assign(payload[`${item}ComString`], { [key]: valueCom ? valueCom.toString() : "0" });
+ if (!child.perDisabled) {
+ _.assign(payload[`${item}PerString`], { [key]: toDecimal_n(valuePer, 2) || "0" });
+ }
+ if (!child.comDisabled) {
+ _.assign(payload[`${item}ComString`], { [key]: toDecimal_n(valueCom, 2) || "0" });
+ }
});
});
for (let i in payload) {
@@ -97,22 +104,6 @@ class SupplementarySlide extends Component {
}
return payload;
};
- convertData = (dataSource) => {
- let endList = [];
- _.values(_.groupBy(dataSource, "insuranceName")).forEach((itemList) => {
- let data = {};
- itemList.forEach(d => {
- const perKey = `${d.insuranceId}_per`, comKey = `${d.insuranceId}_com`;
- data = _.assign(data, {
- ...d,
- [perKey]: "",
- [comKey]: ""
- });
- });
- return endList.push(data);
- });
- return endList;
- };
handleSaveSupplementSalary = () => {
const { billMonth, paymentOrganization, onCancel } = this.props;
const { baseInfo } = this.state;
@@ -185,9 +176,9 @@ class SupplementarySlide extends Component {
if (status) {
this.setState({
businessAccounting: {
- socialSecurityBase: _.filter(data, it => it.title === "社保"),
- fundBase: _.filter(data, it => it.title === "公积金"),
- otherBase: _.filter(data, it => it.title === "企业年金及其它福利")
+ socialSecurityBase: _.filter(data, it => it.titleSign === "social"),
+ fundBase: _.filter(data, it => it.titleSign === "fund"),
+ otherBase: _.filter(data, it => it.titleSign === "other")
}
});
} else {
@@ -214,9 +205,9 @@ class SupplementarySlide extends Component {
if (status) {
this.setState({
inputPaymentAmount: {
- socialPayment: this.convertData(_.filter(data, it => it.title === "社保")),
- fundPayment: this.convertData(_.filter(data, it => it.title === "公积金")),
- otherPayment: this.convertData(_.filter(data, it => it.title === "企业年金及其它福利"))
+ socialPayment: convertData(_.filter(data, it => it.titleSign === "social")),
+ fundPayment: convertData(_.filter(data, it => it.titleSign === "fund")),
+ otherPayment: convertData(_.filter(data, it => it.titleSign === "other"))
}
});
} else {
@@ -348,6 +339,16 @@ class SupplementarySlide extends Component {
...baseInfo,
supplementType,
historyMonth: ""
+ },
+ businessAccounting: {
+ socialSecurityBase: [],
+ fundBase: [],
+ otherBase: []
+ },
+ inputPaymentAmount: {
+ socialPayment: [],
+ fundPayment: [],
+ otherPayment: []
}
}, () => this.handleChangeItem());
}
@@ -431,3 +432,22 @@ export const SelectDetailType = payload => {
);
};
+
+export const convertData = (dataSource) => {
+ let endList = [];
+ _.values(_.groupBy(dataSource, "insuranceName")).forEach((itemList) => {
+ let data = {};
+ itemList.forEach(d => {
+ const perKey = `${d.insuranceId}_per`, comKey = `${d.insuranceId}_com`;
+ data = _.assign(data, {
+ ...d,
+ [perKey]: "",
+ [comKey]: "",
+ perDisabled: !_.includes(_.map(itemList, o => o.paymentScopeSign), "per"),
+ comDisabled: !_.includes(_.map(itemList, o => o.paymentScopeSign), "com")
+ });
+ });
+ return endList.push(data);
+ });
+ return endList;
+};
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/constant.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/constant.js
index 6b2634c3..276072e3 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/constant.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/constant.js
@@ -1,50 +1,56 @@
-export const unArchiveTabs = [
- {
- title: "正常缴纳",
- viewcondition: "NORMAL",
- },
- {
- title: "异动清单",
- viewcondition: "LIST",
- },
- {
- title: "补缴",
- viewcondition: "PAY",
- },
- {
- title: "总览",
- viewcondition: "OVERVIEW",
- },
-];
-export const archiveTabs = [
- {
- title: "正常缴纳",
- viewcondition: "NORMAL",
- },
- {
- title: "补缴",
- viewcondition: "PAY",
- },
- {
- title: "总览",
- viewcondition: "OVERVIEW",
- },
-];
-
export const regColumns = [
{
- title: '福利项',
- dataIndex: 'benefits',
- key: 'benefits',
+ title: "福利项",
+ dataIndex: "benefits",
+ key: "benefits"
},
{
- title: '个人缴纳金额',
- dataIndex: 'personalPaymentAmount',
- key: 'personalPaymentAmount',
+ title: "个人缴纳金额",
+ dataIndex: "personalPaymentAmount",
+ key: "personalPaymentAmount"
},
{
- title: '单位缴纳金额',
- dataIndex: 'companyPaymentAmount',
- key: 'companyPaymentAmount',
- },
+ title: "单位缴纳金额",
+ dataIndex: "companyPaymentAmount",
+ key: "companyPaymentAmount"
+ }
+];
+export const addPersonConditions = [
+ {
+ items: [
+ {
+ colSpan: 1,
+ conditionType: "BROWSER",
+ browserConditionParam: {
+ completeParams: {},
+ conditionDataParams: {},
+ dataParams: {},
+ destDataParams: {},
+ hasAddBtn: false,
+ hasAdvanceSerach: true,
+ idSeparator: ",",
+ isAutoComplete: 1,
+ isDetail: 0,
+ isMultCheckbox: false,
+ isSingle: true,
+ linkUrl: "/hrm/resource/HrmResource.jsp?id=",
+ pageSize: 10,
+ quickSearchName: "",
+ replaceDatas: [],
+ title: "",
+ type: "1"
+ },
+ domkey: ["employeeId"],
+ fieldcol: 14,
+ label: "对象",
+ lanId: 106,
+ labelcol: 7,
+ rules: "required|string",
+ viewAttr: 3,
+ value: ""
+ }
+ ],
+ defaultshow: true,
+ title: ""
+ }
];
diff --git a/pc4mobx/hrmSalary/stores/StandingBook.js b/pc4mobx/hrmSalary/stores/StandingBook.js
index d74c1c5c..1288da0f 100644
--- a/pc4mobx/hrmSalary/stores/StandingBook.js
+++ b/pc4mobx/hrmSalary/stores/StandingBook.js
@@ -7,6 +7,12 @@ import * as API from "../apis/standingBook";
const { TableStore } = WeaTableNew;
export class StandingBookStore {
+ @observable accountForm = new WeaForm(); // 社保台账核算Form
+ @action initAccountForm = () => this.accountForm = new WeaForm();
+ @observable addCPForm = new WeaForm(); // 社保台账详情页面，添加补差人员form
+ @action initAddCPForm = () => this.addCPForm = new WeaForm();
+
+
@observable tableStore = new TableStore(); // new table
@observable form = new WeaForm(); // nrew 一个form
@observable ocForm = new WeaForm(); // 社保福利线下对比form
diff --git a/pc4mobx/hrmSalary/stores/ledger.js b/pc4mobx/hrmSalary/stores/ledger.js
index d1a0860c..8dc46dc8 100644
--- a/pc4mobx/hrmSalary/stores/ledger.js
+++ b/pc4mobx/hrmSalary/stores/ledger.js
@@ -12,6 +12,7 @@ export class LedgerStore {
//重构薪资账套
@observable copyForm = new WeaForm(); // 复制form
@observable categoryForm = new WeaForm(); // 新增分类form
+ @observable searchForm = new WeaForm(); // 查询form
/*******************************************************/
diff --git a/pc4mobx/hrmSalary/util/index.js b/pc4mobx/hrmSalary/util/index.js
index 9be126dc..e5b3c1aa 100644
--- a/pc4mobx/hrmSalary/util/index.js
+++ b/pc4mobx/hrmSalary/util/index.js
@@ -117,17 +117,10 @@ export const padding0 = (num, length) => {
}
return "0." + num;
};
-export const toDecimal_n = (x, num) => {
- if (isNaN(parseFloat(x))) return false;
- let f = Math.round(x * 100) / 100;
- let s = f.toString();
- let rs = s.indexOf(".");
- if (rs < 0) {
- rs = s.length;
- s += ".";
- }
- while (s.length <= rs + num) {
- s += "0";
- }
- return s;
+export const toDecimal_n = (num, decimalPlaces) => {
+ if (num === null || !isFinite(num)) return null
+ if (decimalPlaces < 0) return null;
+ const multiplier = Math.pow(10, decimalPlaces);
+ const roundedNum = Math.round(num * multiplier) / multiplier;
+ return roundedNum.toFixed(decimalPlaces);
};