From 71dfd84fdef84e48e9a2acca2f9e7482c8a0d4d1 Mon Sep 17 00:00:00 2001
From: guoxin <guoxin@yisa.com>
Date: Fri, 27 Oct 2023 13:38:32 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx |  1 -
 src/pages/SystemMgm/AreaManage/loadable.jsx           | 18 +++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

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 ? <>
                     <PlusCircleOutlined className='label-icon' onClick={() => handleAreaAdd({ level, id, isCity: false })} />
-                    <DeleteOutlined className="label-icon" onClick={() => handleAreaDel({ name, id })} />
+                    <DeleteOutlined className="label-icon" onClick={() => handleAreaDel({ name, id, children })} />
                     <EditOutlined className="label-icon" onClick={() => handleAreaEdit({ name, id, virtually_code, code, lng_lat })} />
                 </> : null
             }
             {
                 level > 2 ? <>
                     {/* <PlusCircleOutlined className='label-icon' onClick={() => handleAreaAdd({level, pid, isCity: false})} /> */}
-                    <DeleteOutlined className="label-icon" onClick={() => handleAreaDel({ name, id })} />
+                    <DeleteOutlined className="label-icon" onClick={() => handleAreaDel({ name, id, children })} />
                     <EditOutlined className="label-icon" onClick={() => handleAreaEdit({ name, id, virtually_code, code, lng_lat })} />
                 </> : null
             }