chenglb
/
PMS_Frontend_v1.0.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix():bug修改

tags/PMS_V1.0.0_Alpha5
xingjx 1 year ago
parent
2ddd3835b3
commit
121239d7e3
6 changed files with 64 additions and 102 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx
  2. 25
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx
  3. 69
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx
  4. 9
      src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarGroupMgm.jsx
  5. 9
      src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/TollCollectorManagement.jsx
  6. 10
      src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/index.jsx

44
src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx
View File

@ -30,8 +30,9 @@ function AddModal(props) {
const isEdit = status === "edit";
const [getOperationName, setGetOperationName] = useState([])
const [getNewOperationName, setNewGetOperationName] = useState([])
const [timestatus, setTimestatus] = useState(true)
const [timestatus, setTimestatus] = useState([true])
const [timevalidate, setTimevalidate] = useState(true)
const [valiArr, setValiArr] = useState([])
const operationName = () => {
ajax.getAllOperator().then(res => {
let arr = res.data
@ -65,7 +66,7 @@ function AddModal(props) {
// effectiveDateList?.map((e)=>{
// arr.push(e.date)
// })
setTimestatus(false)
//setTimestatus(false)
const randomNum = Math.floor(Math.random() * 1000);
const item = {
key: randomNum.toString() + Date.now().toString().substring(0, 6),
@ -75,9 +76,19 @@ function AddModal(props) {
}
function removeEffectiveDate(key) {
let indexDB = ''
effectiveDateList
.map((item, index) => { if (item.key == key && item) { indexDB = index } })
const _effectiveDateList = effectiveDateList
.map((item) => item.key !== key && item)
.filter((item) => item.key !== undefined);
let arr = timestatus
arr.splice(indexDB, 1);
setTimestatus(arr)
let effarr = valiArr
effarr.splice(indexDB, 1);
setValiArr(effarr)
console.log(indexDB, key, arr, effectiveDateList)
setEffectiveDateList(_effectiveDateList);
}
//提交成功后函数
@ -111,14 +122,23 @@ function AddModal(props) {
message.error("请填写完整！")
return
}
if (timevalidate == 0) {
message.error("时段之和必须为24小时，且时段不能重叠");
return
} else if (timevalidate == 2) {
message.error('时段范围不能重叠！')
return
}
//return
valiArr.map(item => {
if (item == 0) {
message.error("时段之和必须为24小时，且时段不能重叠");
return
} else if (item == 2) {
message.error('时段范围不能重叠！')
return
}
})
// if (timevalidate == 0) {
// message.error("时段之和必须为24小时，且时段不能重叠");
// return
// } else if (timevalidate == 2) {
// message.error('时段范围不能重叠！')
// return
// }
return
if (status === "add") {
ajax.addChargeRule(params).then((res) => {
if (res.status === 20000) {
@ -333,8 +353,8 @@ function AddModal(props) {
index={index + 1}
itemKey={item.key}
remove={removeEffectiveDate}
timePart={(e) => { console.log(78787, e); setTimestatus(e) }}//时段内数据是否完整
validate={(e) => { setTimevalidate(e) }}//时段填写是否符合要求
timePart={(e) => { console.log(78787, effectiveDateList, e); setTimestatus(e) }}//时段内数据是否完整
validate={(e, arr) => { setTimevalidate(e); console.log(arr); setValiArr(arr) }}//时段填写是否符合要求
onChange={(value, key) => {
const _effectiveDateList = effectiveDateList.map((item) => {
if (item.key === key) {

25
src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx
View File

@ -14,6 +14,7 @@ import {
import TimePart from "./TimePart";
import moment from "moment";
var carr = []
var effarr = []
function EffectiveDate(props) {
const {
remove = () => { },
@ -47,7 +48,7 @@ function EffectiveDate(props) {
}
});
const addTimePart = () => {
if (!effTimePart) {
if (effTimePart.some(ele => ele === false)) {
message.error("请先把当前时段填写完整")
return
}
@ -119,7 +120,9 @@ function EffectiveDate(props) {
});
}
useEffect(() => {
validate(isOneDay())
let arr = []
arr[index - 1] = isOneDay()
validate(isOneDay(), arr)
}, [timePartList])
const valueChange = (value, all) => {
console.log(value, all)
@ -138,8 +141,8 @@ function EffectiveDate(props) {
form={form}
onValuesChange={valueChange}
initialValues={{
...record,
unit_fee_type_group: [],
...record,
date: moment(record.date),
}}
disabled={disable}
@ -156,7 +159,9 @@ function EffectiveDate(props) {
</Col>
<Col span={12}>
{index !== 1 && (
<Button type="primary" onClick={() => remove(itemKey)}>
<Button type="primary" onClick={() => {
remove(itemKey);
}}>
移除
</Button>
)}
@ -192,22 +197,26 @@ function EffectiveDate(props) {
</>
)}
<Divider />
{timePartList.map((item, index) => {
{timePartList.map((item, tindex) => {
//console.log(180, timePartList);
return (
<TimePart
disable={item.status === "disable"}
record={item}
index={index + 1}
index={tindex + 1}
key={item.key}
remove={removeTimePart}
itemKey={item.key}
//timePart={timePart}
timePart={(e) => {
carr[index] = e
carr[index - 1] = e
console.log(210, timePartList, index, carr[index])
timePart(carr)
}}
effTimePart={(e) => { setEffTimePart(e) }}
effTimePart={(e) => {
effarr[index - 1] = e;
setEffTimePart(effarr)
}}
onChange={(value) => {
const _timePartList = timePartList.map((item) => {
if (item.key === value.key) {

69
src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx
View File

@ -71,75 +71,6 @@ function ChargeRulesMgm() {
<a
onClick={() => {
ajax.getChargeRuleInfo({ id: record.id }).then((res) => {
// res = {
// "status": 20000,
// "message": "success",
// "data": {
// "feeName": "凤凰山公园停车场旺季中型车",
// "creatorName": "耿亮",
// "createdTime": "2022-12-13 11:51:23",
// "feeCode": "202212131150",
// "operationId": "1777347430730653926",
// "operationName": "公用事业集团",
// "description": "免费15分钟4月20日-10月10日， \n小型车5元/小时，中型车8元/小时，大型车10元/小时\n",
// "limit24hour": 20,
// "freeTime": 15,
// "freeTimeAbleF": 1,
// "freeTimeAbleFName": "是",
// "typeF": 0,
// "typeFName": "否",
// "evFreeTime": 0,
// "evFreeTimeAble": 0,
// "evFreeTimeAbleName": "否",
// "property": {
// "id": 120,
// "freeTime": 15,
// "freeTimeAble": 1,
// "evFreeTime": 0,
// "evFreeTimeAble": 0,
// "limit24hour": "23",
// "rules": [
// {
// "unitDelay": 1,
// "unitUp": 1,
// "date": "2022-12-13",
// "details": [
// {
// "start": "07:00:00",
// "end": "13:00:00",
// "limit": 10,
// "items": [
// {
// "type": 0,
// "threshold": 0,
// "period": 60,
// "unit": 8,
// "segment": 1440
// },
// {
// "type": 2,
// "threshold": 0,
// "period": 60,
// "unit": 8,
// "segment": 1440
// }
// ]
// // "items": [
// // {
// // "type": 1,
// // "threshold": 0,
// // "period": 60,
// // "unit": 2,
// // "segment": 120
// // },
// // ]
// }
// ]
// }
// ]
// }
// }
// }
if (res.status === 20000) {
console.log(res.data);
setAddModal({

9
src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarGroupMgm.jsx
View File

@ -67,6 +67,7 @@ function CarGroupMgm({ id }) {
setEditModal({
visible: true,
data: record,
can_del: record.can_del,
add: 0,
});
setCurrentId(record.id)
@ -74,7 +75,6 @@ function CarGroupMgm({ id }) {
name: record.name,
vehicle_type: record.vehicle_type,
status: record.status,
can_del: record.can_del,
note: record.note,
});
}}
@ -330,7 +330,7 @@ function CarGroupMgm({ id }) {
>
<Form colon={false} labelCol={{ span: 6 }} form={editForm}>
<Row>
<Col span="4_8" style={{ width: "30%" }}>
<Col span="4_8" style={{ width: "35%" }}>
<Form.Item label="车辆组名称" name="name" rules={[{ required: true }]}>
<Input maxLength={15} showCount={true} disabled={editModal.can_del == 2 ? true : false} />
</Form.Item>
@ -338,7 +338,7 @@ function CarGroupMgm({ id }) {
<Col span="4_8" style={{ width: "30%" }}>
<Form.Item label="车辆类型" name="vehicle_type" rules={[{ required: true }]}>
<Select
disabled={true}
disabled={!editModal.add}
options={[
{ label: "免费车", value: 1 },
{ label: "临时车", value: 2 },
@ -349,8 +349,9 @@ function CarGroupMgm({ id }) {
</Form.Item>
</Col>
<Col span="4_8" style={{ width: "30%" }}>
<Form.Item label="状态" name="status" rules={[{ required: true }]} disabled={editModal.can_del == 2 ? true : false}>
<Form.Item label="状态" name="status" rules={[{ required: true }]} >
<Select
disabled={editModal.can_del == 2 ? true : false}
options={[
{ label: "启用", value: '2' },
{ label: "禁用", value: '1' },

9
src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/TollCollectorManagement.jsx
View File

@ -82,6 +82,7 @@ function TollCollectorManagement({ id: road_id }) {
const [collectorList, setCollectorList] = useState([]);
const [total, setTotal] = useState(0);
const addCollector = () => {
getTransferData()
setModalData({ ...modalData, visible: true });
};
//获取收费员列表接口
@ -145,9 +146,9 @@ function TollCollectorManagement({ id: road_id }) {
const search = () => {
setPageData({ ...pageData, pn: 1 });
};
useEffect(() => {
getTransferData();
}, []);
// useEffect(() => {
// getTransferData();
// }, []);
useEffect(() => {
getOutSegmentUserList();
}, [pageData]);
@ -169,7 +170,7 @@ function TollCollectorManagement({ id: road_id }) {
<Col span="4_8" style={{ width: "30%" }}>
<Form.Item label="角色" name="user_account">
<Select />
<Select options={sysConfig.orpMBUserRole} />
</Form.Item>
</Col>
<Form.Item>

10
src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/index.jsx
View File

@ -67,11 +67,11 @@ function ConfigParking(props) {
key: "9",
children: <TollCollectorManagement id={itemData.id} />,
},
{
label: "欠费离场",
key: "10",
children: <ArrearsExitManagement />,
},
// {
// label: "欠费离场",
// key: "10",
// children: <ArrearsExitManagement />,
// },
]
}else{
return [

Write Preview
Loading…
Cancel
Save