From ecaa1607d6498d925f2c6544b06f6cd93a343915 Mon Sep 17 00:00:00 2001
From: wanghx <wanghx@yisa.com>
Date: Thu, 21 Dec 2023 09:43:49 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E8=B7=AF=E5=86=85=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E7=9F=A5bug=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EquipmentMgm/EquipmentBrand/loadable.jsx       | 32 ++++++++++++++--------
 .../InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx     | 28 ++++++++++++-------
 2 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx
index c977994..c297d45 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentBrand/loadable.jsx
@@ -258,20 +258,28 @@ function Fence(props) {
     }
     const handleSubmit = () => {
         if (editStatus) { // 编辑
-            brandEdit(form.getFieldsValue()).then((msg) => {
-                message.success(msg || '品牌更新成功')
-                setEditModalVisible(false)
-                getBrandData()
-                getData()
-                getBrandData()
+            form.validateFields().then(data => {
+                brandEdit(data).then((msg) => {
+                    message.success(msg || '品牌更新成功')
+                    setEditModalVisible(false)
+                    getBrandData()
+                    getData()
+                    getBrandData()
+                })
+            }).catch(err => {
+                console.log(err)
             })
         } else { // 新增
-            brandAdd(form.getFieldsValue()).then((msg) => {
-                message.success(msg || '品牌添加成功')
-                setEditModalVisible(false)
-                getBrandData()
-                getData()
-                getBrandData()
+            form.validateFields().then(data => {
+                brandAdd(data).then((msg) => {
+                    message.success(msg || '品牌添加成功')
+                    setEditModalVisible(false)
+                    getBrandData()
+                    getData()
+                    getBrandData()
+                })
+            }).catch(err => {
+                console.log(err)
             })
         }
     }
diff --git a/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
index 6627ceb..9b81c3e 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/NvrMgm/loadable.jsx
@@ -393,18 +393,26 @@ function Fence(props) {
   const handleSubmit = () => {
     if (editStatus) {
       // 编辑
-      nvrUpdate(form.getFieldsValue()).then((msg) => {
-        message.success(msg || "设备更新成功");
-        setEditModalVisible(false);
-        getData();
-      });
+      form.validateFields().then(data => {
+        nvrUpdate(data).then((msg) => {
+          message.success(msg || "设备更新成功");
+          setEditModalVisible(false);
+          getData();
+        });
+      }).catch(err => {
+        console.log(err)
+      })
     } else {
       // 新增
-      nvrAdd(form.getFieldsValue()).then((msg) => {
-        message.success(msg || "设备添加成功");
-        setEditModalVisible(false);
-        getData();
-      });
+      form.validateFields().then(data => {
+        nvrAdd(data).then((msg) => {
+          message.success(msg || "设备添加成功");
+          setEditModalVisible(false);
+          getData();
+        });
+      }).catch(err => {
+        console.log(err)
+      })
     }
   };
   const [sessionTabList, setSessionTabList] = useSessionStorageState("nvrMgm", {