current === o.key).editBtns : []}
+ tabDatas={tabs} selectedKey={String(current)}
+ onChange={cur => this.setState({ current: parseInt(cur) })}/>
}
content={
@@ -297,9 +248,7 @@ class LedgerSlide extends Component {
}
}
- {
- this.renderChildren()
- }
+ {_.find(tabs, o => current === o.key).children}
}
onClose={this.handleClose}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/index.less
index 2fc10db7..182042bf 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/index.less
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/index.less
@@ -1,13 +1,3 @@
-.ledgerOuter {
- .wea-new-top {
- .ant-col-10 {
- & > span:nth-child(2) {
- margin-top: -6px;
- }
- }
- }
-}
-
.ledgerWrapper {
height: 100%;
diff --git a/pc4mobx/hrmSalary/pages/reportView/components/condition.js b/pc4mobx/hrmSalary/pages/reportView/components/condition.js
index f0c3b8e6..23980906 100644
--- a/pc4mobx/hrmSalary/pages/reportView/components/condition.js
+++ b/pc4mobx/hrmSalary/pages/reportView/components/condition.js
@@ -484,6 +484,10 @@ export const mapBarOptions = (params) => ({
];
}
},
+ textStyle: {
+ textShadowColor: "transparent",
+ color: "#fff"
+ },
rich: {
a: {
fontWeight: "bold",
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/columns.js b/pc4mobx/hrmSalary/pages/salaryItem/columns.js
index e34b5431..b2cae4bd 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/columns.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/columns.js
@@ -128,13 +128,14 @@ export const salaryItemFields = [
viewAttr: 2,
tip: ""
},
- // {
- // key: "defaultValue",
- // label: "默认值",
- // type: "INPUT",
- // viewAttr: 2,
- // tip: ""
- // },
+ {
+ key: "defaultValue",
+ label: "默认值",
+ type: "INPUT",
+ viewAttr: 2,
+ precision: 2,
+ tip: ""
+ },
{
key: "formulaContent",
label: "公式",
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/index.js b/pc4mobx/hrmSalary/pages/salaryItem/index.js
index 4be1e225..d96ae163 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/index.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/index.js
@@ -2,7 +2,7 @@ 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 } from "../../util";
+import { renderLoading, toDecimal_n } from "../../util";
import CustomTab from "../../components/customTab";
import SystemSalaryItemModal from "./systemSalaryItemModal";
import { columns } from "./columns";
@@ -358,7 +358,8 @@ export default class SalaryItem extends React.Component {
const handleSaveSlideChange = (value) => {
const { salaryItemStore: { setRequest } } = this.props;
- setRequest(value);
+ const { defaultValue, pattern, ...extra } = value;
+ setRequest({ ...extra, pattern, defaultValue: toDecimal_n(defaultValue, parseInt(pattern)) });
};
const rowSelection = {
selectedRowKeys,
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/options.js b/pc4mobx/hrmSalary/pages/salaryItem/options.js
index 7dbd51b4..58e64e3e 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/options.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/options.js
@@ -71,6 +71,16 @@ export const patternOptions = [
key: "8",
showname: "8",
selected: false
+ },
+ {
+ key: "9",
+ showname: "9",
+ selected: false
+ },
+ {
+ key: "10",
+ showname: "10",
+ selected: false
}
];
diff --git a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
index 47d48a73..98a869e3 100644
--- a/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
+++ b/pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
@@ -122,6 +122,8 @@ class SalaryItemForm extends Component {
return { ...item, type: v === "number" ? "INPUTNUMBER" : "INPUT" };
} else if (key === "valueType" && item.key === "defaultValue") {
return { ...item, display: v === "1" };
+ } else if (key === "pattern" && item.key === "defaultValue") {
+ return { ...item, precision: parseInt(v) };
} else if (key === "valueType" && (item.key === "originSqlContent" || item.key === "originFormulaContent")) {
return {
...item,
@@ -133,11 +135,11 @@ class SalaryItemForm extends Component {
return { ...item };
})
}, () => {
- // if (key === "valueType" && !this.props.isLedger) {
- // onChangeFieldsItem({ formulaContent: "", formulaId: 0, valueType: v });
- // } else {
- onChangeFieldsItem({ [key]: (key === "useDefault" || key === "useInEmployeeSalary" || key === "hideDefault") ? Number(v) : v });
- // }
+ if (key === "dataType") {
+ onChangeFieldsItem({ [key]: v, defaultValue: "" });
+ } else {
+ onChangeFieldsItem({ [key]: (key === "useDefault" || key === "useInEmployeeSalary" || key === "hideDefault") ? Number(v) : v });
+ }
});
};
@@ -148,7 +150,7 @@ class SalaryItemForm extends Component {
{
_.map(salaryItemFieldsList, item => {
- const { key, label, type, viewAttr, tip, options, display = true, multiple = false } = item;
+ const { key, label, type, viewAttr, tip, options, display = true, multiple = false, precision = 0 } = item;
const value = !_.isNil(request[key]) ? request[key].toString() : "";
return
{
@@ -181,7 +183,7 @@ class SalaryItemForm extends Component {
(type === "INPUTNUMBER" && display) ?
- this.handleChangeSalaryFiledItems(key, v)}/>
{key === "width" && display &&
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js
index 9447e487..10751d50 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/components/welfarePlanEditSlide/planSetTable.js
@@ -246,7 +246,9 @@ class PlanSetTable extends Component {
{ key: "5", showname: "5" },
{ key: "6", showname: "6" },
{ key: "7", showname: "7" },
- { key: "8", showname: "8" }
+ { key: "8", showname: "8" },
+ { key: "9", showname: "9" },
+ { key: "10", showname: "10" }
]} viewAttr={showOperateBtn ? 2 : 1}
onChange={validNum => onEdit({
record: { ...record, validNum },