From 14e2890f6585d9a677539c9245a953f7f35bfc56 Mon Sep 17 00:00:00 2001
From: xingjx <xingjx@yisa.com>
Date: Thu, 23 Nov 2023 09:38:57 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E9=80=80=E6=AC=BE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParkingAlyOverview/loadable.jsx                | 120 +++++++++++++--------
 .../OrderInquiry/OrderChangeInquiry/index.jsx      |  44 +++++++-
 .../OrderInquiry/ParkingOrderInquiry/index.jsx     |   2 +-
 .../OrderInquiry/ReturnOrderInquiry/index.jsx      |  84 +++++++++++----
 .../OperationCenter/CarMgm/CarInfo/loadable.jsx    |   2 +-
 .../OperationCenter/UserMgm/UserInfo/loadable.jsx  |   2 +-
 6 files changed, 183 insertions(+), 71 deletions(-)

diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
index 30a7b90..8345925 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
 import { ResultFlowResult, DataSelect } from "@/components";
 import { Select, Input, Button, Table, message, Pagination, DatePicker, Modal, Cascader, Tooltip } from "antd";
 import { useSessionStorageState } from "ahooks";
-import { dictionary } from "@/config/common";
+import { lineChartOption } from "@/config/character.config.js";
 import { useNavigate } from "react-router-dom";
 import { setTabList } from "@/store/common.js";
 import { useSelector, useDispatch } from "react-redux";
@@ -153,7 +153,7 @@ function ParkingAlyOverview() {
             end_time: end,
         });
     };
-    //
+    //停车趋势分析，折线图
     const getRevenueOption = (data) => {
         // 获取所有地区名称
         data.sort((a, b) => {
@@ -209,32 +209,7 @@ function ParkingAlyOverview() {
                 },
             };
         });
