diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx index 1e1b557..5643779 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx @@ -433,19 +433,21 @@ function CarTypeAly() {
handchange(e, option)} + value={formData.area_id} + onChange={(v, option) => { + setFormData({ ...formData, area_id: v ? v : null }); + }} />
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx index 694ae6a..415a6b4 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx @@ -397,19 +397,21 @@ function ParkTurnoverAly() {
handchange(e, option)} + value={formData.area_id} + onChange={(v, option) => { + setFormData({ ...formData, area_id: v ? v : null }); + }} />
diff --git a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx index e7fbfe2..0106914 100644 --- a/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx @@ -215,9 +215,9 @@ function ProductOrderInquiry() { { name: "pay_channel", type: "Select", - label: "支付设备", - placeholder: "请选择支付设备", - options: sysConfig.Equipment, + label: "支付方式", + placeholder: "请选择支付方式", + options: sysConfig.StaggeredPay, }, { name: "timePeriod", @@ -583,7 +583,7 @@ function ProductOrderInquiry() { } else if (addOrderData.plate == '') { message.error('请输入车牌号') return - } else if (addOrderData.plate_type == '') { + } else if (addOrderData.plate_type <0) { message.error('请选择车牌颜色') return } else if (addOrderData.phone && !phoneReg.test(addOrderData.phone)) { diff --git a/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx b/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx index aae6027..6525450 100644 --- a/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx +++ b/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx @@ -246,7 +246,7 @@ function PayRecordTotal(props) { return } if (!row.flow_type_name) { - message.error('无支付类型,无法跳转') + message.error('无流水类型,无法跳转') return } if (row.flow_type_name == "支付" && row.third_party_flow_id) { diff --git a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx index 969c2ce..2359e40 100644 --- a/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx @@ -342,14 +342,9 @@ function CreditScoreMgm() { } //积分兑换配置 编辑保存 function getRedeemEdit(e, type) { - ajax.getCreditScoreRedeemAdd({ ...e }).then((res) => { + ajax.getCreditScoreRedeemEdit({ ...e }).then((res) => { let { status, data, total } = res if (status == 20000) { - // if (data.list) { - // setAddData(data.list) - // } else { - // setAddData(data) - // } getRedeemList({ awardId: awardId, pn: 1, page_size: 15 }) if (type == 12) { return @@ -360,6 +355,21 @@ function CreditScoreMgm() { setEditVisible({ visible: false, type: 0 }) return } + } else { + //setAddData({}) + message.error(res.message) + } + }) + } + //积分兑换配置 添加 + function getRedeemAdd(e, type) { + ajax.getCreditScoreRedeemAdd({ ...e }).then((res) => { + let { status, data, total } = res + if (status == 20000) { + getRedeemList({ awardId: awardId, pn: 1, page_size: 15 }) + if (type == 12) { + return + } if (editVisible.type == 0) { message.success("添加成功") setAddData({}) @@ -556,8 +566,9 @@ function CreditScoreMgm() { className="credit-modal" onCancel={() => { setEditVisible({ visible: false, type: 0 }) + setAddData({}) }} - onOk={() => { getRedeemEdit(addData, editVisible.type) }} + onOk={() => { editVisible.type == 1 ? getRedeemEdit(addData, editVisible.type) : getRedeemAdd(addData, editVisible.type) }} >
diff --git a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx index 070e3d7..8f9c9ad 100644 --- a/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx +++ b/src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx @@ -421,7 +421,7 @@ const OutRoadOverview = () => { borderRadius: '10px' }}>? -

{headerNums.total_park_time}个

+

{headerNums.total_park_time}

日均泊位周转次数:{headerNums.today_turn_num}个

diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx index 2c7c1fb..ad96271 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx @@ -11,6 +11,7 @@ import { Checkbox, Radio, message, + InputNumber } from "antd"; import ajax from "@/services"; import EffectiveDate from "./EffectiveDate"; @@ -99,13 +100,14 @@ function AddModal(props) { //提交按钮 function submit() { console.log(effectiveDateList) - return + //return form .validateFields() .then((res) => { const params = { ...res, - property: effectiveDateList,// property: {rules:effectiveDateList}, + //property: effectiveDateList, + property: { rules: effectiveDateList }, }; fetch(params); }) @@ -173,7 +175,8 @@ function AddModal(props) { - + {/* */} + @@ -182,7 +185,8 @@ function AddModal(props) { name="freeTime" rules={[{ required: true }]} > - + {/* */} + @@ -235,11 +239,12 @@ function AddModal(props) { name="evFreeTime" initialValue={type === 0 || ""} > - + /> */} + diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx index 79c276f..de31cda 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx @@ -16,6 +16,7 @@ import EffectiveDate from "./EffectiveDate"; import ajax from "@/services"; function Detail(props) { const { record, visible = false, close = () => { } } = props; + const [show ,setShow] = useState(visible) const [form] = Form.useForm(); const [effectiveDateList, setEffectiveDateList] = useState(record.property); console.log(effectiveDateList) @@ -30,6 +31,7 @@ function Detail(props) { onCancel={close} width={1200} title="详情" + footer={null} >
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx index 3f14c36..78f0bf7 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx @@ -9,6 +9,7 @@ import { Row, Col, Divider, + InputNumber } from "antd"; import moment from "moment"; function TimePart(props) { @@ -37,7 +38,6 @@ function TimePart(props) { "status": "disable", "key": "821170365" } - console.log(disable); const valueChange = (value, all) => { all.key = itemKey; if (all.time_part) { @@ -194,18 +194,20 @@ function TimePart(props) { <> - +
,
-
/
- @@ -213,18 +215,20 @@ function TimePart(props) {
- +
,
-
/
- @@ -236,18 +240,18 @@ function TimePart(props) { return ( - +
/
- +
); case 1: return ( - + ); } @@ -261,14 +265,15 @@ function TimePart(props) { return ( (getFieldValue("type") === 0 || getFieldValue("type") === 2) && ( - + - + +
“0”表示没有最高限额
) ); diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx index 2b25945..ac41afe 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx @@ -71,77 +71,77 @@ function ChargeRulesMgm() { { 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": 0, - "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": "", - "rules": [ - { - "unitDelay": 1, - "unitUp": 1, - "date": "2022-12-13", - "details": [ - { - "start": "07:00:00", - "end": "13:00:00", - "limit": 0, - // "items": [ - // { - // "type": 1, - // "threshold": 0, - // "period": 60, - // "unit": 8, - // "segment": 1440 - // }, - // { - // "type": 1, - // "threshold": 0, - // "period": 60, - // "unit": 8, - // "segment": 1440 - // } - // ] - "items": [ - { - "type": 1, - "threshold": 0, - "period": 60, - "unit": 2, - "segment": 120 - }, - ] - } - ] - } - ] - } - } - } + // 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({ diff --git a/src/services/OperationCenter/OperationSales/index.js b/src/services/OperationCenter/OperationSales/index.js index 5f85824..9777f73 100644 --- a/src/services/OperationCenter/OperationSales/index.js +++ b/src/services/OperationCenter/OperationSales/index.js @@ -283,9 +283,17 @@ const getCreditScoreRedeem = (p) => { data: p, }); }; -// 信用积分管理-积分兑换配置添加和编辑 +// 信用积分管理-积分兑换配置添加 const getCreditScoreRedeemAdd = (p) => { return ajax({ + url: "/api/ope/credit_system/score_redeem_add", + type: "post", + data: p, + }); +}; +// 信用积分管理-积分兑换配置编辑 +const getCreditScoreRedeemEdit = (p) => { + return ajax({ url: "/api/ope/credit_system/score_redeem_edit", type: "post", data: p, @@ -344,6 +352,7 @@ export default { getCreditScoreRuleEdit, getCreditScoreRedeem, getCreditScoreRedeemAdd, + getCreditScoreRedeemEdit, getCreditScoreRedeemDel, getCreditScoreAward };