From a7930c054c2d6e820ba454b6e68be5d52559d879 Mon Sep 17 00:00:00 2001
From: chenqiang <chenqiang@yisa.com>
Date: Thu, 1 Feb 2024 08:48:52 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix():=20=E8=A7=A3=E5=86=B3=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EquipmentAly/EquipmentRunningStat/loadable.jsx                    | 4 +++-
 src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx   | 4 +++-
 src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx       | 4 ++--
 src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx  | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx b/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx
index 7f16a7d..dc674c9 100644
--- a/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx
@@ -712,7 +712,7 @@ function ExceptionParkReport() {
             <p>
               共查询到<span> {Data?.total || 0}</span>条数据
             </p>
-            {Data?.total && (
+            {Data?.total ? (
               <ExportBtnNew
                 children={
                   <Button className="export-btn" size="medium" type="primary">
@@ -732,6 +732,8 @@ function ExceptionParkReport() {
                 }}
                 imgno={false}
               />
+            ) : (
+              ""
             )}
           </div>
           <ResultFlow
diff --git a/src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx b/src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx
index 2190054..c6ddf8e 100644
--- a/src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx
@@ -603,7 +603,7 @@ function ParkingAly() {
             <p>
               共查询到<span> {Data?.total || 0}</span>条数据
             </p>
-            {Data?.total && (
+            {Data?.total ? (
               <ExportBtnNew
                 children={
                   <Button className="export-btn" size="medium" type="primary">
@@ -623,6 +623,8 @@ function ParkingAly() {
                 }}
                 imgno={false}
               />
+            ) : (
+              ""
             )}
           </div>
           <ResultFlow
diff --git a/src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx b/src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx
index d2379fc..3723d89 100644
--- a/src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx
@@ -986,7 +986,7 @@ function PayAly() {
             <p>
               共查询到<span> {Data?.total || 0}</span>条数据
             </p>
-            {Data?.total && (
+            {Data?.total ? (
               <ExportBtnNew
                 children={
                   <Button className="export-btn" size="medium" type="primary">
@@ -1003,7 +1003,7 @@ function PayAly() {
                 isTableModule={true}
                 onOk={ReportPaySummaryReport}
               />
-            )}
+            ):""}
           </div>
           <ResultFlow
             hasLoad={true}
diff --git a/src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx b/src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx
index c7a6744..03970ea 100644
--- a/src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx
@@ -809,7 +809,7 @@ function RegisterAly() {
             <p>
               共查询到<span> {Data?.total || 0}</span>条数据
             </p>
-            {Data?.total && (
+            {Data?.total ? (
               <ExportBtnNew
                 children={
                   <Button className="export-btn" size="medium" type="primary">
@@ -826,7 +826,7 @@ function RegisterAly() {
                 isTableModule={true}
                 onOk={ReportPaySummaryReport}
               />
-            )}
+            ):""}
           </div>
           <ResultFlow
             hasLoad={true}

From 51a6213cb9f23134df4cadd2b19ded44fbc9f2e7 Mon Sep 17 00:00:00 2001
From: xingjx <xingjx@yisa.com>
Date: Thu, 1 Feb 2024 14:56:16 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix():bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx
index d20e92e..f699344 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx
@@ -109,7 +109,7 @@ function EffectiveDetail(props) {
         </Descriptions.Item>
         <Descriptions.Item span={2}>
           <Checkbox.Group
-            defaultValue={[record.unitDelay ? 1 : -1, record.unitUp ? 2 : -1]}
+            defaultValue={[...record.unit_fee_type_group]}
             disabled
             options={[
               {

From 00df853ef3fac770e0f62e231e5d008e54c86f2e Mon Sep 17 00:00:00 2001
From: guoxin <guoxin@yisa.com>
Date: Thu, 1 Feb 2024 14:58:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx | 4 ++--
 src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx
index 4445df1..3fc8dbc 100644
--- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx
@@ -663,7 +663,7 @@ const FormModal = (props) => {
                   </div>
                   <div className="place">
                     <Form.Item
-                      name="disability_time"
+                      name="new_energy_time"
                       label="续停免费分钟"
                       className="yisa-label timeSearch"
                       rules={[{ required: true, message: "请输入${label}" }]}
@@ -712,7 +712,7 @@ const FormModal = (props) => {
                   </div>
                   <div className="place">
                     <Form.Item
-                      name="new_energy_time"
+                      name="disability_time"
                       label="续停免费分钟"
                       className="yisa-label timeSearch"
                       rules={[{ required: true, message: "请输入${label}" }]}
diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx
index 3b15d20..0087a3f 100644
--- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx
@@ -640,7 +640,7 @@ const FormModal = (props) => {
                 </div>
                 <div className="place">
                   <Form.Item
-                    name="disability_time"
+                    name="new_energy_time"
                     label="续停免费分钟"
                     className="yisa-label timeSearch"
                     rules={[{ required: true, message: "请输入${label}" }]}
@@ -688,7 +688,7 @@ const FormModal = (props) => {
                   </div>
                   <div className="place">
                     <Form.Item
-                      name="new_energy_time"
+                      name="disability_time"
                       label="续停免费分钟"
                       className="yisa-label timeSearch"
                       rules={[{ required: true, message: "请输入${label}" }]}

From 25a77c74710955d5dc808f7397a718d0999f7eed Mon Sep 17 00:00:00 2001
From: lisf <lisf@yisa.com>
Date: Thu, 1 Feb 2024 15:07:14 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat():=20=E4=BC=98=E6=83=A0=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx         | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
index 692ea2e..bca3c30 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
@@ -246,6 +246,8 @@ function ParkingCardMgm(props) {
         sale_end:"",
         card_num:'',
         text:"",
+        discount_amount:'',
+        original_price:''
         
     }
     //停车卡名称
@@ -640,9 +642,7 @@ function ParkingCardMgm(props) {
             message.error('请选择销售渠道')
         } else if (checkData.original_price == '') {
             message.error('请输入原价')
-        } else if (checkData.discount_amount == '') {
-            message.error('请输入优惠金额')
-        }
+        } 
         else {
             url(data).then((res) => {
                 if (res.status === 20000) {
@@ -1072,7 +1072,6 @@ function ParkingCardMgm(props) {
                         />
                 </div>
                 <div className="yisa-search ">
-                 <em style={{marginRight:'5px',marginLeft:'-13px',color:'red'}}>*</em>
                     <label>优惠金额</label>
                      <InputNumber
                         min={0}
@@ -1084,7 +1083,6 @@ function ParkingCardMgm(props) {
                         />
                 </div>
                 <div className="yisa-search ">
-                 <em style={{marginRight:'5px',marginLeft:'-13px',color:'red'}}>*</em>
                     <label>销售价格</label>
                      <InputNumber
                         value={checkData.original_price  && checkData.discount_amount  ?