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

# Conflicts:
#	src/assets/css/mixin.scss

src/assets/css/base.scss

@@ -779,3 +779,7 @@ color:var(--color-text) !important;
 //   border-left: unset;
 //   border-bottom-color: transparent;
 // }
+
+.ant-table-cell-scrollbar{
+  background-color: #505a6f;
+}

src/pages/OffPeak/OffPeakParkMgm/BookInfo/loadable.jsx

@@ -16,7 +16,7 @@ function BookInfo(props) {
   const initFormData = {
     park_name: "",
     plate: "",
-    status: "",
+    status: "0",
     tel: stateInfo?.state?.tel ? stateInfo.state.tel : '',
     book_time_range: [moment(new Date(new Date().getTime() - 7*86400*1000)), moment()]
   };

src/pages/OffPeak/OffPeakParkMgm/OffPeakParkingRecords/loadable.jsx

@@ -66,7 +66,7 @@ function OffPeakParkingRecords() {
       title: "操作",
       align: "center",
       render: (text, record, index) => (
-        <span className="offpeak-records-op" onClick={()=>{setVisible(true);setCurrentRecord(record)}}>详情</span>
+        <span className="offpeak-records-op" onClick={()=>{getDetailData(record.id)}}>详情</span>
       )
     },
   ];
@@ -155,6 +155,18 @@ function OffPeakParkingRecords() {
     })
   }
 
+  const getDetailData = (id)=>{
+    ajax.getOffPeakDetail({id: id}).then(res => {
+      if (res.status == 20000) {
+        setCurrentRecord(res.data)
+        setVisible(true);
+      } else {
+        message.error(res.message)
+      }
+    })
+    
+  }
+
   useEffect(()=>{
     ajaxGetPark()
   },[])
@@ -172,6 +184,7 @@ function OffPeakParkingRecords() {
         //   pagename="PDA操作记录"
         //   pageName={'entryExitOptPDA'}
         initFormData={initFormData}
+        isExport={false}
       //   exportUrl="/api/bpm/record/get_pda_export"
       />
       <Modal
@@ -202,7 +215,7 @@ function OffPeakParkingRecords() {
                         <div className="new-item">车牌号</div><div className="new-value">{currentRecord.plate || "--"}</div>
                     </div>
                     <div className="ltc-item">
-                        <div className="new-item">会员手机号</div><div className="new-value">{currentRecord.phone || "--"}</div>
+                        <div className="new-item">会员手机号</div><div className="new-value">{currentRecord.tel || "--"}</div>
                     </div>
                     <div className="ltc-item">
                         <div className="new-item">入场时间</div><div className="new-value">{currentRecord.in_time || "--"}</div>
@@ -211,7 +224,7 @@ function OffPeakParkingRecords() {
                         <div className="new-item">出场时间</div><div className="new-value">{currentRecord.out_time || "--"}</div>
                     </div>
                     <div className="ltc-item">
-                        <div className="new-item">停车时长</div><div className="new-value">{currentRecord.admission_time || "--"}</div>
+                        <div className="new-item">停车时长</div><div className="new-value">{currentRecord.parking_duration || "--"}</div>
                     </div>
                     <div className="ltc-item">
                         <div className="new-item">应收金额</div><div className="new-value">{currentRecord.receivable_amount || "--"}</div>

src/services/OffPeak/index.js

@@ -55,6 +55,16 @@ const getOffPeakRecords = (params) => {
     data: params,
   });
 }
+
+//错时车辆停车记录详情
+const getOffPeakDetail = (params) => {
+  return ajax({
+    url: "/api/off_peak/off_peak_records/get_off_peak_detail",
+    type: "post",
+    data: params,
+  });
+}
+
 const shareParkAdd = (params) => {
   return ajax({
     url: "/api/off_peak/park_info/share_park_add",
@@ -178,5 +188,6 @@ export default {
     getRuleDetailsSelect,
     getRuleLinkAdd,
     getDelRuleLink,
-    updateBreakCount 
+    updateBreakCount ,
+    getOffPeakDetail
 }