diff --git a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
index 529b1f6..bfa2996 100644
--- a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
@@ -23,7 +23,7 @@ function SalesStat(props) {
})
const parameter = {
name: '',//登录名
- start_time: moment().format('YYYY-MM-DD 00:00:00'),
+ start_time: moment().subtract(1, 'days').startOf('day').format('YYYY-MM-DD 00:00:00'),
end_time: moment().format("YYYY-MM-DD 23:59:59"),
pn: 1,
length: Number(pageSizeOptions[0]), // 每页条数
diff --git a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
index 8f170ad..0bf596d 100644
--- a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
@@ -22,6 +22,7 @@ import ajax from "@/services";
import errorImg from '@/assets/images/error-img-new.png'
import { QuestionCircleOutlined } from '@ant-design/icons';
import { TableModule } from "@/components";
+import { useSessionStorageState } from 'ahooks';
import "./index.scss";
import {
payRecordColumns,
@@ -35,6 +36,23 @@ const { TextArea } = Input;
let array = [];
function ParkRecordTotal() {
+ const [sessionTabList, setSessionTabList] = useSessionStorageState("parkRecordTotal", {
+ value: {}
+ })
+ const sType = sessionTabList.type // 出场类型
+ // 数据来源
+ const [source, setSource] = useState(() => {
+ if (!sType || sType == 1) {
+ return sysConfig?.inSource
+ } else if (sType == 2) {
+ return sysConfig?.outSource
+ }
+ })
+ const valueChange = (v) => {
+ // console.log(v.type);
+ let _source = v.type == 1 ? sysConfig?.inSource : sysConfig?.outSource
+ setSource(_source)
+ }
const roadContent = (
出场时间-入场时间的计算金额
@@ -70,7 +88,7 @@ function ParkRecordTotal() {
render: (text, record, index) => index + 1,
width: 100,
},
-
+
{
title: "路段名称",
dataIndex: "road",
@@ -178,8 +196,8 @@ function ParkRecordTotal() {
{
title:
应收金额
-
- ,
+
+ ,
dataIndex: "receivable_amount",
key: "receivable_amount",
width: 100,
@@ -198,10 +216,10 @@ function ParkRecordTotal() {
align: "center",
},
{
- title:
+ title:
优惠金额
-
- ,
+
+ ,
dataIndex: "preferential_amount",
key: "preferential_amount",
width: 100,
@@ -213,10 +231,10 @@ function ParkRecordTotal() {
//
},
{
- title:
+ title:
折扣金额
-
- ,
+
+ ,
dataIndex: "discount_amount",
key: "discount_amount",
width: 100,
@@ -230,8 +248,8 @@ function ParkRecordTotal() {
{
title:
退款总计
-
- ,
+
+ ,
dataIndex: "refund_total",
key: "refund_total",
width: 100,
@@ -303,7 +321,7 @@ function ParkRecordTotal() {
name: "region",
type: "TreeSelect",
label: "区域",
- areaName:1
+ areaName: 1
},
{
name: "operator",
@@ -311,14 +329,14 @@ function ParkRecordTotal() {
label: "商户名称",
defaultValue: "0",
placeholder: "请选择商户名称",
- operatorName:1
+ operatorName: 1
},
{
name: "road",
type: "SearchSelect",
label: "路段名称",
placeholder: "请输入路段名称",
- roadName:1
+ roadName: 1
},
{
name: "road_type",
@@ -432,12 +450,12 @@ function ParkRecordTotal() {
// ],
},
{
- name: "in_source",
+ name: "source",
type: "Select",
label: "操作来源",
placeholder: "请选择操作来源",
defaultValue: 0,
- options: sysConfig?.inSource || [],
+ options: source,
},
{
name: "in_person",
@@ -699,7 +717,7 @@ function ParkRecordTotal() {
{item.receivable_amount}
-
{item.coupon }
+
{item.coupon}
{item.preferential_amount}
@@ -725,17 +743,17 @@ function ParkRecordTotal() {
-
+
-
+
-
+
@@ -744,7 +762,7 @@ function ParkRecordTotal() {
);
}
//查看历史详情
- const [getHistoryData,setGetHistoryData]=useState({})
+ const [getHistoryData, setGetHistoryData] = useState({})
function checkHistoryDetail(record) {
setGetHistoryData(record);
setHistoryVisible(true);
@@ -794,7 +812,7 @@ function ParkRecordTotal() {
ajax.getHistoryRecord({ park_record_id: park_id }).then((res) => {
if (res.status === 20000) {
// res.data.list.map(res=>{
- setHistoryProgressRecord(res.data.list);
+ setHistoryProgressRecord(res.data.list);
// })
} else {
message.error(res.message)
@@ -809,7 +827,7 @@ function ParkRecordTotal() {
if (res.status === 20000) {
setTableData(res.data.list);
setTotal(res.data.total);
- }else{
+ } else {
message.error(res.message)
}
});
@@ -826,7 +844,8 @@ function ParkRecordTotal() {
tableData={tableData}
formSearch={formSearch}
pagename="停车记录查询"
- mandatory={['plate','berth_id']}
+ valueChange={valueChange}
+ mandatory={['plate', 'berth_id']}
mandatory_name={['车牌号或泊位号']}
pageName={'parkRecordTotal'}
initFormData={initFormData}
@@ -1184,11 +1203,11 @@ function ParkRecordTotal() {