Browse Source

fix():修改计费规则页面详情字段

tags/PMS_Frontend_v1.0.6-develop
xingjx 1 year ago
parent
commit
0fd1bceac2
  1. 5
      src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx
  2. 36
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx

5
src/pages/OutRoadMgm/OutRoadOverview/loadable.jsx

@ -240,6 +240,7 @@ const OutRoadOverview = () => {
.getOutRoadBaseInfo() .getOutRoadBaseInfo()
.then((res) => { .then((res) => {
if (res.status === 20000) { if (res.status === 20000) {
console.log('顶部数据',res.data)
setHeaderNums(res.data.list); setHeaderNums(res.data.list);
} }
}) })
@ -254,6 +255,7 @@ const OutRoadOverview = () => {
.getOutRoadPaymentTopInfo() .getOutRoadPaymentTopInfo()
.then((res) => { .then((res) => {
if (res.status === 20000) { if (res.status === 20000) {
console.log('收入top5',res.data)
setIncomeTop(res.data.list); setIncomeTop(res.data.list);
} }
}) })
@ -266,6 +268,7 @@ const OutRoadOverview = () => {
.getOutRoadParkingTopInfo() .getOutRoadParkingTopInfo()
.then((res) => { .then((res) => {
if (res.status === 20000) { if (res.status === 20000) {
console.log('记录',res.data)
setRecordTop(res.data.list); setRecordTop(res.data.list);
} }
}) })
@ -279,6 +282,7 @@ const OutRoadOverview = () => {
.getOutRoadParkingIncomeInfo() .getOutRoadParkingIncomeInfo()
.then((res) => { .then((res) => {
if (res.status === 20000) { if (res.status === 20000) {
console.log('收入概览',res.data)
getRevenueOption(res.data.list); getRevenueOption(res.data.list);
} }
}) })
@ -291,6 +295,7 @@ const OutRoadOverview = () => {
.getOutRoadParkingRecordsInfo() .getOutRoadParkingRecordsInfo()
.then((res) => { .then((res) => {
if (res.status === 20000) { if (res.status === 20000) {
console.log('记录概览',res.data)
getRecordOption(res.data.list); getRecordOption(res.data.list);
} }
}) })

36
src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx

@ -88,7 +88,7 @@ function Detail(props) {
{effectiveDateList && {effectiveDateList &&
effectiveDateList.map((item, index) => { effectiveDateList.map((item, index) => {
console.log(item); console.log(item);
<EffectiveDetail record={effectiveDateList} />
return <EffectiveDetail record={item} key={index}/>
}) })
} }
</div> </div>
@ -98,16 +98,16 @@ function Detail(props) {
function EffectiveDetail(props) { function EffectiveDetail(props) {
const { record } = props; const { record } = props;
console.log(123);
console.log(123,record);
return ( return (
<> <>
<Descriptions column={2}> <Descriptions column={2}>
<Descriptions.Item label="生效日期" span={1}> <Descriptions.Item label="生效日期" span={1}>
{record.effective_date}
{record.date}
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item span={2}> <Descriptions.Item span={2}>
<Checkbox.Group <Checkbox.Group
defaultValue={record.unit_fee_type_group}
defaultValue={[record.unitDelay?1:-1,record.unitUp?2:-1]}
disabled disabled
options={[ options={[
{ {
@ -122,7 +122,7 @@ function EffectiveDetail(props) {
></Checkbox.Group> ></Checkbox.Group>
</Descriptions.Item> </Descriptions.Item>
</Descriptions> </Descriptions>
{record.time_part_arr.map((item, index) => {
{record.details.map((item, index) => {
return <TimePartDetail index={index + 1} record={item} />; return <TimePartDetail index={index + 1} record={item} />;
})} })}
</> </>
@ -145,34 +145,38 @@ function TimePartDetail(props) {
<> <>
<Descriptions column={2}> <Descriptions column={2}>
<Descriptions.Item label={`时段${index}`}> <Descriptions.Item label={`时段${index}`}>
{`${record.time_part[0]}-${record.time_part[1]}`}
{`${record.start}-${record.end}`}
</Descriptions.Item> </Descriptions.Item>
{(record.interval === 1 || record.interval === 2) && (
{(record.type === 1 || record.type === 2) && (
<Descriptions.Item label="时段最高金额"> <Descriptions.Item label="时段最高金额">
{record.time_max_money}
{record.limit}
</Descriptions.Item> </Descriptions.Item>
)} )}
<Descriptions.Item label={`区间${index}`} span={2}> <Descriptions.Item label={`区间${index}`} span={2}>
{partName(record.interval)}
{partName(record.type)}
</Descriptions.Item> </Descriptions.Item>
{record.interval === 1 && (
{record.type === 1 && (
<> <>
<Descriptions.Item span={2}> <Descriptions.Item span={2}>
<div>{`前:${record.time_before} 分钟,${record.time_before_money}元/${record.time_before_minute}分钟`}</div>
{/* <div>{`前:${record.time_before} 分钟,${record.time_before_money}元/${record.time_before_minute}分钟`}</div> */}
<div>{`前:${record.items&&record.items[0].segment} 分钟,${record.items&&record.items[0].unit}元/${record.items&&record.items[0].period}分钟`}</div>
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item span={2}> <Descriptions.Item span={2}>
<div>{`满:${record.time_before} 分钟后,${record.time_after_money}元/${record.time_after_minute}分钟`}</div>
{/* <div>{`满:${record.time_before} 分钟后,${record.time_after_money}元/${record.time_after_minute}分钟`}</div> */}
{record.items&&record.items[0].sub?<div>{`满:${record.items&&record.items[0].segment} 分钟后,${record.items[0].sub[0].unit}元/${record.items[0].sub[0]?.period}分钟`}</div>:null}
</Descriptions.Item> </Descriptions.Item>
</> </>
)} )}
{record.interval === 2 && (
{record.type === 2 && (
<Descriptions.Item span={2}> <Descriptions.Item span={2}>
<div>{`${record.time_money}元/${record.time_minute}分钟`}</div>
{/* <div>{`${record.time_money}元/${record.time_minute}分钟`}</div> */}
<div>{`${record.items&&record.items[0].unit}元/${record.items&&record.items[0].period}分钟`}</div>
</Descriptions.Item> </Descriptions.Item>
)} )}
{record.interval === 3 && (
{record.type === 3 && (
<Descriptions.Item span={2}> <Descriptions.Item span={2}>
<div>{`${record.money_per_time}元/次`}</div>
{/* <div>{`${record.money_per_time}元/次`}</div> */}
<div>{`${record.items&&record.items[0].unit}元/次`}</div>
</Descriptions.Item> </Descriptions.Item>
)} )}
</Descriptions> </Descriptions>

Loading…
Cancel
Save