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

fix():退款订单查询页面修改

tags/PMS_Frontend_v1.0.6-develop
xingjx 1 year ago
parent
dfe2aaaa6b
commit
14e2890f65
6 changed files with 183 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 102
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
  2. 44
      src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx
  3. 2
      src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
  4. 48
      src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx
  5. 2
      src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx
  6. 2
      src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx

102
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
View File

@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
import { ResultFlowResult, DataSelect } from "@/components";
import { Select, Input, Button, Table, message, Pagination, DatePicker, Modal, Cascader, Tooltip } from "antd";
import { useSessionStorageState } from "ahooks";
import { dictionary } from "@/config/common";
import { lineChartOption } from "@/config/character.config.js";
import { useNavigate } from "react-router-dom";
import { setTabList } from "@/store/common.js";
import { useSelector, useDispatch } from "react-redux";
@ -153,7 +153,7 @@ function ParkingAlyOverview() {
end_time: end,
});
};
//
//停车趋势分析，折线图
const getRevenueOption = (data) => {
// 获取所有地区名称
data.sort((a, b) => {
@ -209,32 +209,7 @@ function ParkingAlyOverview() {
},
};
});
setRevenueData({
title: {
text: "",
textStyle: {
color: "#fff",
},
},
tooltip: {
trigger: "axis",
},
xAxis: {
data: xAxisData,
type: 'category',
axisLine: {
lineStyle: {
color: "#bbb",
},
},
axisLabel: {
textStyle: {
color: "#bbb",
},
},
},
yAxis: {
lineChartOption.yAxis= {
type: "value",
name: '泊位利用率',
min: 0,
@ -248,9 +223,7 @@ function ParkingAlyOverview() {
},
},
},
color: ["#4DC3FF", "#FFD767"],
//series: seriesData,
series:
lineChartOption.series =
{
"name": "西区",
"type": "line",
@ -260,13 +233,66 @@ function ParkingAlyOverview() {
24
]
},
grid: {
x: 50,
y: 55,
x2: 70,
y2: 20,
},
});
setRevenueData(lineChartOption)
console.log(212, lineChartOption)
// setRevenueData({
// title: {
// text: "",
// textStyle: {
// color: "#fff",
// },
// },
// tooltip: {
// trigger: "axis",
// },
// xAxis: {
// data: xAxisData,
// type: 'category',
// axisLine: {
// lineStyle: {
// color: "#bbb",
// },
// },
// axisLabel: {
// textStyle: {
// color: "#bbb",
// },
// },
// },
// yAxis: {
// type: "value",
// name: '泊位利用率',
// min: 0,
// // /max: 50,
// interval: 10,
// splitNumber: 6, //设置坐标轴的分割段数
// axisLabel: {
// formatter: "{value}%",
// textStyle: {
// color: "#bbb",
// },
// },
// },
// color: ["#4DC3FF", "#FFD767"],
// //series: seriesData,
// series:
// {
// "name": "西区",
// "type": "line",
// "data": [
// 12,
// 12,
// 24
// ]
// },
// grid: {
// x: 50,
// y: 55,
// x2: 70,
// y2: 20,
// },
// });
};
function getParkingIncome() {

44
src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx
View File

@ -112,6 +112,7 @@ function EditOrderInquiry(props) {
}
setDefaultParams({ ...postData, ...pageInfo });
setTabLoading(true);
console.log(115,pageInfo,{ ...postData, ...pageInfo, ...v })
ajax.getOrderChangeList({ ...postData, ...pageInfo, ...v }).then(
(res) => {
if (parseInt(res?.status) === 20000) {
@ -503,7 +504,48 @@ function EditOrderInquiry(props) {
<Select
className="form-con"
placeholder="请选择"
options={dictionary.BusinessOrderType || []}
options={[
{
value: '0',
label: '全部'
},
{
value: '1',
label: '停车订单'
},
{
value: '2',
label: '充电订单'
},
{
value: '3',
label: '充值订单'
},
{
value: '4',
label: '停车卡订单'
},
{
value: '5',
label: '充电预约订单'
},
{
value: '6',
label: '停车预约订单'
},
{
value: '7',
label: '错峰订单'
},
{
value: '8',
label: '预付费订单'
},
{
value: '9',
label: '商家预付费订单'
},
]}
value={formData.parking_type}
onChange={(v) =>
setFormData({ ...formData, parking_type: v })

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

@ -768,7 +768,7 @@ function ParkingOrderInquiry() {
<Tabs.TabPane tab="订单修改记录" key="2">
{tabKeyChild == 2 ? renderTable(
createCol(['停车订单ID', '欠费金额（元）', '订单修改时间', '修改原因', '处理记录ID', '区域', '商户名称', '停车场名称', '车场类型', '车牌号', '入场时间', '出场时间', '停车时长'],
['park_record_id', 'arrearsAmount', 'examine_time', 'update_reason', 'deal_record_id', 'area', 'merchantName', 'sectionName', '', 'licensePlateNumber', 'entryTime', 'exitTime', 'parkingDuration'], 0),
['park_record_id', 'arrearsAmount', 'examine_time', 'update_reason', 'deal_record_id', 'area', 'merchantName', 'sectionName', 'parking_model_type', 'licensePlateNumber', 'entryTime', 'exitTime', 'parkingDuration'], 0),
[ash[25], ash[1], ash[2], ash[18], ash[26], ash[29], ash[5], ash[12], ash[27], ash[28]],
resultData, '/api/fin/order_search/arrears_order_update_list_export', 1
) : null}

48
src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx
View File

@ -95,7 +95,49 @@ function ReturnOrderInquiry() {
name: "type",
type: "Select",
label: "业务订单类型",
options: dictionary.BusinessOrderType,
defaultValue:'0',
options: [
{
value: '0',
label: '全部'
},
{
value: '1',
label: '停车订单'
},
{
value: '2',
label: '充电订单'
},
{
value: '3',
label: '充值订单'
},
{
value: '4',
label: '停车卡订单'
},
{
value: '5',
label: '充电预约订单'
},
{
value: '6',
label: '停车预约订单'
},
{
value: '7',
label: '错峰订单'
},
{
value: '8',
label: '预付费订单'
},
{
value: '9',
label: '商家预付费订单'
},
],
},
{
name: "park_id",
@ -135,11 +177,13 @@ function ReturnOrderInquiry() {
value: 4,
},
],
defaultValue:0,
},
{
name: "reason",
type: "Select",
label: "退款原因",
defaultValue:0,
options: [
{
label: "全部",
@ -385,7 +429,7 @@ function ReturnOrderInquiry() {
<>
{renderTable(
createCol(['序号', '最近尝试时间', '支付渠道', '应退实付（元）', '应退优惠（元）', '退款原因', '退款申请时间', '退款订单ID', '业务订单类型', '业务订单ID', '支付订单类型', '支付订单ID', '渠道流水号', '状态'],
['index', 'latest_try_time', 'payment_channels_name', 'refund_actual_amount', 'refund_discount_amount', 'reason_name', 'refund_time', 'payment_order_id', 'parking_type_name', 'park_record_id', 'payment_type_name', 'payment_order_id', 'flow_id', 'state_name'], 8),
['index', 'latest_try_time', 'payment_channels_name', 'refund_actual_amount', 'refund_discount_amount', 'reason_name', 'refund_time', 'id', 'parking_type_name', 'park_record_id', 'payment_type_name', 'payment_order_id', 'flow_id', 'state_name'], 8),
formRefundSearch,
resultData
)}

2
src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx
View File

@ -1156,7 +1156,7 @@ function CarInfo() {
{tabKey == 5 ?
renderTable(
createCol(['序号', '最近尝试时间', '支付渠道', '应退实付（元）', '应退优惠（元）', '退款原因', '退款申请时间', '退款订单ID', '业务订单类型', '业务订单ID', '支付订单类型', '支付订单ID', '渠道流水号', '状态'],
['index', 'latest_try_time', 'payment_channels_name', 'refund_actual_amount', 'refund_discount_amount', 'reason', 'refund_time', 'payment_order_id', 'parking_type_name', 'park_record_id', 'payment_type_name', 'payment_order_id', 'flow_id', 'state_name'], 5),
['index', 'latest_try_time', 'payment_channels_name', 'refund_actual_amount', 'refund_discount_amount', 'reason', 'refund_time', 'id', 'parking_type_name', 'park_record_id', 'payment_type_name', 'payment_order_id', 'flow_id', 'state_name'], 5),
formRefundSearch,
resultData
) : null}

2
src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx
View File

@ -1196,7 +1196,7 @@ function UserInfo() {
{tabKey == 8 ?
renderTable(
createCol(['序号', '最近尝试时间', '支付渠道', '应退实付（元）', '应退优惠（元）', '退款原因', '退款申请时间', '退款订单ID', '业务订单类型', '业务订单ID', '支付订单类型', '支付订单ID', '渠道流水号', '状态'],
['index', 'latest_try_time', 'payment_channels_name', 'refund_actual_amount', 'refund_discount_amount', 'reason', 'refund_time', 'payment_order_id', 'parking_type_name', 'park_record_id', 'payment_type_name', 'payment_order_id', 'flow_id', 'state_name'], 8),
['index', 'latest_try_time', 'payment_channels_name', 'refund_actual_amount', 'refund_discount_amount', 'reason', 'refund_time', 'id', 'parking_type_name', 'park_record_id', 'payment_type_name', 'payment_order_id', 'flow_id', 'state_name'], 8),
formRefundSearch,
resultData
) : null}

Write Preview
Loading…
Cancel
Save