-
-        setRevenueData({
-            title: {
-                text: "",
-                textStyle: {
-                    color: "#fff",
-                },
-            },
-            tooltip: {
-                trigger: "axis",
-            },
-            xAxis: {
-                data: xAxisData,
-                type: 'category',
-                axisLine: {
-                    lineStyle: {
-                        color: "#bbb",
-                    },
-                },
-                axisLabel: {
-                    textStyle: {
-                        color: "#bbb",
-                    },
-                },
-            },
-            yAxis: {
+        lineChartOption.yAxis= {
                 type: "value",
                 name: '泊位利用率',
                 min: 0,
@@ -248,25 +223,76 @@ function ParkingAlyOverview() {
                     },
                 },
             },
-            color: ["#4DC3FF", "#FFD767"],
-            //series: seriesData,
-            series:
-            {
-                "name": "西区",
-                "type": "line",
-                "data": [
-                    12,
-                    12,
-                    24
-                ]
-            },
-            grid: {
-                x: 50,
-                y: 55,
-                x2: 70,
-                y2: 20,
-            },
-        });
+        lineChartOption.series =
+        {
+            "name": "西区",
+            "type": "line",
+            "data": [
+                12,
+                12,
+                24
+            ]
+        },
+        setRevenueData(lineChartOption)
+
+        console.log(212, lineChartOption)
+        // setRevenueData({
+        //     title: {
+        //         text: "",
+        //         textStyle: {
+        //             color: "#fff",
+        //         },
+        //     },
+        //     tooltip: {
+        //         trigger: "axis",
+        //     },
+        //     xAxis: {
+        //         data: xAxisData,
+        //         type: 'category',
+        //         axisLine: {
+        //             lineStyle: {
+        //                 color: "#bbb",
+        //             },
+        //         },
+        //         axisLabel: {
+        //             textStyle: {
+        //                 color: "#bbb",
+        //             },
+        //         },
+        //     },
+        //     yAxis: {
+        //         type: "value",
+        //         name: '泊位利用率',
+        //         min: 0,
+        //         // /max: 50,
+        //         interval: 10,
+        //         splitNumber: 6, //设置坐标轴的分割段数
+        //         axisLabel: {
+        //             formatter: "{value}%",
+        //             textStyle: {
+        //                 color: "#bbb",
+        //             },
+        //         },
+        //     },
+        //     color: ["#4DC3FF", "#FFD767"],
+        //     //series: seriesData,
+        //     series:
+        //     {
+        //         "name": "西区",
+        //         "type": "line",
+        //         "data": [
+        //             12,
+        //             12,
+        //             24
+        //         ]
+        //     },
+        //     grid: {
+        //         x: 50,
+        //         y: 55,
+        //         x2: 70,
+        //         y2: 20,
+        //     },
+        // });
     };
 
     function getParkingIncome() {
diff --git a/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx
index fd6cd45..d49db79 100644
--- a/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx
@@ -112,6 +112,7 @@ function EditOrderInquiry(props) {
     }
     setDefaultParams({ ...postData, ...pageInfo });
     setTabLoading(true);
+    console.log(115,pageInfo,{ ...postData, ...pageInfo, ...v })
     ajax.getOrderChangeList({ ...postData, ...pageInfo, ...v }).then(
       (res) => {
         if (parseInt(res?.status) === 20000) {
@@ -503,7 +504,48 @@ function EditOrderInquiry(props) {
               <Select
                 className="form-con"
                 placeholder="请选择"
-                options={dictionary.BusinessOrderType || []}
+                options={[
+                  {
+                    value: '0',
+                    label: '全部'
+                  },
+                  {
+                    value: '1',
+                    label: '停车订单'
+                  },
+                  {
+                    value: '2',
+                    label: '充电订单'
+                  },
+                  {
+                    value: '3',
+                    label: '充值订单'
+                  },
+                  {
+                    value: '4',
+                    label: '停车卡订单'
+                  },
+                  {
+                    value: '5',
+                    label: '充电预约订单'
+                  },
+                  {
+                    value: '6',
+                    label: '停车预约订单'
+                  },
+                  {
+                    value: '7',
+                    label: '错峰订单'
+                  },
+                  {
+                    value: '8',
+                    label: '预付费订单'
+                  },
+                  {
+                    value: '9',
+                    label: '商家预付费订单'
+                  },
+                ]}
                 value={formData.parking_type}
                 onChange={(v) =>
                   setFormData({ ...formData, parking_type: v })
diff --git a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
index 1751472..039f4ba 100644
--- a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
@@ -768,7 +768,7 @@ function ParkingOrderInquiry() {
             <Tabs.TabPane tab="订单修改记录" key="2">
                 {tabKeyChild == 2 ? renderTable(
                     createCol(['停车订单ID', '欠费金额（元）', '订单修改时间', '修改原因', '处理记录ID', '区域', '商户名称', '停车场名称', '车场类型', '车牌号', '入场时间', '出场时间', '停车时长'],
-                        ['park_record_id', 'arrearsAmount', 'examine_time', 'update_reason', 'deal_record_id', 'area', 'merchantName', 'sectionName', '', 'licensePlateNumber', 'entryTime', 'exitTime', 'parkingDuration'], 0),
+                        ['park_record_id', 'arrearsAmount', 'examine_time', 'update_reason', 'deal_record_id', 'area', 'merchantName', 'sectionName', 'parking_model_type', 'licensePlateNumber', 'entryTime', 'exitTime', 'parkingDuration'], 0),
                     [ash[25], ash[1], ash[2], ash[18], ash[26], ash[29], ash[5], ash[12], ash[27], ash[28]],
                     resultData, '/api/fin/order_search/arrears_order_update_list_export', 1
                 ) : null}
diff --git a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx
index a5e3f30..b7cd18d 100644
--- a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx
@@ -59,23 +59,23 @@ function ReturnOrderInquiry() {
         switch (type) {
             case 8:
                 obj.render = (text, record) => {
-                
-                return <>
-                    {record.state_name == "退款失败"||record.state_name =="处理中"||record.state_name =="退款中"?
-                    <span type="primary" style={{ display: 'block', textAlign: 'center' }} onClick={() => {
-                        refundre(record)
-                        // setTkddVisible(true)
-                    }}>
-                        <a>重试</a>
-                    </span>
-                    :null}
-                    <span type="primary" style={{ display: 'block', textAlign: 'center' }} onClick={() => {
-                        refundSearch(record)
-                        setTkddVisible(true)
-                    }}>
-                        <a>详情</a>
-                    </span>
-                </>
+
+                    return <>
+                        {record.state_name == "退款失败" || record.state_name == "处理中" || record.state_name == "退款中" ?
+                            <span type="primary" style={{ display: 'block', textAlign: 'center' }} onClick={() => {
+                                refundre(record)
+                                // setTkddVisible(true)
+                            }}>
+                                <a>重试</a>
+                            </span>
+                            : null}
+                        <span type="primary" style={{ display: 'block', textAlign: 'center' }} onClick={() => {
+                            refundSearch(record)
+                            setTkddVisible(true)
+                        }}>
+                            <a>详情</a>
+                        </span>
+                    </>
                 }
                 arr.push(obj)
                 break
@@ -95,7 +95,49 @@ function ReturnOrderInquiry() {
             name: "type",
             type: "Select",
             label: "业务订单类型",
-            options: dictionary.BusinessOrderType,
+            defaultValue:'0',
+            options: [
+                {
+                    value: '0',
+                    label: '全部'
+                },
+                {
+                    value: '1',
+                    label: '停车订单'
+                },
+                {
+                    value: '2',
+                    label: '充电订单'
+                },
+                {
+                    value: '3',
+                    label: '充值订单'
+                },
+                {
+                    value: '4',
+                    label: '停车卡订单'
+                },
+                {
+                    value: '5',
+                    label: '充电预约订单'
+                },
+                {
+                    value: '6',
+                    label: '停车预约订单'
+                },
+                {
+                    value: '7',
+                    label: '错峰订单'
+                },
+                {
+                    value: '8',
+                    label: '预付费订单'
+                },
+                {
+                    value: '9',
+                    label: '商家预付费订单'
+                },
+            ],
         },
         {
             name: "park_id",
@@ -135,11 +177,13 @@ function ReturnOrderInquiry() {
                     value: 4,
                 },
             ],
+            defaultValue:0,
         },
         {
             name: "reason",
             type: "Select",
             label: "退款原因",
+            defaultValue:0,
             options: [
                 {
                     label: "全部",
@@ -189,7 +233,7 @@ function ReturnOrderInquiry() {
 
     //列表查询
     function search(e) {
-        var url ="/api/ope/record/get_refund_orders"//退费订单
+        var url = "/api/ope/record/get_refund_orders"//退费订单
         ajax({
             url: url,
             type: "post",
@@ -385,7 +429,7 @@ function ReturnOrderInquiry() {
         <>
             {renderTable(
                 createCol(['序号', '最近尝试时间', '支付渠道', '应退实付（元）', '应退优惠（元）', '退款原因', '退款申请时间', '退款订单ID', '业务订单类型', '业务订单ID', '支付订单类型', '支付订单ID', '渠道流水号', '状态'],
-                    ['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),
+                    ['index', 'latest_try_time', 'payment_channels_name', 'refund_actual_amount', 'refund_discount_amount', 'reason_name', 'refund_time', '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/OperationCenter/CarMgm/CarInfo/loadable.jsx b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx
index 2281839..d80c6ac 100644
--- a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx
+++ b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx
@@ -1156,7 +1156,7 @@ function CarInfo() {
                             {tabKey == 5 ?
                                 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'], 5),
+                                        ['index', 'latest_try_time', 'payment_channels_name', 'refund_actual_amount', 'refund_discount_amount', 'reason', 'refund_time', 'id', 'parking_type_name', 'park_record_id', 'payment_type_name', 'payment_order_id', 'flow_id', 'state_name'], 5),
                                     formRefundSearch,
                                     resultData
                                 ) : null}
diff --git a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx
index 8c7847a..7970512 100644
--- a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx
+++ b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx
@@ -1196,7 +1196,7 @@ function UserInfo() {
                             {tabKey == 8 ?
                                 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', 'refund_time', 'id', 'parking_type_name', 'park_record_id', 'payment_type_name', 'payment_order_id', 'flow_id', 'state_name'], 8),
                                     formRefundSearch,
                                     resultData
                                 ) : null}