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(false); const [placeList, setPlaceList] = useState([]); - const [areaList, setAreaList] = useState([]); + // const [areaList, setAreaList] = useState([]); const [selectAreaStatus, setSelectAreaStatus] = useState(); const currentPlace = useRef(); 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 { - - + + 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 { - - + + 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 = (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) {