diff --git a/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx index d8fc86d..d3feaaa 100644 --- a/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx @@ -238,7 +238,11 @@ function PersonInfo() { const getAssets = (id, editFlag) => { if (id) { - ajax.getAssets({ id: id }).then(res => { + let temp_params = {id: id} + if(showEdit || editFlag){ + temp_params.user_id = currentPersonId + } + ajax.getUserGoods(temp_params).then(res => { if (res.status == 20000) { if (showEdit || editFlag) { let temparr = []; diff --git a/src/pages/Nav/index.scss b/src/pages/Nav/index.scss index 4f20e57..0e82520 100644 --- a/src/pages/Nav/index.scss +++ b/src/pages/Nav/index.scss @@ -16,7 +16,7 @@ align-items: center; } .nav-contanier{ - width: 1600px; + width: 1510px; height: 710px; display: flex; flex-direction: row; diff --git a/src/pages/NewEnergy/ChargeBusinessMgm/index.jsx b/src/pages/NewEnergy/ChargeBusinessMgm/index.jsx new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/NewEnergy/ChargeDeviceMgm/index.jsx b/src/pages/NewEnergy/ChargeDeviceMgm/index.jsx new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/NewEnergy/ChargeStationMgm/index.jsx b/src/pages/NewEnergy/ChargeStationMgm/index.jsx new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx b/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx index cecb221..4ef6d7b 100644 --- a/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx +++ b/src/pages/NewEnergy/ChargingMgm/BillingRule/loadable.jsx @@ -15,245 +15,58 @@ import { Timeline, Popover } from "antd"; -import { dictionary, utils } from "@/config/common"; -// import moment from 'moment' -// import { useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks'; +import { dictionary } from "@/config/common"; import ajax from "@/services"; -import errorImg from '@/assets/images/error-img-new.png' -import { QuestionCircleOutlined } from '@ant-design/icons'; import { TableModule } from "@/components"; import "./index.scss"; -import { - payRecordColumns, - refundRecordColumns, - operatorRecordColumns, -} from "./dataSource"; -// import errorImg from "@/assets/images/layout/error.png" -// import { useLocation } from "react-router-dom"; -const { TextArea } = Input; -let array = []; +const { TextArea } = Input; function BillingRule() { - const roadContent = ( -
-

出场时间-入场时间的计算金额

-
- ) - const receivableContent = ( -
-

订单金额-折扣金额

-
- ) - const discountContent = ( -
-

折扣金额=停车卡抵扣+路段折扣

-
- ) - const preferentialContent = ( -
-

优惠券支付金额

-
- ) - const refundContent = ( -
-

退款总计=退实付+退优惠

-
- ) + // 详情弹窗 + const [detailVisible, setDetailVisible] = useState(false); + // 列表数据 + const [tableData, setTableData] = useState([]); + // 数据总数 + const [total, setTotal] = useState(0); + // 详情数据 + const [detailData, setDetailData] = useState({}); + // 初始搜索条件 + const initFormData = { + operator: "0", + rule_name: "", + }; + const columns = [ { - title: "序号", - dataIndex: "index", - key: "index", - align: "center", - fixed: "left", - render: (text, record, index) => index + 1, - width: 100, - }, - - { - title: "路段名称", - dataIndex: "road", + title: "运营商名称", + dataIndex: "operator", + key: "operator", align: "center", - render: (text, record, index) => ( -
{record.road}
- ) }, { - title: "车牌号", + title: "规则名称", dataIndex: "plate", + key: "plate", align: "center", - render: (text, record, index) => ( -
{record.plate}
- ) }, { - title: "车牌颜色", + title: "规则编码", dataIndex: "plate_color", key: "plate_color", - width: 100, align: "center", }, { - title: "泊位号", + title: "创建人", dataIndex: "berth_id", key: "berth_id", width: 100, align: "center", }, { - title: "入场时间", + title: "创建时间", dataIndex: "in_time", - align: "center", - render: (text, record, index) => ( -
{record.in_time}
- ) - }, - { - title: "离场时间", - dataIndex: "out_time", - align: "center", - render: (text, record, index) => ( -
{record.out_time}
- ) - }, - { - title: "停车时长", - dataIndex: "admission_time", - key: "admission_time", - width: 100, - align: "center", - }, - { - title: "入场收费员", - dataIndex: "in_person", - key: "in_person", - width: 100, - align: "center", - - }, - { - title: "出场收费员", - dataIndex: "out_person", - key: "out_person", - width: 100, - align: "center", - }, - { - title: - 订单金额 - - , - dataIndex: "order_amount", - key: "order_amount", - width: 100, - align: "center", - // filterDropdown: true, - // filterIcon: - // - // - // - }, - { - title: - 应收金额 - - , - dataIndex: "receivable_amount", - key: "receivable_amount", - width: 100, - align: "center", - // filterDropdown: true, - // filterIcon: - // - // - // - }, - { - title: - 折扣金额 - - , - dataIndex: "discount_amount", - key: "discount_amount", - width: 100, - align: "center", - // filterDropdown: true, - // filterIcon: - // - // - // - }, - { - title: - 优惠金额 - - , - dataIndex: "preferential_amount", - key: "preferential_amount", - width: 100, - align: "center", - // filterDropdown: true, - // filterIcon: - // - // - // - }, - { - title: "实付金额", - dataIndex: "actual_amount", - key: "actual_amount", - width: 100, - align: "center", - }, - { - title: - 退款总计 - - , - dataIndex: "refund_total", - key: "refund_total", - width: 100, - align: "center", - // filterDropdown: true, - // filterIcon: - // - // - // - }, - { - title: "停车记录ID", - dataIndex: "park_id", - align: "center", - render: (text, record, index) => ( -
- { - navigator.clipboard.writeText(`${text}`).then(() => { message.success("已复制到剪切板") }); - }}>{record.park_id} -
- ), - }, - { - title: "区域", - dataIndex: "region", - align: "center", - render: (text, record, index) => ( -
{record.region}
- ) - }, - { - title: "商户名称", - dataIndex: "operator", - align: "center", - render: (text, record, index) => ( -
{record.operator}
- ) - }, - { - title: "路段类型", - dataIndex: "road_type", - key: "road_type", - width: 100, + key: "in_time", align: "center", }, { @@ -264,7 +77,6 @@ function BillingRule() { fixed: "right", width: 100, render: (text, record, index) => { - setDataDetail(record) return ( <> - ); - }, - }, - ]; - - const h_columns = [ - { - title: "停车订单ID", - dataIndex: "park_id", - key: "park_id", - width: 200, - align: "center", - render: (text) => ( - <> - { - navigator.clipboard.writeText(`${text}`).then(() => { - message.success("已复制到剪切板"); - }); - }} - > - {text} - - - ), - }, - { - title: "车牌号", - dataIndex: "plate", - key: "plate", - align: "center", - }, - { - title: "停车场名称", - dataIndex: "park_name", - key: "park_name", - align: "center", - width: 200, - }, - { - title: "入场时间", - dataIndex: "in_time", - key: "in_time", - align: "center", - }, - { - title: "计费时间", - dataIndex: "admission_time", - key: "admission_time", - align: "center", - }, - ]; - - - const [detailVisible, setDetailVisible] = useState(false); - const [tableData, setTableData] = useState([]); - const [total, setTotal] = useState(0); - const [tabKey, setTabKey] = useState("1"); - // 车场id - const [parkId, setParkId] = useState(""); - //支付记录数据 - const [payRecord, setPayRecord] = useState([]); - //退款订单数据 - const [refundRecord, setRefundRecord] = useState([]); - //操作记录数据 - const [operationRecord, setOperatorRecord] = useState([]); - //历史处理数据 - const [historyProgressRecord, setHistoryProgressRecord] = useState([]); - //停车记录信息数据 - const [parkingRecordDetail, setParkingRecordDetail] = useState({}); - //当前的所选择的停车信息索引 - const [recordIndex, setRecordIndex] = useState(-1); - //当前所选择的订单ID - const [currentRecordID, setCurrentRecordID] = useState(""); - //历史记录详情Modal - const [historyVisible, setHistoryVisible] = useState(false); - //历史记录详情的弹窗查看全部 - const [isShowAll, setIsShowAll] = useState(false); - //历史记录车辆图片弹窗 - const [platePhototModal, setPlatePhotoModal] = useState(false); - //历史记录详情数据 - const [historyDataDetail, setHistoryDataDetail] = useState({}); - const [DataDetail, setDataDetail] = useState({}); - function openModal(index, record) { + // 打开弹窗 + const openModal = (index, record) => { + setDetailData(record) setDetailVisible(true); - setParkingRecordDetail(record); - setHistoryDataDetail(record) - setRecordIndex(index); - } - - const handleImgError = (e) => { - let evn = e || event - let img = evn.srcElement ? evn.srcElement : evn.target - img.src = errorImg - } - - function changeKey(key) { - setTabKey(key); - switch (key) { - case "2": - getPaymentRecord(currentRecordID); - break; - case "3": - getRefundRecord(currentRecordID); - break; - case "4": - getOperateRecord(currentRecordID); - break; - case "5": - getHistoryRecord(currentRecordID); - break; - default: - break; - } - } - function renderParkRecord(item) { - return ( - item && ( -
- - {item.road} - {item.berth_id} - {item.region} - {item.operator} - {item.road_type} - - - {item.plate} - {item.phone} - {item.in_time} - {item.out_time} - {item.admission_time} - {item.order_amount} - {item.parking_card_discount} - - {item.road_discount} - - - {item.receivable_amount} - - {item.coupon } - - {item.preferential_amount} - - - {item.actual_amount} - - - {item.refund_discount} - - - {item.actual_refund} - - - {item.refund_total} - - - {item.in_person} - - - {item.out_person} - - - - -
- -
- - -
- -
- - -
- -
- - -
- ) - ); - } - //查看历史详情 - const [getHistoryData,setGetHistoryData]=useState({}) - function checkHistoryDetail(record) { - setGetHistoryData(record); - setHistoryVisible(true); - } - function renderModalTable(columns, dataSource) { - return ( - - ); - } - //获取订单的支付记录 - function getPaymentRecord(park_id) { - ajax.getPaymentRecord({ park_record_id: park_id }).then((res) => { - if (res.status === 20000) { - setPayRecord(res.data.list); - } - }); - } - //获取退款订单的接口 - function getRefundRecord(park_id) { - ajax.getRefundRecord({ park_id }).then((res) => { - if (res.status === 20000) { - setRefundRecord(res.data.list); - } - }); - } - //获取操作处理的接口 - function getOperateRecord(park_id) { - ajax.getOperateRecord({ park_record_id: park_id }).then((res) => { - if (res.status === 20000) { - setOperatorRecord(res.data.list); - } - }); - } - //获取历史处理记录的接口 - function getHistoryRecord(park_id) { - ajax.getHistoryRecord({ park_record_id: park_id }).then((res) => { - if (res.status === 20000) { - // res.data.list.map(res=>{ - setHistoryProgressRecord(res.data.list); - // }) - } - }); } - //获取函数 - function search(params) { - utils.tableScrollTop("parent-table-scroll") + // 检索 + const search = (params) => { ajax.getParkingList(params).then((res) => { if (res.status === 20000) { setTableData(res.data.list); setTotal(res.data.total); - }else{ + } else { message.error(res.message) } }); } - useEffect(() => { - // setParkingRecordDetail(tableData[recordIndex]); - setCurrentRecordID(tableData[recordIndex]?.park_id || ""); - }, [recordIndex]); + + const handelAdd = () => { + setDetailVisible(true) + } return ( <> + 新增 + + } columns={columns} tableData={tableData} formSearch={formSearch} pagename="停车记录查询" - mandatory={['plate','berth_id']} - mandatory_name={['车牌号或泊位号']} - pageName={'parkRecordTotal'} + pageName={'billingRule'} initFormData={initFormData} total={total} search={search} @@ -765,359 +161,10 @@ function BillingRule() { className="totalModal" onCancel={() => { setDetailVisible(false); - setTabKey("1"); }} destroyOnClose > - - - {renderParkRecord(parkingRecordDetail)} - - - {renderModalTable(payRecordColumns, payRecord)} - - - {renderModalTable(refundRecordColumns, refundRecord)} - - - {renderModalTable(operatorRecordColumns, operationRecord)} - - - {renderModalTable(historyProgressColumns, historyProgressRecord)} - - - { - setHistoryVisible(false); - }} - className="hanleHistoyModal" - footer={null} - width={1000} - > -
- - - {historyDataDetail?.road} - - - {historyDataDetail.region} - - - {historyDataDetail.operator} - - - {historyDataDetail.berth_id} - - - {historyDataDetail.road_type} - - - - - {historyDataDetail.plate} - - - {historyDataDetail.admission_time} - - - {historyDataDetail.in_time} - - - {historyDataDetail.out_time} - - - {historyDataDetail.in_source} - - - {historyDataDetail.out_source} - - - { - setPlatePhotoModal(true); - }} - > - 查看 - - - - - - {historyDataDetail.order_amount} - - - {historyDataDetail.preferential_total} - - - {historyDataDetail.actual_amount} - - - {historyDataDetail.arrears_mount} - - - { - setIsShowAll(false); - }} - > - 返回 - - ) : ( - { - setIsShowAll(true); - }} - > - 查看全部 - - ) - } - > - - - - - {isShowAll ? ( - - -
-
流程记录 -
-
- - -
-
申诉处理审核: 已完成
-
-
{getHistoryData.examine_time}
-
来源:平台
-
操作人:{getHistoryData.dealer}
-
-
- - -
-
申诉处理提审
-
-
-
操作项
-
- {getHistoryData?.change_content == 1 - ? "调整出场时间" - : getHistoryData?.change_content == 2 - ? "变更车牌号" - : getHistoryData?.change_content == 3 - ? "更改订单金额" - : getHistoryData?.change_content == 4 - ? "免费该订单" - : "作废该订单"} -
-
{getHistoryData.deal_time}
-
-
-
初始值
-
{getHistoryData.initial_value || "--"}
-
来源:平台
-
-
-
变更值
-
{getHistoryData.update_value || "--"}
-
{getHistoryData.dealer}
-
-
-
- - -
- - - ) : ( - - - - -