diff --git a/src/components/DataSelect/index.jsx b/src/components/DataSelect/index.jsx
new file mode 100644
index 0000000..2a6ef3c
--- /dev/null
+++ b/src/components/DataSelect/index.jsx
@@ -0,0 +1,144 @@
+import React, { useState, useEffect } from 'react'
+import moment from 'moment'
+import { Select, DatePicker, } from "antd";
+// import { Dropdown, Menu } from 'antd'
+// import Icon from '../Icon'
+import './index.scss'
+
+function DataSelect(props) {
+ console.log(props)
+ const {
+ formData = {
+ date_type:'4'
+ },
+ SetTimeNow,
+ } = props
+
+ //时间状态切换
+ const TimeChange = () => {
+ let e = formData?.date_type||'';
+ let str = "day";
+ let mat = "YYYY-MM-DD";
+ if (e == 4) {
+ str = "year";
+ mat = "YYYY";
+ } else if (e == 3) {
+ str = "month";
+ mat = "YYYY-MM";
+ } else if (e == 2) {
+ str = "week";
+ mat = "YYYY-MM-DD";
+ }
+ return { str, mat };
+ };
+
+
+ return (
+ <>
+
+
-
-
{
- setDetailVisible(false);
- }}
- footer={[
- ]}
- >
- {tkddModal}
-
-
{
- setBigpicVisible(false);
- }}
- footer={false}
- >
-
-
-

-
+
+
+
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx
index 536634e..fcc18fd 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx
@@ -15,7 +15,7 @@ import ajax from "@/services";
function ParkingLiveData() {
// session缓存
const [defaultParams, setDefaultParams] = useSessionStorageState(
- "formData_temporaryParkStat",
+ "formData_parkingLiveData",
{ defaultValue: null }
);
//区域的下拉数据
@@ -59,7 +59,7 @@ function ParkingLiveData() {
//
const [ringData, setRingData] = useState({});
const [searchSelectList, setSearchSelectList] = useState([]); //搜索下拉数据
- const [sessionTabList, setSessionTabList] = useSessionStorageState('temporaryParkStat', {
+ const [sessionTabList, setSessionTabList] = useSessionStorageState('parkingLiveData', {
value: {
}
})
diff --git a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx
index 27c2c0c..a5e3f30 100644
--- a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx
@@ -146,12 +146,20 @@ function ReturnOrderInquiry() {
value: 0,
},
{
+ label: "重复支付退款",
+ value: 2,
+ },
+ {
+ label: "异常支付退款",
+ value: 7,
+ },
+ {
label: "异常订单处理",
- value: 1,
+ value: 11,
},
{
label: "自动平单退款",
- value: 2,
+ value: 12,
},
],
},
@@ -377,7 +385,7 @@ function ReturnOrderInquiry() {
<>
{renderTable(
createCol(['序号', '最近尝试时间', '支付渠道', '应退实付(元)', '应退优惠(元)', '退款原因', '退款申请时间', '退款订单ID', '业务订单类型', '业务订单ID', '支付订单类型', '支付订单ID', '渠道流水号', '状态'],
- ['index', 'latest_try_time', 'payment_channels_name', 'refund_actual_amount', 'refund_discount_amount', 'reason', 'refund_time', 'payment_order_id', 'parking_type_name', 'park_record_id', 'payment_type_name', 'payment_order_id', 'flow_id', 'state_name'], 8),
+ ['index', 'latest_try_time', 'payment_channels_name', 'refund_actual_amount', 'refund_discount_amount', 'reason_name', 'refund_time', 'payment_order_id', 'parking_type_name', 'park_record_id', 'payment_type_name', 'payment_order_id', 'flow_id', 'state_name'], 8),
formRefundSearch,
resultData
)}
diff --git a/src/pages/InRoadMgm/RecordInquiry/ArrearsInquiries/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ArrearsInquiries/loadable.jsx
index c72e545..1e595e4 100644
--- a/src/pages/InRoadMgm/RecordInquiry/ArrearsInquiries/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/ArrearsInquiries/loadable.jsx
@@ -144,6 +144,8 @@ function ArrearsInquiries() {
total={total}
search={fetch}
initFormData={initFormData}
+ mandatory={'plate'}
+ mandatory_name={'车牌号'}
pagename="欠费追缴查询"
pageName={'arrearsInquiries'}
otherData={{
diff --git a/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx
index 1c796a3..90acc83 100644
--- a/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx
@@ -149,6 +149,8 @@ function ArrearsRecordTotal() {
tableData={tableData}
formSearch={formSearch}
total={total}
+ mandatory={'plate'}
+ mandatory_name={'车牌号'}
pagename="停车欠费订单"
pageName={'arrearsRecordTotal'}
search={fetch}
diff --git a/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx
index 7c5c924..ac410d9 100644
--- a/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx
@@ -699,6 +699,8 @@ function DisabledCarParkRecordTotal() {
tableData={resultData}
formSearch={formSearch}
total={total}
+ mandatory={'plate'}
+ mandatory_name={'车牌号'}
pageName={'disabledCarParkRecordTotal'}
search={search}
exportUrl={'http://192.168.5.149:90/PMS/api/bpm/record/get_record_export'}
diff --git a/src/pages/InRoadMgm/RecordInquiry/EntryExitOptPDA/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/EntryExitOptPDA/loadable.jsx
index f039e73..30512b0 100644
--- a/src/pages/InRoadMgm/RecordInquiry/EntryExitOptPDA/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/EntryExitOptPDA/loadable.jsx
@@ -134,6 +134,8 @@ function EntryExitOptPDA() {
formSearch={formSearch}
search={search}
total={total}
+ mandatory={'parking_num'}
+ mandatory_name={'泊位号'}
pagename="PDA操作记录"
pageName={'entryExitOptPDA'}
initFormData={initFormData}
diff --git a/src/pages/InRoadMgm/RecordInquiry/GeomagneticSignalMgm/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/GeomagneticSignalMgm/loadable.jsx
index d0581ac..5021224 100644
--- a/src/pages/InRoadMgm/RecordInquiry/GeomagneticSignalMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/GeomagneticSignalMgm/loadable.jsx
@@ -150,6 +150,8 @@ function GeomagneticSignalMgm() {
formSearch={formSearch}
search={search}
total={total}
+ mandatory={'parkingSpotNumber'}
+ mandatory_name={'泊位号'}
initFormData={initFormData}
pagename="地磁信号记录"
pageName={'geomagneticSignalMgm'}
diff --git a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
index e92a603..bf93b3a 100644
--- a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
@@ -656,6 +656,8 @@ function ParkRecordTotal() {
tableData={tableData}
formSearch={formSearch}
pagename="停车记录查询"
+ mandatory={'plate'}
+ mandatory_name={'车牌号'}
pageName={'parkRecordTotal'}
initFormData={initFormData}
total={total}
diff --git a/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx
index 6d648fe..aade1bf 100644
--- a/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx
@@ -183,6 +183,8 @@ function PreOrderRecord() {
<>