From 1139163092264c3245ac23f4baa66b87bc7e67a3 Mon Sep 17 00:00:00 2001
From: chenglb <chenglb@yisa.com>
Date: Tue, 16 Jan 2024 18:04:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20tablemodule=E9=BB=98=E8=AE=A4=E5=8F=91?=
=?UTF-8?q?=E9=80=81=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/TableModule/index.jsx | 10 ++++------
.../OtherBusiness/ParkingCard/ParkingCardMgm/index.scss | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx
index ca3c70d..2607b67 100644
--- a/src/components/TableModule/index.jsx
+++ b/src/components/TableModule/index.jsx
@@ -198,8 +198,6 @@ const TableModule = forwardRef((props, ref) => {
// temp_obj.carId = sessionTabList.plate2
fetchPlateSearch(sessionTabList.plateValue.match(/:(\S*)/)[1], setPlateData, []);
}
- fetch('first')
-
// if (sessionTabList.start_time) {
// let temp_obj = { ...sessionTabList, start_time: moment(start_time), end_time: moment(end_time) }
// if (sessionTabList.plateValue){
@@ -218,8 +216,8 @@ const TableModule = forwardRef((props, ref) => {
// searchForm.setFieldsValue({ ...sessionTabList, carId: sessionTabList.plate2 })
// } // let start_time = sessionTabList.start_time
// let end_time = sessionTabList.end_time
-
}
+ fetch('first')
}, [])
useEffect(() => {
if (formData) {
@@ -249,10 +247,10 @@ const TableModule = forwardRef((props, ref) => {
form = {...searchForm.getFieldsValue(), ...pageData, ...otherData, ...pnno, ...updateData}
}
if(args1 == 'first' ){ // 去掉plateData的监听, 避免进入页面多发送一次请求
- if(sessionTabList.plate2){
+ if(sessionTabList?.plate2){
form.carId = sessionTabList.plate2
}
- if(sessionTabList.region?.length){
+ if(sessionTabList?.region?.length){
form.region = sessionTabList.region
}
}
@@ -818,7 +816,7 @@ const TableModule = forwardRef((props, ref) => {
key={item.name}
initialValue={item.defaultValue}
>
- <DatePicker.RangePicker />
+ <DatePicker.RangePicker allowClear={item.allowClear ? true : false} />
</Form.Item>
)
break;
diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/index.scss b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/index.scss
index 7df2885..51df6eb 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/index.scss
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/index.scss
@@ -78,7 +78,7 @@ $color-primary: var(--color-primary);
.btnBox {
display: flex;
margin-top: 20px;
-
+ width: 100%;
.yisa-btn {
margin-left: 20px;
width: 85px;