diff --git a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx index 5bb07b0..c8d1966 100644 --- a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx +++ b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx @@ -16,7 +16,6 @@ function ModalAreaAdd (props) { level, onCancel } = props - console.log(pid); const [form] = Form.useForm() const [areaType, setAreaType] = useState("1") diff --git a/src/pages/SystemMgm/AreaManage/loadable.jsx b/src/pages/SystemMgm/AreaManage/loadable.jsx index 968da42..264afbb 100644 --- a/src/pages/SystemMgm/AreaManage/loadable.jsx +++ b/src/pages/SystemMgm/AreaManage/loadable.jsx @@ -74,7 +74,7 @@ function AreaManage() { }) } const handleAreaAdd = ({ level, id, isCity }) => { - let pid =id + let pid = id setIsCity(isCity) setPid(pid) setLevel(Number(level) + 1) @@ -89,7 +89,15 @@ function AreaManage() { } // 区域删除 - const handleAreaDel = ({ name, id }) => { + const handleAreaDel = ({ name, id, children }) => { + let arr = [] + arr.push(id) + console.log(children, id); + if (children != undefined) { + children.map(res => { + arr.push(res.id) + }) + } Modal.confirm({ title: '确认删除?', content: `是否确认删除区域: ${name}`, @@ -97,7 +105,7 @@ function AreaManage() { okText: '删除', cancelText: '取消', onOk: () => { - ajaxAreaDel({ name, id }).then((msg) => { + ajaxAreaDel({ name, arr }).then((msg) => { message.success(msg) getAreaTree() }).catch((err) => { @@ -158,14 +166,14 @@ function AreaManage() { { level === 2 ? <> handleAreaAdd({ level, id, isCity: false })} /> - handleAreaDel({ name, id })} /> + handleAreaDel({ name, id, children })} /> handleAreaEdit({ name, id, virtually_code, code, lng_lat })} /> : null } { level > 2 ? <> {/* handleAreaAdd({level, pid, isCity: false})} /> */} - handleAreaDel({ name, id })} /> + handleAreaDel({ name, id, children })} /> handleAreaEdit({ name, id, virtually_code, code, lng_lat })} /> : null }