feat：修改录入信息品种bug

src/views/old_mini/entry_information/components/selectVariety.vue

@@ -57,7 +57,13 @@
                     <el-select v-model="defaultForm.varietyId" class="variety-select" placeholder="选择品种"
                         popper-class="variety-select-popper"
                         @change="handleDefaultVarietyChange">
-                        <el-option v-for="item in allVarieties" :key="item.id" :label="item.name" :value="item.id" />
+                        <el-option
+                            v-for="item in currentVarieties"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                            :class="{ 'is-variety-selected': isSelected(item.id) }"
+                        />
                     </el-select>
                 </div>
 
@@ -112,14 +118,20 @@
                 </div>
             </div>
 
-            <!-- 已选品种详情卡 -->
-            <div v-for="(item, index) in selectedList" :key="item.uid" class="form-card selected-card">
+            <!-- 已选品种详情卡：只显示当前品类 -->
+            <div v-for="item in visibleSelectedList" :key="item.uid" class="form-card selected-card">
                 <div class="form-card__header">
                     <img class="title-icon" src="@/assets/img/home/label-icon.png" alt="" />
                     <el-select v-model="item.id" class="variety-select" placeholder="选择品种"
                         popper-class="variety-select-popper"
-                        @change="(val) => handleSelectedVarietyChange(index, val)">
-                        <el-option v-for="opt in allVarieties" :key="opt.id" :label="opt.name" :value="opt.id" />
+                        @change="(val) => handleSelectedVarietyChange(item.uid, val)">
+                        <el-option
+                            v-for="opt in getVarietiesByCategory(item.categoryId)"
+                            :key="opt.id"
+                            :label="opt.name"
+                            :value="opt.id"
+                            :class="{ 'is-variety-selected': isSelected(opt.id) }"
+                        />
                     </el-select>
                     <span class="delete-btn" @click="removeVariety(item.uid)">删除</span>
                 </div>
@@ -189,7 +201,7 @@ import { ElMessage } from "element-plus";
 import { Search } from "@element-plus/icons-vue";
 import { useRouter } from "vue-router";
 import { useStore } from "vuex";
-import SelectLocationMap from "../map/selectLocationMap.js";
+import SelectLocationMap, { POINT_ICON } from "../map/selectLocationMap.js";
 
 const emit = defineEmits(["prev", "confirm"]);
 const router = useRouter();
