fix():bug修改

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss

@@ -173,9 +173,15 @@ $color-primary : var(--color-primary);
         .duration-left {
           width: 50%;
           margin-right: 20px;
+          .ant-tabs .ant-tabs-nav-wrap .ant-tabs-nav-list{
+            width: 100%;
+          }
         }
         .duration-right {
           width: 50%;
+          .ant-tabs .ant-tabs-nav-wrap .ant-tabs-nav-list{
+            width: 100%;
+          }
         }
       }
       .row-head {

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx

@@ -111,7 +111,7 @@ function ParkingAlyDuration() {
             //width: 200,
         },
         {
-            title: '利用率',
+            title: '周转次数（次）',
             dataIndex: 'area_rate',
             key: 'area_rate',
             width: 120,
@@ -964,7 +964,7 @@ function ParkingAlyDuration() {
                                             disabled: "true"
                                         },
                                         {
-                                            label: `利用率`,
+                                            label: `周转次数（次）`,
                                             key: '4',
                                             disabled: "true"
                                         },

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss

@@ -301,6 +301,9 @@ $color-primary : var(--color-primary);
       .overview-right {
         display: inline-block;
         width: 50%;
+        .ant-tabs .ant-tabs-nav-wrap .ant-tabs-nav-list{
+          width: 100%;
+        }
       }
 
       .row-head {

src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/index.scss

@@ -184,6 +184,9 @@ $color-primary : var(--color-primary);
         }
         .parkinglive-right {
           width: 50%;
+          .ant-tabs .ant-tabs-nav-wrap .ant-tabs-nav-list{
+            width: 100%;
+          }
         }
       }
       .row-head {

src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx

@@ -917,19 +917,19 @@ function ParkingOrderInquiry(props) {
                             ):null} */}
                 {
                     tabKeyChild == 1 ?
-                    <div style={{ height: '800px' }}>
-                        <TableModule
-                            columns={acdColums}
-                            tableData={resultData}
-                            formSearch={[ash[25], ash[0], ash[1], ash[2], ash[3], ash[18], ash[5], ash[12], ash[26], ash[29]]}
-                            total={total}
-                            initFormData={{ type: 1 }}
-                            rowKey={"order_id"}
-                            exportUrl={'/api/fin/order_search/arrears_order_export'}
-                            limitCon={limitCon}
-                            search={searchOther}
-                        /> 
-                        </div>: null
+                        <div style={{ height: '800px' }}>
+                            <TableModule
+                                columns={acdColums}
+                                tableData={resultData}
+                                formSearch={[ash[25], ash[0], ash[1], ash[2], ash[3], ash[18], ash[5], ash[12], ash[26], ash[29]]}
+                                total={total}
+                                initFormData={{ type: 1 }}
+                                rowKey={"order_id"}
+                                exportUrl={'/api/fin/order_search/arrears_order_export'}
+                                limitCon={limitCon}
+                                search={searchOther}
+                            />
+                        </div> : null
                 }
             </Tabs.TabPane>
             <Tabs.TabPane tab="订单修改记录" key="2">
