From 385cc04fef23969509c1656b99927fad4a5aca14 Mon Sep 17 00:00:00 2001
From: fengxiang <361798944@qq.com>
Date: Mon, 22 Jan 2024 09:50:50 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E6=94=B9=E5=81=9C=E8=BD=A6?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=92=8C=E6=9C=AA=E7=99=BB=E8=AE=B0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RecordInquiry/ParkRecordTotal/loadable.jsx     | 102 +++++++++++++++------
 .../RecordInquiry/UnRecordOrder/loadable.jsx       |  21 +++++
 2 files changed, 93 insertions(+), 30 deletions(-)

diff --git a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
index 091ed30..a174e46 100644
--- a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
@@ -95,6 +95,13 @@ function ParkRecordTotal() {
       align: "center",
     },
     {
+      title: "车辆类型",
+      dataIndex: "vehicel_type",
+      key: "vehicel_type",
+      width: 100,
+      align: "center",
+    },
+    {
       title: "泊位号",
       dataIndex: "berth_id",
       key: "berth_id",
@@ -139,21 +146,21 @@ function ParkRecordTotal() {
       width: 100,
       align: "center",
     },
-    {
-      title: <Popover content={roadContent} >
-        订单金额
-      <QuestionCircleOutlined />
-    </Popover>,
-      dataIndex: "order_amount",
-      key: "order_amount",
-      width: 100,
-      align: "center",
-      // filterDropdown: true,
-      // filterIcon:
-      //   <Popover content={roadContent} >
-      //     <QuestionCircleOutlined />
-      //   </Popover>
-    },
+    // {
+    //   title: <Popover content={roadContent} >
+    //     订单金额
+    //   <QuestionCircleOutlined />
+    // </Popover>,
+    //   dataIndex: "order_amount",
+    //   key: "order_amount",
+    //   width: 100,
+    //   align: "center",
+    //   // filterDropdown: true,
+    //   // filterIcon:
+    //   //   <Popover content={roadContent} >
+    //   //     <QuestionCircleOutlined />
+    //   //   </Popover>
+    // },
     {
       title: <Popover content={receivableContent} >
         应收金额
@@ -170,19 +177,11 @@ function ParkRecordTotal() {
       //   </Popover>
     },
     {
-      title:  <Popover content={discountContent} >
-        折扣金额
-      <QuestionCircleOutlined />
-    </Popover>,
-      dataIndex: "discount_amount",
-      key: "discount_amount",
+      title: "实付金额",
+      dataIndex: "actual_amount",
+      key: "actual_amount",
       width: 100,
       align: "center",
-      // filterDropdown: true,
-      // filterIcon:
-      //   <Popover content={discountContent} >
-      //     <QuestionCircleOutlined />
-      //   </Popover>
     },
     {
       title:    <Popover content={preferentialContent} >
@@ -200,11 +199,19 @@ function ParkRecordTotal() {
       //   </Popover>
     },
     {
-      title: "实付金额",
-      dataIndex: "actual_amount",
-      key: "actual_amount",
+      title:  <Popover content={discountContent} >
+        折扣金额
+      <QuestionCircleOutlined />
+    </Popover>,
+      dataIndex: "discount_amount",
+      key: "discount_amount",
       width: 100,
       align: "center",
+      // filterDropdown: true,
+      // filterIcon:
+      //   <Popover content={discountContent} >
+      //     <QuestionCircleOutlined />
+      //   </Popover>
     },
     {
       title: <Popover content={refundContent} >
@@ -353,7 +360,7 @@ function ParkRecordTotal() {
     {
       name: "order_type",
       type: "Select",
-      label: "订单类型",
+      label: "支付状态",
       defaultValue: 0,
       options: [
         {
@@ -375,6 +382,39 @@ function ParkRecordTotal() {
       ],
     },
     {
+      name: "vehicel_type",
+      type: "Select",
+      label: "订单类型",
+      defaultValue: 0,
+      options: sysConfig?.parkCarType || [],
+      // options: [
+      //   {
+      //     label: "全部",
+      //     value: 0,
+      //   },
+      //   {
+      //     label: "小型车",
+      //     value: 1,
+      //   },
+      //   {
+      //     label: "中型车",
+      //     value: 2,
+      //   },
+      //   {
+      //     label: "大型车",
+      //     value: 3,
+      //   },
+      //   {
+      //     label: "公务车",
+      //     value: 4,
+      //   },
+      //   {
+      //     label: "残疾人车",
+      //     value: 5,
+      //   },
+      // ],
+    },
+    {
       name: "in_person",
       type: "Input",
       label: "入场收费员",
@@ -403,6 +443,7 @@ function ParkRecordTotal() {
     type: 1,
     park_id: "",
     order_type: 0,
+    vehicel_type: 0,
     plate_color: -1,
     in_person: "",
     out_person: "",
@@ -620,6 +661,7 @@ function ParkRecordTotal() {
           </Descriptions>
           <Descriptions title="停车信息">
             <Descriptions.Item label="车牌号">{item.plate}</Descriptions.Item>
+            <Descriptions.Item label="车辆类型">{item.vehicel_type}</Descriptions.Item>
             <Descriptions.Item label="会员手机号">{item.phone}</Descriptions.Item>
             <Descriptions.Item label="入场时间"> {item.in_time} </Descriptions.Item>
             <Descriptions.Item label="出场时间">{item.out_time}</Descriptions.Item>
diff --git a/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx
index 5c1569b..e83f942 100644
--- a/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx
@@ -184,6 +184,26 @@ function PreOrderRecord() {
         },
       ],
     },
+    {
+      name: "effect",
+      type: "Select",
+      label: "状态",
+      options: sysConfig?.unregStatus || [],
+      // options: [
+      //   {
+      //     label: "全部",
+      //     value: 0,
+      //   },
+      //   {
+      //     label: "有效",
+      //     value: 1,
+      //   },
+      //   {
+      //     label: "无效",
+      //     value: 2,
+      //   },
+      // ],
+    },
   ];
   const initFormData = {
     // region: null,
@@ -193,6 +213,7 @@ function PreOrderRecord() {
     berth_id: "",
     parking_duration: "",
     work_time: 0,
+    effect: 0,
   };
 
   const [tableData, setTableData] = useState([]);