Browse Source

fix(): 错时车场接口对接

tags/PMS_V1.0.0_Alpha5
wanghx 1 year ago
parent
commit
0ab34cae80
  1. 2
      src/components/ImportBtn/index.jsx
  2. 2
      src/components/TableModule/index.jsx
  3. 15
      src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx
  4. 18
      src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx
  5. 28
      src/pages/OffPeak/OffPeakShareRecords/StallCount/loadable.jsx
  6. 12
      src/services/OffPeak/index.js

2
src/components/ImportBtn/index.jsx

@ -23,7 +23,7 @@ function ImportBtn(props) {
if (e && e.status == 20000) { if (e && e.status == 20000) {
setMsg(e.message) setMsg(e.message)
} else { } else {
message.error(e.message)
// message.error(e.message)
} }
} }

2
src/components/TableModule/index.jsx

@ -655,7 +655,7 @@ const TableModule = forwardRef((props, ref) => {
onChange={handleChange} onChange={handleChange}
defaultValue={item.defaultValue} defaultValue={item.defaultValue}
filterOption={(input, option) => (option?.label ?? '').includes(input)} filterOption={(input, option) => (option?.label ?? '').includes(input)}
options={getRoadList}
options={item.options || getRoadList}
/> />
</Form.Item> </Form.Item>
); );

15
src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx

@ -11,6 +11,7 @@ function InfoModal (props) {
isDetail=false, isDetail=false,
onCancel, onCancel,
timeRulesData=[], timeRulesData=[],
parkList=[],
data={}, data={},
onOk onOk
} = props } = props
@ -24,6 +25,10 @@ function InfoModal (props) {
}, },
] ]
const handleParkChange = (v, _) => {
baseForm.setFieldValue('total', _.berth_number)
}
const handleSave = () => { const handleSave = () => {
baseForm.validateFields().then((data) => { baseForm.validateFields().then((data) => {
onOk({...data}) onOk({...data})
@ -66,14 +71,18 @@ function InfoModal (props) {
<Row> <Row>
<Col span={11}> <Col span={11}>
<Form.Item label="车场名称" name="park_name" rules={rules}>
<Input></Input>
<Form.Item label="车场名称" name="park_id" rules={rules}>
{/* <Input></Input> */}
<Select
options={parkList}
onChange={handleParkChange}
/>
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={2}></Col> <Col span={2}></Col>
<Col span={11}> <Col span={11}>
<Form.Item label="总车位数" name="total" rules={rules}> <Form.Item label="总车位数" name="total" rules={rules}>
<Input type='number'></Input>
<Input type='number' disabled></Input>
</Form.Item> </Form.Item>
</Col> </Col>
</Row> </Row>

18
src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx

@ -15,6 +15,7 @@ function ShareParkMgm() {
const [isEdit, setIsEdit] = useState(false) const [isEdit, setIsEdit] = useState(false)
const [editData, setEditData] = useState({}) const [editData, setEditData] = useState({})
const [timeRulesData, setTimeRulesData] = useState([]) const [timeRulesData, setTimeRulesData] = useState([])
const [parkList, setParkList] = useState([])
const tableRef = useRef(null) const tableRef = useRef(null)
const columns = [ const columns = [
{ {
@ -70,11 +71,11 @@ function ShareParkMgm() {
placeholder:"请选择商户名称" placeholder:"请选择商户名称"
}, },
{ {
type: "Input",
type: "SearchSelect",
label: "车场名称", label: "车场名称",
placeholder: "请输入车场名称", placeholder: "请输入车场名称",
name: "parkName", name: "parkName",
hiddenCount: 1
options: [{label: '全部', value: ""}, ...parkList]
}, },
{ {
type: "Input", type: "Input",
@ -85,6 +86,16 @@ function ShareParkMgm() {
} }
]; ];
const ajaxGetPark = () => {
ajax.getParkList().then(res => {
if (res.status == 20000) {
setParkList([...res.data])
} else {
setParkList([])
}
})
}
const handleEdit = (data) => { const handleEdit = (data) => {
setIsEdit(true) setIsEdit(true)
setEditData({...data}) setEditData({...data})
@ -171,6 +182,7 @@ function ShareParkMgm() {
useEffect(() => { useEffect(() => {
getTimeRulesData() getTimeRulesData()
ajaxGetPark()
}, []) }, [])
@ -187,6 +199,7 @@ function ShareParkMgm() {
renderAdd={() => ( renderAdd={() => (
<Button type="primary" className="submit" onClick={handleAdd}>添加</Button> <Button type="primary" className="submit" onClick={handleAdd}>添加</Button>
)} )}
isExport={false}
// mandatory={'parking_num'} // mandatory={'parking_num'}
// mandatory_name={''} // mandatory_name={''}
// pagename="PDA" // pagename="PDA"
@ -201,6 +214,7 @@ function ShareParkMgm() {
onOk={handleEditConfirm} onOk={handleEditConfirm}
data={editData} data={editData}
timeRulesData={timeRulesData} timeRulesData={timeRulesData}
parkList={parkList}
/> />
</> </>
); );

28
src/pages/OffPeak/OffPeakShareRecords/StallCount/loadable.jsx

@ -10,6 +10,7 @@ import { TableModule } from "@/components";
function StallCount() { function StallCount() {
const [parkList, setParkList] = useState([])
const columns = [ const columns = [
{ {
title: '日期', title: '日期',
@ -56,12 +57,12 @@ function StallCount() {
name: 'time' name: 'time'
}, },
{ {
type: 'Input',
label: '车场名称',
name: 'parkName',
placeholder: '请输入车场名称',
hiddenCount: 1
}
type: "SearchSelect",
label: "车场名称",
placeholder: "请输入车场名称",
name: "parkName",
options: [{label: '全部', value: ""}, ...parkList]
},
]; ];
// //
const initFormData = { const initFormData = {
@ -81,6 +82,20 @@ function StallCount() {
}); });
} }
const ajaxGetPark = () => {
ajax.getParkList().then(res => {
if (res.status == 20000) {
setParkList([...res.data])
} else {
setParkList([])
}
})
}
useEffect(() => {
ajaxGetPark()
}, [])
return ( return (
<TableModule <TableModule
columns={columns} columns={columns}
@ -89,6 +104,7 @@ function StallCount() {
search={search} search={search}
total={total} total={total}
initFormData={initFormData} initFormData={initFormData}
isExport={false}
exportUrl="/api/off_peak/park_info/get_park_list/export" exportUrl="/api/off_peak/park_info/get_park_list/export"
/> />
); );

12
src/services/OffPeak/index.js

@ -59,7 +59,14 @@ const getTimeRulesData = () => {
return ajax({ return ajax({
url: "/api/off_peak/park_info/get_time_rules_list", url: "/api/off_peak/park_info/get_time_rules_list",
type: "get", type: "get",
data: params,
// data: params,
})
}
const getParkList = () => {
return ajax({
url: '/api/common/get_park_select',
type: 'get'
}) })
} }
@ -72,5 +79,6 @@ export default {
shareParkAdd, shareParkAdd,
getBookInfoList, getBookInfoList,
getBreakInfoList, getBreakInfoList,
getOffPeakRecords
getOffPeakRecords,
getParkList
} }
Loading…
Cancel
Save