diff --git a/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx
index aaef5c3..1037605 100644
--- a/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx
@@ -115,8 +115,8 @@ function EditOrderInquiry(props) {
ajax.getOrderChangeList({ ...postData, ...pageInfo, ...v }).then(
(res) => {
if (parseInt(res?.status) === 20000) {
- setResultData(res?.data || []);
- setTotal(res.total)
+ setResultData(res?.data.list || []);
+ setTotal(res.data.total)
} else {
message.error(res?.message);
}
@@ -262,7 +262,7 @@ function EditOrderInquiry(props) {
{ handleView(); }}>
+ }} onClick={() => { handleView(); }}>
查看
);
@@ -295,6 +295,13 @@ function EditOrderInquiry(props) {
title: "支付订单ID",
dataIndex: "order_id",
align: "center",
+ render: (text) => (
+ <>
+ {
+ navigator.clipboard.writeText(`${text}`).then(() => { message.success("已复制到剪切板") });
+ }}>{text}
+ >
+ )
},
{
title: "抵扣修改金额",
@@ -333,41 +340,41 @@ function EditOrderInquiry(props) {
-
停车场名称
{ycddData?.order_info?.parking_detail.road_name|| "--"}
+
停车场名称
{ycddData?.order_info?.parking_detail.road_name || "--"}
-
区域
{ycddData?.order_info?.parking_detail.region_name|| "--"}
+
区域
{ycddData?.order_info?.parking_detail.region_name || "--"}
-
商户名称
{ycddData?.order_info?.parking_detail.operator_name|| "--"}
+
商户名称
{ycddData?.order_info?.parking_detail.operator_name || "--"}
-
泊位号
{ycddData?.order_info?.parking_detail.berth_id|| "--"}
+
泊位号
{ycddData?.order_info?.parking_detail.berth_id || "--"}
-
车场类型
{ycddData?.order_info?.parking_detail.parking_model_type_name|| "--"}
+
车场类型
{ycddData?.order_info?.parking_detail.parking_model_type_name || "--"}
-
车牌号
{ycddData?.order_info?.vehicle_detail.plate|| "--"}
+
车牌号
{ycddData?.order_info?.vehicle_detail.plate || "--"}
-
停车时长
{ycddData?.order_info?.vehicle_detail.parking_duration|| "--"}
+
停车时长
{ycddData?.order_info?.vehicle_detail.parking_duration || "--"}
-
入场时间
{ycddData?.order_info?.vehicle_detail.in_time|| "--"}
+
入场时间
{ycddData?.order_info?.vehicle_detail.in_time || "--"}
-
出场时间
{ycddData?.order_info?.vehicle_detail.out_time|| "--"}
+
出场时间
{ycddData?.order_info?.vehicle_detail.out_time || "--"}
-
入场记录来源
{ycddData?.order_info?.vehicle_detail.in_source_name|| "--"}
+
入场记录来源
{ycddData?.order_info?.vehicle_detail.in_source_name || "--"}
-
出场记录来源
{ycddData?.order_info?.vehicle_detail.out_source_name|| "--"}
+
出场记录来源
{ycddData?.order_info?.vehicle_detail.out_source_name || "--"}
证据图像
@@ -416,7 +423,7 @@ function EditOrderInquiry(props) {
//rowSelection={rowSelection}
rowKey={'index'}
columns={detailColumns}
- dataSource={detailTable||[]}
+ dataSource={detailTable || []}
pagination={false}
/>
diff --git a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
index a0cac18..5985fa6 100644
--- a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
@@ -452,10 +452,12 @@ function ParkingOrderInquiry() {
function changeKey(key) {
setTabKey(key);
setTabKeyChild('1');
+ //setTotal('0')
}
const [tabKeyChild, setTabKeyChild] = useState("1");
function changeKeyChild(key) {
setTabKeyChild(key);
+ //setTotal('0')
}
//限制条件
const limitCon = (e) => {
@@ -794,15 +796,15 @@ function ParkingOrderInquiry() {
) : null}
- {orderInfo}
+ {tabKey == 2 ? orderInfo : null}
- {renderTable(
+ {tabKey == 3 ? renderTable(
createCol(['订单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'], 0),
[ash[22], ash[23], ash[21], ash[24], ash[15]],
resultData
- )}
+ ) : null}