diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js index c65d2ef0..8684eaf2 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js @@ -106,11 +106,15 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { } else if (item === "cardType") { declareForm.updateFields({ [item]: "居民身份证" }); } else if (item === "employee") { - declareForm.updateFields({ - // employeeType: { - // value: ["ORGANIZATION", ["13", "郑世珍", [{ id: "13", lastname: "郑世珍" }]]], - // valueSpan: ["employeeId"] - // } + const [employeeData] = result[item] || []; + !_.isEmpty(employeeData) && declareForm.updateFields({ + employeeType: { + value: [employeeData._entityType, [employeeData.id, employeeData.name, [{ + id: employeeData.id, + lastname: employeeData.name + }]]], + valueSpan: ["employeeId"] + } }); } else { declareForm.updateFields({ [item]: result[item] || "" }); diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js index 74b8d9d2..56b8402b 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/index.js @@ -382,6 +382,7 @@ class Index extends Component { /> ]; // !showOperateBtn && tabBtns.shift(); + selectedKey !== "list" && tabBtns.shift(); return (