this.setState({ searchValue })}
+ placeholder="请输入对象"
+ onSearch={() => console.log(searchValue)}
+ />];
+ return (
+
+
this.setState({ selectedKey })}
+ />
+ this.personalScopeTableRef = dom}
+ searchKeyVal={{ key: "salarySobId", value: editId }}
+ APIFox={APIFox}
+ tabActive={selectedKey}
+ searchValue={searchValue}
+ onChangeSelectKey={rowKeys => this.setState({ rowKeys })}
+ />
+
+ );
+ }
+}
+
+export default LedgerAssociatedPersonnel;
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
index 6e043517..29f4af17 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
@@ -66,7 +66,7 @@ class LedgerBaseSetting extends Component {
attendCycleFromDay: "1",
socialSecurityCycleType: "3",
description: "",
- canEdit: false
+ canEdit: "true"
}
});
};
@@ -124,7 +124,10 @@ class LedgerBaseSetting extends Component {
};
render() {
+ const { editId } = this.props;
const { baseForm, settingBaseInfo } = this.state;
+ const { canEdit, taxAgentId } = settingBaseInfo;
+ let taxAgentIdDisabled = false, taxableItemsDisabled = false;
return (
@@ -132,16 +135,19 @@ class LedgerBaseSetting extends Component {
{
_.map(baseForm, item => {
const { key, label, type, options = [], children = [] } = item;
+ taxAgentIdDisabled = key === "taxAgentId" && taxAgentId;
+ taxableItemsDisabled = key === "taxableItems" && editId;
return
{
type === "INPUT" ?
- this.handleChangeField(key, v)}/> :
type === "TEXTAREA" ?
- this.handleChangeField(key, v)}/> :
+ this.handleChangeField(key, v)}/> :
type === "CHECKBOX" ?
:
type === "SELECT" ?
this.handleChangeField(key, v)}/> :
type === "CUSTOM" ?
{
const { list, baseInfo, onChange, inputStr } = props;
- const { salaryCycleType, salaryCycleFromDay, attendCycleType, attendCycleFromDay } = baseInfo;
+ const { salaryCycleType, salaryCycleFromDay, attendCycleType, attendCycleFromDay, canEdit } = baseInfo;
const salaryCycleStrObj = initPeriodStr("inputStr", salaryCycleType, salaryCycleFromDay);
const attendCycleStrObj = initPeriodStr("inputStr", attendCycleType, attendCycleFromDay);
return
@@ -179,6 +186,7 @@ const CustomSelect = (props) => {
const { key, options = [] } = item;
return
onChange(key, v)}/>
;
})
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
index e3c58e7c..d861e3c6 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
@@ -10,6 +10,7 @@ import { WeaSlideModal, WeaSteps } from "ecCom";
import { Button, message, Modal } from "antd";
import SlideModalTitle from "../../../components/slideModalTitle";
import LedgerBaseSetting from "./ledgerBaseSetting";
+import LedgerAssociatedPersonnel from "./ledgerAssociatedPersonnel";
import { saveLedgerBasic } from "../../../apis/ledger";
import "./index.less";
@@ -17,9 +18,9 @@ const Step = WeaSteps.Step;
const tabs = [
{ key: 0, title: "基础设置" },
{ key: 1, title: "关联人员" },
- { key: 3, title: "薪资项目" },
- { key: 4, title: "回算薪资项目" },
- { key: 5, title: "校验规则" }
+ { key: 2, title: "薪资项目" },
+ { key: 3, title: "回算薪资项目" },
+ { key: 4, title: "调薪计薪规则" }
];
@inject("taxAgentStore")
@@ -81,6 +82,9 @@ class LedgerSlide extends Component {
case 0:
CurrentDom = ;
break;
+ case 1:
+ CurrentDom = ;
+ break;
default:
CurrentDom = null;
break;
@@ -104,10 +108,10 @@ class LedgerSlide extends Component {
];
break;
case 1:
- CurrentDom = [
+ CurrentDom = !editId ? [
,
- ];
+ ] : [];
break;
case 2:
CurrentDom = !editId ?