From c84987d881880a297cfbf73482f2862b3c0dd397 Mon Sep 17 00:00:00 2001 From: wanghx Date: Tue, 23 Jan 2024 10:45:34 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat():=20=E5=AF=BC=E5=87=BA=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E7=BB=9F=E4=B8=80=E4=B8=8B=E8=BD=BD=E5=85=A5?= =?UTF-8?q?=E5=8F=A3=E8=87=B3=E5=AF=BC=E5=87=BA=E4=B8=8B=E8=BD=BD=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Export/ExportBtnNew/index.jsx | 27 ++++++++------ src/components/TableModule/index.jsx | 9 ++--- .../FinancialReport/OperationReport/loadable.jsx | 3 +- .../FinancialReport/ParkCardReport/loadable.jsx | 3 +- .../ParkingIncomeReport/loadable.jsx | 3 +- .../FinancialReport/PaySummaryReport/loadable.jsx | 3 +- .../FinancialReport/PdaStat/loadable.jsx | 3 +- .../FinancialReport/PreOrderReport/loadable.jsx | 3 +- src/pages/FinancialMgm/PayRecordTotal/loadable.jsx | 4 +-- .../FinancialMgm/SettleBill/PayRepeat/loadable.jsx | 3 +- .../BusinessMgm/SpecialRecord/loadable.jsx | 3 +- .../EquipmentMgm/EquipmentStatus/Device/index.jsx | 3 +- .../EquipmentOpe/faultReport/loadable.jsx | 3 +- .../EquipmentOpe/patrolStatistics/loadable.jsx | 3 +- .../Attendance/WorkerAttendance/loadable.jsx | 3 +- .../Attendance/WorkerSchedule/loadable.jsx | 3 +- .../PersonMgm/Performance/SalesStat/loadable.jsx | 6 ++-- .../PersonMgm/Performance/WorkerStat/loadable.jsx | 3 +- .../InRoadMgm/PersonMgm/ReportMsg/loadable.jsx | 3 +- src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx | 9 ++--- .../CallbackSuggestion/loadable.jsx | 3 +- .../CustomerServieMgm/ComplainManage/loadable.jsx | 3 +- .../CouponMgm/WriteOffDetail/loadable.jsx | 3 +- .../CouponMgm/WriteOffStat/loadable.jsx | 3 +- .../ParkingCard/ParkingCardOrder/loadable.jsx | 3 +- .../Staggered/StaggeredOrder/loadable.jsx | 3 +- .../Staggered/StaggeredStat/loadable.jsx | 3 +- .../OutExceptionMgm/LiftUpPoleRecord/loadable.jsx | 28 ++++++++++++--- .../ZombieCarCleanRecord/loadable.jsx | 41 +++++++++++++++++++--- .../OutSegmentMgm/OutSegment/loadable.jsx | 3 +- 30 files changed, 138 insertions(+), 55 deletions(-) diff --git a/src/components/Export/ExportBtnNew/index.jsx b/src/components/Export/ExportBtnNew/index.jsx index b1cf3f7..ea4d70b 100644 --- a/src/components/Export/ExportBtnNew/index.jsx +++ b/src/components/Export/ExportBtnNew/index.jsx @@ -126,6 +126,7 @@ const ExportBtn = forwardRef((props, ref) => { key="max" min={1} value={max} + max={totalRecords} onChange={(e) => handleChangeNum(e, "max")} /> @@ -177,7 +178,7 @@ const ExportBtn = forwardRef((props, ref) => { //全部 else { if (isTableModule) { - onOk(1, totalRecords) + onOk(1, totalRecords, undefined, 1) } else { startExport(1, totalRecords, exportType == "hasImg" ? 1 : 0) } @@ -199,11 +200,12 @@ const ExportBtn = forwardRef((props, ref) => { return } if (res.status === 20000) { - if (end - start > 500) { - message.info('当前导出任务, 已加入导出任务列表') - } else { - downloadFile(res.data.url || res.data.export_url) - } + // if (end - start > 500) { + // message.info('当前导出任务, 已加入导出任务列表') + // } else { + // } + message.info(res.message) + downloadFile(res.data.url || res.data.export_url) handleCancel() // 成功 res.data.task_url // setInProcess("2"); @@ -227,11 +229,12 @@ const ExportBtn = forwardRef((props, ref) => { return } if (res.status === 20000) { - if (end - start > 500) { - message.info('当前导出任务, 已加入导出任务列表') - } else { - downloadFile(res.data.url || res.data.export_url) - } + // if (end - start > 500) { + // message.info('当前导出任务, 已加入导出任务列表') + // } else { + // } + message.info(res.message) + downloadFile(res.data.url || res.data.export_url) handleCancel() // setInProcess("2"); // setProcess(res.data?.task_url) @@ -250,6 +253,7 @@ const ExportBtn = forwardRef((props, ref) => { // 执行下载 const downloadFile = (url) => { + if (!url) return var link = document.createElement("a"); link.setAttribute("target", "_blank"); link.style.display = "none"; @@ -279,6 +283,7 @@ const ExportBtn = forwardRef((props, ref) => { setInProcess("1"); setProcess(0); setMaxExportNum(modalType === "hasImg" ? 10000 : 100000); + setBtnLoading(false) }; //导出进度 diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx index 172703b..7f1836b 100644 --- a/src/components/TableModule/index.jsx +++ b/src/components/TableModule/index.jsx @@ -949,10 +949,10 @@ const TableModule = forwardRef((props, ref) => { }) .then((res) => { if (res.status === 20000) { - const link = document.createElement("a"); - link.href = res.data.url || res.data.export_url; - link.target = "_blank"; // 打开新页面 - link.click(); + // const link = document.createElement("a"); + // link.href = res.data.url || res.data.export_url; + // link.target = "_blank"; // 打开新页面 + // link.click(); setTipModal({ ...tipModal, visible: false, filename: @@ -961,6 +961,7 @@ const TableModule = forwardRef((props, ref) => { new Date().getDate(), }); tipForm.setFieldsValue({ filename: pagename + (new Date().getMonth() + 1).toString().padStart(2, "0") + new Date().getDate(), }) + message.success(res.message) resolved() } else { message.error(res.message); diff --git a/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx index 21a1315..1014296 100644 --- a/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx @@ -607,7 +607,8 @@ function OperationReport() { }).then( (res) => { if (parseInt(res?.status) === 20000) { - Daownload(res?.data?.url); + // Daownload(res?.data?.url); + message.success(res.message) exportRef.current.handleCancel() } else { message.error(res?.message); diff --git a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx index 6648520..96c83b7 100644 --- a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx @@ -314,7 +314,8 @@ function ParkCardReport() { }).then( (res) => { if (parseInt(res?.status) === 20000) { - Daownload(res?.data?.url); + // Daownload(res?.data?.url); + message.success(res.message) exportRef.current.handleCancel() } else { message.error(res?.message); diff --git a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx index c6a521d..39a4c8c 100644 --- a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx @@ -550,7 +550,8 @@ function ParkingIncomeReport() { }).then( (res) => { if (parseInt(res?.status) === 20000) { - Daownload(res?.data?.url); + // Daownload(res?.data?.url); + message.success(res.message) exportRef.current.handleCancel() } else { message.error(res?.message); diff --git a/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx index 8102c09..fe2894c 100644 --- a/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx @@ -384,7 +384,8 @@ function PaySummaryReport() { }).then( (res) => { if (parseInt(res?.status) === 20000) { - Daownload(res?.data?.url); + // Daownload(res?.data?.url); + message.success(res.message) exportRef.current.handleCancel() } else { message.error(res?.message); diff --git a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx index 5e1e230..766e2f5 100644 --- a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx @@ -344,7 +344,8 @@ function PdaStat() { }).then( (res) => { if (parseInt(res?.status) === 20000) { - Daownload(res?.data?.url); + // Daownload(res?.data?.url); + message.success(res.message) exportRef.current.handleCancel() } else { message.error(res?.message); diff --git a/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx index 9989047..9c9dc8a 100644 --- a/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx @@ -349,7 +349,8 @@ function PreOrderReport() { }).then( (res) => { if (parseInt(res?.status) === 20000) { - Daownload(res?.data?.url); + // Daownload(res?.data?.url); + message.success(res.message) exportRef.current.handleCancel() } else { message.error(res?.message); diff --git a/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx b/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx index a3b4f8f..e2b2424 100644 --- a/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx +++ b/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx @@ -284,11 +284,11 @@ function PayRecordTotal(props) { const handleExport = (start, end) => { if (resultData.list?.length > 0) { let { pn, page_size, ...params } = defaultParams; - ajax.getPayRecordTotalListExport(params).then( + ajax.getPayRecordTotalListExport({...params, start: start, end: end}).then( (res) => { if (parseInt(res?.status) === 20000) { //window.location.href = res.data?.url - window.open(res.data?.url) + // window.open(res.data?.url) message.success(res?.message); exportRef.current.handleCancel() } else { diff --git a/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx b/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx index 920b3cf..f509610 100644 --- a/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx +++ b/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx @@ -422,7 +422,8 @@ function PayRepeat() { }).then( (res) => { if (parseInt(res?.status) === 20000) { - Daownload(res?.data?.url); + // Daownload(res?.data?.url); + message.success(res?.message); exportRef.current.handleCancel() } else { message.error(res?.message); diff --git a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx index 97e6618..e678a2d 100644 --- a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx +++ b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx @@ -927,7 +927,8 @@ function CollectorWorkStat(props) { end: end } ajax.specialExport(data).then(res => { - window.open(res.data.url) + // window.open(res.data.url) + message.success(res?.message); resolved() }).catch(err => { rejected(err) diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx index 228046e..f3b3b45 100644 --- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx +++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx @@ -252,7 +252,8 @@ function Road(props) { const handleExport = (start, end) => { ajax.deviceDimensionExport({...form, start: start, end: end}).then(e => { if (e.status == 20000) { - window.open(e.data.url) + // window.open(e.data.url) + message.success(res?.message); exportRef.current.handleCancel() } else { exportRef.current.handleError() diff --git a/src/pages/InRoadMgm/EquipmentOpe/faultReport/loadable.jsx b/src/pages/InRoadMgm/EquipmentOpe/faultReport/loadable.jsx index b9c7960..e4ea6cf 100644 --- a/src/pages/InRoadMgm/EquipmentOpe/faultReport/loadable.jsx +++ b/src/pages/InRoadMgm/EquipmentOpe/faultReport/loadable.jsx @@ -70,7 +70,8 @@ function faultReport(props) { end: end } ajax.getFaultReportExport(data).then(res => { - window.open(res.data.export_url) + // window.open(res.data.export_url) + message.success(res?.message); resolved() }).catch(err => { rejected(err) diff --git a/src/pages/InRoadMgm/EquipmentOpe/patrolStatistics/loadable.jsx b/src/pages/InRoadMgm/EquipmentOpe/patrolStatistics/loadable.jsx index 0cc42c8..f49ca96 100644 --- a/src/pages/InRoadMgm/EquipmentOpe/patrolStatistics/loadable.jsx +++ b/src/pages/InRoadMgm/EquipmentOpe/patrolStatistics/loadable.jsx @@ -70,7 +70,8 @@ function patrolStatistics(props) { end: end } ajax.getBerthWarningListExport(data).then(res => { - window.open(res.data.export_url) + // window.open(res.data.export_url) + message.success(res?.message); resolved() }).catch(err => { rejected(err) diff --git a/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerAttendance/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerAttendance/loadable.jsx index a33736f..a9b0c95 100644 --- a/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerAttendance/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerAttendance/loadable.jsx @@ -332,7 +332,8 @@ function WorkerAttendance (props) { end: end } ajax.attendanceExport(data).then(res => { - window.open(res.data.url) + // window.open(res.data.url) + message.success(res?.message); resolved() }).catch(err => { rejected() diff --git a/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx index 3d3e687..ed156a7 100644 --- a/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx @@ -292,7 +292,8 @@ function WorkerSchedule(props) { end: end } ajax.scheduleExport(data).then(res => { - window.open(res.data.url) + // window.open(res.data.url) + message.success(res?.message); resolved() }).catch(err => { rejected() diff --git a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx index ff3a1e8..aeb8d6c 100644 --- a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx @@ -293,7 +293,8 @@ function SalesStat(props) { end: end } ajax.salesExport(data).then(res => { - window.open(res.data.url) + // window.open(res.data.url) + message.success(res.message) setExportVisible(false) }) } @@ -304,7 +305,8 @@ function SalesStat(props) { export_type: "all" } ajax.salesExport(data).then(res => { - window.open(res.data.url) + // window.open(res.data.url) + message.success(res.message) setExportVisible(false) }) } diff --git a/src/pages/InRoadMgm/PersonMgm/Performance/WorkerStat/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Performance/WorkerStat/loadable.jsx index 0143dee..36605eb 100644 --- a/src/pages/InRoadMgm/PersonMgm/Performance/WorkerStat/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/Performance/WorkerStat/loadable.jsx @@ -149,7 +149,8 @@ function WorkerStat(props) { end: end } ajax.statExport(data).then(res => { - window.open(res.data.url) + // window.open(res.data.url) + message.success(res.message) resolved() }).catch(err => { rejected() diff --git a/src/pages/InRoadMgm/PersonMgm/ReportMsg/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/ReportMsg/loadable.jsx index 46f82f2..bfd9a81 100644 --- a/src/pages/InRoadMgm/PersonMgm/ReportMsg/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/ReportMsg/loadable.jsx @@ -65,7 +65,8 @@ function ReportMsg(props) { end: end } ajax.getReportExport(data).then(res => { - window.open(res.data.url) + // window.open(res.data.url) + message.success(res.message) resolved() }).catch(err => { rejected(err) diff --git a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx index 19bf63d..212c023 100644 --- a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx +++ b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx @@ -445,10 +445,11 @@ function RoadConf() { .exportRoadList({...result, start: start, end: end}) .then((res) => { if (res.status === 20000) { - const link = document.createElement("a"); - link.href = res.data.export_url; - link.target = "_blank"; // 打开新页面 - link.click(); + // const link = document.createElement("a"); + // link.href = res.data.export_url; + // link.target = "_blank"; // 打开新页面 + // link.click(); + message.success(res.message) resolved() } }) diff --git a/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx b/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx index e08cb6c..6c3ec29 100644 --- a/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx +++ b/src/pages/OperationCenter/CustomerServieMgm/CallbackSuggestion/loadable.jsx @@ -523,7 +523,8 @@ function CallbackSuggestion(props) { end: end } ajax.exportDataList(data).then(res => { - window.open(res.data.export_url) + // window.open(res.data.export_url) + message.success(res.message) exportRef.current.handleCancel() }).catch(err => { exportRef.current.handleError() diff --git a/src/pages/OperationCenter/CustomerServieMgm/ComplainManage/loadable.jsx b/src/pages/OperationCenter/CustomerServieMgm/ComplainManage/loadable.jsx index 1325cd3..4bda681 100644 --- a/src/pages/OperationCenter/CustomerServieMgm/ComplainManage/loadable.jsx +++ b/src/pages/OperationCenter/CustomerServieMgm/ComplainManage/loadable.jsx @@ -245,7 +245,8 @@ function ComplainManage(props) { let data = { ...holdData, ...pageInfo, start: start, end: end }; ajax.getComplainExport(data).then((res) => { if (res?.data?.url) { - window.open(res.data.url); + // window.open(res.data.url); + message.success(res.message) exportRef.current.handleCancel() } else { message.error("导出异常"); diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/loadable.jsx b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/loadable.jsx index 1fc51fc..79b06e9 100644 --- a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffDetail/loadable.jsx @@ -251,7 +251,8 @@ function WriteOffDetail() { end: end } ajax.handleOffExport(data).then(res => { - window.open(res.data.url) + // window.open(res.data.url) + message.success(res.message) exportRef.current.handleCancel() }).catch(err => { exportRef.current.handleError() diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx index 9b845d8..a19094b 100644 --- a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx @@ -154,7 +154,8 @@ function WriteOffStat(props) { end: end } ajax.handleCountExport(data).then(res => { - window.open(res.data.url) + // window.open(res.data.url) + message.success(res.message) exportRef.current.handleCancel() }).catch(err => { exportRef.current.handleError() diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx index 997e48b..e490cb0 100644 --- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx +++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx @@ -300,7 +300,8 @@ function ParkingCardOrder() { } ajax.exportOrder({...formData, start: start, end: end}).then(res => { if (parseInt(res?.status) === 20000){ - Donwload(res.data?.url) + // Donwload(res.data?.url) + message.success(res.message) exportRef.current.handleCancel() } else { diff --git a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredOrder/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredOrder/loadable.jsx index cc9bf43..f235b31 100644 --- a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredOrder/loadable.jsx +++ b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredOrder/loadable.jsx @@ -77,7 +77,8 @@ function StaggeredOrder(props) { end: end } ajax.getExportOrder(data).then(res => { - window.open(res.data.url) + // window.open(res.data.url) + message.success(res.message) exportRef.current.handleCancel() }).catch(err => { exportRef.current.handleError() diff --git a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredStat/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredStat/loadable.jsx index 5e04951..90eb0be 100644 --- a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredStat/loadable.jsx +++ b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredStat/loadable.jsx @@ -58,7 +58,8 @@ function StaggeredStat(props) { end: end } ajax.getStaggeredStatExport(data).then(res => { - window.open(res.data.url) + // window.open(res.data.url) + message.success(res.message) exportRef.current.handleCancel() }).catch(err => { exportRef.current.handleError() diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx index bde8fc4..35eebf5 100644 --- a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx +++ b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx @@ -1,5 +1,5 @@ import React, { useState, useRef, useEffect } from "react"; -import { ResultFlowResult } from "@/components" +import { ResultFlowResult, ExportBtnNew } from "@/components" import { Button, Table, message, Pagination, Input, Modal, Image, DatePicker, Space } from 'antd' import { pageSizeOptions @@ -27,6 +27,7 @@ function LiftUpPoleRecord(props) { pn: 1, page_size: Number(pageSizeOptions[0]), // 每页条数 } + const exportRef = useRef(null) const [formData, setFormData] = useState(parameter) const [lastFormData, setLastFormData] = useState(formData) const lastFormDataRef = useRef(formData) @@ -198,15 +199,20 @@ function LiftUpPoleRecord(props) { getData({...data, pn: 1}) } //导出 - const salesData = () => { + const salesData = (start, end) => { let data = { - ...formData + ...formData, + start: start, + end: end } ajax.poleExport(data).then(res => { if (res.status == 20000) { - window.open(res.data.url || res.data.export_url) + // window.open(res.data.url || res.data.export_url) + message.success(res.message) + exportRef.current.handleCancel() } else { message.error(res.message) + exportRef.current.handleError() } }) } @@ -276,7 +282,19 @@ function LiftUpPoleRecord(props) {
共检索到{resultData.total_records}条结果
- + {/* */} + 导出} + modalType="noImg" + ref={exportRef} + totalRecords={resultData.total_records} + imgno={false} + postdata={{ + formData: formData + }} + isTableModule={true} + onOk={salesData} + />
{ // getData() // }, []) + + const exportOk = (start, end, type, isAll) => { + let data = { + ...formData, + start: start, + end: end, + export_type: isAll == 1 ? 'all' : '' + } + ajax.zombieExport(data).then(res => { + if (res.status == 20000) { + // window.open(res.data?.url || res.data?.export_url) + message.success(res.message) + exportRef.current.handleCancel() + } else { + message.error(res.message) + exportRef.current.handleError() + } + }) + } + function handleOk() { let data = { ...formData, @@ -533,10 +554,22 @@ function ZombieCarCleanRecord(props) {
共检索到{resultData.total_records}条结果 -
-   +   */} + 导出} + modalType="noImg" + ref={exportRef} + totalRecords={resultData.total_records} + imgno={false} + postdata={{ + formData: formData + }} + isTableModule={true} + onOk={exportOk} + /> diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx index 8b39a70..114c627 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx @@ -412,7 +412,8 @@ function OutSegment() { }).then( (res) => { if (res) { - window.open(res.data.export_url) + // window.open(res.data.export_url) + message.success(res.message) tableRef.current.handleCancel() } else { message.error(res?.message); From 70d0ffcb44d86dfa33cadf2a46ff2524cceaeb48 Mon Sep 17 00:00:00 2001 From: chenglb Date: Tue, 23 Jan 2024 11:34:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E8=AF=B7=E6=B1=82=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E9=87=8C=E9=9D=A2=E6=9C=89=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/InroadMgm/InRoadOverview/index.js | 4 ++-- src/services/OutRoadMgm/OutParkingArrearsOrders.js | 2 +- src/services/OutRoadMgm/OutParkingRecordInquiry.js | 2 +- src/services/OutRoadMgm/ZombieCarMgm.js | 2 +- src/services/search.js | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/services/InroadMgm/InRoadOverview/index.js b/src/services/InroadMgm/InRoadOverview/index.js index dd069a0..38e7b7b 100644 --- a/src/services/InroadMgm/InRoadOverview/index.js +++ b/src/services/InroadMgm/InRoadOverview/index.js @@ -21,7 +21,7 @@ const getIncomeTop5 = (params) => { // /api/bpm/home/parking_records_top5 概览-停车记录top5 const getParkingRecordTop5 = (params) => { return ajax({ - url: "/api/bpm/home/parking_records_top5 ", + url: "/api/bpm/home/parking_records_top5", type: "get", data: params, }); @@ -36,7 +36,7 @@ const getParkingPayTop5 = (params) => { // /api/bpm/home/parking_income 概览-停车收入概览 const getParkingIncome = (params) => { return ajax({ - url: "/api/bpm/home/parking_income ", + url: "/api/bpm/home/parking_income", type: "get", data: params, }); diff --git a/src/services/OutRoadMgm/OutParkingArrearsOrders.js b/src/services/OutRoadMgm/OutParkingArrearsOrders.js index 4593772..226c9cf 100644 --- a/src/services/OutRoadMgm/OutParkingArrearsOrders.js +++ b/src/services/OutRoadMgm/OutParkingArrearsOrders.js @@ -2,7 +2,7 @@ import ajax from "@/config/ajax"; // 停车记录查询/欠费订单-列表 const getOutParkingArrearsList = (params) => { return ajax({ - url: "/api/orp/business/get_record_arrears_list ", + url: "/api/orp/business/get_record_arrears_list", type: "post", data: params, }); diff --git a/src/services/OutRoadMgm/OutParkingRecordInquiry.js b/src/services/OutRoadMgm/OutParkingRecordInquiry.js index fef3d38..80bee95 100644 --- a/src/services/OutRoadMgm/OutParkingRecordInquiry.js +++ b/src/services/OutRoadMgm/OutParkingRecordInquiry.js @@ -2,7 +2,7 @@ import ajax from "@/config/ajax"; ///api/orp/business/get_record_list 停车记录查询/欠费订单-列表 const getOutParkingRecordList = (params) => { return ajax({ - url: "/api/orp/business/get_record_list ", + url: "/api/orp/business/get_record_list", type: "post", data: params, }); diff --git a/src/services/OutRoadMgm/ZombieCarMgm.js b/src/services/OutRoadMgm/ZombieCarMgm.js index 4e7ad98..18181aa 100644 --- a/src/services/OutRoadMgm/ZombieCarMgm.js +++ b/src/services/OutRoadMgm/ZombieCarMgm.js @@ -26,7 +26,7 @@ const showStopList = (params) => { ///api/bpm/offroad/show_pay_list 查看支付记录 const showPayList = (params) => { return ajax({ - url: "/api/bpm/offroad/show_pay_list ", + url: "/api/bpm/offroad/show_pay_list", type: "post", data: params, }); diff --git a/src/services/search.js b/src/services/search.js index e4c73e0..efa4f98 100644 --- a/src/services/search.js +++ b/src/services/search.js @@ -342,7 +342,7 @@ const monitorAdd = (params) => { }; const monitorOutAdd = (params) => { return ajax({ - url: "/api/orp/nvr/add_monitor_device ", + url: "/api/orp/nvr/add_monitor_device", type: "post", data: params, }); From ed00aaa81d9fbbb2ce2c1425db2baea4b677b096 Mon Sep 17 00:00:00 2001 From: wanghx Date: Tue, 23 Jan 2024 14:31:14 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix():=20=E7=BB=9F=E4=B8=80=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=EF=BC=8C=E6=97=A0=E6=95=B0=E6=8D=AE=E6=97=B6=E9=9A=90?= =?UTF-8?q?=E8=97=8Fbutton?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Export/ExportBtnNew/index.jsx | 10 +++++----- .../InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/Export/ExportBtnNew/index.jsx b/src/components/Export/ExportBtnNew/index.jsx index ea4d70b..6843173 100644 --- a/src/components/Export/ExportBtnNew/index.jsx +++ b/src/components/Export/ExportBtnNew/index.jsx @@ -168,11 +168,11 @@ const ExportBtn = forwardRef((props, ref) => { } //当前页 else if (checkedType == 1) { - const { pn, length, page_size } = postdata.formData + const { pn, length, page_size, size } = postdata.formData if (isTableModule) { - onOk((pn - 1) * (length || page_size) + 1, pn * (length || page_size)) + onOk((pn - 1) * (length || page_size || size) + 1, pn * (length || page_size || size)) } else { - startExport((pn - 1) * (length || page_size) + 1, pn * (length || page_size) , exportType == "hasImg" ? 1 : 0) + startExport((pn - 1) * (length || page_size || size) + 1, pn * (length || page_size || size) , exportType == "hasImg" ? 1 : 0) } } //全部 @@ -340,7 +340,7 @@ const ExportBtn = forwardRef((props, ref) => { handleError })); - return ( + return totalRecords ? <>
{ setIsExportOpen(true) @@ -487,7 +487,7 @@ const ExportBtn = forwardRef((props, ref) => { )}
- ); + : <> }) export default ExportBtn; diff --git a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx index f3b3b45..5480d4b 100644 --- a/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx +++ b/src/pages/InRoadMgm/EquipmentMgm/EquipmentStatus/Device/index.jsx @@ -250,7 +250,7 @@ function Road(props) { } const handleExport = (start, end) => { - ajax.deviceDimensionExport({...form, start: start, end: end}).then(e => { + ajax.deviceDimensionExport({...formData, start: start, end: end}).then(e => { if (e.status == 20000) { // window.open(e.data.url) message.success(res?.message); From e62af9d941858c6643f3724815b5a63b5a5cc6b8 Mon Sep 17 00:00:00 2001 From: guoxin Date: Tue, 23 Jan 2024 15:11:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E8=AF=B7=E6=B1=82=E7=8A=B6=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableModule/index.jsx | 55 +++++++++++++--------- .../OrderInquiry/ParkingOrderInquiry/index.jsx | 4 +- .../PersonMgm/Performance/SalesStat/loadable.jsx | 31 +++--------- .../PersonMgm/Performance/WorkerStat/loadable.jsx | 12 ++--- .../RecordInquiry/ArrearsEtcInquiries/loadable.jsx | 3 ++ .../RecordInquiry/ArrearsInquiries/loadable.jsx | 3 ++ .../RecordInquiry/ArrearsRecordTotal/loadable.jsx | 5 ++ .../DisabledCarParkRecordTotal/loadable.jsx | 3 ++ .../RecordInquiry/EntryExitOptPDA/loadable.jsx | 5 +- .../RecordInquiry/ParkRecordTotal/loadable.jsx | 11 +++++ .../RecordInquiry/PayRecordQuery/loadable.jsx | 4 ++ .../RecordInquiry/PreOrderRecord/loadable.jsx | 4 ++ .../RecordInquiry/UnRecordOrder/loadable.jsx | 10 ++++ src/pages/NewEnergy/ChargeStationMgm/loadable.jsx | 1 + .../RecordsInquiry/Appointment/loadable.jsx | 1 + .../OffPeakShareRecords/ShareParkMgm/loadable.jsx | 3 +- .../OperationCenter/CarMgm/CarInfo/loadable.jsx | 1 + .../OperationCenter/UserMgm/UserInfo/loadable.jsx | 1 + .../OutParkingArrearsOrders/loadable.jsx | 2 + .../OutParkingRecordInquiry/loadable.jsx | 2 + .../OutSegmentMgm/ChargeRulesMgm/loadable.jsx | 1 + .../OutSegmentMgm/ZombieCarMgm/loadable.jsx | 2 + 22 files changed, 109 insertions(+), 55 deletions(-) diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx index 500abbd..ebe90bf 100644 --- a/src/components/TableModule/index.jsx +++ b/src/components/TableModule/index.jsx @@ -92,9 +92,10 @@ const TableModule = forwardRef((props, ref) => { maxLength: 50, showCount: true, }; - const areaName = formSearch.filter((item) => item.type === "TreeSelect")[0]?.name || null; - // console.log(areaName); + const roadNameType = formSearch.filter((item) => item.type === "SearchSelect")[0]?.roadName || null; + const areaNameType = formSearch.filter((item) => item.type === "TreeSelect")[0]?.areaName || null; + const operatorNameType = formSearch.filter((item) => item.type === "Select")[0]?.operatorName || null; const [loading, setLoading] = useState(false); //区域的下拉数据 const [areaList, setAreaList] = useState([]); @@ -567,6 +568,7 @@ const TableModule = forwardRef((props, ref) => { } }; + //查询部分 function renderSearch(params) { return ( @@ -598,6 +600,7 @@ const TableModule = forwardRef((props, ref) => { > {formSearch.map((item) => { + let children = null; switch (item.type) { case "Input": @@ -886,6 +889,8 @@ const TableModule = forwardRef((props, ref) => { ajax.getAllOperator().then((res) => { if (res.status === 20000) { setOperatorList(res.data); + }else{ + message.error(res.message) } }); } @@ -1006,32 +1011,40 @@ const TableModule = forwardRef((props, ref) => { }, [pageData]); useEffect(() => { - getAllOperator(); - }, []); + if(operatorNameType===1){ + getAllOperator(); + } + }, [operatorNameType]); useEffect(() => { - // 也许多发的这一次请求,就是压垮服务器的最后一根稻草 - if(formSearch.find(item=> item.type == 'TreeSelect')){ + if (areaNameType === 1) { ajax - .getAreaTree() - .then((res) => { - if (res.status === 20000) { - setAreaList(res.data); - } - }) - .catch((err) => { - console.error(err); - }); + .getAreaTree() + .then((res) => { + if (res.status === 20000) { + setAreaList(res.data); + } else { + res.message(res.data) + } + }) + .catch((err) => { + console.error(err); + }); } - }, [formSearch]); + }, [areaNameType]); const [getRoadList, setGetRoadList] = useState([]) - useEffect(() => { - ajax.getNewRoadSearch().then((res) => { - setGetRoadList(res.data); - }) - }, []) + if (roadNameType === 1) { + ajax.getNewRoadSearch().then((res) => { + if (res.status === 20000) { + setGetRoadList(res.data); + } else { + message.error(res.message) + } + }) + } + }, [roadNameType]) return (
diff --git a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx index 8e3494e..a6293c6 100644 --- a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx @@ -299,12 +299,14 @@ function ParkingOrderInquiry(props) { name: "region", type: "TreeSelect", label: "区域", + areaName:1 }, {//2 name: "operator", type: "Select", label: "商户名称", options: dictionary.MerchantName, + operatorNameType:1 }, {//3 name: "road", @@ -857,7 +859,7 @@ function ParkingOrderInquiry(props) {
停车订单:{ycddData.park_record_id}
-
车场详情
+
车厂详情
平台商户
{ycddData.payment_operator_name}
diff --git a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx index aeb8d6c..58ad259 100644 --- a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx @@ -23,8 +23,8 @@ function SalesStat(props) { }) const parameter = { name: '',//登录名 - start: moment().format('YYYY-MM-DD 00:00:00'), - end: moment().format("YYYY-MM-DD 23:59:59"), + start_time: moment().format('YYYY-MM-DD 00:00:00'), + end_time: moment().format("YYYY-MM-DD 23:59:59"), pn: 1, length: Number(pageSizeOptions[0]), // 每页条数 } @@ -58,8 +58,8 @@ function SalesStat(props) { setGetTime(v) setFormData({ ...formData, - start: v.startDateTime, - end: v.endDateTime, + start_time: v.startDateTime, + end_time: v.endDateTime, time: v.time }) setTabData({ @@ -249,15 +249,6 @@ function SalesStat(props) { getData(Object.assign({}, formData, { pn: pn, length: length })) } } - const changeTabPn = (pn, length) => { - if (lastTotalData.length === length) { - setTabData(Object.assign({}, tabData, { pn: pn, length: length })) - setLastTotalData(Object.assign({}, lastTotalData, { pn: pn, length: length })) - lastTabDataRef.current = Object.assign({}, lastTotalData, { pn: pn, length: length }) - getDetailData(Object.assign({}, tabData, { pn: pn, length: length, ...getDetailId })) - } - } - console.log(tabData); //切换每页条数 const changeLength = (pn, length) => { setFormData(Object.assign({}, formData, { pn: 1, length: length })) @@ -265,12 +256,6 @@ function SalesStat(props) { lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, length: length }) getData(Object.assign({}, formData, { pn: 1, length: length })) } - const changeTabLength = (pn, length) => { - setTabData(Object.assign({}, tabData, { pn: 1, length: length })) - setLastTotalData(Object.assign({}, lastTotalData, { pn: 1, length: length })) - lastTabDataRef.current = Object.assign({}, lastTotalData, { pn: 1, length: length }) - getDetailData(Object.assign({}, tabData, { pn: 1, length: length })) - } //检索数据 const getSearchData = (data = formData) => { setFormData(Object.assign({}, formData, { pn: 1 })) @@ -281,10 +266,6 @@ function SalesStat(props) { const exportModal = () => { setExportVisible(false) } - //导出 - const salesData = () => { - setExportVisible(true) - } const exportNow = (start, end) => { let data = { ...formData, @@ -358,8 +339,8 @@ const [getTextValue,setGetTextValue]=useState({})
{ setFormData({ ...formData, - start: v.startDateTime, - end: v.endDateTime, + start_time: v.startDateTime, + end_time: v.endDateTime, time: v.time }) } @@ -238,8 +238,8 @@ function WorkerStat(props) {
{ if (res.status === 20000) { setPayRecord(res.data.list); + } else { + message.error(res.message) } }); } @@ -747,6 +752,8 @@ function ParkRecordTotal() { ajax.getRefundRecord({ park_id }).then((res) => { if (res.status === 20000) { setRefundRecord(res.data.list); + } else { + message.error(res.message) } }); } @@ -755,6 +762,8 @@ function ParkRecordTotal() { ajax.getOperateRecord({ park_record_id: park_id }).then((res) => { if (res.status === 20000) { setOperatorRecord(res.data.list); + } else { + message.error(res.message) } }); } @@ -765,6 +774,8 @@ function ParkRecordTotal() { // res.data.list.map(res=>{ setHistoryProgressRecord(res.data.list); // }) + } else { + message.error(res.message) } }); } diff --git a/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx index 77a114e..2c95d37 100644 --- a/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx @@ -105,6 +105,7 @@ function ParkRecordTotal() { type: "SearchSelect", label: "路段名称", placeholder: "请输入路段名称", + roadName:1 }, { name: "plate", @@ -134,6 +135,7 @@ function ParkRecordTotal() { name: "operator", type: "Select", label: "所属商户", + operatorNameType:1 }, { name: "berth_id", @@ -169,6 +171,8 @@ function ParkRecordTotal() { if (res.status === 20000) { setTableData(res.data.list); setTotal(res.data.total); + } else { + message.error(res.message) } }); } diff --git a/src/pages/InRoadMgm/RecordInquiry/PreOrderRecord/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/PreOrderRecord/loadable.jsx index f4e1451..8e1c475 100644 --- a/src/pages/InRoadMgm/RecordInquiry/PreOrderRecord/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/PreOrderRecord/loadable.jsx @@ -143,6 +143,8 @@ function PreOrderRecord() { if (res.status === 20000) { setTableData(res.data.list); setTotal(res.data.total); + } else { + message.error(res.message) } }); } @@ -151,6 +153,8 @@ function PreOrderRecord() { ajax.getAllOperator().then((res) => { if (res.status === 20000) { setOperatorList(res.data); + } else { + message.error(res.message) } }); } diff --git a/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx index e83f942..3e4c1ac 100644 --- a/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx @@ -127,6 +127,7 @@ function PreOrderRecord() { type: "TreeSelect", label: "区域", defaultValue: ["0"], + areaName:1 //options: [], }, { @@ -135,6 +136,7 @@ function PreOrderRecord() { label: "商户名称", defaultValue: "0", placeholder: "请选择商户名称", + operatorNameType:1 }, { name: "road", @@ -237,6 +239,8 @@ function PreOrderRecord() { if (res.status === 20000) { setTotal(res.data.total); setTableData(res.data.list); + } else { + message.error(res.message) } }) .catch((err) => { @@ -278,6 +282,8 @@ function EffectCheckBox(props) { if (res.status === 20000) { setTollmanList(res.data); setEffectiveModal(true); + } else { + message.error(res.message) } }) .catch((err) => { @@ -290,6 +296,8 @@ function EffectCheckBox(props) { message.success(res.message); setChecked(!checked); getData() + } else { + message.error(res.message) } }, (reject) => { @@ -306,6 +314,8 @@ function EffectCheckBox(props) { setChecked(!checked); setEffectiveModal(false); getData() + } else { + message.error(res.message) } }, (reject) => { diff --git a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx index 7155c1e..06d3962 100644 --- a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx +++ b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx @@ -151,6 +151,7 @@ function Appointment() { label: "商户名称", defaultValue: "0", placeholder: "请选择商户名称", + operatorNameType:1 }, ]; diff --git a/src/pages/NewEnergy/RecordsInquiry/Appointment/loadable.jsx b/src/pages/NewEnergy/RecordsInquiry/Appointment/loadable.jsx index e19e26e..6f90b1c 100644 --- a/src/pages/NewEnergy/RecordsInquiry/Appointment/loadable.jsx +++ b/src/pages/NewEnergy/RecordsInquiry/Appointment/loadable.jsx @@ -149,6 +149,7 @@ function Appointment() { label: "商户名称", defaultValue: "0", placeholder: "请选择商户名称", + operatorNameType:1 }, { name: "pre_time", diff --git a/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx b/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx index 2d767de..fcb3605 100644 --- a/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx +++ b/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx @@ -68,7 +68,8 @@ function ShareParkMgm() { type: "Select", label: "商户名称", name: "merchantName", - placeholder:"请选择商户名称" + placeholder:"请选择商户名称", + operatorNameType:1 }, { type: "SearchSelect", diff --git a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx index 989b198..5fae3c6 100644 --- a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx +++ b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx @@ -343,6 +343,7 @@ function CarInfo() { name: "region", type: "TreeSelect", label: "区域", + areaName:1 }, {//2 name: "operator", diff --git a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx index 5a88a10..e07db4f 100644 --- a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx +++ b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx @@ -486,6 +486,7 @@ function UserInfo() { name: "region", type: "TreeSelect", label: "区域", + areaName:1 }, {//2 name: "operator", diff --git a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx index de5cd10..cf190e6 100644 --- a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx +++ b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx @@ -89,12 +89,14 @@ function OutParkingArrearsOrders() { name: "region", type: "TreeSelect", label: "区域", + areaName:1 }, { name: "operator", type: "Select", label: "商户名称", placeholder: "请选择商户名称", + operatorNameType:1 }, { name: "parking_lot", diff --git a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx index 9951b42..f42a6a6 100644 --- a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx +++ b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx @@ -135,12 +135,14 @@ function OutParkingRecordInquiry() { name: "region", type: "TreeSelect", label: "区域", + areaName:1 }, { name: "operator", type: "Select", label: "商户名称", placeholder: "请选择商户名称", + operatorNameType:1 }, { name: "road", diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx index 6e0bf8d..ba65ac7 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx @@ -124,6 +124,7 @@ function ChargeRulesMgm() { type: "Select", label: "商户名称", placeholder: "请选择商户名称", + operatorNameType:1 }, ]; //搜索参数初始化 diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx index 75857f8..1c860f6 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx @@ -91,12 +91,14 @@ function ZombieCarMgm() { type: "TreeSelect", label: "区域", defaultValue: ['0'], + areaName:1 }, { name: "operator", type: "Select", label: "商户名称", placeholder: "请选择商户名称", + operatorNameType:1 }, { name: "road", From 700915ee00b066de219b53c8fa594fd6ef890b0e Mon Sep 17 00:00:00 2001 From: guoxin Date: Tue, 23 Jan 2024 15:18:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E8=AF=B7=E6=B1=82=E7=8A=B6=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx | 2 +- src/pages/InRoadMgm/RecordInquiry/ArrearsEtcInquiries/loadable.jsx | 2 +- src/pages/InRoadMgm/RecordInquiry/ArrearsInquiries/loadable.jsx | 2 +- src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx | 2 +- .../InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx | 2 +- src/pages/InRoadMgm/RecordInquiry/EntryExitOptPDA/loadable.jsx | 2 +- src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx | 2 +- src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx | 2 +- src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx | 2 +- src/pages/NewEnergy/ChargeStationMgm/loadable.jsx | 2 +- src/pages/NewEnergy/RecordsInquiry/Appointment/loadable.jsx | 2 +- src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx | 2 +- .../OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx | 2 +- .../OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx | 2 +- src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx | 2 +- src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx index a6293c6..46f0673 100644 --- a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx @@ -306,7 +306,7 @@ function ParkingOrderInquiry(props) { type: "Select", label: "商户名称", options: dictionary.MerchantName, - operatorNameType:1 + operatorName:1 }, {//3 name: "road", diff --git a/src/pages/InRoadMgm/RecordInquiry/ArrearsEtcInquiries/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ArrearsEtcInquiries/loadable.jsx index 0bd3b9e..028b18a 100644 --- a/src/pages/InRoadMgm/RecordInquiry/ArrearsEtcInquiries/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/ArrearsEtcInquiries/loadable.jsx @@ -105,7 +105,7 @@ function ArrearsEtcInquiries() { type: "Select", label: "商户名称", placeholder: "请输入商户名称", - operatorNameType:1 + operatorName:1 }, { name: "road", diff --git a/src/pages/InRoadMgm/RecordInquiry/ArrearsInquiries/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ArrearsInquiries/loadable.jsx index 64ff8e4..97d958d 100644 --- a/src/pages/InRoadMgm/RecordInquiry/ArrearsInquiries/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/ArrearsInquiries/loadable.jsx @@ -105,7 +105,7 @@ function ArrearsInquiries() { type: "Select", label: "商户名称", placeholder: "请输入商户名称", - operatorNameType:1 + operatorName:1 }, { name: "road", diff --git a/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx index beb4472..412886b 100644 --- a/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx @@ -80,7 +80,7 @@ function ArrearsRecordTotal() { type: "Select", label: "商户名称", placeholder: "请选择商户名称", - operatorNameType:1 + operatorName:1 }, { name: "road", diff --git a/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx index 4048762..1ade25e 100644 --- a/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx @@ -369,7 +369,7 @@ function DisabledCarParkRecordTotal() { label: "商户名称", defaultValue: "0", placeholder: "请选择商户名称", - operatorNameType:1 + operatorName:1 }, { name: "road", diff --git a/src/pages/InRoadMgm/RecordInquiry/EntryExitOptPDA/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/EntryExitOptPDA/loadable.jsx index a95133a..a59a355 100644 --- a/src/pages/InRoadMgm/RecordInquiry/EntryExitOptPDA/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/EntryExitOptPDA/loadable.jsx @@ -92,7 +92,7 @@ function EntryExitOptPDA() { label: "商户名称", name: "merchantName", placeholder:"请选择商户名称", - operatorNameType:1 + operatorName:1 }, { type: "Input", diff --git a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx index 233e30e..cc727df 100644 --- a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx @@ -297,7 +297,7 @@ function ParkRecordTotal() { label: "商户名称", defaultValue: "0", placeholder: "请选择商户名称", - operatorNameType:1 + operatorName:1 }, { name: "road", diff --git a/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx index 2c95d37..f0d9e8e 100644 --- a/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx @@ -135,7 +135,7 @@ function ParkRecordTotal() { name: "operator", type: "Select", label: "所属商户", - operatorNameType:1 + operatorName:1 }, { name: "berth_id", diff --git a/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx index 3e4c1ac..be47387 100644 --- a/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/UnRecordOrder/loadable.jsx @@ -136,7 +136,7 @@ function PreOrderRecord() { label: "商户名称", defaultValue: "0", placeholder: "请选择商户名称", - operatorNameType:1 + operatorName:1 }, { name: "road", diff --git a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx index 06d3962..7cf3ca6 100644 --- a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx +++ b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx @@ -151,7 +151,7 @@ function Appointment() { label: "商户名称", defaultValue: "0", placeholder: "请选择商户名称", - operatorNameType:1 + operatorName:1 }, ]; diff --git a/src/pages/NewEnergy/RecordsInquiry/Appointment/loadable.jsx b/src/pages/NewEnergy/RecordsInquiry/Appointment/loadable.jsx index 6f90b1c..f396561 100644 --- a/src/pages/NewEnergy/RecordsInquiry/Appointment/loadable.jsx +++ b/src/pages/NewEnergy/RecordsInquiry/Appointment/loadable.jsx @@ -149,7 +149,7 @@ function Appointment() { label: "商户名称", defaultValue: "0", placeholder: "请选择商户名称", - operatorNameType:1 + operatorName:1 }, { name: "pre_time", diff --git a/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx b/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx index fcb3605..aa75c76 100644 --- a/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx +++ b/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/loadable.jsx @@ -69,7 +69,7 @@ function ShareParkMgm() { label: "商户名称", name: "merchantName", placeholder:"请选择商户名称", - operatorNameType:1 + operatorName:1 }, { type: "SearchSelect", diff --git a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx index cf190e6..b44a4bd 100644 --- a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx +++ b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx @@ -96,7 +96,7 @@ function OutParkingArrearsOrders() { type: "Select", label: "商户名称", placeholder: "请选择商户名称", - operatorNameType:1 + operatorName:1 }, { name: "parking_lot", diff --git a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx index f42a6a6..c21cd9a 100644 --- a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx +++ b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx @@ -142,7 +142,7 @@ function OutParkingRecordInquiry() { type: "Select", label: "商户名称", placeholder: "请选择商户名称", - operatorNameType:1 + operatorName:1 }, { name: "road", diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx index ba65ac7..ef8c14b 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx @@ -124,7 +124,7 @@ function ChargeRulesMgm() { type: "Select", label: "商户名称", placeholder: "请选择商户名称", - operatorNameType:1 + operatorName:1 }, ]; //搜索参数初始化 diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx index 1c860f6..ff70e13 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/loadable.jsx @@ -98,7 +98,7 @@ function ZombieCarMgm() { type: "Select", label: "商户名称", placeholder: "请选择商户名称", - operatorNameType:1 + operatorName:1 }, { name: "road",