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

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

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

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}

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}

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}" }]}

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}" }]}

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,8 +642,6 @@ function ParkingCardMgm(props) {
             message.error('请选择销售渠道')
         } else if (checkData.original_price == '') {
             message.error('请输入原价')
-        } else if (checkData.discount_amount == '') {
-            message.error('请输入优惠金额')
         } 
         else {
             url(data).then((res) => {
@@ -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  ? 

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={[
               {