Compare commits
No commits in common. "5fc1a9c8e45bc497c017edc1277a16cf7aa80be1" and "213224cf83feb99e966d29a0e0baa8b42840e9cc" have entirely different histories.
5fc1a9c8e4
...
213224cf83
|
|
@ -119,7 +119,7 @@ function DepartmentPositionPage(props) {
|
||||||
const tree = res?.data || [];
|
const tree = res?.data || [];
|
||||||
setTreeData(tree);
|
setTreeData(tree);
|
||||||
if (tree.length) {
|
if (tree.length) {
|
||||||
setSelectedDept(tree[0]);
|
setSelectedDept(toSelectedDept(tree[0]));
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.warn("[DepartmentPosition] loadTree failed:", err);
|
console.warn("[DepartmentPosition] loadTree failed:", err);
|
||||||
|
|
@ -281,7 +281,7 @@ function DepartmentPositionPage(props) {
|
||||||
treeData={filteredTree}
|
treeData={filteredTree}
|
||||||
fieldNames={{ title: "deptName", key: "id", children: "children" }}
|
fieldNames={{ title: "deptName", key: "id", children: "children" }}
|
||||||
onSelect={(_, { node }) => {
|
onSelect={(_, { node }) => {
|
||||||
setSelectedDept(node);
|
setSelectedDept(toSelectedDept(node));
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -383,7 +383,6 @@ function DepartmentPositionPage(props) {
|
||||||
{deptModalOpen && (
|
{deptModalOpen && (
|
||||||
<DeptFormModal
|
<DeptFormModal
|
||||||
open={deptModalOpen}
|
open={deptModalOpen}
|
||||||
selectedDept={selectedDept}
|
|
||||||
currentId={currentId}
|
currentId={currentId}
|
||||||
selectedDeptId={selectedDept?.id}
|
selectedDeptId={selectedDept?.id}
|
||||||
staffOptions={staffOptions}
|
staffOptions={staffOptions}
|
||||||
|
|
@ -463,7 +462,6 @@ function DeptFormModal({
|
||||||
currentId,
|
currentId,
|
||||||
staffOptions,
|
staffOptions,
|
||||||
treeData,
|
treeData,
|
||||||
selectedDept,
|
|
||||||
requestAdd,
|
requestAdd,
|
||||||
requestEdit,
|
requestEdit,
|
||||||
requestDetails,
|
requestDetails,
|
||||||
|
|
@ -530,12 +528,10 @@ function DeptFormModal({
|
||||||
};
|
};
|
||||||
|
|
||||||
const handleSubmit = async (values) => {
|
const handleSubmit = async (values) => {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
setSubmitting(true);
|
setSubmitting(true);
|
||||||
const request = currentId ? requestEdit : requestAdd;
|
const request = currentId ? requestEdit : requestAdd;
|
||||||
const payload = {...selectedDept, ...values };
|
const payload = { ...values };
|
||||||
delete payload.children;
|
|
||||||
if (currentId) {
|
if (currentId) {
|
||||||
payload.id = currentId;
|
payload.id = currentId;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue