From f4154ebd405317aeb7936344b9bbe63fe59fccb9 Mon Sep 17 00:00:00 2001 From: xingjx Date: Wed, 25 Oct 2023 14:40:57 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E5=A4=84=E7=90=86=E6=AC=A0=E8=B4=B9?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=92=8C=E5=83=B5=E5=B0=B8=E8=BD=A6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableModule/index.jsx | 28 +- .../OrderInquiry/ParkingOrderInquiry/index.jsx | 501 ++++++++------------- .../OrderInquiry/ReturnOrderInquiry/index.jsx | 108 +---- .../ArrearsRecover/ArrearsCar/loadable.jsx | 4 +- .../OutSegmentMgm/ZombieCarMgm/loadable.jsx | 2 +- 5 files changed, 219 insertions(+), 424 deletions(-) diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx index 969cbe2..b1c9f65 100644 --- a/src/components/TableModule/index.jsx +++ b/src/components/TableModule/index.jsx @@ -47,7 +47,7 @@ const TableModule = forwardRef((props, ref) => { otherData = {}, //额外需要携带的参数，传入对象 rowKey, //table的key值 userInfo = {},//用户信息页面数据 - pageName='',//路由名字 + pageName = '',//路由名字 } = props; const [sessionTabList, setSessionTabList] = useSessionStorageState(pageName, { value: '' @@ -119,10 +119,10 @@ const TableModule = forwardRef((props, ref) => { let start_time = sessionTabList.start_time let end_time = sessionTabList.end_time searchForm.setFieldsValue({ ...sessionTabList, start_time: moment(start_time), end_time: moment(end_time) }) - }else { - if(sessionTabList.in_time){ + } else { + if (sessionTabList.in_time) { searchForm.setFieldsValue({ ...sessionTabList, in_time: moment(sessionTabList.in_time) }) - }else { + } else { searchForm.setFieldsValue({ ...sessionTabList }) } } @@ -151,12 +151,20 @@ const TableModule = forwardRef((props, ref) => { ), }; } + if (form.in_time) { + form = { + ...form, + in_time: moment(form.in_time).format( + "YYYY-MM-DD" + ), + } + } if (areaName !== null) form[areaName] = areaSelectedList; if (form.start_time !== void 0 && form.end_time !== void 0) { form.start_time = moment(form.start_time).format("YYYY-MM-DD HH:mm:ss"); form.end_time = moment(form.end_time).format("YYYY-MM-DD HH:mm:ss"); } - console.log(212,form) + console.log(212, form) search(form); } //重置 @@ -188,10 +196,12 @@ const TableModule = forwardRef((props, ref) => { start_time: moment(deftime.startDateTime), end_time: moment(deftime.endDateTime) }) - console.log(21,deftime) - setSessionTabList({ ...sessionTabList, start_time: moment(deftime.startDateTime), - end_time: moment(deftime.endDateTime) }) - }else { + console.log(21, deftime) + setSessionTabList({ + ...sessionTabList, start_time: moment(deftime.startDateTime), + end_time: moment(deftime.endDateTime) + }) + } else { // searchForm.setFieldsValue({ // start_time: moment().subtract(1, "month"), // end_time: moment() diff --git a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx index 12e6195..adb6458 100644 --- a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx @@ -168,317 +168,238 @@ function ParkingOrderInquiry() { defaultValue: [moment().subtract(1, "month"), moment()], }, ]; - //退费记录检索条件 - const formRefundSearch = [ - { - name: "refund_id", - type: "Input", - label: "退款订单号", - placeholder: "请输入退款订单号", + + //所有检索条件 + const ash = [ + {//1 + name: "region", + type: "TreeSelect", + label: "区域", }, - { - name: "type", + {//2 + name: "operator", type: "Select", - label: "业务订单类型", - options: dictionary.BusinessOrderType, + label: "商户名称", + options: dictionary.MerchantName, }, - { - name: "park_id", + {//3 + name: "road", type: "Input", - label: "业务订单ID", - placeholder: "请输入业务订单ID", + label: "停车场名称", + placeholder: "请输入停车场名称", }, - { - name: "order_id", - type: "Input", - label: "支付订单ID", - placeholder: "请输入支付订单ID", - }, - { - name: "state", + {//4 + name: "road_type", type: "Select", - label: "退款状态", + label: "车场类型", options: [ { label: "全部", value: 0, }, { - label: "待确认", + label: "路侧平行", value: 1, }, { - label: "退款中", + label: "路侧垂停", value: 2, }, { - label: "已完成", + label: "封闭车场", value: 3, }, { - label: "退款失败", + label: "半封闭车场", value: 4, }, ], }, - { - name: "reason", + {//5 + name: "phone", + type: "Input", + label: "手机号", + placeholder: "请输入手机号", + }, + {//6 + name: "type", + type: "Select", + label: "出入场类型", + placeholder: "请选择出入场类型", + defaultValue: 1, + options: [ + { + label: "入场", + value: 1, + }, + { + label: "出场", + value: 2, + }, + ], + }, + + {//7 + name: "b", + type: "Input", + label: "商品名称", + placeholder: "请输入商品名称", + }, + {//8 + name: "b", type: "Select", - label: "退款原因", + label: "购买渠道", + placeholder: "请选择购买渠道", options: [ { label: "全部", value: 0, }, { - label: "异常订单处理", + label: "线上渠道", value: 1, }, { - label: "自动平单退款", + label: "后台录入", value: 2, }, ], }, - { - name: "flow_id", + {//9 + name: "b", + type: "Select", + label: "订单状态", + placeholder: "请选择订单状态", + options: [ + { + label: "全部", + value: 0, + }, + { + label: "未生效", + value: 1, + }, + { + label: "生效中", + value: 2, + }, + { + label: "已失效", + value: 3, + }, + ], + }, + {//10 + name: "PayChannel", + type: "Select", + label: "支付渠道", + placeholder: "请选择支付渠道", + options: dictionary.PayChannel, + }, + {//11 + name: "payment_equipment", + type: "Select", + label: "支付设备", + placeholder: "请选择支付设备", + options: dictionary.PayDevice + }, + {//12 + name: "pay_type", + type: "Select", + label: "支付方式", + placeholder: "请选择支付方式", + options: dictionary.PaydMethod, + }, + {//13 + name: "timePeriod", + type: "RangePicker", + label: "时间段", + defaultValue: [moment().startOf("day"), moment()], + }, + {//14 + name: "b", + type: "Select", + label: "退款方式", + placeholder: "请选择退款方式", + options: dictionary.PaydMethod, + }, + {//15 + name: "b", type: "Input", - label: "渠道流水号", - placeholder: "请输入渠道流水号", + label: "第三方流水号", + placeholder: "请输入第三方流水号", }, - { + {//16 name: "timePeriod", type: "RangePicker", label: "时间段", - defaultTitle: ['退款时间', '至'], - defaultValue: [moment().subtract(1, "month"), moment()], + defaultTitle: ['支付时间', '至'] + // defaultValue: [moment().startOf("day"), moment()], + }, + {//17 + name: "timePeriod", + type: "RangePicker", + label: "时间段", + defaultTitle: ['订购时间', '至'] + // defaultValue: [moment().startOf("day"), moment()], + }, + {//18 + name: "timePeriod", + type: "RangePicker", + label: "时间段", + defaultTitle: ['预约到场时间', '至'] + // defaultValue: [moment().startOf("day"), moment()], + }, + {//19 + name: "plate", + type: "Input", + label: "车牌号", + placeholder: "请输入车牌号", + }, + {//20 + name: "order_id", + type: "Input", + label: "支付订单ID", + placeholder: "请输入支付订单ID", + }, + {//21 + name: "t", + type: "Input", + label: "泊位号", + placeholder: "请输入泊位号", + }, + {//22 + name: "t", + type: "Select", + label: "所属商户", + placeholder: "请选择所属商户", + options: dictionary.PaydMethod, + }, + {//23 + name: "t", + type: "Input", + label: "预付订单ID", + placeholder: "请输入订单ID", + }, + {//24 + name: "t", + type: "Input", + label: "停车记录ID", + placeholder: "停车记录ID", + }, + {//25 + name: "t", + type: "Input", + label: "操作人", + placeholder: "请输入操作人", + }, + {//26 + name: "t", + type: "Input", + label: "停车订单ID", + placeholder: "停车订单ID", }, ]; - //所有检索条件 - const ash = [ - {//1 - name: "region", - type: "TreeSelect", - label: "区域", - }, - {//2 - name: "operator", - type: "Select", - label: "商户名称", - options: dictionary.MerchantName, - }, - {//3 - name: "road", - type: "Input", - label: "停车场名称", - placeholder: "请输入停车场名称", - }, - {//4 - name: "road_type", - type: "Select", - label: "车场类型", - options: [ - { - label: "全部", - value: 0, - }, - { - label: "路侧平行", - value: 1, - }, - { - label: "路侧垂停", - value: 2, - }, - { - label: "封闭车场", - value: 3, - }, - { - label: "半封闭车场", - value: 4, - }, - ], - }, - {//5 - name: "phone", - type: "Input", - label: "手机号", - placeholder: "请输入手机号", - }, - {//6 - name: "type", - type: "Select", - label: "出入场类型", - placeholder: "请选择出入场类型", - defaultValue: 1, - options: [ - { - label: "入场", - value: 1, - }, - { - label: "出场", - value: 2, - }, - ], - }, - - {//7 - name: "b", - type: "Input", - label: "商品名称", - placeholder: "请输入商品名称", - }, - {//8 - name: "b", - type: "Select", - label: "购买渠道", - placeholder: "请选择购买渠道", - options: [ - { - label: "全部", - value: 0, - }, - { - label: "线上渠道", - value: 1, - }, - { - label: "后台录入", - value: 2, - }, - ], - }, - {//9 - name: "b", - type: "Select", - label: "订单状态", - placeholder: "请选择订单状态", - options: [ - { - label: "全部", - value: 0, - }, - { - label: "未生效", - value: 1, - }, - { - label: "生效中", - value: 2, - }, - { - label: "已失效", - value: 3, - }, - ], - }, - {//10 - name: "PayChannel", - type: "Select", - label: "支付渠道", - placeholder: "请选择支付渠道", - options: dictionary.PayChannel, - }, - {//11 - name: "payment_equipment", - type: "Select", - label: "支付设备", - placeholder: "请选择支付设备", - options: dictionary.PayDevice - }, - {//12 - name: "pay_type", - type: "Select", - label: "支付方式", - placeholder: "请选择支付方式", - options: dictionary.PaydMethod, - }, - {//13 - name: "timePeriod", - type: "RangePicker", - label: "时间段", - defaultValue: [moment().startOf("day"), moment()], - }, - {//14 - name: "b", - type: "Select", - label: "退款方式", - placeholder: "请选择退款方式", - options: dictionary.PaydMethod, - }, - {//15 - name: "b", - type: "Input", - label: "第三方流水号", - placeholder: "请输入第三方流水号", - }, - {//16 - name: "timePeriod", - type: "RangePicker", - label: "时间段", - defaultTitle: ['支付时间', '至'] - // defaultValue: [moment().startOf("day"), moment()], - }, - {//17 - name: "timePeriod", - type: "RangePicker", - label: "时间段", - defaultTitle: ['订购时间', '至'] - // defaultValue: [moment().startOf("day"), moment()], - }, - {//18 - name: "timePeriod", - type: "RangePicker", - label: "时间段", - defaultTitle: ['预约到场时间', '至'] - // defaultValue: [moment().startOf("day"), moment()], - }, - {//19 - name: "plate", - type: "Input", - label: "车牌号", - placeholder: "请输入车牌号", - }, - {//20 - name: "order_id", - type: "Input", - label: "支付订单ID", - placeholder: "请输入支付订单ID", - }, - {//21 - name: "t", - type: "Input", - label: "泊位号", - placeholder: "请输入泊位号", - }, - {//22 - name: "t", - type: "Select", - label: "所属商户", - placeholder: "请选择所属商户", - options: dictionary.PaydMethod, - }, - {//23 - name: "t", - type: "Input", - label: "预付订单ID", - placeholder: "请输入订单ID", - }, - {//24 - name: "t", - type: "Input", - label: "停车记录ID", - placeholder: "停车记录ID", - }, - {//25 - name: "t", - type: "Input", - label: "操作人", - placeholder: "请输入操作人", - }, - ]; const [tag, setTag] = useState('1'); const [edit, setEdit] = useState(true); const [resultData, setResultData] = useState([]) @@ -972,58 +893,11 @@ function ParkingOrderInquiry() { - //停车卡详情 - const tckModal =
-
订单信息:
-
- - {ycddData?.t || "--"} - {ycddData.r || "--"} - {ycddData.o || "--"} - {ycddData.r || "--"} - {ycddData.mobile || "--"} - {ycddData.r || "--"} - {ycddData.r || "--"} - {ycddData.r || "--"} - {ycddData.r || "--"} - -
商品信息:
-
- - {ycddData.plate} - {ycddData.admission_time} - {ycddData.in_time} - {ycddData.out_time} - {ycddData.in_source} - {ycddData.out_source} - - -
- - //错峰卡详情 - const cfkModal =
-
订单信息:
-
- - {ycddData?.road || "--"} - {ycddData.mobile || "--"} - {ycddData.plate_number || "--"} - {ycddData.r || "--"} - {ycddData.r || "--"} - {ycddData.r || "--"} - {ycddData.r || "--"} - -
商品信息:
-
- - {ycddData.plate} - {ycddData.admission_time} - -
useEffect(() => { searchOther() }, [tabKey]) + //欠费订单查询 const orderInfo = <> @@ -1052,6 +926,7 @@ function ParkingOrderInquiry() { + return ( <> diff --git a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx index a59df00..b1edda4 100644 --- a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx @@ -57,37 +57,6 @@ function ReturnOrderInquiry() { align: "center", } switch (type) { - case 2: - obj.render = (text, record) => (<> - { - setYcddData(record) - setDetailVisible(true) - }}> - 详情 - - ) - arr.push(obj) - break - case 6: - obj.render = (text, record) => (<> - { - setTkddVisible(true) - }}> - 详情 - - ) - arr.push(obj) - break - case 7: - obj.render = (text, record) => (<> - { - setTkddVisible(true) - }}> - 详情 - - ) - arr.push(obj) - break case 8: obj.render = (text, record) => (<> { @@ -189,78 +158,19 @@ function ReturnOrderInquiry() { defaultValue: [moment().subtract(1, "month"), moment()], }, ]; - - const [tag, setTag] = useState('1'); const [resultData, setResultData] = useState([]) - const [baseData, setBaseData] = useState({ - //car_type:2 - img: '' - }) const [ycddData, setYcddData] = useState([])//异常订单数据 const [detailVisible, setDetailVisible] = useState(false); const [timesVisible, setTimesVisible] = useState(false); //退款尝试次数展开 const [tkddVisible, setTkddVisible] = useState(false); const [eaeVisible, setEaeVisible] = useState(false);//出入场图片 const [bigpicVisible, setBigpicVisible] = useState(false);//大图展示 - const [bqVisible, setBqVisible] = useState(false);//流程查看 const [bigPic, setBigPic] = useState(); const [total, setTotal] = useState(0); - const [tabKey, setTabKey] = useState("1"); - function openModal(params) { - setDetailVisible(true); - } - - //基本信息详情 - function searchDetail(e) { - ajax({ - url: "/api/ope/user/get_base_info", - type: "get", - data: { memberId: e.memberId }, - }).then((res) => { - let { status, data, total } = res - if (status == 20000) { - setBaseData(data) - setTag('2') - } else { - message.error(res.message) - } - }) - - } - //详情其他模块查询 - function searchOther(e) { - var url = '' - switch (tabKey) { - case "1": - url = "" - break - case "2": - url = "/api/bpm/record/get_record_list"//停车记录 - break - case "3": - url = "/api/bpm/record/get_payment_list"//支付记录 - break - case "4": - url = "/api/ope/record/get_recharge_list"//充值記錄 - break - case "5": - url = "/api/bpm/record/get_parking_arrears_list"//欠费记录 - break - case "6": - url = "" - break - case "7": - url = "" - break - case "8": - url = "/api/ope/record/get_refund_list"//退费订单 - break - default: break - } - if (tabKey == '5' && e && !e?.type) { - e.type = 1 - } + //列表查询 + function search(e) { + var url ="/api/ope/record/get_refund_list"//退费订单 ajax({ url: url, type: "post", @@ -298,7 +208,7 @@ function ReturnOrderInquiry() { }) } - //其他页面渲染 + //页面渲染 function renderTable(columns, arr, dataSource, exportUrl) { return ( @@ -438,12 +349,11 @@ function ReturnOrderInquiry() { useEffect(() => { - searchOther() - }, [tabKey]) + search() + }, []) return ( <> - {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), @@ -481,8 +391,6 @@ function ReturnOrderInquiry() { ]} > {tkddModal} - {/* {tabKey == '8' ? tkddModal : tabKey == '6' ? tckModal : tabKey == '7' ? cfkModal : null} */} - ); diff --git a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx index 6308a43..7d5cd62 100644 --- a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx +++ b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx @@ -330,7 +330,9 @@ function ArrearsCar() { }) } useEffect(() => { - searchDetail() + if(carId){ + searchDetail() + } }, [pageData]); return ( <> diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx index 90aa2f0..93101de 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx @@ -114,7 +114,7 @@ function ZombieCarMgm() { name: "in_time", label: "入场时间", component: () => { - return ; + return ; }, }, {