diff --git a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx index 0106914..0806cb1 100644 --- a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx @@ -612,7 +612,7 @@ function ProductOrderInquiry() { } // 修改订单 const placeEditBtn = () => { - setTabKey('2') + setTabKey('3') ajax.getProductOrderInquiryParkingEidt({ ...editData, id: myId }).then((res) => { if (res.status === 20000) { setEditData({}) diff --git a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/index.scss b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/index.scss index a3506bb..be08f5f 100644 --- a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/index.scss +++ b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/index.scss @@ -24,4 +24,14 @@ $color-primary : var(--color-primary); height: 100%; 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; + } } \ No newline at end of file diff --git a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx index 061ce06..fc31ea1 100644 --- a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx +++ b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx @@ -30,7 +30,7 @@ function ArrearsCar() { fixed: "right", render: (text) => { return
{text}
; - }, + }, }, { title: "车辆归属地", @@ -186,7 +186,7 @@ function ArrearsCar() { key: "in_veh_pic", render: (text, record, index) => { return
- { setBigPic(text); setBigpicVisible(true) }}/> + { setBigPic(text); setBigpicVisible(true) }} />
}, }, @@ -196,7 +196,7 @@ function ArrearsCar() { key: "out_veh_pic", render: (text, record, index) => { return
- { setBigPic(text); setBigpicVisible(true) }}/> + { setBigPic(text); setBigpicVisible(true) }} />
}, }, @@ -433,6 +433,10 @@ function ArrearsCar() { className="eae-modal" onCancel={() => { setModalVisible(false); + setPageData({ + pn: 1, + page_size: 15, + }) }} footer={false} > @@ -467,8 +471,8 @@ function ArrearsCar() { footer={false} >
-
- +
+
diff --git a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx index 2359e40..21b7f15 100644 --- a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx @@ -295,13 +295,13 @@ function CreditScoreMgm() { ajax.getCreditScoreRule({ ...saveData }).then((res) => { let { status, data, total } = res if (status == 20000) { - setSaveData(data) + //setSaveData(data) if (e) { setRuleVisible(false) message.success("保存成功") + setSaveData({}) } } else { - setSaveData({}) message.error(res.message) } }) @@ -312,9 +312,9 @@ function CreditScoreMgm() { let { status, data, total } = res if (status == 20000) { setRuleVisible(false) + setSaveData({}) message.success("保存成功") } else { - setSaveData({}) message.error(res.message) } }) diff --git a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx index 323da4f..bf12828 100644 --- a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx +++ b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx @@ -207,9 +207,9 @@ function OutParkingRecordInquiry() { } //限制条件 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) { - message.error(`查询时间范围大于一个月,需填写车牌号!`) + message.error(`查询时间范围大于7天,需填写车牌号!`) return 1 } } diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx index ad96271..9f86088 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx @@ -15,6 +15,7 @@ import { } from "antd"; import ajax from "@/services"; import EffectiveDate from "./EffectiveDate"; +import { time } from "echarts"; function AddModal(props) { const [form] = Form.useForm(); const { @@ -77,6 +78,15 @@ function AddModal(props) { } //提交接口 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") { ajax.addChargeRule(params).then((res) => { if (res.status === 20000) { @@ -113,6 +123,9 @@ function AddModal(props) { }) .catch((err) => console.error(err)); } + const timePart = (e) => { + return e + } useEffect(() => { operationName() }, []) @@ -129,7 +142,7 @@ function AddModal(props) { form={form} labelCol={{ span: 6 }} colon={false} - initialValues={record} + initialValues={{ ...record, freeTimeAbleF: [record.freeTimeAbleF], evFreeTimeAble: [record.evFreeTimeAble] }} > @@ -186,7 +199,7 @@ function AddModal(props) { rules={[{ required: true }]} > {/* */} - + @@ -244,7 +257,7 @@ function AddModal(props) { addonAfter={"分"} style={{ width: "50%" }} /> */} - + @@ -288,6 +301,7 @@ function AddModal(props) { index={index + 1} itemKey={item.key} remove={removeEffectiveDate} + timePart={timePart} onChange={(value, key) => { const _effectiveDateList = effectiveDateList.map((item) => { if (item.key === key) { diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx index de31cda..702d6b6 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx @@ -22,7 +22,7 @@ function Detail(props) { console.log(effectiveDateList) useEffect(() => { setEffectiveDateList(record.property); - console.log(444455,record.property); + console.log(444455,record); }, []); return ( {}, + remove = () => { }, itemKey, - onChange = () => {}, + onChange = () => { }, + timePart = () => { }, index, disable = false, record = {}, } = props; - console.log(25,record) + console.log(25, record) let ac = { "unitDelay": 1, "unitUp": 1, "date": "2022-12-13", "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", "status": "disable" -} + } const [form] = Form.useForm(); const [timePartList, setTimePartList] = useState(() => { if (!disable) { @@ -103,11 +104,11 @@ function EffectiveDate(props) { return false; } function submit() { - console.log(106,form.getFieldsValue()) + console.log(106, form.getFieldsValue()) form .validateFields() .then((values) => { - console.log(83,values) + console.log(83, values) if (isOneDay(values)) { message.success("时段检验通过"); } else { @@ -178,7 +179,7 @@ function EffectiveDate(props) { )} {timePartList.map((item, index) => { - console.log(180,timePartList); + console.log(180, timePartList); return ( { const _timePartList = timePartList.map((item) => { if (item.key === value.key) { diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx index 78f0bf7..ee81cb7 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx @@ -19,6 +19,7 @@ function TimePart(props) { remove, itemKey, onChange = () => { }, + timePart = () => { }, record, disable = false, } = props; @@ -39,6 +40,11 @@ function TimePart(props) { "key": "821170365" } const valueChange = (value, all) => { + timePart(value) + console.log(value) + if(value.limit){ + form.validateFields(Object.keys(value)) + } all.key = itemKey; if (all.time_part) { 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_money": record.items[0].unit, "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, time_part: [ moment(record.start, "HH:mm:ss"), @@ -193,11 +199,11 @@ function TimePart(props) { return ( <> - - + +
,
- +
/
- +
- - + +
,
- +
/
- + @@ -239,12 +247,12 @@ function TimePart(props) { case 2: return ( - +
/
- - + +
); diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx index ac41afe..a4541f5 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx @@ -84,9 +84,7 @@ function ChargeRulesMgm() { // "description": "免费15分钟4月20日-10月10日, \n小型车5元/小时,中型车8元/小时,大型车10元/小时\n", // "limit24hour": 20, // "freeTime": 15, - // "freeTimeAbleF": [ - // 1 - // ], + // "freeTimeAbleF": 1, // "freeTimeAbleFName": "是", // "typeF": 0, // "typeFName": "否", @@ -278,6 +276,75 @@ function ChargeRulesMgm() { const getRuleDetail = (id) => { ajax.getChargeRuleInfo({ id }).then((res) => { 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 }); console.log(res.data); }