From 91044787bac3a1dd5418830a838029df4bba061e Mon Sep 17 00:00:00 2001 From: zhangjian Date: Mon, 15 Jan 2024 15:07:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat():=E8=A7=A3=E5=86=B3=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=BB=91=E5=B1=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RealtimeMonitor/ChargerMonitor/index.jsx | 4 +- .../RealtimeMonitor/ChargerMonitor/loadable.jsx | 4 +- .../RealtimeMonitor/LockMonitor/index.jsx | 4 +- .../RealtimeMonitor/LockMonitor/loadable.jsx | 4 +- .../RealtimeMonitor/PileMonitor/index.jsx | 4 +- .../RealtimeMonitor/PileMonitor/loadable.jsx | 480 +-------------------- src/pages/NewEnergy/index.jsx | 2 +- src/router/router.config.js | 2 +- 8 files changed, 18 insertions(+), 486 deletions(-) diff --git a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/index.jsx b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/index.jsx index 7fbec04..e9321ff 100644 --- a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/index.jsx +++ b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/index.jsx @@ -2,5 +2,5 @@ import React from "react" import loadable from "@loadable/component" import { LoadingImg } from "@/components" -const BillingRule = loadable(() => import("./loadable")) -export default (pros) => } /> \ No newline at end of file +const ChargerMonitor = loadable(() => import("./loadable")) +export default (pros) => } /> \ No newline at end of file diff --git a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx index cecb221..f960e2f 100644 --- a/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx +++ b/src/pages/NewEnergy/RealtimeMonitor/ChargerMonitor/loadable.jsx @@ -34,7 +34,7 @@ const { TextArea } = Input; let array = []; -function BillingRule() { +function ChargerMonitor() { const roadContent = (

出场时间-入场时间的计算金额

@@ -1123,4 +1123,4 @@ function BillingRule() { ); } -export default BillingRule; +export default ChargerMonitor; diff --git a/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/index.jsx b/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/index.jsx index 7fbec04..d155dc7 100644 --- a/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/index.jsx +++ b/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/index.jsx @@ -2,5 +2,5 @@ import React from "react" import loadable from "@loadable/component" import { LoadingImg } from "@/components" -const BillingRule = loadable(() => import("./loadable")) -export default (pros) => } /> \ No newline at end of file +const LockMonitor = loadable(() => import("./loadable")) +export default (pros) => } /> \ No newline at end of file diff --git a/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx index cecb221..b2afd6b 100644 --- a/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx +++ b/src/pages/NewEnergy/RealtimeMonitor/LockMonitor/loadable.jsx @@ -34,7 +34,7 @@ const { TextArea } = Input; let array = []; -function BillingRule() { +function LockMonitor() { const roadContent = (

出场时间-入场时间的计算金额

@@ -1123,4 +1123,4 @@ function BillingRule() { ); } -export default BillingRule; +export default LockMonitor; diff --git a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.jsx b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.jsx index 7fbec04..d6150c1 100644 --- a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.jsx +++ b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/index.jsx @@ -2,5 +2,5 @@ import React from "react" import loadable from "@loadable/component" import { LoadingImg } from "@/components" -const BillingRule = loadable(() => import("./loadable")) -export default (pros) => } /> \ No newline at end of file +const PileMonitor = loadable(() => import("./loadable")) +export default (pros) => } /> \ No newline at end of file diff --git a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx index cecb221..6d6811a 100644 --- a/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx +++ b/src/pages/NewEnergy/RealtimeMonitor/PileMonitor/loadable.jsx @@ -23,43 +23,15 @@ import errorImg from '@/assets/images/error-img-new.png' import { QuestionCircleOutlined } from '@ant-design/icons'; import { TableModule } from "@/components"; import "./index.scss"; -import { - payRecordColumns, - refundRecordColumns, - operatorRecordColumns, -} from "./dataSource"; + // import errorImg from "@/assets/images/layout/error.png" // import { useLocation } from "react-router-dom"; const { TextArea } = Input; let array = []; -function BillingRule() { - const roadContent = ( -
-

出场时间-入场时间的计算金额

