From 7a2e4cea2f4946d705ca58e1159d71cb7a4524d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=A2=81=E5=B8=85?= <jl-yuans@chinaunicom.cn>
Date: Wed, 28 Sep 2022 16:26:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=84=E6=A0=87=E5=9C=BA?=
 =?UTF-8?q?=E6=89=80=E3=80=81=E5=8C=BA=E5=9F=9Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/modal/AreasModal.tsx           | 36 +++++++++----------
 .../components/modal/PlaceModal.tsx           |  7 ++--
 .../modal/SelectExternPlaceModal.tsx          |  1 -
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/pages/ElecEvaluation/PlaceAreasManage/components/modal/AreasModal.tsx b/src/pages/ElecEvaluation/PlaceAreasManage/components/modal/AreasModal.tsx
index 3bbdbbc..eb5e7a1 100644
--- a/src/pages/ElecEvaluation/PlaceAreasManage/components/modal/AreasModal.tsx
+++ b/src/pages/ElecEvaluation/PlaceAreasManage/components/modal/AreasModal.tsx
@@ -49,13 +49,13 @@ interface AreaOptions {
         const {areasInfo, modalVisible, onCancel, reload} = props;;
         const [saveLoading, setSaveLoading] = useState<boolean>(false);
         const [placeList, setPlaceList] = useState<any[]>([]);
-        const [areaList, setAreaList] = useState<any[]>([]);
+        // const [areaList, setAreaList] = useState<any[]>([]);
         const [selectAreaStatus, setSelectAreaStatus] = useState<any>();
         const currentPlace = useRef<any>();
         const [form] = Form.useForm();
         const clearForm = () => {
             form.resetFields();
-            setAreaList([]);
+            // setAreaList([]);
         }
         useEffect(() => {
             clearForm();
@@ -63,12 +63,8 @@ interface AreaOptions {
             getPlaceListByPermission().then(res => {
                 if(res.code === 200){
                     setPlaceList(EnvPlaceOptions(res.data));
-                    if(areasInfo?.placeRegionCode){
-                        getPlatAreaList({placeId: areasInfo?.placeRegionCode}).then(res => {
-                            if(res.code === 200){
-                                setAreaList(EnvAreaOptions(res.data));
-                            }
-                        })
+                    if(areasInfo?.placeId){
+                        currentPlace.current = areasInfo?.placeId;
                     }
                 }
             })
@@ -91,16 +87,16 @@ interface AreaOptions {
             return value;
         }
 
-        const EnvAreaOptions = (data: AreaOptions[]) => {
-            let value = [];
-            for (let i = 0; i < data.length; i++) {
-                // if (i === 0) {
-                //     value.push({label:'-请选择-',value:''});
-                // }
-                value.push({label:data[i].name, value:data[i].indexCode});
-            }
-            return value;
-        }
+        // const EnvAreaOptions = (data: AreaOptions[]) => {
+        //     let value = [];
+        //     for (let i = 0; i < data.length; i++) {
+        //         // if (i === 0) {
+        //         //     value.push({label:'-请选择-',value:''});
+        //         // }
+        //         value.push({label:data[i].name, value:data[i].indexCode});
+        //     }
+        //     return value;
+        // }
         /**
          * 评标场所回调
          * @param value 
@@ -213,8 +209,8 @@ interface AreaOptions {
                         <Select labelInValue options={placeList} placeholder='请选择' onChange={handlePlaceChange}>
                         </Select>
                     </Form.Item>
-                    <Form.Item label="评标区域名称" required initialValue={areasInfo?.areaName}>
-                        <Form.Item name="areaName" noStyle rules={[{ required: true, message: '请填写评标区域名称/选择评标区域' }]}>
+                    <Form.Item label="评标区域名称" required>
+                        <Form.Item name="areaName" initialValue={areasInfo?.areaName} noStyle rules={[{ required: true, message: '请填写评标区域名称/选择评标区域' }]}>
                             <Input style={{ width: 'calc(85% - 8px)' }} placeholder="请填写评标区域名称/选择评标区域" maxLength={200} />
                         </Form.Item>
                         <Button style={{ width: 'calc(15%)', margin: '0 0 0 8px' }} type='primary' onClick={() => ShowExternAreaModal()}>选择</Button>
diff --git a/src/pages/ElecEvaluation/PlaceAreasManage/components/modal/PlaceModal.tsx b/src/pages/ElecEvaluation/PlaceAreasManage/components/modal/PlaceModal.tsx
index a3b1981..b6fd193 100644
--- a/src/pages/ElecEvaluation/PlaceAreasManage/components/modal/PlaceModal.tsx
+++ b/src/pages/ElecEvaluation/PlaceAreasManage/components/modal/PlaceModal.tsx
@@ -110,6 +110,9 @@ interface PlaceInfo {
             getPlatforms(platformParams).then(res =>{
                 if(res.code === 200){
                     setPlatforms(EnvPlatformOptions(res.data));
+                    if(placeInfo?.platformList){
+                        currentPlatform.current = placeInfo?.platformList;
+                    }
                     // if(placeInfo?.platformList && placeInfo?.platformList[0]?.platformId){
                     //     getExternPlaces(placeInfo?.platformList[0]?.platformId).then(res => {
                     //         setExternPlaces(EnvExternPlacesOptions(res.data));
@@ -450,8 +453,8 @@ interface PlaceInfo {
                         <Select labelInValue options={platforms} placeholder="请选择管理平台" onChange={handlePlatformChange}>
                         </Select>
                     </Form.Item>
-                    <Form.Item label="评标场所名称" required initialValue={placeInfo?.placeName}>
-                        <Form.Item name="placeName" noStyle rules={[{ required: true, message: '请填写评标场所名称/选择评标场所' }]}>
+                    <Form.Item label="评标场所名称" required>
+                        <Form.Item name="placeName" initialValue={placeInfo?.placeName} noStyle rules={[{ required: true, message: '请填写评标场所名称/选择评标场所' }]}>
                             <Input style={{ width: 'calc(85% - 8px)' }} placeholder="请填写评标场所名称/选择评标场所" maxLength={200} />
                         </Form.Item>
                         <Button style={{ width: 'calc(15%)', margin: '0 0 0 8px' }} type='primary' onClick={() => ShowExternPlaceModal()}>选择</Button>
diff --git a/src/pages/ElecEvaluation/PlaceAreasManage/components/modal/SelectExternPlaceModal.tsx b/src/pages/ElecEvaluation/PlaceAreasManage/components/modal/SelectExternPlaceModal.tsx
index 6c10b43..340366e 100644
--- a/src/pages/ElecEvaluation/PlaceAreasManage/components/modal/SelectExternPlaceModal.tsx
+++ b/src/pages/ElecEvaluation/PlaceAreasManage/components/modal/SelectExternPlaceModal.tsx
@@ -54,7 +54,6 @@ const SelectExternPlace: React.FC<SelectExternPlaceProps> = (props) => {
     }, [values])
 
     const queryExternPlaceList = async () => {
-        console.log(values[0]?.platformId);
         setLoading(true);
         return await getExternPlaces({platformId:values[0]?.platformId}).then(res => {
             if (res?.code == 200) {