diff --git a/src/assets/css/base.scss b/src/assets/css/base.scss index 3edd9ae..30f04db 100644 --- a/src/assets/css/base.scss +++ b/src/assets/css/base.scss @@ -769,3 +769,10 @@ color:var(--color-text) !important; border-radius: 4px; } } + +// th.ant-table-cell.ant-table-cell-scrollbar { +// background: transparent; +// box-shadow: unset; +// border-left: unset; +// border-bottom-color: transparent; +// } diff --git a/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx index ac01176..da9d310 100644 --- a/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx @@ -54,6 +54,7 @@ function PersonInfo() { const [dataSource, setDataSource] = useState([]) const [tranferAllData, setTranferAllData] = useState([]) const [currentPersonId, setCurrentPersonId] = useState('') + const currentPersonIdRef = useRef() const [currentPersonRecord, setCurrentPersonRecord] = useState('') const [currentPersonInfo, setCurrentPersonInfo] = useState({ // 12各参数 name: '', @@ -98,6 +99,7 @@ function PersonInfo() { const clickDropDown = (param, record) => { setCurrentPersonId(record.id) + currentPersonIdRef.current = record.id if (param.key == '3') { // resetPersonPwd(record) setIsResetModalOpen(true) @@ -240,7 +242,7 @@ function PersonInfo() { const getAssets = (id, editFlag) => { if (id) { if(showEdit || editFlag){ - ajax.getAssets({id: id , user_id: currentPersonId}).then(res => { // + ajax.getAssets({id: id , user_id: currentPersonIdRef.current}).then(res => { // if (res.status == 20000) { let temparr = []; res.data.map(item => { diff --git a/src/pages/OffPeak/OffPeakParkMgm/BookInfo/loadable.jsx b/src/pages/OffPeak/OffPeakParkMgm/BookInfo/loadable.jsx index dc9fcb5..85772b7 100644 --- a/src/pages/OffPeak/OffPeakParkMgm/BookInfo/loadable.jsx +++ b/src/pages/OffPeak/OffPeakParkMgm/BookInfo/loadable.jsx @@ -11,6 +11,19 @@ import { useLocation } from "react-router-dom"; function BookInfo(props) { const stateInfo = useLocation(); + const [parkList, setParkList] = useState([]) + //搜索参数初始化 + const initFormData = { + park_name: "", + plate: "", + status: "", + tel: stateInfo?.state?.tel ? stateInfo.state.tel : '', + book_time_range: [moment(new Date(new Date().getTime() - 7*86400*1000)), moment()] + }; + //搜索的结果 + const [tableData, setTableData] = useState([]); + //搜索的总结果数 + const [total, setTotal] = useState(0); const columns = [ { title: "手机号", @@ -62,6 +75,7 @@ function BookInfo(props) { label: "车场名称", placeholder: "请输入", name: "park_name", + options: [{label: '全部', value: ""}, ...parkList] // roadName:1 }, { @@ -113,18 +127,7 @@ function BookInfo(props) { defaultValue: [moment(new Date(new Date().getTime() - 7*86400*1000)), moment()] }, ]; - //搜索参数初始化 - const initFormData = { - park_name: "", - plate: "", - status: "", - tel: stateInfo?.state?.tel ? stateInfo.state.tel : '', - book_time_range: [moment(new Date(new Date().getTime() - 7*86400*1000)), moment()] - }; - //搜索的结果 - const [tableData, setTableData] = useState([]); - //搜索的总结果数 - const [total, setTotal] = useState(0); + function search(params) { let temp_obj = {...params} if(temp_obj.book_time_range?.length){ @@ -140,6 +143,20 @@ function BookInfo(props) { }); } + const ajaxGetPark = () => { + ajax.getParkList().then(res => { + if (res.status == 20000) { + setParkList([...res.data]) + } else { + setParkList([]) + } + }) + } + + useEffect(()=>{ + ajaxGetPark() + },[]) + return ( 查看 -   - {setCurrentRecord(record); setVisible(true); setCount(record.total_remain)}}>修改 +   + { setCurrentRecord(record); setVisible(true); setCount(record.total_remain) }}>修改 ) } @@ -94,15 +103,7 @@ function BreakInfo() { operator: "", exceedTime: "", }; - //搜索的结果 - const [tableData, setTableData] = useState([]); - const [visible, setVisible] = useState(false) - const [currentRecord,setCurrentRecord] = useState({}) - const [count ,setCount] = useState() - const tableRef = useRef() - //搜索的总结果数 - const [total, setTotal] = useState(0); function search(params) { ajax.getBreakInfoList(params).then((res) => { if (res.status === 20000) { diff --git a/src/pages/OffPeak/OffPeakParkMgm/OffPeakParkingRecords/loadable.jsx b/src/pages/OffPeak/OffPeakParkMgm/OffPeakParkingRecords/loadable.jsx index f82f30e..dacb92b 100644 --- a/src/pages/OffPeak/OffPeakParkMgm/OffPeakParkingRecords/loadable.jsx +++ b/src/pages/OffPeak/OffPeakParkMgm/OffPeakParkingRecords/loadable.jsx @@ -10,6 +10,15 @@ import "./index.scss"; // import { useLocation } from "react-router-dom"; function OffPeakParkingRecords() { + //搜索的结果 + const [tableData, setTableData] = useState([]); + const [visible, setVisible] = useState(false) + const [currentRecord, setCurrentRecord] = useState({}) + const [bigPic, setBigPic] = useState(); + const [bigpicVisible, setBigpicVisible] = useState(false);//大图展示 + //搜索的总结果数 + const [total, setTotal] = useState(0); + const [parkList, setParkList] = useState([]) const columns = [ { title: "停车场名称", @@ -74,7 +83,7 @@ function OffPeakParkingRecords() { label: "停车场名称", placeholder: "请输入", name: "park_name", - roadName:1 + options: [{label: '全部', value: ""}, ...parkList] }, { type: "Input", @@ -90,10 +99,6 @@ function OffPeakParkingRecords() { name: "in_out_type", options: [ { - value: '0', - label: '全部' - }, - { value: '1', label: '入场' }, @@ -124,20 +129,11 @@ function OffPeakParkingRecords() { ]; //搜索参数初始化 const initFormData = { - merchantName: "0", - road_name: "", - parking_num: "", - operator: "", - exceedTime: "", + park_name: "", + plate: "", + in_out_type: "1", }; - //搜索的结果 - const [tableData, setTableData] = useState([]); - const [visible,setVisible] = useState(false) - const [currentRecord,setCurrentRecord] = useState({}) - const [bigPic, setBigPic] = useState(); - const [bigpicVisible, setBigpicVisible] = useState(false);//大图展示 - //搜索的总结果数 - const [total, setTotal] = useState(0); + function search(params) { ajax.getOffPeakRecords(params).then((res) => { if (res.status === 20000) { @@ -147,6 +143,20 @@ function OffPeakParkingRecords() { }); } + const ajaxGetPark = () => { + ajax.getParkList().then(res => { + if (res.status == 20000) { + setParkList([...res.data]) + } else { + setParkList([]) + } + }) + } + + useEffect(()=>{ + ajaxGetPark() + },[]) + return ( <> { ajax.deleteHotCbd({id: id}).then((res) => { if (res.status == 20000) { - search(Object.assign({},formData, pageData)) + if(resultData.length == 1){ + setPageData({...pageData, pn: 1}) + search(Object.assign({},formData, {...pageData, pn: 1})) + }else{ + search(Object.assign({},formData, pageData)) + } message.success(res.message) } else { message.error(res.message) diff --git a/src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx b/src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx index f1d1e18..310ff86 100644 --- a/src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx +++ b/src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx @@ -193,11 +193,11 @@ function VacationConf() {
*节假日区间  - {setStartDate(e)}} allowClear={false} format={'YYYY-MM-DD'} /> + {setStartDate(e)}} allowClear={false} format={'YYYY-MM-DD'} />
至  - {setEndDate(e)}} allowClear={false} format={'YYYY-MM-DD'} /> + {setEndDate(e)}} allowClear={false} format={'YYYY-MM-DD'} />
diff --git a/src/services/OutRoadMgm/OutPayOrders.js b/src/services/OutRoadMgm/OutPayOrders.js index f5c1363..7a4dee4 100644 --- a/src/services/OutRoadMgm/OutPayOrders.js +++ b/src/services/OutRoadMgm/OutPayOrders.js @@ -4,7 +4,7 @@ const getOutPayOrdersList = (params) => { return ajax({ url: "/api/orp/business/get_payment_list", type: "post", - data: params, + data: {...params, guard: true} }); }; export default { diff --git a/src/services/recordInquiry.js b/src/services/recordInquiry.js index 6173ae8..010e6ee 100644 --- a/src/services/recordInquiry.js +++ b/src/services/recordInquiry.js @@ -60,7 +60,7 @@ const getPaymentList = (params) => { return ajax({ url: "/api/bpm/record/get_payment_list", type: "post", - data: params, + data: {...params, guard: true} }); }; ///api/bpm/record/get_payment_record 停车记录查询-支付记录