-
- ) - const receivableContent = ( -
-

订单金额-折扣金额

-
- ) - const discountContent = ( -
-

折扣金额=停车卡抵扣+路段折扣

-
- ) - const preferentialContent = ( -
-

优惠券支付金额

-
- ) - const refundContent = ( -
-

退款总计=退实付+退优惠

-
- ) +function PileMonitor() { + const columns = [ { title: "序号", @@ -139,88 +111,8 @@ function BillingRule() { width: 100, align: "center", }, - { - title: - 订单金额 - - , - dataIndex: "order_amount", - key: "order_amount", - width: 100, - align: "center", - // filterDropdown: true, - // filterIcon: - // - // - // - }, - { - title: - 应收金额 - - , - dataIndex: "receivable_amount", - key: "receivable_amount", - width: 100, - align: "center", - // filterDropdown: true, - // filterIcon: - // - // - // - }, - { - title: - 折扣金额 - - , - dataIndex: "discount_amount", - key: "discount_amount", - width: 100, - align: "center", - // filterDropdown: true, - // filterIcon: - // - // - // - }, - { - title: - 优惠金额 - - , - dataIndex: "preferential_amount", - key: "preferential_amount", - width: 100, - align: "center", - // filterDropdown: true, - // filterIcon: - // - // - // - }, - { - title: "实付金额", - dataIndex: "actual_amount", - key: "actual_amount", - width: 100, - align: "center", - }, - { - title: - 退款总计 - - , - dataIndex: "refund_total", - key: "refund_total", - width: 100, - align: "center", - // filterDropdown: true, - // filterIcon: - // - // - // - }, + + { title: "停车记录ID", dataIndex: "park_id", @@ -759,368 +651,8 @@ function BillingRule() { search={search} exportUrl="/api/bpm/record/get_record_export" /> - { - setDetailVisible(false); - setTabKey("1"); - }} - destroyOnClose - > - - - {renderParkRecord(parkingRecordDetail)} - - - {renderModalTable(payRecordColumns, payRecord)} - - - {renderModalTable(refundRecordColumns, refundRecord)} - - - {renderModalTable(operatorRecordColumns, operationRecord)} - - - {renderModalTable(historyProgressColumns, historyProgressRecord)} - - - { - setHistoryVisible(false); - }} - className="hanleHistoyModal" - footer={null} - width={1000} - > - - - - {historyDataDetail?.road} - - - {historyDataDetail.region} - - - {historyDataDetail.operator} - - - {historyDataDetail.berth_id} - - - {historyDataDetail.road_type} - - - - - {historyDataDetail.plate} - - - {historyDataDetail.admission_time} - - - {historyDataDetail.in_time} - - - {historyDataDetail.out_time} - - - {historyDataDetail.in_source} - - - {historyDataDetail.out_source} - - - { - setPlatePhotoModal(true); - }} - > - 查看 - - - - - - {historyDataDetail.order_amount} - - - {historyDataDetail.preferential_total} - - - {historyDataDetail.actual_amount} - - - {historyDataDetail.arrears_mount} - - - { - setIsShowAll(false); - }} - > - 返回 - - ) : ( - { - setIsShowAll(true); - }} - > - 查看全部 - - ) - } - > - - - - - {isShowAll ? ( - - -
-
流程记录 -
-
- - -
-
申诉处理审核: 已完成
-
-
{getHistoryData.examine_time}
-
来源:平台
-
操作人:{getHistoryData.dealer}
-
-
- - -
-
申诉处理提审
-
-
-
操作项
-
- {getHistoryData?.change_content == 1 - ? "调整出场时间" - : getHistoryData?.change_content == 2 - ? "变更车牌号" - : getHistoryData?.change_content == 3 - ? "更改订单金额" - : getHistoryData?.change_content == 4 - ? "免费该订单" - : "作废该订单"} -
-
{getHistoryData.deal_time}
-
-
-
初始值
-
{getHistoryData.initial_value || "--"}
-
来源:平台
-
-
-
变更值
-
{getHistoryData.update_value || "--"}
-
{getHistoryData.dealer}
-
-
-
- - -
- - - ) : ( - - - - -