diff --git a/src/pages/OutRoadMgm/OutPersonMgm/TransitionReport/index.jsx b/src/pages/OutRoadMgm/OutPersonMgm/TransitionReport/index.jsx
index 7e1546d..b6f33a8 100644
--- a/src/pages/OutRoadMgm/OutPersonMgm/TransitionReport/index.jsx
+++ b/src/pages/OutRoadMgm/OutPersonMgm/TransitionReport/index.jsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from "react";
-import { message, Pagination, Table, Select, Input, DatePicker, Button, Popover } from "antd";
+import { message, Pagination, Table, Select, Input, DatePicker, Button, Popover, Modal } from "antd";
import { dictionary, utils } from "@/config/common";
import moment from "moment";
import { useSessionStorageState } from "ahooks";
@@ -10,11 +10,345 @@ import RecordReviewModal from "@/components/ParkingRecordModal/RecordReviewModal
import "./index.scss";
function TransitionReport() {
-
+ // 默认数据
+ const defaultData = {
+ operator: "0", // 商户名称
+ login_name: "", // 登录名
+ user_name: "", // 姓名
+ time_sel: "1", // 时间下拉数据
+ start_time: moment().subtract(31, "days").startOf("day").format("YYYY-MM-DD HH:mm:ss"), // 开始时间
+ end_time: moment().format("YYYY-MM-DD HH:mm:ss"), // 结束时间
+ pn: 1,
+ page_size: dictionary?.pageSizeOptions1[0]
+ };
+ const timeSel = [
+ {value: "1", label: "按上班时间"},
+ {value: "2", label: "按下班时间"},
+ ];
+
+ const [formData, setFormData] = useState(defaultData); // 表单数据
+ const [sessionData, setSessionData] = useSessionStorageState("transitionReport", { value: {} }); // session缓存
+ const [operatorList, setOperatorList] = useState([{ value: "0", label: "全部" }]); // 商户名称查询数据
+ const [loading, setLoading] = useState(false); // 检索按钮加载状态
+
+ // 表格返回数据
+ const [resultData, setResultData] = useState({
+ total: 0,
+ list: [],
+ });
+
+ //列表
+ const tableColumns = [
+ {
+ title: "序号",
+ width: 60,
+ align: "center",
+ fixed: 'left',
+ render: (text, record, index) => index + 1,
+ },
+ {
+ title: "商户名称",
+ dataIndex: "operator_name",
+ key: "operator_name",
+ align: "center",
+ render: (text, record, index) => text || "--",
+ },
+ {
+ title: "收费员姓名",
+ dataIndex: "user_name",
+ key: "user_name",
+ align: "center",
+ render: (text, record, index) => text || "--",
+ },
+ {
+ title: "登录名",
+ dataIndex: "login_name",
+ key: "login_name",
+ align: "center",
+ render: (text, record, index) => text || "--",
+ },
+ {
+ title: "上班时间",
+ dataIndex: "work_time",
+ key: "work_time",
+ align: "center",
+ render: (text, record, index) => text || "--",
+ },
+ {
+ title: "下班时间",
+ dataIndex: "clos_time",
+ key: "clos_time",
+ align: "center",
+ render: (text, record, index) => text || "--",
+ },
+ {
+ title: "上班时长",
+ dataIndex: "work_duration",
+ key: "work_duration",
+ align: "center",
+ render: (text, record, index) => text || "--",
+ },
+ {
+ title: "现金收入",
+ dataIndex: "cash_earnings",
+ key: "cash_earnings",
+ align: "center",
+ render: (text, record, index) => text || "--",
+ },
+
+ {
+ title: '操作',
+ key: 'operation',
+ dataIndex: 'operation',
+ align: "center",
+ fixed: 'right',
+ width: 100,
+ render: (text, record, index) => {
+ return <>
+
+ console.log("详情")}>详情
+
+ }
+ >
+