fix():修改停车记录订单类型

src/components/TableModule/index.jsx

@@ -60,6 +60,7 @@ const TableModule = forwardRef((props, ref) => {
   const [formData, setFormData] = useState()
   const [inputSelectGroup, setInputSelectGroup] = useState([])
   const [deftime, setDeftime] = useState([])
+  const [reftime, setReftime] = useState([])
   const [searchForm] = Form.useForm();
   const [tipForm] = Form.useForm();
   const timeFlag =
@@ -172,7 +173,7 @@ const TableModule = forwardRef((props, ref) => {
     }
     if (moment(form.end_time) - moment(form.start_time) > 180 * 3600 * 24000) {
       //console.log(2222,form.plate,form.berth_id,form.plate==undefined||form.berth_id==undefined||form.plate==''||form.berth_id=='')
-      if (!(form.plate||form.berth_id)) {
+      if (!(form.plate || form.berth_id)) {
         message.error('查询时间范围大于半年，需填写车牌号或泊位号！')
         return
       }
@@ -237,6 +238,7 @@ const TableModule = forwardRef((props, ref) => {
     setValue(newValue);
   };
   useEffect(() => {
+    console.log(deftime.startDateTime);
     if (deftime.startDateTime) {
       searchForm.setFieldsValue({
         start_time: moment(deftime.startDateTime),
@@ -465,22 +467,25 @@ const TableModule = forwardRef((props, ref) => {
                 break;
               case "FormSliderPicker":
                 children = (
-                  <InputSelectGroup
-                    onChange={(range, type) => {
-                      console.log(range, type)
-                      setTimeGroup({ timeType: type, timeRanges: range });
-                    }}
-                    getValue={(v) => {
-                      setInputSelectGroup(v)
-                      // setTimeGroup({
-                      //   timeType: 1,
-                      //   timeRanges: {
-                      //     start_time: v.startDateTime,
-                      //     end_time: v.endDateTime
-                      //   }
-                      // });
-                    }}
-                  />
+                  <>
+                    <InputSelectGroup
+                      onChange={(range, type) => {
+                        console.log(range, type)
+                        setTimeGroup({ timeType: type, timeRanges: range });
+                      }}
+                      getValue={(v) => {
+                        setInputSelectGroup(v)
+                        // setTimeGroup({
+                        //   timeType: 1,
+                        //   timeRanges: {
+                        //     start_time: v.startDateTime,
+                        //     end_time: v.endDateTime
+                        //   }
+                        // });
+                      }}
+                    />
+                
+                  </>
                 );
                 break;
               case "stopTime":
@@ -704,31 +709,39 @@ const TableModule = forwardRef((props, ref) => {
 function InputSelectGroup(params) {
   const {
     onChange = () => { },
-    getValue = () => { }
+    getValue = () => { },
+    pageName = "",
   } = params;
+  const [searchForm] = Form.useForm();
+  const [sessionTabList, setSessionTabList] = useSessionStorageState(pageName, {
+    value: ''
+  })
   const [timeType, setTimeType] = useState(1);
   const [deftime, setDeftime] = useState([])
   const [timeGroup, setTimeGroup] = useState({
     start_time: moment().subtract(1, "day").format(),
     end_time: moment().format(),
   });
-  // useEffect(() => {
-  //   if (deftime.startDateTime) {
-  //     searchForm.setFieldsValue({
-  //       start_time: moment(deftime.startDateTime),
-  //       end_time: moment(deftime.endDateTime)
-  //     })
-  //     setSessionTabList({
-  //       ...sessionTabList, start_time: moment(deftime.startDateTime),
-  //       end_time: moment(deftime.endDateTime)
-  //     })
-  //   } else {
-  //     // searchForm.setFieldsValue({
-  //     //   start_time: moment().subtract(1, "month"),
-  //     //   end_time: moment()
-  //     // })
-  //   }
-  // }, [deftime])
+  console.log();
+  useEffect(() => {
+    if (deftime.startDateTime) {
+      setTimeGroup({
+        start_time: moment(deftime.startDateTime),
+        end_time: moment(deftime.endDateTime)
+      })
+    console.log(timeGroup);
+
+      setSessionTabList({
+        ...sessionTabList, start_time: moment(deftime.startDateTime),
+        end_time: moment(deftime.endDateTime)
+      })
+    } else {
+      // searchForm.setFieldsValue({
+      //   start_time: moment().subtract(1, "month"),
+      //   end_time: moment()
+      // })
+    }
+  }, [deftime])
   useEffect(() => {
     onChange(timeGroup, timeType);
   }, [timeGroup, timeType]);
@@ -780,7 +793,7 @@ function InputSelectGroup(params) {
         </Col>
       </Row>
       <div style={{ margin: "0px 0 10px 0" }}>
-        {/* <QuickMenu
+        <QuickMenu
           dropdownData={[
             { text: '昨日', value: 1 },
             { text: '今日', value: 0 },
@@ -791,10 +804,10 @@ function InputSelectGroup(params) {
             { text: '近两年', value: 730 },
           ]}
           onChange={(v) => {
-            setTimeGroup({ ...timeGroup, start_time: v.startDateTime, end_time: v.endDateTime })
+           // setTimeGroup({ ...timeGroup, start_time: v.startDateTime, end_time: v.endDateTime })
             getValue(v)
             setDeftime(v);
-          }} /> */}
+          }} />
       </div>
     </>
   );

src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx

@@ -283,9 +283,13 @@ function ParkRecordTotal() {
           value: 1,
         },
         {
-          label: "已完成",
+          label: "待支付",
           value: 2,
         },
+        {
+          label: "已支付",
+          value: 3,
+        }
       ],
     },
     {
@@ -317,7 +321,7 @@ function ParkRecordTotal() {
     type: 1,
     park_id: "",
     order_type: 0,
-    plate_color:0,
+    plate_color:-1,
     in_person: "",
     out_person: "",
   };

src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx

@@ -19,6 +19,8 @@ function GeoSignalIgnoreInquiry(props) {
     const parameter = {
         areId: [], //区域
         parkName: '', //路段
+        name: '', //姓名
+        phone: '', //手机号
         signalType: 0, //消息类型
         auditType: 0,//忽略型号
         pn: 1,
@@ -36,6 +38,14 @@ function GeoSignalIgnoreInquiry(props) {
     const handleParkName = (v) => {
         setFormData({ ...formData, parkName: v.target.value })
     }
+    //姓名
+    const handleName = (v) => {
+        setFormData({ ...formData, name: v.target.value })
+    }
+    //手机号
+    const handlePhone = (v) => {
+        setFormData({ ...formData, phone: v.target.value })
+    }
     //消息类型
     const handleSignalType = (v) => {
         setFormData({ ...formData, signalType: v })
@@ -83,6 +93,16 @@ function GeoSignalIgnoreInquiry(props) {
             key: 'areaName',
         },
         {
+            title: '区域',
+            dataIndex: 'name',
+            key: 'name',
+        },
+        {
+            title: '区域',
+            dataIndex: 'phone',
+            key: 'phone',
+        },
+        {
             title: '所属路段',
             dataIndex: 'parkName',
             key: 'parkName',
@@ -257,6 +277,24 @@ function GeoSignalIgnoreInquiry(props) {
                     />
                 </div>
                 <div className="yisa-search">
+                    <label>姓名</label>
+                    <Input
+                        placeholder="请输入姓名"
+                        value={formData.name}
+                        style={{ width: 270, marginLeft: 29 }}
+                        onChange={handleName}
+                    />
+                </div>
+                <div className="yisa-search">
+                    <label>手机号</label>
+                    <Input
+                        placeholder="请输入手机号"
+                        value={formData.phone}
+                        style={{ width: 270, marginLeft: 14 }}
+                        onChange={handlePhone}
+                    />
+                </div>
+                <div className="yisa-search">
                     <label>消息类型</label>
                     <Select
                         style={{ width: 270 }}