From fb97f343577779450abbe3c37c3b9d502b0332dd Mon Sep 17 00:00:00 2001
From: chenglb <chenglb@yisa.com>
Date: Mon, 18 Dec 2023 12:58:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=83=AD=E9=97=A8=E5=95=86=E5=9C=88?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE,=20=E6=89=80=E5=B1=9E=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?0,=200=E6=98=AF=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E5=80=BC,?=
 =?UTF-8?q?=20=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E6=9C=89,=20=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83=E6=B2=A1=E6=9C=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx   | 12 ++++++------
 src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx |  6 +++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx b/src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx
index 6a26acd..b625cf6 100644
--- a/src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx
+++ b/src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx
@@ -33,7 +33,7 @@ function HotCbdConf() {
         defaultValue:{}
     })
     const [formData, setFormData] = useSetState({ 
-        area: defaultParams.formParams?.area ? defaultParams.formParams.area : '0',
+        area: defaultParams.formParams?.area ? defaultParams.formParams.area : '',
         name: defaultParams.formParams?.name ? defaultParams.formParams.name : '',
     })
 
@@ -159,7 +159,7 @@ function HotCbdConf() {
                     setDetailVisible(false)
                     setModalFormData({
                         name: '',
-                        area: '0',
+                        area: '',
                         center_name: ''
                     })
                     message.success('编辑商圈成功')
@@ -174,7 +174,7 @@ function HotCbdConf() {
                     setDetailVisible(false)
                     setModalFormData({
                         name: '',
-                        area: '0',
+                        area: '',
                         center_name: ''
                     })
                     search(Object.assign({},formData, pageData))
@@ -191,7 +191,7 @@ function HotCbdConf() {
         setCurrentRecord(record)
         setModalFormData({
             name: record.name, 
-            area: parseInt(record.area_id) ? record.area_id : '0' ,
+            area: parseInt(record.area_id) ? record.area_id : '' ,
             center_name: record.center_name
         })
         setDetailVisible(true)
@@ -227,10 +227,10 @@ function HotCbdConf() {
     const reset = ()=>{
         setFormData({
             name: '',
-            area: '0'
+            area: ''
         })
         setPageData({...pageData, pn: 1})
-        search({name: '', area: '0', pn: 1, size: pageData.size})
+        search({name: '', area: '', pn: 1, size: pageData.size})
     }
 
     const addConfig = ()=>{
diff --git a/src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx b/src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx
index 6577755..05ee5bb 100644
--- a/src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx
+++ b/src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx
@@ -85,6 +85,8 @@ function VacationConf() {
                     message.success('新增成功')
                     setModalVisible(false)
                     getVacationData()
+                }else{
+                    message.error(res.message)
                 }
             }).catch(err=>{
     
@@ -102,6 +104,8 @@ function VacationConf() {
                     message.success('修改成功')
                     setModalVisible(false)
                     getVacationData()
+                }else{
+                    message.error(res.message)
                 }
             }).catch(err=>{
     
@@ -118,7 +122,7 @@ function VacationConf() {
     }
 
     const onChange = (value, mode) => {
-        let temp  = value.format('MM-DD')
+        let temp  = value.format('YYYY-MM-DD')
         if(vacationData.length){
             let one = vacationData.find(item=> item.day == temp)
             if(one){