Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0.git into develop

src/components/TableModule/index.jsx

@@ -195,6 +195,9 @@ const TableModule = forwardRef((props, ref) => {
             temp_obj[key] = [moment(temp_obj[key][0]), moment(temp_obj[key][1])]
           }
         }
+        if(temp_obj.tel != fv.tel){ // todo
+          temp_obj.tel = fv.tel
+        }
       })
       searchForm.setFieldsValue(temp_obj)
       if (sessionTabList?.plateValue) {
@@ -1011,13 +1014,13 @@ const TableModule = forwardRef((props, ref) => {
   }, [pageData]);
 
   useEffect(() => {
-    if(operatorNameType===1){
+    // if(operatorNameType===1){
       getAllOperator();
-    }
+    // }
   }, [operatorNameType]);
 
   useEffect(() => {
-    if (areaNameType === 1) {
+    // if (areaNameType === 1) {
       ajax
         .getAreaTree()
         .then((res) => {
@@ -1030,12 +1033,12 @@ const TableModule = forwardRef((props, ref) => {
         .catch((err) => {
           console.error(err);
         });
-    }
+    // }
 
   }, [areaNameType]);
   const [getRoadList, setGetRoadList] = useState([])
   useEffect(() => {
-    if (roadNameType === 1) {
+    // if (roadNameType === 1) {
       ajax.getNewRoadSearch().then((res) => {
         if (res.status === 20000) {
           setGetRoadList(res.data);
@@ -1043,7 +1046,7 @@ const TableModule = forwardRef((props, ref) => {
           message.error(res.message)
         }
       })
-    }
+    // }
   }, [roadNameType])
   return (
     <div className={`TableModule ${className}`}>

src/pages/OffPeak/OffPeakParkMgm/BookInfo/loadable.jsx

@@ -62,6 +62,7 @@ function BookInfo(props) {
       label: "车场名称",
       placeholder: "请输入",
       name: "park_name",
+      // roadName:1
     },
     {
       type: "Input",
@@ -109,7 +110,7 @@ function BookInfo(props) {
       type: "DateRangePicker",
       label: "预约时间",
       name: "book_time_range",
-      defaultValue: [moment('2023-10-10'), moment('2024-01-01')]
+      defaultValue: [moment(new Date(new Date().getTime() - 7*86400*1000)), moment()]
     },
   ];
   //搜索参数初始化
@@ -118,7 +119,7 @@ function BookInfo(props) {
     plate: "",
     status: "",
     tel: stateInfo?.state?.tel ? stateInfo.state.tel : '',
-    book_time_range: [moment('2023-10-10'), moment('2024-01-01')]
+    book_time_range: [moment(new Date(new Date().getTime() - 7*86400*1000)), moment()]
   };
   //搜索的结果
   const [tableData, setTableData] = useState([]);

src/pages/OffPeak/OffPeakParkMgm/OffPeakParkingRecords/loadable.jsx

@@ -74,6 +74,7 @@ function OffPeakParkingRecords() {
       label: "停车场名称",
       placeholder: "请输入",
       name: "park_name",
+      roadName:1
     },
     {
       type: "Input",