From 56600748f2738f0b2c995875601ddd4e4caaae06 Mon Sep 17 00:00:00 2001
From: guoxin <guoxin@yisa.com>
Date: Sat, 16 Dec 2023 15:11:04 +0800
Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=86=85BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableModule/index.jsx               | 17 ++++++++++--
 .../RecordInquiry/ArrearsRecordTotal/loadable.jsx  |  3 +-
 .../DisabledCarParkRecordTotal/loadable.jsx        |  3 +-
 .../RecordInquiry/ParkRecordTotal/loadable.jsx     |  3 +-
 .../RecordInquiry/PayRecordQuery/loadable.jsx      |  3 +-
 .../InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx      |  1 +
 src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx    |  7 +++--
 .../BusinessConfig/BusinessConf/loadable.jsx       | 32 ++++++++++++----------
 8 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx
index 42c4930..ca2c61e 100644
--- a/src/components/TableModule/index.jsx
+++ b/src/components/TableModule/index.jsx
@@ -469,10 +469,12 @@ const TableModule = forwardRef((props, ref) => {
                     label={item.label}
                     name={item.name}
                     key={item.name}
+                    defaultValue={item.defaultValue}
                   >
-                    <Select
+                    {/* <Select
                       showSearch
                       value={value}
+                     
                       placeholder={props.placeholder}
                       defaultActiveFirstOption={false}
                       showArrow={false}
@@ -484,6 +486,14 @@ const TableModule = forwardRef((props, ref) => {
                         value: d.value,
                         label: d.text,
                       }))}
+                    /> */}
+                    <Select
+                      showSearch
+                      optionFilterProp="label"
+                      onChange={handleChange}
+                      defaultValue={item.defaultValue}
+                      filterOption={(input, option) => (option?.label ?? '').includes(input)}
+                      options={getRoadList}
                     />
                   </Form.Item>
                 );
@@ -747,8 +757,11 @@ const TableModule = forwardRef((props, ref) => {
         console.error(err);
       });
   }, []);
