fix():bug修改

src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx

@@ -20,6 +20,25 @@ import { dictionary } from "@/config/common.js";
 import "./index.scss";
 import { constant } from "lodash";
 function ParkingOrderInquiry(props) {
+    function getUrlSearch(name) {
+        // 未传参，返回空
+        if (!name) return null;
+        // 查询参数：先通过search取值，如果取不到就通过hash来取
+        var after = window.location.search;
+        after = after.substr(1) || window.location.hash.split('?')[1];
+        // 地址栏URL没有查询参数，返回空
+        if (!after) return null;
+        // 如果查询参数中没有"name"，返回空
+        if (after.indexOf(name) === -1) return null;
+
+        var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)');
+        // 当地址栏参数存在中文时，需要解码，不然会乱码
+        var r = decodeURI(after).match(reg);
+        // 如果url中"name"没有值，返回空
+        if (!r) return null;
+
+        return r[2];
+    }
     const [carId, setCarId] = useState()
     function getQueryString(name, search) {
         search = search || window.location.search.substr(1) || window.location.hash.split("?")[1];
@@ -955,7 +974,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'
+                        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")) }
                     ) : null}
                 </Tabs.TabPane>
                 <Tabs.TabPane tab="欠费订单查询" key="2">

src/pages/FinancialMgm/PayRecordTotal/loadable.jsx

@@ -234,12 +234,12 @@ function PayRecordTotal(props) {
   ];
 
   // 查看
-  const handleView = () => {
+  const handleView = (row) => {
     let jumpMenu = {
       text: "停车订单查询",
       name: "parkingOrderInquiry",
       icon: "",
-      path: "/financialMgm/parkingOrderInquiry",
+      path: "/financialMgm/parkingOrderInquiry?third_party_flow_id="+row.third_party_flow_id+"&pay_time="+row.pay_time //+"&order_id="+row.order_id,
     };
     if (tabList.filter((item) => item.path === jumpMenu.path).length === 0) {
       sessionStorage.setItem("tabList", JSON.stringify([...tabList, jumpMenu]));

src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx

@@ -334,7 +334,7 @@ function AddParking(props) {
               if (type !== 0 && type !== 1) {
                 return (
                   <Col span="4_8" style={{ width: "33%" }}>
-                    <Form.Item label="关联停车场">
+                    <Form.Item label="关联停车场" name="pid">
                       <Select
                         options={parentRoadList}
                         onChange={(value) => {

src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/MSPages.jsx

@@ -85,7 +85,11 @@ function MSPages(props) {
     ajax.getRoadMs({ road_id: itemData.id }).then((res) => {
       if (res.status === 20000) {
         console.log(res.data);
+        if(res.data){
            setDataSource([res.data]);
+        }else {
+          setDataSource([])
+        }
       }
     });
   }, []);