Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0.git into develop

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")}
             />
           </div>
@@ -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)
   };
 
   //导出进度

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);

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);

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);

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);

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);

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);

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);

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 {

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);

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)

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()

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)

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)

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()

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()

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)
     })
   }

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()

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)

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()
           }
         })

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()

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("导出异常");

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()

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()

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 {

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()

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()

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) {
                 <div className="result">
                     <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
                     <div className="header-button">
-                        <Button type="primary" onClick={() => { salesData() }}>导出</Button>
+                        {/* <Button type="primary" onClick={() => { salesData() }}>导出</Button> */}
+                        <ExportBtnNew
+                            children={<Button className="export-btn" size='medium' type="primary">导出</Button>}
+                            modalType="noImg"
+                            ref={exportRef}
+                            totalRecords={resultData.total_records}
+                            imgno={false}
+                            postdata={{
+                                formData: formData
+                            }}
+                            isTableModule={true}
+                            onOk={salesData}
+                        />
                     </div>
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                         <Table

src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/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, Tabs, Form, Radio } from 'antd'
 import {
     pageSizeOptions
@@ -14,6 +14,7 @@ const { TabPane } = Tabs;
 const { RangePicker } = DatePicker;
 function ZombieCarCleanRecord(props) {
     const [ajaxLoading, setAjaxLoading] = useState(false)
+    const exportRef = useRef(null)
     const [resultData, setResultData] = useState({
         data: [],
         total_records: 0,
@@ -450,6 +451,26 @@ function ZombieCarCleanRecord(props) {
     // useEffect(() => {
     //     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) {
                 <div className="result">
                     <div className="result-info-row">
                          <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
-                        <div>
-                            <Button type="primary" className="yisa-btn" onClick={() => { setExportModal({ ...exportModal, visible: true }) }}>
+                        <div style={{display: "flex"}}>
+                            {/* <Button type="primary" className="yisa-btn" onClick={() => { setExportModal({ ...exportModal, visible: true }) }}>
                                 导出
-                            </Button>&emsp;
+                            </Button>&emsp; */}
+                            <ExportBtnNew
+                                children={<Button className="export-btn" size='medium' type="primary">导出</Button>}
+                                modalType="noImg"
+                                ref={exportRef}
+                                totalRecords={resultData.total_records}
+                                imgno={false}
+                                postdata={{
+                                    formData: formData
+                                }}
+                                isTableModule={true}
+                                onOk={exportOk}
+                            />
                             <Button type="primary" className="yisa-btn" disabled={true} onClick={() => { sameBtn() }}>
                                 同步
                             </Button>

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);