+  const [getRoadList,setGetRoadList]=useState([])
   useEffect(() => {
-
+    ajax.getRoadSearch().then((res) => {
+        setGetRoadList(res.data);
+    })
   }, [])
   return (
     <div className="TableModule">
diff --git a/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx
index bc46192..bd24bb7 100644
--- a/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/ArrearsRecordTotal/loadable.jsx
@@ -83,7 +83,6 @@ function ArrearsRecordTotal() {
     {
       name: "road",
       type: "SearchSelect",
-      id:2,
       label: "路段名称",
       placeholder: "请输入路段名称",
     },
@@ -133,7 +132,7 @@ function ArrearsRecordTotal() {
     region: ["0"],
     type: 2,
     operator: "0",
-    road: "",
+    road: "0",
     road_type: 0,
     plate: "",
     plate_color:-1
diff --git a/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx
index 9155466..1b5b37e 100644
--- a/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx
@@ -369,8 +369,9 @@ function DisabledCarParkRecordTotal() {
     },
     {
       name: "road",
-      type: "Input",
+      type: "SearchSelect",
       label: "路段名称",
+      defaultValue: "0",
       placeholder: "请输入路段名称",
     },
     {
diff --git a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
index 8e7e71e..5036368 100644
--- a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx
@@ -279,7 +279,6 @@ function ParkRecordTotal() {
       name: "road",
       type: "SearchSelect",
       label: "路段名称",
-      id: 2,
       placeholder: "请输入路段名称",
     },
     {
@@ -381,7 +380,7 @@ function ParkRecordTotal() {
   const initFormData = {
     region: ["0"],
     operator: "0",
-    road: "",
+    road: "0",
     road_type: 0,
     phone: "",
     plate: "",
diff --git a/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx
index 173352c..7ac6e11 100644
--- a/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx
+++ b/src/pages/InRoadMgm/RecordInquiry/PayRecordQuery/loadable.jsx
@@ -104,7 +104,6 @@ function ParkRecordTotal() {
       name: "road",
       type: "SearchSelect",
       label: "路段名称",
-      id: 2,
       placeholder: "请输入路段名称",
     },
     {
@@ -152,7 +151,7 @@ function ParkRecordTotal() {
   //搜索参数初始化
   const initFormData = {
     order_id: "",
-    road: "",
+    road: "0",
     plate: "",
     payment_channels: 0,
     payment_equipment: 0,
diff --git a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
index adb9121..33dcf55 100644
--- a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
@@ -1844,6 +1844,7 @@ function ConfigRoad() {
           <Descriptions.Item label="服务属性">
             <Checkbox.Group
               defaultValue={berthModal.record.service_type}
+              disabled={true}
               options={[
                 {
                   label: "潮汐泊位",
diff --git a/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx b/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
index f055581..a91bb4f 100644
--- a/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
+++ b/src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
@@ -253,7 +253,7 @@ function StuffMgm(props) {
             brand_id: record.brand_id,
             model_id: record.model_id,
             status: record.status,
-            uid: record.use_name,
+            uid: record.uid,
         }))
     }
     const editModal = () => {
@@ -261,6 +261,7 @@ function StuffMgm(props) {
         setGetUid({
             uid: ''
         })
+        setGetSelectStatus(true)
     }
     //重置数据
     const getResetData = () => {
@@ -537,6 +538,7 @@ function StuffMgm(props) {
                     setGetUid({
                         uid: ''
                     })
+                    setGetSelectStatus(true)
                 }
             })
         }
@@ -556,6 +558,7 @@ function StuffMgm(props) {
         setGetUid({
             uid: ''
         })
+        setGetSelectStatus(true)
     }
     const addplaceBtn = () => {
         setAddVisible(false)
@@ -1094,7 +1097,7 @@ function StuffMgm(props) {
                         style={{ width: 180, marginLeft: 33 }}
                         placeholder="请选择"
                         disabled={getSelectStatus}
-                        value={getUid.uid}
+                        value={getEditData.uid}
                         options={getRecipient}
                         onChange={(v) => {
                             setGetEditData(
diff --git a/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx b/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
index 18f96d8..2748eb2 100644
--- a/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
+++ b/src/pages/SystemMgm/BusinessConfig/BusinessConf/loadable.jsx
@@ -48,8 +48,7 @@ function BusinessConf(props) {
         operator_name: "0",
         item_name: '',
         parameterValue: 1,
-        parameter_exit: '',
-        parameter_exit_pda: ''
+        parameter_exit: ''
     })
     const addAdmin = () => {
         setImgVisible(true)
@@ -79,15 +78,14 @@ function BusinessConf(props) {
     }
     //添加
     const onChangeAdd = (e) => {
-        setAddManage({ ...addManage, parameterValue: e.target.value, parameter_exit: '', parameter_exit_pda: '' })
+        setAddManage({ ...addManage, parameterValue: e.target.value, parameter_exit: '' })
     }
     //添加
     const onChangehoose = (e) => {
         setAddManage({ ...addManage, parameter_exit: e.target.value })
     }
-    //添加
-    const onChangeAddTypeValue = (e) => {
-        setAddManage({ ...addManage, parameter_exit_pda: e.target.value })
+    const onChangeEdithoose = (e) => {
+        setGetEditData({ ...geteditData, parameter_exit: e.target.value })
     }
     const [getType, setGetType] = useState(1)
     const onChangeAddType = (e) => {
@@ -273,8 +271,7 @@ function BusinessConf(props) {
         item_id: '',
         parameter: '',
         parameterValue: 1,
-        parameter_exit: '',
-        parameter_exit_pda: ''
+        parameter_exit: ''
     })
     const CheckApplyBtn = (record) => {
         setGetAdminId(record)
@@ -616,14 +613,12 @@ function BusinessConf(props) {
                                 <Radio value={2}>PDA审核</Radio>
                                 {
                                     getType == 1 ?
-                                        <>
+                                        < div>
                                             <Radio.Group onChange={onChangehoose} value={addManage.parameter_exit}>
                                                 <Radio value={3}>自动出场</Radio>
-                                            </Radio.Group>
-                                            <Radio.Group onChange={onChangeAddTypeValue} value={addManage.parameter_exit_pda}>
                                                 <Radio value={4}>PDA确认出场</Radio>
                                             </Radio.Group>
-                                        </>
+                                        </div>
                                         : ''
                                 }
                             </Radio.Group>
@@ -976,6 +971,7 @@ function BusinessConf(props) {
                         <div className="yisa-search">
                             <Radio.Group style={{ marginLeft: 42 }}
                                 onChange={(v) => {
+                                    setGetType(v.target.value)
                                     setGetEditData(
                                         Object.assign({}, geteditData, { parameterValue: v.target.value })
                                     );
@@ -983,8 +979,16 @@ function BusinessConf(props) {
                                 value={geteditData.parameterValue}>
                                 <Radio value={1}>取信地磁</Radio>
                                 <Radio value={2}>PDA审核</Radio>
-                                <Radio value={3}>自动出场</Radio>
-                                <Radio value={4}>PDA确认出场</Radio>
+                                {
+                                    getType == 1 ?
+                                        < div>
+                                            <Radio.Group onChange={onChangeEdithoose} value={geteditData.parameter_exit}>
+                                                <Radio value={3}>自动出场</Radio>
+                                                <Radio value={4}>PDA确认出场</Radio>
+                                            </Radio.Group>
+                                        </div>
+                                        : ''
+                                }
                             </Radio.Group>
                         </div> : ''
                 }