From b4aab911d84472fde9555bc0a5d2f38f15739e4b Mon Sep 17 00:00:00 2001
From: guoxin <guoxin@yisa.com>
Date: Tue, 24 Oct 2023 18:10:46 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=86=85?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InRoadMgm/BusinessMgm/Blacklist/loadable.jsx   |  4 +-
 .../InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx | 35 ++++++++++++-
 .../Attendance/WorkerSchedule/loadable.jsx         |  5 +-
 src/pages/InRoadMgm/RoadMgm/AddRoad/loadable.jsx   | 61 ++++++++++++++++++++--
 src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx  |  3 +-
 .../InRoadMgm/RoadMgm/RoadDetail/loadable.jsx      |  2 +-
 src/pages/SystemMgm/RoleMgm/loadable.jsx           |  2 +
 src/services/InroadMgm/RoadMgm/RoadMgm.js          |  8 +++
 8 files changed, 108 insertions(+), 12 deletions(-)

diff --git a/src/pages/InRoadMgm/BusinessMgm/Blacklist/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/Blacklist/loadable.jsx
index c7b987a..32c5ee6 100644
--- a/src/pages/InRoadMgm/BusinessMgm/Blacklist/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/Blacklist/loadable.jsx
@@ -66,9 +66,7 @@ function Blacklist(props) {
         }
         if (getAddData.plate == '') {
             message.error('请输入车牌号')
-        } else if (getAddData.operator_id ) {
-            message.error('请选择商户名称')
-        } else {
+        }  else {
             ajax.addChange(data).then(res => {
                 if (res.status === 20000) {
                     setGetAddVisible(false)
diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx
index 0f1e3d3..a59c292 100644
--- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx
@@ -29,8 +29,10 @@ function ChargeRules(props) {
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
     }
+    const [getBindId, setGetBindId] = useState({})
     const [formData, setFormData] = useState(parameter)
     const [lastFormData, setLastFormData] = useState(formData)
+
     const lastFormDataRef = useRef(formData)
     const [addVisible, setGetAddVisible] = useState(false)
     const [editVisible, setGetEditVisible] = useState(false)
@@ -341,7 +343,7 @@ function ChargeRules(props) {
         setDeleteVisible(true)
     }
     //绑定车场
-    const [getBindId, setGetBindId] = useState({})
+
     const bindPark = (record) => {
         setBindVisible(true)
         setGetBindId(record)
@@ -404,6 +406,20 @@ function ChargeRules(props) {
         lastFormDataRef.current = Object.assign({}, lastFormData, { pn: 1, page_size: length })
         getData(Object.assign({}, lastFormData, { pn: 1, page_size: length }))
     }
+    //切换分页
+    const tableChangePn = (pn, length) => {
+        if (tableFormData.page_size === length) {
+            setTableFormData(Object.assign({}, tableFormData, { pn: pn }))
+            tableFormDataRef.current = Object.assign({}, tableFormData, { pn: pn })
+            getData(Object.assign({}, tableFormData, { pn: pn }))
+        }
+    }
+    //切换每页条数
+    const tanleChangeLength = (pn, length) => {
+        setTableFormData(Object.assign({}, tableFormData, { pn: 1, page_size: length }))
+        tableFormDataRef.current = Object.assign({}, tableFormData, { pn: 1, page_size: length })
+        getData(Object.assign({}, tableFormData, { pn: 1, page_size: length }))
+    }
     //检索数据
     const getSearchData = (data = formData) => {
         getData(data)
@@ -551,6 +567,8 @@ function ChargeRules(props) {
         value: {
         }
     })
+    const [tableFormData, setTableFormData] = useState({ ...bindData, id: getBindId.id, pn: 1, page_size: Number(pageSizeOptions[0]) })
+    const tableFormDataRef = useRef({ ...bindData, id: getBindId.id, pn: 1, page_size: Number(pageSizeOptions[0]) })
     useEffect(() => {
         if (sessionTabList && Object.values(sessionTabList).length > 0) {
             setFormData({
@@ -568,7 +586,7 @@ function ChargeRules(props) {
     const [getName, setGetName] = useState({})
     const [getBindStatus, setBindStatus] = useState(false)
     useEffect(() => {
-        if(bindData.road_parent_id){
+        if (bindData.road_parent_id) {
             let data = {
                 name: bindData.road_parent_id,
                 id: getBindId.id
@@ -748,6 +766,19 @@ function ChargeRules(props) {
                                         rowSelection={rowSelection}
                                         columns={columns()}
                                         dataSource={getColumnList.data}
+                                        pagination={false}
+                                    />
+                                    <Pagination
+                                        className="pagination-common"
+                                        showSizeChanger
+                                        showQuickJumper
+                                        showTotal={() => `共 ${getColumnList.total_records} 条`}
+                                        total={getColumnList.total_records}
+                                        current={tableFormData.pn}
+                                        pageSize={tableFormData.page_size}
+                                        pageSizeOptions={pageSizeOptions}
+                                        onChange={tableChangePn}
+                                        onShowSizeChange={tanleChangeLength}
                                     />
                                     <div className="bind-btn">
                                         <Button type="primary" onClick={start} disabled={!hasSelected} >
diff --git a/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx
index 7d3ed80..254e9d0 100644
--- a/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Attendance/WorkerSchedule/loadable.jsx
@@ -319,7 +319,9 @@ function WorkerSchedule(props) {
             }
         })
     }
-    const [getAllChange, setGetAllChange] = useState({})
+    const [getAllChange, setGetAllChange] = useState({
+        scheduleId:1
+    })
     const handleAllChange = (v) => {
         setGetAllChange(v)
 
@@ -495,6 +497,7 @@ function WorkerSchedule(props) {
                         <Select
                             style={{ width: 200 }}
                             // allowClear
+                            value={getAllChange.scheduleId}
                             placeholder="请选择"
                             options={getOperation}
                             onChange={handleAllChange}
diff --git a/src/pages/InRoadMgm/RoadMgm/AddRoad/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/AddRoad/loadable.jsx
index 03da10b..f44a8bf 100644
--- a/src/pages/InRoadMgm/RoadMgm/AddRoad/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/AddRoad/loadable.jsx
@@ -82,6 +82,10 @@ function AddRoad() {
   const [transferSouceData, setTransferSouceData] = useState([]);
   const [selectedKeys, setSelectedKeys] = useState([]);
   const [targetKeys, setTargetKeys] = useState([]);
+   //etc泊位列表获取
+   const [getEtcList, setGetEtcList] = useState([])
+   const [selectedEtcKeys, setSelectedEtcKeys] = useState([]);
+   const [EtctargetKeys, setEtcTargetKeys] = useState([]);
   //区域的下拉数据
   const [areaList, setAreaList] = useState([]);
   const uploadButton = (
@@ -114,6 +118,7 @@ function AddRoad() {
               ...res3,
               lng_lat: lngLat,
               business_area: targetKeys,
+              berth_ids:EtctargetKeys,
               img_url: imgList,
               type: isEdit ? "edit" : "add",
               road_id: id,
@@ -243,14 +248,43 @@ function AddRoad() {
       }
     );
   }
+ 
+  const getEtcStatus = (id) => {
+    const params = id !== null ? { id } : {};
+    ajax.getEtcData(params).then(
+      (res) => {
+        if (res.status === 20000) {
+          let _data = [...res.data].map((item) => {
+            item.key = item.value;
+            return item;
+          });
+          // let _right = [...res.data.right].map((item) => {
+          //   item.key = item.value;
+          //   return item.key;
+          // });
+          setGetEtcList(_data);
+          // setEtcTargetKeys(_right);
+        }
+      },
+      (err) => {
+        console.error(err);
+      }
+    );
+  }
   //穿梭框
   const transferChange = (nextTargetKeys) => {
     setTargetKeys(nextTargetKeys);
   };
+  //穿梭框
+  const transferEtcChange = (nextTargetKeys) => {
+    setEtcTargetKeys(nextTargetKeys);
+  };
   const onSelectChange = (sourceSelectedKeys, targetSelectedKeys) => {
     setSelectedKeys([...sourceSelectedKeys, ...targetSelectedKeys]);
   };
-
+  const onSelectEtcChange = (sourceSelectedKeys, targetSelectedKeys) => {
+    setSelectedEtcKeys([...sourceSelectedKeys, ...targetSelectedKeys]);
+  };
   function getAllParentRoad() {
     ajax.getAllParentRoad().then((res) => {
       if (res.status === 20000) {
@@ -307,6 +341,7 @@ function AddRoad() {
 
   useEffect(() => {
     getTradingArea(id);
+    getEtcStatus(id);
     getAllOperator();
   }, []);
   useEffect(() => {
@@ -369,7 +404,7 @@ function AddRoad() {
                       <Form.Item
                         label="关联父车场"
                         name="parentId"
-                        // rules={rules}
+                      // rules={rules}
                       >
                         <Select
                           options={parentList}
@@ -499,7 +534,7 @@ function AddRoad() {
                     <Form.Item
                       label="是否支持充电"
                       name="recharge"
-                      rules={rules}
+                      // rules={rules}
                     >
                       <Select
                         value={initFormData.recharge}
@@ -672,7 +707,7 @@ function AddRoad() {
             </Panel>
           </Collapse>
           <Collapse defaultActiveKey={"1"}>
-            <Panel header="路段运营信息" key="1">
+            <Panel header="路段相关信息" key="1">
               <div className="last-panel">
                 <div className="left-content">
                   <label>所属热门商圈</label>
@@ -725,6 +760,24 @@ function AddRoad() {
               </div>
             </Panel>
           </Collapse>
+          <Collapse defaultActiveKey={"1"}>
+            <Panel header="ETC追缴泊位配置" key="1">
+              <div className="last-panel">
+                <div className="left-content">
+                  <label>选择开启ETC追缴的泊位</label>
+                  <Transfer
+                    dataSource={getEtcList}
+                    titles={["未选择", "已选择"]}
+                    targetKeys={EtctargetKeys}
+                    onChange={transferEtcChange}
+                    selectedKeys={selectedEtcKeys}
+                    onSelectChange={onSelectEtcChange}
+                    render={(item) => item.label}
+                  />
+                </div>
+              </div>
+            </Panel>
+          </Collapse>
           <div className="bottom-button">
             <Button
               onClick={() => {
diff --git a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
index 78b2c36..cc5ddb1 100644
--- a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
@@ -290,9 +290,10 @@ function RoadConf() {
             <Form.Item label="区域" name={"area"}>
               <Cascader
                 placeholder={"请选择区域"}
-                options={regionOptions}
+                options={regionOptions || null}
                 expandTrigger="hover"
                 changeOnSelect
+                allowClear={false}
                 fieldNames={{
                   label: "name",
                   value: "id",
diff --git a/src/pages/InRoadMgm/RoadMgm/RoadDetail/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/RoadDetail/loadable.jsx
index f0dc418..efbe9c5 100644
--- a/src/pages/InRoadMgm/RoadMgm/RoadDetail/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/RoadDetail/loadable.jsx
@@ -108,7 +108,7 @@ function RoadDetail(props) {
                     {resultData.free_time}
                   </Descriptions.Item>
                   <Descriptions.Item label="收费规则描述">
-                    收费标准：依据青黄发改发【2016】45号文件，收费时段8:00至18:00，首停15分钟免费，小型车2元/小时，中型车3元/小时，大型车4元/小时，不足1小时按1小时计。车主缴费后请15分钟内离场，否则占用泊位将重新按收费规则启动计时。停车欠费或将影响个人征信。
+                  {resultData.note}
                   </Descriptions.Item>
                 </Descriptions>
               </div>
diff --git a/src/pages/SystemMgm/RoleMgm/loadable.jsx b/src/pages/SystemMgm/RoleMgm/loadable.jsx
index ffdd312..9eab8af 100644
--- a/src/pages/SystemMgm/RoleMgm/loadable.jsx
+++ b/src/pages/SystemMgm/RoleMgm/loadable.jsx
@@ -145,6 +145,8 @@ function RoleMgm(props) {
                     auth: ''
                 })
                 getData(formData)
+            }else{
+                message.error(res.message)
             }
         })
     }
diff --git a/src/services/InroadMgm/RoadMgm/RoadMgm.js b/src/services/InroadMgm/RoadMgm/RoadMgm.js
index 5e7b70f..51e038c 100644
--- a/src/services/InroadMgm/RoadMgm/RoadMgm.js
+++ b/src/services/InroadMgm/RoadMgm/RoadMgm.js
@@ -195,6 +195,13 @@ const getTradingArea = (params) => {
     data: params,
   });
 };
+const getEtcData = (params) => {
+  return ajax({
+    url: "/api/bpm/road/no_etc_berth",
+    type: "get",
+    data: params,
+  });
+};
 // /api/bpm/device/add_device  数据采集设备管理-新增或修改接口
 const addDevice = (params) => {
   return ajax({
@@ -354,6 +361,7 @@ export default {
   getRoadTollList,
   getRoadInfo,
   addToll,
+  getEtcData,
   getPoleList,
   getRoadRuleList,
   delToll,