@@ -947,7 +947,8 @@ function ParkingOrderInquiry(props) {
                             formSearch={[ash[25], ash[1], ash[2], ash[18], ash[26], ash[29], ash[5], ash[12], ash[27], ash[28]]}
                             total={total}
                             initFormData={{ type: 1 }}
-                            rowKey={"park_record_id"}
+                            //rowKey={"park_record_id"}
+                            rowKey={(row, index) => row?.park_record_id + toString(Math.random() * 10000)}
                             exportUrl={'/api/fin/order_search/arrears_order_update_list_export'}
                             //limitCon={limitCon}
                             search={search}
@@ -974,7 +975,7 @@ function ParkingOrderInquiry(props) {
                         createCol(['支付订单ID', '停车订单ID', '支付商户', '平台商户', '停车场', '泊位号', '车牌号', '入场时间', '计费时间', '停车时长', '应收金额', '优惠金额', '实付金额', '支付渠道', '支付设备', '操作人', '付款车场', '支付时间', '渠道流水号'],
                             ['order_id', 'park_record_id', 'pay_store', 'operator', 'road_id', 'berth_id', 'plate', 'admission_time', 'charging_time', 'parking_duration', 'receivable_amount', 'discount_amount', 'paid_in_money', 'payment_channels', 'payment_equipment', 'dealer', 'pay_road', 'pay_time', 'third_party_flow_id'], 1),
                         [ash[19], ash[2], ash[18], ash[20], ash[21], ash[9], ash[10], ash[14], ash[15]],
-                        resultData, '/api/fin/order_search/park_order_export', { out_trade_no: getUrlSearch("third_party_flow_id") || null, start_time: getUrlSearch("pay_time") ? moment(getUrlSearch("pay_time")) : moment(moment().format("YYYY-MM-DD HH:mm:ss")) }
+                        resultData, '/api/fin/order_search/park_order_export', { out_trade_no: getUrlSearch("third_party_flow_id") || '', start_time: getUrlSearch("pay_time") ? moment(getUrlSearch("pay_time")) : moment(moment().format("YYYY-MM-DD HH:mm:ss")) }
                     ) : null}
                 </Tabs.TabPane>
                 <Tabs.TabPane tab="欠费订单查询" key="2">

src/pages/FinancialMgm/OrderInquiry/ProductOrderInquiry/index.jsx

@@ -72,7 +72,7 @@ function ProductOrderInquiry() {
                                     textAlign: "center",
                                 }}
                             >
-                                <a onClick={() => { searchDetail({ id: record.id }); }}>
+                                <a onClick={() => { searchDetail({ id: record.id }); setIsEdit(0) }}>
                                     查看
                                 </a>
                                 <a onClick={() => { searchDetail({ id: record.id }); setMyId(record.id); setIsEdit(1) }}>
@@ -456,7 +456,7 @@ function ProductOrderInquiry() {
                         <Select
                             //style={{ width: '100%' }}
                             value={editData.plate_type}
-                            options={sysConfig.plateColor}
+                            options={sysConfig.plateColor.slice(1)}
                             onChange={(e) => { setEditData({ ...editData, plate_type: e }) }}
                         />
                         : (ycddData.plate_type || "--")}
@@ -577,12 +577,10 @@ function ProductOrderInquiry() {
         }
         let phoneReg = new RegExp(/^(?:(?:\+|00)86)?1[3-9]\d{9}$/)
 
