From 48fa43788cbaa65902af473bb42a87a3a8557d39 Mon Sep 17 00:00:00 2001
From: guoxin <guoxin@yisa.com>
Date: Tue, 2 Jan 2024 09:01:49 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=86=85bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessMgm/ChargeRules/EditModal.jsx          | 19 ++++++++------
 .../PersonMgm/AuditMgm/AuditCheck/loadable.jsx     |  6 +++--
 .../PersonMgm/MesNotification/loadable.jsx         |  5 +---
 .../PersonMgm/Performance/SalesStat/loadable.jsx   | 30 ++++++++++++++--------
 .../GeomagneticSignalMgm/loadable.jsx              | 12 ++++-----
 .../Staggered/StaggeredMgm/loadable.jsx            | 21 ++++++++-------
 6 files changed, 51 insertions(+), 42 deletions(-)

diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx
index 1968329..64262b5 100644
--- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx
@@ -246,15 +246,18 @@ const FormModal = (props) => {
   };
 
   useEffect(() => {
-    let newObj = { ...defaultData }
-    if (JSON.stringify(yisaData) != "{}") {
-      newObj = handelDate(yisaData, 2)
+    if(yisaData){
+      let newObj = { ...defaultData }
+      if (JSON.stringify(yisaData) != "{}") {
+        newObj = handelDate(yisaData, 2)
+      }
+      newObj.rules = newObj?.source?.rules
+      // delete newObj.source
+       //生成初始组件
+       init(newObj);
+       form.setFieldsValue(newObj);
     }
-    newObj.rules = newObj?.source?.rules
-    // delete newObj.source
-     //生成初始组件
-     init(newObj);
-     form.setFieldsValue(newObj);
+
   }, [yisaData]);
 
   useEffect(() => {
diff --git a/src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx
index 50a26a8..dbfbcc8 100644
--- a/src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/AuditMgm/AuditCheck/loadable.jsx
@@ -306,6 +306,7 @@ function AuditCheck() {
   function search(date) {
     console.log(date);
     let result = searchForm.getFieldsValue();
+    console.log(result);
     if (type === "1") {
       result = { ...result, ...reportTime, ...pageData };
     } else {
@@ -373,7 +374,8 @@ function AuditCheck() {
     operator_id: "0",
     report_time: "",
     type_id: "0",
-    road_name: ""
+    road_name: "",
+    status:-1
   };
   //查询部分
   function renderSearch(params) {
@@ -441,7 +443,7 @@ function AuditCheck() {
           </Col>
           <Col span={24}>
             <Form.Item label="所属路段" name="road_name">
-              <Input placeholder="请输入记录编号" {...inputParams} />
+              <Input placeholder="请输入所属路段" {...inputParams} />
             </Form.Item>
           </Col>
           <Col span={24}>
diff --git a/src/pages/InRoadMgm/PersonMgm/MesNotification/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/MesNotification/loadable.jsx
index ca20e52..c7c962c 100644
--- a/src/pages/InRoadMgm/PersonMgm/MesNotification/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/MesNotification/loadable.jsx
@@ -48,9 +48,6 @@ function MesNotification(props) {
         }
         return result;
     }
-    const sendModal = () => {
-        setSendVisible(false)
-    }
     //重置数据
     const getResetData = () => {
         setSendVisible(true)
@@ -308,7 +305,7 @@ function MesNotification(props) {
         </div>
         <Modal
             visible={sendVisible}
-            onCancel={sendModal}
+            onCancel={placeBtn}
             footer={null}
             title='发送短信'
             className="sendModal"
diff --git a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
index 88f58fc..b30a0cd 100644
--- a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
@@ -8,6 +8,7 @@ import moment from "moment";
 import "./index.scss";
 import { SearchOutlined } from '@ant-design/icons';
 import ajax from '@/services'
+import { useSetState } from "ahooks";
 
 
 function SalesStat(props) {
@@ -266,7 +267,7 @@ function SalesStat(props) {
   const exportNow = () => {
     let data = {
       ...formData,
-      export_type:""
+      export_type: ""
     }
     ajax.salesExport(data).then(res => {
       window.open(res.data.url)
@@ -274,10 +275,10 @@ function SalesStat(props) {
     })
   }
   const exportAll = () => {
-   
+
     let data = {
       ...formData,
-      export_type:"all"
+      export_type: "all"
     }
     ajax.salesExport(data).then(res => {
       window.open(res.data.url)
@@ -288,6 +289,7 @@ function SalesStat(props) {
   const revenueModal = () => {
     setRevenueVisible(false)
   }
+  const [textL, setTextL] = useState('')
   useEffect(() => {
     getData()
   }, [])
@@ -327,10 +329,10 @@ function SalesStat(props) {
             ]}
           />
           <div className="btnBox">
-            <Button type="primary" className="yisa-btn colorBtn"  onClick={() => { getSearchData() }}>
-            查询
+            <Button type="primary" className="yisa-btn colorBtn" onClick={() => { getSearchData() }}>
+              查询
             </Button>
-            
+
           </div>
         </div>
       </div>
@@ -339,8 +341,8 @@ function SalesStat(props) {
           <div className="result-info-row">
             <span className="font">共检索到<em>{resultData.total_records}</em>条结果</span>
             <Button type="primary" className="yisa-btn colorBtn" onClick={() => { salesData() }}>
-                导出
-              </Button>
+              导出
+            </Button>
           </div>
           <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
             <Table
@@ -388,7 +390,7 @@ function SalesStat(props) {
           }>《</div>
           {/* 外层做显示区域，里边元素滚动 */}
           <div className="list-view">
-            <div className="tab-top" style={{ transform: `translateX(${-getValue * 100}px)` }}>
+            <div className="tab-top" style={{ transform: `translateX(${- textL * 14 * getValue}px)` }}>
               {
                 getTabData &&
                 getTabData.map((item, index) => {
@@ -398,10 +400,16 @@ function SalesStat(props) {
             </div>
           </div>
           <div style={{ lineHeight: 4, marginLeft: 6 }}
-          className="curpoint"
+            className="curpoint"
             onClick={() => {
-              getValue < getTabData.length - 1 &&
+              if (getValue < getTabData.length - 1) {
                 setGetValue(getValue + 1)
+                let Arritem = getTabData.filter((item) => item.value == getValue + 1)[0]
+                setTextL(Arritem.text.length)
+                console.log(textL);
+                setCheckData(Arritem.children)
+                setGetTotal(Arritem.total_records)
+              }
             }
             }
           >》</div>
diff --git a/src/pages/InRoadMgm/RecordInquiry/GeomagneticSignalMgm/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/GeomagneticSignalMgm/loadable.jsx
index f33eb80..4f3bba2 100644
--- a/src/pages/InRoadMgm/RecordInquiry/GeomagneticSignalMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/GeomagneticSignalMgm/loadable.jsx
@@ -300,14 +300,14 @@ function GeomagneticSignalMgm() {
     },
     {
       title: "实付金额",
-      dataIndex: "actual_amount",
-      key: "actual_amount",
+      dataIndex: "paid_in_money",
+      key: "paid_in_money",
       align: "center",
     },
     {
       title: "支付类型",
-      dataIndex: "pay_road",
-      key: "pay_road",
+      dataIndex: "pay_type_name",
+      key: "pay_type_name",
       align: "center",
     },
     {
@@ -330,8 +330,8 @@ function GeomagneticSignalMgm() {
     },
     {
       title: "付款路段",
-      dataIndex: "road",
-      key: "road",
+      dataIndex: "pay_road",
+      key: "pay_road",
       align: "center",
     },
     {
diff --git a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
index ca8fe85..404c7b1 100644
--- a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx
@@ -95,7 +95,7 @@ function StaggeredMgm(props) {
     // };
     //物品类型
     const handleParkName = (v) => {
-        setFormData({ ...formData, road: v})
+        setFormData({ ...formData, road: v })
     }
     //商户名称
     const handleDeployType = (value) => {
@@ -396,10 +396,6 @@ function StaggeredMgm(props) {
     const placeSaveBtn = () => {
         let infoArr = [...getSaleMsg]
         infoArr.map((item, index) => {
-            if (item.week.length != []) {
-                item.week = item.week.join(',')
-            }
-
             let data = {
                 ...getCarMsg,
                 info: infoArr
@@ -412,11 +408,14 @@ function StaggeredMgm(props) {
                 message.error('请选择错峰日期')
             } else if (item?.start_time === '' || item?.end_time === '') {
                 message.error('请选择错峰时间')
-            }  else if (item?.num === '') {
+            } else if (item?.num === '') {
                 message.error('请输入错峰卡数量')
             } else if (item?.price === '') {
                 message.error('请输入销售价格')
             } else {
+                if (item.week.length != []) {
+                    item.week = item.week.join(',')
+                }
                 ajax.getAddStaggered(data).then(res => {
                     if (res.status === 20000) {
                         message.success(res.message)
@@ -567,13 +566,13 @@ function StaggeredMgm(props) {
                 </div>
                 <div className="timePicker yisa-search">
                     <div className="btnBox">
-                        <Button type="primary" className="yisa-btn colorBtn"  onClick={() => { getSearchData() }}>
-                        查询
+                        <Button type="primary" className="yisa-btn colorBtn" onClick={() => { getSearchData() }}>
+                            查询
                         </Button>
-                        <Button type="primary" className="yisa-btn colorReset"  onClick={() => { getResetData() }}>
+                        <Button type="primary" className="yisa-btn colorReset" onClick={() => { getResetData() }}>
                             重置
                         </Button>
-                        <Button type="primary" className="yisa-btn colorBtn"  onClick={() => { addData() }}>
+                        <Button type="primary" className="yisa-btn colorBtn" onClick={() => { addData() }}>
                             添加
                         </Button>
                     </div>
@@ -855,7 +854,7 @@ function StaggeredMgm(props) {
                                         <div className="redLogo">*</div>
                                         <label>错峰日期</label>
                                         <RangePicker
-                                             value={[moment(item.start_date), moment(item.end_date)]}
+                                            value={[moment(item.start_date), moment(item.end_date)]}
                                             style={{ width: 250, marginLeft: 20 }}
                                             onChange={(date, dateString) => handleChangeDate(
                                                 date, dateString, index