Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0 into develop

src/pages/MerchantMgm/MerchantInfo/loadable.jsx

@@ -1345,6 +1345,7 @@ const MerchantInfo = (props) => {
                           required={true}
                           className="form-item"
                           validateTrigger="onBlur"
+
                           rules={[
                             { required: true, message: "请选择商户类型!" }
                           ]}
@@ -1352,6 +1353,7 @@ const MerchantInfo = (props) => {
                           <Select
                             options={tenantType}
                             placeholder="请选择"
+                            getPopupContainer={(node) => node.parentElement}
                           >
                           </Select>
                         </Form.Item>
@@ -1370,6 +1372,7 @@ const MerchantInfo = (props) => {
                             mode="tags"
                             placeholder="请选择"
                             maxTagCount={2}
+                            getPopupContainer={(node) => node.parentElement}
                             style={{
                               width: '100%',
                             }}
@@ -1389,6 +1392,7 @@ const MerchantInfo = (props) => {
                             className="search-group-item"
                             limit={90}
                             showTime={false}
+                            getPopupContainer={(node) => node.parentElement}
                           />
                         </Form.Item>
 
@@ -1428,6 +1432,7 @@ const MerchantInfo = (props) => {
                           <Cascader
                             placeholder="请选择"
                             options={companyAddress}
+                            getPopupContainer={(node) => node.parentElement}
                             fieldNames={{
                               label: "areaName",
                               value: "areaId",
@@ -1613,6 +1618,7 @@ const MerchantInfo = (props) => {
                             options={PAY}
                             placeholder="请选择"
                             className="select"
+                            getPopupContainer={(node) => node.parentElement}
                             onChange={e => {
                               // handleChangeSelect(e);
                               // setFormCreate({ ...formCreate, pay_type: e })
@@ -1646,7 +1652,7 @@ const MerchantInfo = (props) => {
                               className="form-item"
                               validateTrigger="onBlur"
                               rules={[
-                                { required: true, message: "请输入清分比例!" }
+                                { required: true, message: "请输入正确的清分比例(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/) }
                               ]}
                             >
                               <Input placeholder="请输入清分比例!"></Input>
@@ -1659,7 +1665,7 @@ const MerchantInfo = (props) => {
                               className="form-item"
                               validateTrigger="onBlur"
                               rules={[
-                                { required: true, message: "请输入清分周期!" }
+                                { required: true, message: "请输入正确的清分周期(不允许输入汉字)",  pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/) }
                               ]}
                             >
                               <Input placeholder="请输入清分周期!"></Input>
@@ -1672,7 +1678,7 @@ const MerchantInfo = (props) => {
                               className="form-item"
                               validateTrigger="onBlur"
                               rules={[
-                                { required: true, message: "请输入结算费率!" }
+                                { required: true, message: "请输入正确的结算费率(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/) }
                               ]}
                             >
                               <Input placeholder="请输入结算费率!"></Input>
@@ -1692,6 +1698,7 @@ const MerchantInfo = (props) => {
                                 // className="select"
                                 placeholder="请选择"
                                 className="form-item charge-type-sel"
+                                getPopupContainer={(node) => node.parentElement}
                               >
                               </Select>
                             </Form.Item>
@@ -1703,7 +1710,7 @@ const MerchantInfo = (props) => {
                               className="form-item"
                               validateTrigger="onBlur"
                               rules={[
-                                { required: true, message: "请输入结算周期!" }
+                                { required: true, message: "请输入正确的结算周期(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                               ]}
                             >
                               <Input placeholder="请输入结算周期!"></Input>
@@ -1779,7 +1786,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入微信支付应用ID(开放平台)!" }
+                            { required: true, message: "请输入正确的微信支付应用ID(开放平台)(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入微信支付应用ID(开放平台)!"></Input>
@@ -1792,7 +1799,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入微信支付商户ID!" }
+                            { required: true, message: "请输入正确的微信支付商户ID(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入微信支付商户ID!"></Input>
@@ -1805,7 +1812,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入微信支付APL_KEY!" }
+                            { required: true, message: "请输入正确的微信支付APL_KEY(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入微信支付APL_KEY!"></Input>
@@ -1818,7 +1825,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "微信支付开发者密钥!" }
+                            { required: true, message: "请输入正确的微信支付开发者密钥(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="微信支付开发者密钥!"></Input>
@@ -1856,7 +1863,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝应用ID!" }
+                            { required: true, message: "请输入正确的支付宝应用ID(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝应用ID!"></Input>
@@ -1869,7 +1876,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝支付商户ID!" }
+                            { required: true, message: "请输入正确的支付宝支付商户ID(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝支付商户ID!"></Input>
@@ -1882,7 +1889,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝支付商户私钥!" }
+                            { required: true, message: "请输入正确的支付宝支付商户私钥(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝支付商户私钥!"></Input>
@@ -1895,7 +1902,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝公钥!" }
+                            { required: true, message: "请输入正确的支付宝公钥(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝公钥!"></Input>
@@ -1933,7 +1940,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入微信支付应用ID(开放平台)!" }
+                            { required: true, message: "请输入正确的微信支付应用ID(开放平台)(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入微信支付应用ID(开放平台)!"></Input>
@@ -1946,7 +1953,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入微信支付商户ID!" }
+                            { required: true, message: "请输入正确的微信支付商户ID(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入微信支付商户ID!"></Input>
@@ -1959,7 +1966,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入微信支付APL_KEY!" }
+                            { required: true, message: "请输入正确的微信支付APL_KEY(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入微信支付APL_KEY!"></Input>
@@ -1972,10 +1979,10 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "微信支付开发者密钥!" }
+                            { required: true, message: "请输入正确的微信支付开发者密钥(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
-                          <Input placeholder="微信支付开发者密钥!"></Input>
+                          <Input placeholder="请输入微信支付开发者密钥!"></Input>
                         </Form.Item>
                       </Form>
                     </div>
@@ -2010,7 +2017,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝应用ID!" }
+                            { required: true, message: "请输入正确的支付宝应用ID(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝应用ID!"></Input>
@@ -2023,7 +2030,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝支付商户ID!" }
+                            { required: true, message: "请输入正确的支付宝支付商户ID(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝支付商户ID!"></Input>
@@ -2036,7 +2043,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝支付商户私钥!" }
+                            { required: true, message: "请输入正确的支付宝支付商户私钥(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝支付商户私钥!"></Input>
@@ -2049,7 +2056,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝公钥!" }
+                            { required: true, message: "请输入正确的支付宝公钥(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝公钥!"></Input>
@@ -2092,7 +2099,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入微信子商户号!" }
+                            { required: true, message: "请输入正确的微信子商户号(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入微信子商户号!"></Input>
@@ -2131,7 +2138,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝应用ID!" }
+                            { required: true, message: "请输入正确的支付宝应用ID(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝应用ID!"></Input>
@@ -2144,7 +2151,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝支付商户ID!" }
+                            { required: true, message: "请输入正确的支付宝支付商户ID(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝支付商户ID!"></Input>
@@ -2157,7 +2164,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝支付商户私钥!" }
+                            { required: true, message: "请输入正确的支付宝支付商户私钥(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝支付商户私钥!"></Input>
@@ -2170,7 +2177,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝公钥!" }
+                            { required: true, message: "请输入正确的支付宝公钥(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝公钥!"></Input>
@@ -2208,7 +2215,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入微信子商户号!" }
+                            { required: true, message: "请输入正确的微信子商户号(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入微信子商户号!"></Input>
@@ -2247,7 +2254,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝应用ID!" }
+                            { required: true, message: "请输入正确的支付宝应用ID(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝应用ID!"></Input>
@@ -2260,7 +2267,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝支付商户ID!" }
+                            { required: true, message: "请输入正确的支付宝支付商户ID(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝支付商户ID!"></Input>
@@ -2273,7 +2280,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝支付商户私钥!" }
+                            { required: true, message: "请输入正确的支付宝支付商户私钥(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝支付商户私钥!"></Input>
@@ -2286,7 +2293,7 @@ const MerchantInfo = (props) => {
                           className="form-item"
                           validateTrigger="onBlur"
                           rules={[
-                            { required: true, message: "请输入支付宝公钥!" }
+                            { required: true, message: "请输入正确的支付宝公钥(不允许输入汉字)", pattern: new RegExp(/^[^\u4E00-\u9FA5]+$/)}
                           ]}
                         >
                           <Input placeholder="请输入支付宝公钥!"></Input>

src/pages/OutRoadMgm/OutPersonMgm/TollCollector/index.jsx

@@ -474,7 +474,10 @@ function TollCollector() {
               <div className="form-btn">
                 <Button
                   className="reset"
-                  onClick={() => setFormData({ ...defaultData, pn: formData?.pn || 1, page_size: formData?.page_size || dictionary?.pageSizeOptions1[0] })}
+                  onClick={() => {
+                    setFormData(defaultData);
+                    $getTableList(defaultData);
+                  }}
                 >
                   重置
                 </Button>

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 <>
+          <Popover
+            overlayClassName="start-exception-deal-operate"
+            content={
+              <div className="operateBtn operate-btn" style={{ cursor: "pointer" }} trigger="hover">
+                <div className="hover" onClick={() => console.log("详情")}>详情</div>
+              </div>
+            }
+          >
+            <Button type="primary">操作</Button>
+          </Popover>
+        </>
+      },
+    },
+  ];
+
+  // 获取商户名称
+  const $getAllOperator = () => {
+    ajax.ElectInvoice.getSelectOperator().then((res) => {
+      if (res.status === 20000) {
+        setOperatorList(res.data || []);
+      } else {
+        message.error(res.message);
+      }
+    }).catch((error) => {
+      message.error(error.message);
+    });
+  };
+
+  // 分页
+  const $changePn = (pn, page_size) => {
+    let temFormData = {};
+    if (formData.page_size == page_size) {
+      temFormData = {
+        ...formData,
+        pn
+      };
+    } else {
+      temFormData = {
+        ...formData,
+        pn: 1,
+        page_size,
+      };
+    };
+    setFormData(temFormData);
+    $getTableList(temFormData);
+  };
+
+
+  // 获取表格数据
+  const $getTableList = (value = {}) => {
+    let _data = {
+      ...formData,
+      ...value
+    };
+    setLoading(true);
+    setResultData({ list: [], total: 0 });
+    ajax.getAllTransitionReportData(_data).then((res) => {
+      setLoading(false);
+      if (res.status === 20000) {
+        setResultData(res?.data || {});
+      } else {
+        message.error(res.message);
+      }
+    }).catch((error) => {
+      setLoading(false);
+      message.error(error.message);
+    });
+  };
+
+  useEffect(() => {
+    let _data = {};
+    if (sessionData && Object.values(sessionData).length > 0) {
+      _data = {
+        operator: sessionData?.operator || "0", // 商户名称
+        login_name: sessionData?.login_name || "", // 登录名
+        user_name: sessionData?.user_name || "", // 姓名
+        time_sel: sessionData?.time_sel || defaultData?.time_sel, // 时间下拉数据
+        start_time: sessionData?.start_time || defaultData?.start_time,
+        end_time: sessionData?.end_time || defaultData?.end_time,
+        pn: 1,
+        page_size: dictionary?.pageSizeOptions1[0],
+      };
+      setFormData({ ..._data });
+    };
+    $getAllOperator()
+    $getTableList(_data);
+  }, []);
+
+  useEffect(() => {
+    setSessionData(formData);
+  }, [formData]);
 
   return (
     <div className="transition-report">
-      交接班报表
+      <div className="paid-search">
+        <div className="title">查询条件</div>
+        <div className="form-Wrap">
+          <div className="yisa-search">
+            <label>商户名称</label>
+            <Select
+              className="form-con"
+              placeholder="请选择商户名称"
+              getPopupContainer={(node) => node.parentElement}
+              options={operatorList}
+              value={formData?.operator || "0"}
+              onChange={(v) => setFormData({ ...formData, operator: v || "0" })}
+            />
+          </div>
+          <div className="yisa-search">
+            <label>登录名</label>
+            <Input
+              className="form-con"
+              placeholder="请输入登录名"
+              value={formData?.account_number || ""}
+              allowClear
+              onChange={(e) =>
+                setFormData({ ...formData, account_number: e.target.value || "" })
+              }
+            />
+          </div>
+          <div className="yisa-search">
+            <label>姓名</label>
+            <Input
+              className="form-con"
+              placeholder="请输入姓名"
+              value={formData?.user_name || ""}
+              allowClear
+              onChange={(e) =>
+                setFormData({ ...formData, user_name: e.target.value || "" })
+              }
+            />
+          </div>
+          <div className="yisa-search">
+            <label>时间</label>
+            <Select
+              className="form-con"
+              placeholder="请选择角色"
+              getPopupContainer={(node) => node.parentElement}
+              options={timeSel}
+              value={formData?.time_sel || 0}
+              onChange={(v) => setFormData({ ...formData, time_sel: v || "1" })}
+            />
+          </div>
+          <div className="yisa-search">
+            <label>时间段</label>
+            <DatePicker
+              className="form-con"
+              showTime 
+              allowClear={false}
+              format={"YYYY-MM-DD HH:mm:ss"}
+              value={formData?.start_time ? moment(formData.start_time) : null}
+              disabledDate={(current) => 
+                current > moment(formData.end_time) ||
+                current < moment(formData.end_time).subtract(31, "days")
+              }
+              onChange={(date, time) => {
+                setFormData({ ...formData, start_time: time || null })
+              }}
+            />
+          </div>
+          <div className="yisa-search">
+            <label>至</label>
+            <DatePicker
+              className="form-con"
+              showTime 
+              allowClear={false}
+              format={"YYYY-MM-DD HH:mm:ss"}
+              value={formData?.end_time ? moment(formData.end_time) : null}
+              disabledDate={(current) => 
+                current < moment(formData.start_time) ||
+                current > moment(formData.start_time).add(31, "days")
+              }
+              onChange={(date, time) => {
+                setFormData({ ...formData, end_time: time || null })
+              }}
+            />
+          </div>
+          <div className="form-btn">
+            <Button
+              className="reset"
+              onClick={() => {
+                setFormData(defaultData);
+                $getTableList(defaultData);
+              }}
+            >
+              重置
+            </Button>
+            <Button
+              className="submit"
+              type="primary"
+              onClick={() => {
+                let _data = {
+                  ...formData,
+                  pn: 1,
+                  page_size: dictionary?.pageSizeOptions1[0]
+                }
+                setFormData(_data)
+                $getTableList(_data)
+              }}
+              loading={loading}
+            >
+              查询
+            </Button>
+          </div>
+        </div>
+      </div>
+      <div className="paid-result">
+        <div className="result">
+          <div className="row-head">
+            <span className="number-wrapper">共查询到<span className="total-number"> {resultData.total || 0} </span>条结果</span>
+          </div>
+          <div className="result-data">
+            <Table
+              rowKey={(row) => row.id}
+              className="table yisa-table-scroll"
+              dataSource={resultData?.list || []}
+              columns={tableColumns}
+              pagination={false}
+              loading={loading}
+              scroll={{ y: "calc(100% - 50px)" }}
+            />
+            <Pagination
+              className="pagination-common"
+              showSizeChanger={true}
+              showQuickJumper={true}
+              showTotal={() => `共 ${resultData.total || 0} 条`}
+              total={resultData.total}
+              current={formData.pn}
+              pageSize={formData.page_size}
+              pageSizeOptions={dictionary?.pageSizeOptions1}
+              onChange={$changePn}
+            />
+          </div>
+        </div>
+      </div>
+
+      {/* <Modal
+        title="提示"
+        open={jobStatusEditOpen.open}
+        onOk={() => $jobStatusEdit(jobStatusEditOpen.data)}
+        onCancel={() => { setJobStatusEditOpen({ open: false, data: {} }) }}
+      >
+        <p>此操作将改变在职状态, 是否继续?</p>
+      </Modal> */}
     </div>
   );
 }

src/pages/OutRoadMgm/OutPersonMgm/TransitionReport/index.scss

@@ -0,0 +1,153 @@
+@import "@/assets/css/mixin.scss";
+$color-container-bg: var(--color-container-bg);
+$color-user-list-bg: var(--color-user-list-bg);
+$color-text: var(--color-text);
+$color-primary: var(--color-primary);
+
+.transition-report {
+  display: flex;
+  padding-top: 10px;
+  width: 100%;
+  height: 100%;
+
+  .paid-search {
+    display: block;
+    width: 375px;
+    padding: 10px 10px 20px 20px;
+
+    .title {
+      width: 100%;
+      font-size: 16px;
+      font-family: Microsoft YaHei, Microsoft YaHei-Bold;
+      font-weight: 700;
+      text-align: left;
+      color: var(--color-text);
+      margin-bottom: 20px;
+    }
+
+    .yisa-search {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      margin-bottom: 24px;
+
+      >label {
+        color: var(--color-search-list-item-text);
+        flex: 0 0 25%;
+        max-width: 25%;
+        text-align: right;
+        padding-right: 8px;
+      }
+
+      .form-con {
+        flex: 1;
+        width: 220px;
+      }
+    }
+
+    .form-Wrap {
+      height: calc(100% - 45px);
+      overflow-y: auto;
+      scrollbar-width: none;
+      -ms-overflow-style: none;
+
+      &::-webkit-scrollbar {
+        display: none;
+      }
+    }
+
+    .form-btn {
+      display: flex;
+      flex-flow: row nowrap;
+      padding: 0 10px;
+      justify-content: space-between;
+
+      .reset {
+        width: 90px;
+        height: 36px;
+        border-radius: 4px;
+      }
+
+      .submit {
+        width: calc(100% - 100px);
+        height: 36px;
+        border-radius: 4px;
+      }
+    }
+
+    .ant-select-selector,
+    .ant-picker,
+    .ant-input {
+      background-color: var(--color-search-list-item-bg) !important;
+      box-shadow: none !important;
+      color: var(--color-search-list-item-value);
+      border-color: var(--color-search-list-item-bd) !important;
+    }
+  }
+
+  .paid-result {
+    width: calc(100% - 375px);
+    padding-bottom: 15px;
+    padding: 20px;
+    background: var(--color-user-list-bg);
+    border-top-left-radius: 20px;
+    box-shadow: 0px 3px 8px 0px rgba(0, 0, 0, 0.08);
+
+    .result {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+
+      .row-head {
+        height: 32px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 13px;
+
+        .total-number {
+          margin: 0 2px;
+          color: var(--color-primary);
+        }
+
+        .colorBtn {
+          height: 36px;
+          border-radius: 4px;
+        }
+      }
+
+      .result-data {
+        width: 100%;
+        height: calc(100% - 45px - 47px);
+      }
+    }
+  }
+
+  .add-edit-content {
+    width: 565px;
+    .form-Wrap {
+      height: 100%;
+    }
+
+    .yisa-search {
+      >label {
+        >em {
+          margin-right: 5px;
+          color: #a61d24;
+        }
+      }
+
+      .ant-picker {
+        flex: 1;
+      }
+    }
+    .form-btn {
+      justify-content: center;
+      .reset {
+        &:last-child {
+          margin-left: 40px;
+        }
+      }
+    }
+  }
+}

src/pages/SystemMgm/SystemLog/index.scss

@@ -130,7 +130,7 @@ $color-primary: var(--color-primary);
       }
       .result-data {
         width: 100%;
-        height: calc(100% - 45px - 60px);
+        height: calc(100% - 40px - 42px);
         .table {
           width: 100%;
           .ant-table-body {

src/pages/SystemMgm/SystemLog/loadable.jsx

@@ -459,12 +459,12 @@ const SystemLog = () => {
           <div className="result-data">
             <Table
               rowKey={(row) => row.id}
-              className="table"
+              className="table yisa-table-scroll"
               dataSource={resultData?.list || []}
               columns={tableColumns}
               pagination={false}
               loading={loading}
-              scroll={{ y: "calc(100vh - 265px)" }}
+              scroll={{ y: "calc(100% - 50px)" }}
             />
             <Pagination
               className="pagination-common"

src/services/OutRoadMgm/OutPersonMgm.js

@@ -50,8 +50,13 @@ export default {
     });
   },
 
-
-
-
   // -- 交接班报表 --
+  // 交接班报表--列表数据
+  getAllTransitionReportData: (data) => {
+    return ajax({
+      url: "/api/orp/report/get_all_list",
+      type: "post",
+      data,
+    });
+  },
 };