diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss
index 7a0e2b3..25b4f69 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss
@@ -173,9 +173,15 @@ $color-primary : var(--color-primary);
.duration-left {
width: 50%;
margin-right: 20px;
+ .ant-tabs .ant-tabs-nav-wrap .ant-tabs-nav-list{
+ width: 100%;
+ }
}
.duration-right {
width: 50%;
+ .ant-tabs .ant-tabs-nav-wrap .ant-tabs-nav-list{
+ width: 100%;
+ }
}
}
.row-head {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
index fb957e0..68fee65 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
@@ -111,7 +111,7 @@ function ParkingAlyDuration() {
//width: 200,
},
{
- title: '利用率',
+ title: '周转次数(次)',
dataIndex: 'area_rate',
key: 'area_rate',
width: 120,
@@ -964,7 +964,7 @@ function ParkingAlyDuration() {
disabled: "true"
},
{
- label: `利用率`,
+ label: `周转次数(次)`,
key: '4',
disabled: "true"
},
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss
index 6b8a639..f42c7f2 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss
@@ -301,6 +301,9 @@ $color-primary : var(--color-primary);
.overview-right {
display: inline-block;
width: 50%;
+ .ant-tabs .ant-tabs-nav-wrap .ant-tabs-nav-list{
+ width: 100%;
+ }
}
.row-head {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/index.scss
index 9993d3b..1df83c3 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/index.scss
@@ -184,6 +184,9 @@ $color-primary : var(--color-primary);
}
.parkinglive-right {
width: 50%;
+ .ant-tabs .ant-tabs-nav-wrap .ant-tabs-nav-list{
+ width: 100%;
+ }
}
}
.row-head {
diff --git a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
index 2bb92e5..b6091ea 100644
--- a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
@@ -917,19 +917,19 @@ function ParkingOrderInquiry(props) {
):null} */}
{
tabKeyChild == 1 ?
-
: null
+ : null
}
@@ -947,7 +947,8 @@ function ParkingOrderInquiry(props) {
formSearch={[ash[25], ash[1], ash[2], ash[18], ash[26], ash[29], ash[5], ash[12], ash[27], ash[28]]}
total={total}
initFormData={{ type: 1 }}
- rowKey={"park_record_id"}
+ //rowKey={"park_record_id"}
+ rowKey={(row, index) => row?.park_record_id + toString(Math.random() * 10000)}
exportUrl={'/api/fin/order_search/arrears_order_update_list_export'}
//limitCon={limitCon}
search={search}
@@ -974,7 +975,7 @@ function ParkingOrderInquiry(props) {
createCol(['支付订单ID', '停车订单ID', '支付商户', '平台商户', '停车场', '泊位号', '车牌号', '入场时间', '计费时间', '停车时长', '应收金额', '优惠金额', '实付金额', '支付渠道', '支付设备', '操作人', '付款车场', '支付时间', '渠道流水号'],
['order_id', 'park_record_id', 'pay_store', 'operator', 'road_id', 'berth_id', 'plate', 'admission_time', 'charging_time', 'parking_duration', 'receivable_amount', 'discount_amount', 'paid_in_money', 'payment_channels', 'payment_equipment', 'dealer', 'pay_road', 'pay_time', 'third_party_flow_id'], 1),
[ash[19], ash[2], ash[18], ash[20], ash[21], ash[9], ash[10], ash[14], ash[15]],
- resultData, '/api/fin/order_search/park_order_export', { out_trade_no: getUrlSearch("third_party_flow_id") || null, start_time: getUrlSearch("pay_time") ? moment(getUrlSearch("pay_time")) : moment(moment().format("YYYY-MM-DD HH:mm:ss")) }
+ resultData, '/api/fin/order_search/park_order_export', { out_trade_no: getUrlSearch("third_party_flow_id") || '', start_time: getUrlSearch("pay_time") ? moment(getUrlSearch("pay_time")) : moment(moment().format("YYYY-MM-DD HH:mm:ss")) }
) : null}
diff --git a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx
index 80a78d9..d67b67b 100644
--- a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx
@@ -72,7 +72,7 @@ function ProductOrderInquiry() {
textAlign: "center",
}}
>
- { searchDetail({ id: record.id }); }}>
+ { searchDetail({ id: record.id }); setIsEdit(0) }}>
查看
{ searchDetail({ id: record.id }); setMyId(record.id); setIsEdit(1) }}>
@@ -456,7 +456,7 @@ function ProductOrderInquiry() {