From 4110a9e9eb4004d453eb3f704f1f239461d098d4 Mon Sep 17 00:00:00 2001
From: guoxin <guoxin@yisa.com>
Date: Mon, 27 Nov 2023 15:32:34 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E5=A4=84=E7=90=86=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=AF=B9=E6=8E=A5=E9=94=99=E5=B3=B0=E8=BD=A6?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableModule/index.jsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx
index 3ed0860..d7d1420 100644
--- a/src/components/TableModule/index.jsx
+++ b/src/components/TableModule/index.jsx
@@ -182,10 +182,10 @@ const TableModule = forwardRef((props, ref) => {
       if (mandatory) {
         let cna = Object.values(searchForm.getFieldsValue([mandatory]))
         //console.log(mandatory,cna[0],searchForm.getFieldsValue([mandatory]))
-        if (!cna[0]) {
-          message.error(`查询时间范围大于半年，需填写${mandatory_name}！`)
-          return
-        }
+        // if (!cna[0]) {
+        //   message.error(`查询时间范围大于半年，需填写${mandatory_name}！`)
+        //   return
+        // }
       }
     }
     if (limitCon && limitCon(form)) return
@@ -468,7 +468,7 @@ const TableModule = forwardRef((props, ref) => {
                         moment().startOf("day")
                       }
                     >
-                      <DatePicker showTime format={"YYYY-MM-DD HH:mm:ss"} placement={"topLeft"} />
+                      <DatePicker showTime format={"YYYY-MM-DD HH:mm:ss"} allowClear={false} placement={"topLeft"} />
                     </Form.Item>
                     <Form.Item
                       name={item.defaultName ? item.defaultName[1] : "end_time"}
@@ -481,7 +481,7 @@ const TableModule = forwardRef((props, ref) => {
                         (item.defaultValue && item.defaultValue[1]) || moment()
                       }
                     >
-                      <DatePicker showTime format={"YYYY-MM-DD HH:mm:ss"} />
+                      <DatePicker showTime format={"YYYY-MM-DD HH:mm:ss"}  allowClear={false}/>
                     </Form.Item>
                     <div style={{ margin: "-20px 0 10px 0" }}>
                       <QuickMenu
@@ -777,6 +777,7 @@ function InputSelectGroup(params) {
         <Col span={16}>
           <DatePicker
             placeholder="请选择开始日期"
+            allowClear={false}
             onChange={(val, string) => {
               setTimeGroup({ ...timeGroup, start_time: string });
             }}
@@ -792,6 +793,7 @@ function InputSelectGroup(params) {
           <DatePicker
             placeholder="请选择结束日期"
             defaultValue={moment()}
+            allowClear={false}
             onChange={(val, string) => {
               setTimeGroup({ ...timeGroup, end_time: string });
             }}