@@ -224,7 +236,7 @@ function utilWktToCoordinate(point) {
 
 function createPreviewMap(el, point, showPoint = false) {
     if (!el || !point) return null;
-    const map = new SelectLocationMap();
+    const map = new SelectLocationMap({ iconSrc: POINT_ICON.plant });
     map.initMap(point, el, {
         enableClick: false,
         padding: MAP_PADDING,
@@ -334,10 +346,14 @@ function restoreSelectedListDraft() {
 
 const goSelectItemLocation = (item) => {
     sessionStorage.setItem(EDIT_UID_KEY, item.uid);
+    sessionStorage.setItem("ENTRY_INFORMATION_STEP", "3");
     saveSelectedListDraft();
     router.push({
         path: "/entry_select_location",
-        query: { mapCenter: item.location || getDefaultPoint() },
+        query: {
+            mapCenter: item.location || getDefaultPoint(),
+            pointType: "plant",
+        },
     });
 };
 
@@ -518,22 +534,15 @@ const currentStartingPointQuestion = computed(() =>
     getStartingPointQuestion(activeCategoryId.value)
 );
 
-const allVarieties = computed(() => {
-    const list = [];
-    for (const tab of categoryTabs.value) {
-        for (const item of tab.varieties || []) {
-            list.push({
-                ...item,
-                categoryId: tab.id,
-                categoryName: tab.name,
-            });
-        }
-    }
-    return list;
-});
+const currentVarieties = computed(() => currentCategory.value?.varieties || []);
+
+const getVarietiesByCategory = (categoryId) => {
+    const tab = categoryTabs.value.find((item) => String(item.id) === String(categoryId));
+    return tab?.varieties || [];
+};
 
 const filteredVarieties = computed(() => {
-    const list = currentCategory.value?.varieties || [];
+    const list = currentVarieties.value;
     const kw = appliedKeyword.value.trim();
     if (!kw) return list;
     return list.filter((item) => item.name.includes(kw));
@@ -544,6 +553,12 @@ const visibleVarieties = computed(() => {
     return filteredVarieties.value.slice(0, DEFAULT_VISIBLE_COUNT);
 });
 
+const visibleSelectedList = computed(() =>
+    selectedList.value.filter(
+        (item) => String(item.categoryId) === String(activeCategoryId.value)
+    )
+);
+
 watch(activeCategoryId, (id) => {
     searchKeyword.value = "";
     appliedKeyword.value = "";
@@ -589,18 +604,13 @@ const tipSelectVariety = () => {
 /** 顶部「选择品种」：选中后新增下方卡片，顶部表单重置为空 */
 const handleDefaultVarietyChange = (varietyId) => {
     if (!varietyId) return;
-    const found = allVarieties.value.find((item) => String(item.id) === String(varietyId));
+    const found = currentVarieties.value.find((item) => String(item.id) === String(varietyId));
     if (!found) {
         resetDefaultForm();
         return;
     }
     if (!isSelected(found.id)) {
-        selectedList.value.unshift(
-            createSelectedItem(found, {
-                id: found.categoryId,
-                name: found.categoryName,
-            })
-        );
+        selectedList.value.unshift(createSelectedItem(found, currentCategory.value));
         saveSelectedListDraft();
     }
     nextTick(() => {
@@ -608,14 +618,15 @@ const handleDefaultVarietyChange = (varietyId) => {
     });
 };
 
-const handleSelectedVarietyChange = (index, varietyId) => {
-    const found = allVarieties.value.find((item) => String(item.id) === String(varietyId));
-    const item = selectedList.value[index];
-    if (!item || !found) return;
+const handleSelectedVarietyChange = (uid, varietyId) => {
+    const item = selectedList.value.find((i) => i.uid === uid);
+    if (!item) return;
+    const found = getVarietiesByCategory(item.categoryId).find(
+        (opt) => String(opt.id) === String(varietyId)
+    );
+    if (!found) return;
     item.id = found.id;
     item.name = found.name;
-    item.categoryId = found.categoryId;
-    item.categoryName = found.categoryName;
     item.phenologyId = "";
     saveSelectedListDraft();
 };
@@ -734,6 +745,7 @@ const clearEntrySession = () => {
     sessionStorage.removeItem("ENTRY_BA_FORM");
     sessionStorage.removeItem(LOCATION_KEY);
     sessionStorage.removeItem(EDIT_UID_KEY);
+    sessionStorage.removeItem("ENTRY_INFORMATION_STEP");
 };
 
 const submitting = ref(false);
@@ -1151,5 +1163,17 @@ const handleConfirm = async () => {
 .variety-select-popper {
     width: auto !important;
     min-width: 100px !important;
+
+    .el-select-dropdown__item.is-variety-selected {
+        color: #2199f8;
+        background: transparent;
+        font-weight: 500;
+
+        &.is-hovering,
+        &:hover {
+            color: #2199f8;
+            background: transparent;
+        }
+    }
 }
 </style>

src/views/old_mini/entry_information/index.vue

@@ -10,15 +10,31 @@
 </template>
 
 <script setup>
-import { ref } from "vue";
+import { ref, watch } from "vue";
 import { useRouter } from "vue-router";
 import customHeader from "@/components/customHeader.vue";
 import baInformation from "./components/baInformation.vue";
 import selectCategory from "./components/selectCategory.vue";
 import selectVariety from "./components/selectVariety.vue";
 
+const STEP_KEY = "ENTRY_INFORMATION_STEP";
+
 const router = useRouter();
-const currentStep = ref(1);
+
+function readStep() {
+    const step = Number(sessionStorage.getItem(STEP_KEY));
+    return step >= 1 && step <= 3 ? step : 1;
+}
+
+const currentStep = ref(readStep());
+
+watch(
+    currentStep,
+    (step) => {
+        sessionStorage.setItem(STEP_KEY, String(step));
+    },
+    { immediate: true }
+);
 
 const handleNext = () => {
     if (currentStep.value < 3) {

src/views/old_mini/entry_information/map/selectLocationMap.js

@@ -12,16 +12,22 @@ export let mapLocation = reactive({
   data: null,
 });
 
+export const POINT_ICON = {
+  resident: require("@/assets/img/map/current-point.png"),
+  plant: require("@/assets/img/map/zhongzhi-point.png"),
+};
+
 /**
- * @description 常驻点位选点地图
+ * @description 选点地图，默认常驻点位图标；传入 iconSrc 可切换种植点位
  */
 class SelectLocationMap {
-  constructor() {
+  constructor(options = {}) {
+    const iconSrc = options.iconSrc || POINT_ICON.resident;
     this.clickPointLayer = new KMap.VectorLayer("clickPointLayer", 9999, {
       style: () => {
         return new Style({
           image: new Icon({
-            src: require("@/assets/img/map/current-point.png"),
+            src: iconSrc,
             scale: 0.45,
             anchor: [0.5, 1],
           }),

src/views/old_mini/entry_information/selectLocation.vue

@@ -27,7 +27,7 @@ import { useStore } from "vuex";
 import { ElMessage } from "element-plus";
 import customHeader from "@/components/customHeader.vue";
 import locationSearch from "@/components/pageComponents/locationSearch.vue";
-import SelectLocationMap, { mapLocation } from "./map/selectLocationMap.js";
+import SelectLocationMap, { mapLocation, POINT_ICON } from "./map/selectLocationMap.js";
 import { convertPointToArray } from "@/utils/index";
 
 const SESSION_KEY = "ENTRY_RESIDENT_LOCATION";
@@ -37,7 +37,10 @@ const router = useRouter();
 const route = useRoute();
 const store = useStore();
 const mapContainer = ref(null);
-const selectLocationMap = new SelectLocationMap();
+const isPlantPoint = route.query.pointType === "plant";
+const selectLocationMap = new SelectLocationMap({
+    iconSrc: isPlantPoint ? POINT_ICON.plant : POINT_ICON.resident,
+});
 
 const userLocation = ref(
     store.state.home.miniUserLocation || localStorage.getItem("MINI_USER_LOCATION") || "113.61702297075017,23.584863449735067"
@@ -84,7 +87,7 @@ const handleLocate = () => {
 const handleSubmit = () => {
     const coordinate = mapLocation.data;
     if (!coordinate) {
-        ElMessage.warning("请选择常驻点位");
+        ElMessage.warning(isPlantPoint ? "请选择种植点位" : "请选择常驻点位");
         return;
     }
     const point = toPointWkt(coordinate);