-        // if (addOrderData.plate != '' && !utils?.validationPlate(addOrderData.plate)) {
-        //     message.error('请输入正确的车牌号')
-        //     return
-        // }
-        // else 
-        if (addOrderData.plate == '') {
+        if (addOrderData.plate != '' && !utils?.validationPlate(addOrderData.plate)) {
+            message.error('请输入正确的车牌号')
+            return
+        } else if (addOrderData.plate == '') {
             message.error('请输入车牌号')
             return
         } else if (addOrderData.plate_type == '') {
@@ -596,6 +594,7 @@ function ProductOrderInquiry() {
             return
         } else {
             console.log(data)
+            setTabKey('2')
             ajax.getProductOrderInquiryParkingAdd(data).then((res) => {
                 if (res.status === 20000) {
                     setAddVisible(false)
@@ -605,13 +604,16 @@ function ProductOrderInquiry() {
                 } else {
                     message.error(res.message)
                 }
+                setTabKey('1')
             }).catch(err => {
                 console.log(err);
+                setTabKey('1')
             })
         }
     }
     // 修改订单
     const placeEditBtn = () => {
+        setTabKey('2')
         ajax.getProductOrderInquiryParkingEidt({ ...editData, id: myId }).then((res) => {
             if (res.status === 20000) {
                 setEditData({})
@@ -622,6 +624,7 @@ function ProductOrderInquiry() {
             setTabKey('1')
         }).catch(err => {
             console.log(err);
+            setTabKey('1')
         })
     }
     // 取消按钮
@@ -727,32 +730,7 @@ function ProductOrderInquiry() {
                         <Select
                             style={{ width: 250, marginLeft: 23 }}
                             value={addOrderData.plate_type}
-                            options={[
-                                {
-                                    value: '0',
-                                    label: "蓝"
-                                },
-                                {
-                                    value: '1',
-                                    label: '黄'
-                                },
-                                {
-                                    value: '2',
-                                    label: '绿'
-                                },
-                                {
-                                    value: '3',
-                                    label: "黄绿"
-                                },
-                                {
-                                    value: '4',
-                                    label: '黑'
-                                },
-                                {
-                                    value: '5',
-                                    label: '黑'
-                                }
-                            ]}
+                            options={sysConfig.plateColor.slice(1)}
                             onChange={(e) => { setAddOrderData({ ...addOrderData, plate_type: e }) }}
                         />
                     </div>

src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.scss

@@ -266,23 +266,6 @@ $color-primary: var(--color-primary);
               width: 150px;
           }
       }
-      .ltc-item-bind {
-        font-size: 18px;
-        margin: 10px 0;
-        display: block;
-        width: 900px;
-        .new-item-bind {
-          display: inline-block;
-          width: 400px;
-        }
-        .ltc-item-input {
-            display: inline-block;
-            width: 200px;
-        }
-        a {
-          margin-right: 20px;
-        }
-      }
   }
 } 
 .distable {

src/pages/FinancialMgm/PayRecordTotal/loadable.jsx

@@ -103,14 +103,14 @@ function PayRecordTotal(props) {
     );
   };
   // 获取运营商下拉数据
-  const getSelect= () => {
+  const getSelect = () => {
     ajax.getOperator().then((e) => {
       console.log(e)
       setSearchSelect([
-          ...searchSelect,
-          ...e.data
+        ...searchSelect,
+        ...e.data
       ])
-  })
+    })
   };
   // 获取列表数据
   const getData = (v) => {
@@ -235,11 +235,22 @@ function PayRecordTotal(props) {
 
   // 查看
   const handleView = (row) => {
+    let url = ''
+    if (row.third_party_flow_id) {
+      url = "/financialMgm/parkingOrderInquiry?third_party_flow_id=" + row.third_party_flow_id + "&pay_time=" + row.pay_time //+"&order_id="+row.order_id,
+    }
+    else {
+      message.error('无渠道流水号，无法跳转')
+      return
+    }
+    // else if (row.out_trade_no) {
+    //   url = "/financialMgm/parkingOrderInquiry?out_trade_no=" + row.out_trade_no + "&pay_time=" + row.pay_time
+    // } 
     let jumpMenu = {
       text: "停车订单查询",
       name: "parkingOrderInquiry",
       icon: "",
-      path: "/financialMgm/parkingOrderInquiry?third_party_flow_id="+row.third_party_flow_id+"&pay_time="+row.pay_time //+"&order_id="+row.order_id,
+      path: url
     };
     if (tabList.filter((item) => item.path === jumpMenu.path).length === 0) {
       sessionStorage.setItem("tabList", JSON.stringify([...tabList, jumpMenu]));
@@ -426,7 +437,7 @@ function PayRecordTotal(props) {
                 columns={tableColumns}
                 pagination={false}
                 loading={tabLoading}
-                scroll={{y:620}}
+                scroll={{ y: 620 }}
               />
               <Pagination {...paginationProps} className="pagination-common" />
             </ResultFlowResult>

src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx

@@ -262,7 +262,7 @@ function CarInfo() {
             name: "type",
             type: "Select",
             label: "业务订单类型",
-            options: dictionary.BusinessOrderType,
+            options: sysConfig.businessOrderType,
         },
         {
             name: "park_id",

src/pages/OperationCenter/OperationSales/CreditScoreMgm/loadable.jsx

@@ -345,22 +345,24 @@ function CreditScoreMgm() {
     ajax.getCreditScoreRedeemAdd({ ...e }).then((res) => {
       let { status, data, total } = res
       if (status == 20000) {
-        if (data.list) {
-          setAddData(data.list)
-        } else {
-          setAddData(data)
-        }
+        // if (data.list) {
+        //   setAddData(data.list)
+        // } else {
+        //   setAddData(data)
+        // }
         getRedeemList({ awardId: awardId, pn: 1, page_size: 15 })
         if (type == 12) {
           return
         }
         if (type == 1 && editVisible.type == 1) {
           message.success("编辑成功")
+          setAddData({})
           setEditVisible({ visible: false, type: 0 })
           return
         }
         if (editVisible.type == 0) {
           message.success("添加成功")
+          setAddData({})
           setEditVisible({ visible: false, type: 0 })
           return
         }
@@ -406,7 +408,8 @@ function CreditScoreMgm() {
         search={search}
         total={total}
         isExport={false}
-        rowKey={"id"}
+        //rowKey={"id"}
+        rowKey={(row, index) => row?.id + toString(pageInfo.pn) + toString(pageInfo.page)}
         initFormData={{}}
         diyButton={
           <>
@@ -562,6 +565,8 @@ function CreditScoreMgm() {
               <div className="new-item">兑换所需积分</div>
               <div className="new-value">
                 <InputNumber
+                  min={0}
+                  precision={0}
                   className="credit-inputnum"
                   value={addData?.redeem_points}
                   onChange={(e) => { setAddData({ ...addData, redeem_points: e }) }}
@@ -572,6 +577,8 @@ function CreditScoreMgm() {
               <div className="new-item">奖品总量</div>
               <div className="new-value">
                 <InputNumber
+                  min={0}
+                  precision={0}
                   className="credit-inputnum"
                   value={addData?.total_num}
                   onChange={(e) => { setAddData({ ...addData, total_num: e }) }}

src/pages/OperationCenter/UserMgm/UserAuth/index.scss

@@ -245,5 +245,9 @@ $color-primary : var(--color-primary);
   .eae-modal-item {
     display: flex;
     margin-left: 10px;
+    img {
+      width: 98%;
+      height: 100%;
+    }
   }
 }

src/pages/OperationCenter/UserMgm/UserAuth/loadable.jsx

@@ -208,10 +208,10 @@ function UserAuth() {
                             </div>
                             <div className="ltc-content">
                                 <div className="ltc-item ltc-item-img">
-                                    <img src={resultData[indexby].authImg1 || require("../../../../../src/assets/images/error-img.png")} onClick={() => { setBigPic(resultData[indexby].vehicle_travel_license_img1); setBigpicVisible(true) }} />
+                                    <img src={resultData[indexby].authImg1 || require("../../../../../src/assets/images/error-img.png")} onClick={() => { resultData[indexby]?.authImg1 ? setBigPic(resultData[indexby].authImg1) : null; setBigpicVisible(true) }} />
                                 </div>
                                 <div className="ltc-item ltc-item-img">
-                                    <img src={resultData[indexby].authImg2 || require("../../../../../src/assets/images/error-img.png")} onClick={() => { setBigPic(resultData[indexby].vehicle_travel_license_img2); setBigpicVisible(true) }} />
+                                    <img src={resultData[indexby].authImg2 || require("../../../../../src/assets/images/error-img.png")} onClick={() => { resultData[indexby]?.authImg2 ? setBigPic(resultData[indexby].authImg2) : null; setBigpicVisible(true) }} />
                                 </div>
                             </div>
                         </div>

src/pages/OperationCenter/UserMgm/UserInfo/index.scss

@@ -254,7 +254,6 @@ $color-primary: var(--color-primary);
         }
       }
       .ltc-item-bind {
-        font-size: 16px;
         margin: 10px 0;
         display: block;
         width: 900px;

src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx

@@ -219,7 +219,8 @@ function UserInfo() {
             name: "type",
             type: "Select",
             label: "业务订单类型",
-            options: dictionary.BusinessOrderType,
+            //defaultValue:0,
+            options: sysConfig.businessOrderType,
         },
         {
             name: "park_id",
@@ -986,7 +987,7 @@ function UserInfo() {
                 total={total}
                 pagename={pagename}
                 search={searchOther}
-                initFormData={exportUrl == "/api/bpm/record/get_record_export" ? { start_time: moment().subtract(1, "month"), type: 1 } : { type: 1 }} //初始化的表格搜索项
+                initFormData={exportUrl == "/api/bpm/record/get_record_export" ? { start_time: moment().subtract(1, "month"), type: 1 } : tabKey=="8"?{ type: 0 }:{ type: 1 }} //初始化的表格搜索项
                 isExport={exportUrl ? true : false}
                 exportUrl={exportUrl}
                 export_other={{ memberId: memberId }}