From f5c79f21d6dfd668ebd5a188070dedb1d9fe1714 Mon Sep 17 00:00:00 2001
From: xingjx <xingjx@yisa.com>
Date: Wed, 27 Dec 2023 10:51:14 +0800
Subject: [PATCH] =?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/components/TableModule/index.jsx               | 32 +++++++++----
 src/pages/FinancialMgm/PayRecordTotal/loadable.jsx |  4 ++
 .../EquipmentMgm/MonitorEquipment/loadable.jsx     |  2 +-
 .../ArrearsRecover/ArrearsCar/loadable.jsx         |  6 +--
 .../OperationCenter/UserMgm/UserInfo/loadable.jsx  |  5 +-
 .../OutDeviceMgm/OutMonitorMgm/loadable.jsx        |  2 +-
 .../OutSegmentMgm/ChargeRulesMgm/AddModal.jsx      | 26 ++++++----
 .../OutSegmentMgm/ChargeRulesMgm/TimePart.jsx      |  2 +-
 .../OutSegmentMgm/ChargeRulesMgm/loadable.jsx      | 56 ++++++++++++++++------
 .../OutSegmentMgm/OutSegment/AddParking.jsx        | 47 +++++++++++++++++-
 .../ConfigParking/CarMgm/BlacklistManagement.jsx   |  3 +-
 .../ConfigParking/CarMgm/WhitelistManagement.jsx   |  3 +-
 .../OutSegment/ConfigParking/CarMgm/index.jsx      | 12 ++---
 .../OutSegmentMgm/OutSegment/loadable.jsx          |  2 +-
 14 files changed, 151 insertions(+), 51 deletions(-)

diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx
index 8a7dfc0..09d88cf 100644
--- a/src/components/TableModule/index.jsx
+++ b/src/components/TableModule/index.jsx
@@ -574,16 +574,28 @@ const TableModule = forwardRef((props, ref) => {
                     key={item.name}
                     defaultValue={item.defaultValue}
                   >
-                    <Select
-                      getPopupContainer={(e) => e.parentNode}
-                      options={
-                        item.name === "operator" || item.name === "merchantName"
-                          ? operatorList
-                          : item.options
-                      }
-                      defaultValue={item.defaultValue}
-                      placeholder={item.placeholder}
-                    />
+                    {
+                      item.test ?
+                        <Select
+                          options={
+                            item.name === "operator" || item.name === "merchantName"
+                              ? operatorList
+                              : item.options
+                          }
+                          defaultValue={item.defaultValue}
+                          placeholder={item.placeholder}
+                        /> :
+                        <Select
+                          getPopupContainer={(e) => e.parentNode}
+                          options={
+                            item.name === "operator" || item.name === "merchantName"
+                              ? operatorList
+                              : item.options
+                          }
+                          defaultValue={item.defaultValue}
+                          placeholder={item.placeholder}
+                        />
+                    }
                   </Form.Item>
                 );
                 break;;
diff --git a/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx b/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx
index c1e11e1..aae6027 100644
--- a/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx
+++ b/src/pages/FinancialMgm/PayRecordTotal/loadable.jsx
@@ -245,6 +245,10 @@ function PayRecordTotal(props) {
       message.error('充电订单无法跳转')
       return
     }
+    if (!row.flow_type_name) {
+      message.error('无支付类型，无法跳转')
+      return
+    }
     if (row.flow_type_name == "支付" && row.third_party_flow_id) {
       jumpMenu = {
         text: "停车订单查询",
diff --git a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx
index 5a1d845..056e0d9 100644
--- a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx
+++ b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx
@@ -452,7 +452,7 @@ function Fence(props) {
                                 <Row>
                                     <Col span={24} className="berth-container">
                                         <Form.Item 
-                                            label={"通道号"}
+                                            label={"泊位"}
                                             name={"berth_ids"}
                                             rules={[{ required: true, message: '' }]}
                                         >
diff --git a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx
index 83e0093..117d6f4 100644
--- a/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx
+++ b/src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx
@@ -16,8 +16,8 @@ import "./index.scss";
 function ArrearsCar() {
     const [parkID, setParkID] = useState()
     const [carId, setCarId] = useState();
-    const initFormData={
-        police:0
+    const initFormData = {
+        police: 0
     }
     const columns = [
         {
@@ -320,7 +320,7 @@ function ArrearsCar() {
         ajax({
             url: "/api/ope/record/get_arrearage_car_info",
             type: "get",
-            data: { carId: e || carId },
+            data: { carId: e || carId, ...pageData },
         }).then((res) => {
             let { status, data, total } = res
             if (status == 20000) {
diff --git a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx
index abc4425..2f1e5b5 100644
--- a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx
+++ b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx
@@ -605,6 +605,7 @@ function UserInfo() {
             type: "Select",
             label: "支付渠道",
             placeholder: "请选择支付渠道",
+            test: 1,
             options: dictionary.PayChannel,
         },
         {//11
@@ -1342,7 +1343,7 @@ function UserInfo() {
                         isExport={false}
                         userInfo={resData}
                         pageName={'userInfo'}
-                        rowKey={(record) => record.id+ Math.random() * 10000}
+                        rowKey={(record) => record.id + Math.random() * 10000}
                     /> </> :
                 <div className="userinfo-box">
                     <div className="back-btn" onClick={() => { setTag('1'); setTabKey('1') }}>返回</div>
@@ -1439,7 +1440,7 @@ function UserInfo() {
                                 columns={historyProgressColumns}
                                 dataSource={historyProgressRecord || []}
                                 scroll={{ x: 1000 }}
-                                rowKey={(record) => record.id+ Math.random() * 10000}
+                                rowKey={(record) => record.id + Math.random() * 10000}
                                 pagination={true}
                             />
                         </>
diff --git a/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx b/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx
index 8b93dd9..53ae472 100644
--- a/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx
@@ -680,7 +680,7 @@ function OutMonitorMgm(props) {
                 </Form.Item>
               </div>
               <div className="row-line berth-container">
-                <Form.Item label={<span className="required">泊位</span>}>
+                <Form.Item label={<span className="required">通道号</span>}>
                   <Transfer
                     dataSource={berthData}
                     titles={["未选择", "已选择"]}
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx
index 34f4d99..371c484 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx
@@ -19,12 +19,21 @@ function AddModal(props) {
   const {
     record = {},
     visible = false,
-    close = () => {},
+    close = () => { },
     status = "add",
-    research = () => {},
+    research = () => { },
   } = props;
   const isEdit = status === "edit";
-
+  const [getOperationName, setGetOperationName] = useState([])
+  const [getNewOperationName, setNewGetOperationName] = useState([])
+  const operationName = () => {
+    ajax.getAllOperator().then(res => {
+      let arr = res.data
+      let newArr = arr.slice(1)
+      setGetOperationName(res.data)
+      setNewGetOperationName(newArr)
+    })
+  }
   const [effectiveDateList, setEffectiveDateList] = useState(() => {
     if (status === "add") {
       return [
@@ -100,6 +109,9 @@ function AddModal(props) {
       })
       .catch((err) => console.error(err));
   }
+  useEffect(() => {
+    operationName()
+  }, [])
   return (
     <Modal
       open={visible}
@@ -141,14 +153,10 @@ function AddModal(props) {
                 rules={[{ required: true }]}
               >
                 <Select
+                  getPopupContainer={(e) => e.parentNode}
                   disabled={isEdit}
                   style={{ width: "40%" }}
-                  options={[
-                    {
-                      label: "测试",
-                      value: 1,
-                    },
-                  ]}
+                  options={getNewOperationName}
                 />
               </Form.Item>
             </Col>
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx
index fb89a24..6f6837e 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx
@@ -164,7 +164,7 @@ function TimePart(props) {
                     <Form.Item
                       label="时段最高收费金额"
                       name="time_max_money"
-                      //rules={[{ required: true }]}
+                      rules={[{ required: true }]}
                     >
                       <Input />
                     </Form.Item>
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx
index 4e965bd..5c4c590 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx
@@ -89,7 +89,8 @@ function ChargeRulesMgm() {
                 <div>
                   <a
                     onClick={() => {
-                      delChargeRule(record.id);
+                      setUserId(record.id)
+                      setDeleteModal(true)
                     }}
                   >
                     删除
@@ -135,7 +136,9 @@ function ChargeRulesMgm() {
   };
   //子ref
   const childRef = useRef(null);
-
+  const [show, setShow] = useState(true);
+  const [userId, setUserId] = useState();
+  const [deleteModal, setDeleteModal] = useState(false);
   //搜索的结果
   const [tableData, setTableData] = useState([]);
   //搜索的总结果数
@@ -182,11 +185,16 @@ function ChargeRulesMgm() {
   }
   //删除计费规则
   function delChargeRule(id) {
+    setShow(false)
     ajax.delChargeRule({ id }).then((res) => {
       if (res.status === 20000) {
         message.success("删除成功");
+        setShow(true)
         research();
       }
+    }).catch(e => {
+      setShow(true)
+      console.log(e)
     });
   }
   //research
@@ -205,18 +213,38 @@ function ChargeRulesMgm() {
   //TODO 调用到子组件的搜索
   return (
     <>
-      <TableModule
-        ref={childRef}
-        columns={columns}
-        tableData={tableData}
-        formSearch={formSearch}
-        total={total}
-        search={fetch}
-        initFormData={initFormData}
-        isExport={false}
-        pageName={'chargeRulesMgm'}
-        rightButtonGroup={[addItem()]}
-      />
+      {
+        show ?
+          <TableModule
+            ref={childRef}
+            columns={columns}
+            tableData={tableData}
+            formSearch={formSearch}
+            total={total}
+            search={fetch}
+            initFormData={initFormData}
+            isExport={false}
+            pageName={'chargeRulesMgm'}
+            rightButtonGroup={[addItem()]}
+          />
+          : null
+      }
+      <Modal
+        open={deleteModal}
+        onCancel={() => { setDeleteModal(false) }}
+        onOk={() => { delChargeRule(userId); }}
+        //footer={null}
+        className="applyCopyModal"
+        title='提示'
+      >
+        <div className="enableStatus">
+          确认是否删除该记录！
+        </div>
+        {/* <div className="submitBtn">
+          <button className="submit colorBtn" onClick={() => { delChargeRule(userId); }}>queidng</button>
+          <button className="cancel colorReset" onClick={() => { setDeleteModal(false) }}>取消</button>
+        </div> */}
+      </Modal>
       {addModal.visible && (
         <AddModal
           visible={addModal.visible}
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
index a639a24..1cb79f6 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
@@ -76,6 +76,9 @@ function AddParking(props) {
       .then((res) => {
         if (res.status === 20000) {
           setAreaList(res.data);
+          if (record.area) {
+            form.setFieldsValue({ area_id: getAreaArr(res.data, record.area) })
+          }
         }
       })
       .catch((err) => {
@@ -301,7 +304,7 @@ function AddParking(props) {
                 moment(record.open_end_time, "HH:mm:ss"),
               ],
               filings_time: moment(record.filings_time),
-              area_id: getAreaArr(areaList, record.area),
+              //area_id:  record.area,
             }
             : {}
         }
@@ -456,6 +459,48 @@ function AddParking(props) {
                       </Col>
                     </>
                   );
+                case 2:
+                  return (
+                    <>
+                      <Col span="4_8" style={{ width: "33%" }}>
+                        <Form.Item
+                          label="二级车场泊位数"
+                          rules={[{ required: true }]}
+                          name="berth_number"
+                        >
+                          <Input />
+                        </Form.Item>
+                      </Col>
+                    </>
+                  );
+                case 3:
+                  return (
+                    <>
+                      <Col span="4_8" style={{ width: "33%" }}>
+                        <Form.Item
+                          label="三级车场泊位数"
+                          rules={[{ required: true }]}
+                          name="berth_number"
+                        >
+                          <Input />
+                        </Form.Item>
+                      </Col>
+                    </>
+                  );
+                case 4:
+                  return (
+                    <>
+                      <Col span="4_8" style={{ width: "33%" }}>
+                        <Form.Item
+                          label="四级车场泊位数"
+                          rules={[{ required: true }]}
+                          name="berth_number"
+                        >
+                          <Input />
+                        </Form.Item>
+                      </Col>
+                    </>
+                  );
                 default:
                   child = (
                     <Form.Item
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/BlacklistManagement.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/BlacklistManagement.jsx
index 5c7a489..f63a670 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/BlacklistManagement.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/BlacklistManagement.jsx
@@ -17,7 +17,7 @@ import moment from "moment";
 import ajax from "@/services";
 const { RangePicker } = DatePicker;
 const { TextArea } = Input;
-function BlacklistManagement() {
+function BlacklistManagement({id}) {
   const [searchForm] = Form.useForm();
   const [editForm] = Form.useForm();
   const columns = [
@@ -209,6 +209,7 @@ function BlacklistManagement() {
         if (editModal.status === "add") {
           ajax.addRoadBlackVehicle({
             ...res,
+            road_id:id,
             effective_begin_date: moment(res.effective_date[0]).format("YY-MM-DD HH:mm:ss"),
             effective_end_date: moment(res.effective_date[1]).format("YY-MM-DD HH:mm:ss")
           }).then((res) => {
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/WhitelistManagement.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/WhitelistManagement.jsx
index dbc31c6..3763dc5 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/WhitelistManagement.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/WhitelistManagement.jsx
@@ -17,7 +17,7 @@ import moment from "moment";
 import ajax from "@/services";
 const { RangePicker } = DatePicker;
 const { TextArea } = Input;
-function WhitelistManagement() {
+function WhitelistManagement({ id }) {
   const [searchForm] = Form.useForm();
   const [editForm] = Form.useForm();
   const columns = [
@@ -225,6 +225,7 @@ function WhitelistManagement() {
           res.id = currentId;
           ajax.editWhiteVehicle({
             ...res,
+            road_id: id,
             effective_begin_date: moment(res.effective_date[0]).format("YY-MM-DD HH:mm:ss"),
             effective_end_date: moment(res.effective_date[1]).format("YY-MM-DD HH:mm:ss")
           }).then((res) => {
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/index.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/index.jsx
index 51ef500..339122a 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/index.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/index.jsx
@@ -7,32 +7,32 @@ import OffPeakVehicleManagement from "./OffPeakVehicleManagement";
 import BlacklistManagement from "./BlacklistManagement";
 import WhitelistManagement from "./WhitelistManagement";
 function CarMgm(props) {
-  const {id} =props
+  const { id } = props
   const tabsItems = [
     {
       label: "车辆组管理",
       key: "1",
-      children: <CarGroupMgm id={id}/>,
+      children: <CarGroupMgm id={id} />,
     },
     {
       label: "车辆管理",
       key: "2",
-      children: <CarManagement id={id} group_id={1}/>,
+      children: <CarManagement id={id} group_id={1} />,
     },
     {
       label: "错峰车辆管理",
       key: "3",
-      children: <OffPeakVehicleManagement />,
+      children: <OffPeakVehicleManagement id={id} />,
     },
     {
       label: "黑名单管理",
       key: "4",
-      children: <BlacklistManagement />,
+      children: <BlacklistManagement id={id} />,
     },
     {
       label: "白名单管理",
       key: "5",
-      children: <WhitelistManagement />,
+      children: <WhitelistManagement id={id} />,
     },
   ];
   return (
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
index 8f684c8..cae903f 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
@@ -150,7 +150,7 @@ function OutSegment() {
                 <div>
                   <a
                     onClick={() => {
-                      console.log(record)
+                      //console.log(record)
                       setEditModal({
                         ...editModal,
                         visible: true,