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

fix():bug修改

master
xingjx 1 year ago
parent
6ba82f494c
commit
cf3af6fab6
10 changed files with 161 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx
  2. 10
      src/pages/OperationCenter/ArrearsRecover/ArrearsCar/index.scss
  3. 14
      src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx
  4. 6
      src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx
  5. 4
      src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx
  6. 20
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx
  7. 2
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx
  8. 48
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx
  9. 38
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx
  10. 73
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx

2
src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx
View File

@ -612,7 +612,7 @@ function ProductOrderInquiry() {
} }
// 修改订单 // 修改订单
const placeEditBtn = () => { const placeEditBtn = () => {
setTabKey('2')
setTabKey('3')
ajax.getProductOrderInquiryParkingEidt({ ...editData, id: myId }).then((res) => { ajax.getProductOrderInquiryParkingEidt({ ...editData, id: myId }).then((res) => {
if (res.status === 20000) { if (res.status === 20000) {
setEditData({}) setEditData({})

10
src/pages/OperationCenter/ArrearsRecover/ArrearsCar/index.scss
View File

@ -24,4 +24,14 @@ $color-primary : var(--color-primary);
height: 100%; height: 100%;
object-fit: contain; object-fit: contain;
} }
}
.arrearscar-modal-item {
display: contents;
border: 1px solid;
background: rgba(101,101,101,.4196078431);
img {
width: 100%;
height: 100%;
object-fit: contain;
}
} }

14
src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx
View File

@ -30,7 +30,7 @@ function ArrearsCar() {
fixed: "right", fixed: "right",
render: (text) => { render: (text) => {
return <div style={{ width: 90 }}> {text}</div>; return <div style={{ width: 90 }}> {text}</div>;
},
},
}, },
{ {
title: "车辆归属地", title: "车辆归属地",
@ -186,7 +186,7 @@ function ArrearsCar() {
key: "in_veh_pic", key: "in_veh_pic",
render: (text, record, index) => { render: (text, record, index) => {
return <div className="veh-item-img "> return <div className="veh-item-img ">
<img src={text || require("../../../../../src/assets/images/error-img.png")} onClick={() => { setBigPic(text); setBigpicVisible(true) }}/>
<img src={text || require("../../../../../src/assets/images/error-img.png")} onClick={() => { setBigPic(text); setBigpicVisible(true) }} />
</div> </div>
}, },
}, },
@ -196,7 +196,7 @@ function ArrearsCar() {
key: "out_veh_pic", key: "out_veh_pic",
render: (text, record, index) => { render: (text, record, index) => {
return <div className="veh-item-img "> return <div className="veh-item-img ">
<img src={text || require("../../../../../src/assets/images/error-img.png")} onClick={() => { setBigPic(text); setBigpicVisible(true) }}/>
<img src={text || require("../../../../../src/assets/images/error-img.png")} onClick={() => { setBigPic(text); setBigpicVisible(true) }} />
</div> </div>
}, },
}, },
@ -433,6 +433,10 @@ function ArrearsCar() {
className="eae-modal" className="eae-modal"
onCancel={() => { onCancel={() => {
setModalVisible(false); setModalVisible(false);
setPageData({
pn: 1,
page_size: 15,
})
}} }}
footer={false} footer={false}
> >
@ -467,8 +471,8 @@ function ArrearsCar() {
footer={false} footer={false}
> >
<div> <div>
<div className="eae-modal-item">
<img src={bigPic || require("../../../../../src/assets/images/error-img.png")} width={1500} />
<div className="arrearscar-modal-item">
<img src={bigPic || require("../../../../../src/assets/images/error-img.png")} />
</div> </div>
</div> </div>
</Modal> </Modal>

6
src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx
View File

@ -295,13 +295,13 @@ function CreditScoreMgm() {
ajax.getCreditScoreRule({ ...saveData }).then((res) => { ajax.getCreditScoreRule({ ...saveData }).then((res) => {
let { status, data, total } = res let { status, data, total } = res
if (status == 20000) { if (status == 20000) {
setSaveData(data)
//setSaveData(data)
if (e) { if (e) {
setRuleVisible(false) setRuleVisible(false)
message.success("保存成功") message.success("保存成功")
setSaveData({})
} }
} else { } else {
setSaveData({})
message.error(res.message) message.error(res.message)
} }
}) })
@ -312,9 +312,9 @@ function CreditScoreMgm() {
let { status, data, total } = res let { status, data, total } = res
if (status == 20000) { if (status == 20000) {
setRuleVisible(false) setRuleVisible(false)
setSaveData({})
message.success("保存成功") message.success("保存成功")
} else { } else {
setSaveData({})
message.error(res.message) message.error(res.message)
} }
}) })

4
src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx
View File

@ -207,9 +207,9 @@ function OutParkingRecordInquiry() {
} }
//限制条件 //限制条件
const limitCon = (e) => { const limitCon = (e) => {
if (moment(e.end_time) - moment(e.start_time) > 30 * 3600 * 24000) {
if (moment(e.end_time) - moment(e.start_time) > 7 * 3600 * 24000) {
if (!e.plate) { if (!e.plate) {
message.error(`查询时间范围大于一个月，需填写车牌号！`)
message.error(`查询时间范围大于7天，需填写车牌号！`)
return 1 return 1
} }
} }

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

@ -15,6 +15,7 @@ import {
} from "antd"; } from "antd";
import ajax from "@/services"; import ajax from "@/services";
import EffectiveDate from "./EffectiveDate"; import EffectiveDate from "./EffectiveDate";
import { time } from "echarts";
function AddModal(props) { function AddModal(props) {
const [form] = Form.useForm(); const [form] = Form.useForm();
const { const {
@ -77,6 +78,15 @@ function AddModal(props) {
} }
//提交接口 //提交接口
function fetch(params) { function fetch(params) {
console.log(81, params, timePart)
// if(params?.property?.rules){
// params.property.rules.map((item)=>{
// item.details.map((e)=>{
// e.items.map(()
// })
// })
// }
//return
if (status === "add") { if (status === "add") {
ajax.addChargeRule(params).then((res) => { ajax.addChargeRule(params).then((res) => {
if (res.status === 20000) { if (res.status === 20000) {
@ -113,6 +123,9 @@ function AddModal(props) {
}) })
.catch((err) => console.error(err)); .catch((err) => console.error(err));
} }
const timePart = (e) => {
return e
}
useEffect(() => { useEffect(() => {
operationName() operationName()
}, []) }, [])
@ -129,7 +142,7 @@ function AddModal(props) {
form={form} form={form}
labelCol={{ span: 6 }} labelCol={{ span: 6 }}
colon={false} colon={false}
initialValues={record}
initialValues={{ ...record, freeTimeAbleF: [record.freeTimeAbleF], evFreeTimeAble: [record.evFreeTimeAble] }}
> >
<Row gutter={[30]}> <Row gutter={[30]}>
<Col span={12}> <Col span={12}>
@ -186,7 +199,7 @@ function AddModal(props) {
rules={[{ required: true }]} rules={[{ required: true }]}
> >
{/* <Input addonAfter={"分"} style={{ width: "50%" }} /> */} {/* <Input addonAfter={"分"} style={{ width: "50%" }} /> */}
<InputNumber min={0} addonAfter={"分"} style={{ width: "50%" }} />
<InputNumber min={0} precision={0} addonAfter={"分"} style={{ width: "50%" }} />
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={11}> <Col span={11}>
@ -244,7 +257,7 @@ function AddModal(props) {
addonAfter={"分"} addonAfter={"分"}
style={{ width: "50%" }} style={{ width: "50%" }}
/> */} /> */}
<InputNumber disabled={type === 0} min={0} addonAfter={"分"} style={{ width: "50%" }} />
<InputNumber disabled={type === 0} min={0} precision={0} addonAfter={"分"} style={{ width: "50%" }} />
</Form.Item> </Form.Item>
</Col> </Col>
<Col span={11}> <Col span={11}>
@ -288,6 +301,7 @@ function AddModal(props) {
index={index + 1} index={index + 1}
itemKey={item.key} itemKey={item.key}
remove={removeEffectiveDate} remove={removeEffectiveDate}
timePart={timePart}
onChange={(value, key) => { onChange={(value, key) => {
const _effectiveDateList = effectiveDateList.map((item) => { const _effectiveDateList = effectiveDateList.map((item) => {
if (item.key === key) { if (item.key === key) {

2
src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx
View File

@ -22,7 +22,7 @@ function Detail(props) {
console.log(effectiveDateList) console.log(effectiveDateList)
useEffect(() => { useEffect(() => {
setEffectiveDateList(record.property); setEffectiveDateList(record.property);
console.log(444455,record.property);
console.log(444455,record);
}, []); }, []);
return ( return (
<Modal <Modal

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

@ -15,39 +15,40 @@ import TimePart from "./TimePart";
import moment from "moment"; import moment from "moment";
function EffectiveDate(props) { function EffectiveDate(props) {
const { const {
remove = () => {},
remove = () => { },
itemKey, itemKey,
onChange = () => {},
onChange = () => { },
timePart = () => { },
index, index,
disable = false, disable = false,
record = {}, record = {},
} = props; } = props;
console.log(25,record)
console.log(25, record)
let ac = { let ac = {
"unitDelay": 1, "unitDelay": 1,
"unitUp": 1, "unitUp": 1,
"date": "2022-12-13", "date": "2022-12-13",
"details": [ "details": [
{
"start": "00:00:00",
"end": "00:00:00",
"limit": 0,
"items": [
{
"type": 2,
"threshold": 0,
"period": 60,
"unit": 8,
"segment": 1440
}
],
"status": "disable",
"key": "69170366"
}
{
"start": "00:00:00",
"end": "00:00:00",
"limit": 0,
"items": [
{
"type": 2,
"threshold": 0,
"period": 60,
"unit": 8,
"segment": 1440
}
],
"status": "disable",
"key": "69170366"
}
], ],
"key": "741170366", "key": "741170366",
"status": "disable" "status": "disable"
}
}
const [form] = Form.useForm(); const [form] = Form.useForm();
const [timePartList, setTimePartList] = useState(() => { const [timePartList, setTimePartList] = useState(() => {
if (!disable) { if (!disable) {
@ -103,11 +104,11 @@ function EffectiveDate(props) {
return false; return false;
} }
function submit() { function submit() {
console.log(106,form.getFieldsValue())
console.log(106, form.getFieldsValue())
form form
.validateFields() .validateFields()
.then((values) => { .then((values) => {
console.log(83,values)
console.log(83, values)
if (isOneDay(values)) { if (isOneDay(values)) {
message.success("时段检验通过"); message.success("时段检验通过");
} else { } else {
@ -178,7 +179,7 @@ function EffectiveDate(props) {
)} )}
<Divider /> <Divider />
{timePartList.map((item, index) => { {timePartList.map((item, index) => {
console.log(180,timePartList);
console.log(180, timePartList);
return ( return (
<TimePart <TimePart
disable={item.status === "disable"} disable={item.status === "disable"}
@ -187,6 +188,7 @@ function EffectiveDate(props) {
key={item.key} key={item.key}
remove={removeTimePart} remove={removeTimePart}
itemKey={item.key} itemKey={item.key}
timePart={timePart}
onChange={(value) => { onChange={(value) => {
const _timePartList = timePartList.map((item) => { const _timePartList = timePartList.map((item) => {
if (item.key === value.key) { if (item.key === value.key) {

38
src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx
View File

@ -19,6 +19,7 @@ function TimePart(props) {
remove, remove,
itemKey, itemKey,
onChange = () => { }, onChange = () => { },
timePart = () => { },
record, record,
disable = false, disable = false,
} = props; } = props;
@ -39,6 +40,11 @@ function TimePart(props) {
"key": "821170365" "key": "821170365"
} }
const valueChange = (value, all) => { const valueChange = (value, all) => {
timePart(value)
console.log(value)
if(value.limit){
form.validateFields(Object.keys(value))
}
all.key = itemKey; all.key = itemKey;
if (all.time_part) { if (all.time_part) {
all.start = moment(all.time_part[0]).format('HH:mm:ss') all.start = moment(all.time_part[0]).format('HH:mm:ss')
@ -105,8 +111,8 @@ function TimePart(props) {
"time_before": record.items[0].segment, "time_before": record.items[0].segment,
"time_before_money": record.items[0].unit, "time_before_money": record.items[0].unit,
"time_before_minute": record.items[0].period, "time_before_minute": record.items[0].period,
"time_after_money": record.items[1].unit,
"time_after_minute": record.items[1].period,
"time_after_money": record.items[1]?.unit,
"time_after_minute": record.items[1]?.period,
"limit": record.limit, "limit": record.limit,
time_part: [ time_part: [
moment(record.start, "HH:mm:ss"), moment(record.start, "HH:mm:ss"),
@ -193,11 +199,11 @@ function TimePart(props) {
return ( return (
<> <>
<Input.Group compact> <Input.Group compact>
<Form.Item name="time_before" label="前：">
<InputNumber min={0} addonAfter={"分钟"} />
<Form.Item name="time_before" label="前：" rules={[{ required: true }]}>
<InputNumber min={0} precision={0} addonAfter={"分钟"} />
</Form.Item> </Form.Item>
<div className="wenzi">,</div> <div className="wenzi">,</div>
<Form.Item name="time_before_money" noStyle>
<Form.Item name="time_before_money" noStyle rules={[{ required: true }]}>
<InputNumber <InputNumber
min={0} min={0}
addonAfter={"元"} addonAfter={"元"}
@ -205,20 +211,21 @@ function TimePart(props) {
/> />
</Form.Item> </Form.Item>
<div className="wenzi">/</div> <div className="wenzi">/</div>
<Form.Item name="time_before_minute" noStyle>
<Form.Item name="time_before_minute" noStyle rules={[{ required: true }]}>
<InputNumber <InputNumber
min={0}
min={1}
precision={0}
addonAfter={"分钟"} addonAfter={"分钟"}
style={{ width: "20%" }} style={{ width: "20%" }}
/> />
</Form.Item> </Form.Item>
</Input.Group> </Input.Group>
<Input.Group compact> <Input.Group compact>
<Form.Item name="time_before" label="满：">
<InputNumber min={0} addonAfter={"分钟"} disabled />
<Form.Item name="time_before" label="满：" rules={[{ required: true }]}>
<InputNumber min={0} precision={0} addonAfter={"分钟"} disabled />
</Form.Item> </Form.Item>
<div className="wenzi">,</div> <div className="wenzi">,</div>
<Form.Item name="time_after_money" noStyle>
<Form.Item name="time_after_money" noStyle rules={[{ required: true }]}>
<InputNumber <InputNumber
min={0} min={0}
addonAfter={"元"} addonAfter={"元"}
@ -226,9 +233,10 @@ function TimePart(props) {
/> />
</Form.Item> </Form.Item>
<div className="wenzi">/</div> <div className="wenzi">/</div>
<Form.Item name="time_after_minute" noStyle>
<Form.Item name="time_after_minute" noStyle rules={[{ required: true }]}>
<InputNumber <InputNumber
min={0}
min={1}
precision={0}
addonAfter={"分钟"} addonAfter={"分钟"}
style={{ width: "20%" }} style={{ width: "20%" }}
/> />
@ -239,12 +247,12 @@ function TimePart(props) {
case 2: case 2:
return ( return (
<Input.Group compact> <Input.Group compact>
<Form.Item name="unit" noStyle>
<Form.Item name="unit" noStyle rules={[{ required: true }]}>
<InputNumber min={0} addonAfter={"元"} style={{ width: "20%" }} /> <InputNumber min={0} addonAfter={"元"} style={{ width: "20%" }} />
</Form.Item> </Form.Item>
<div className="wenzi">/</div> <div className="wenzi">/</div>
<Form.Item name="period" noStyle>
<InputNumber min={0} addonAfter={"分钟"} style={{ width: "20%" }} />
<Form.Item name="period" noStyle rules={[{ required: true }]}>
<InputNumber min={1} precision={0} addonAfter={"分钟"} style={{ width: "20%" }} />
</Form.Item> </Form.Item>
</Input.Group> </Input.Group>
); );

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

@ -84,9 +84,7 @@ function ChargeRulesMgm() {
// "description": "免费15分钟4月20日-10月10日， \n小型车5元/小时，中型车8元/小时，大型车10元/小时\n", // "description": "免费15分钟4月20日-10月10日， \n小型车5元/小时，中型车8元/小时，大型车10元/小时\n",
// "limit24hour": 20, // "limit24hour": 20,
// "freeTime": 15, // "freeTime": 15,
// "freeTimeAbleF": [
// 1
// ],
// "freeTimeAbleF": 1,
// "freeTimeAbleFName": "是", // "freeTimeAbleFName": "是",
// "typeF": 0, // "typeF": 0,
// "typeFName": "否", // "typeFName": "否",
@ -278,6 +276,75 @@ function ChargeRulesMgm() {
const getRuleDetail = (id) => { const getRuleDetail = (id) => {
ajax.getChargeRuleInfo({ id }).then((res) => { ajax.getChargeRuleInfo({ id }).then((res) => {
if (res.status === 20000) { if (res.status === 20000) {
// 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
// // },
// // ]
// }
// ]
// }
// ]
// }
// }
// }
setDetailModal({ ...detailModal, visible: true, record: res.data }); setDetailModal({ ...detailModal, visible: true, record: res.data });
console.log(res.data); console.log(res.data);
} }

Write Preview
Loading…
Cancel
Save