Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-farm-h5

src/views/old_mini/create_farm/index.vue

@@ -740,6 +740,7 @@ async function changeSpecie(v) {
     if (!data) {
         ElMessage.warning("该品类暂无可用方案，请选择其他品类");
         ruleForm.speciesItem = "";
+        ruleForm.typeId = "";
         fruitsList.value = [];
         return;
     }

src/views/old_mini/monitor/subPages/plan.vue

@@ -192,7 +192,9 @@ const getSpecieList = () => {
             options.value = data || [];
             if (sessionStorage.getItem("specieValue")) {
                 specieValue.value = sessionStorage.getItem("specieValue");
+                currentTabIndex.value = sessionStorage.getItem("currentTabIndex");
                 sessionStorage.removeItem("specieValue");
+                sessionStorage.removeItem("currentTabIndex");
             } else {
                 specieValue.value = data[0]?.defaultContainerId;
             }
@@ -414,7 +416,8 @@ const handleSubmitPlan = async () => {
                         }
                     });
             } else {
-                showTipPopup.value = true;
+                // showTipPopup.value = true;
+                ElMessage.warning("当前方案有未完善报价信息的农事，请先完善报价信息");
             }
         }
     }
@@ -425,6 +428,7 @@ const savePlanPageInfo = () => {
     sessionStorage.setItem("active", active.value);
     sessionStorage.setItem("farmWorkIds", JSON.stringify(farmWorkIds.value));
     sessionStorage.setItem("arrangeIds", JSON.stringify(arrangeIds.value));
+    sessionStorage.setItem("currentTabIndex", currentTabIndex.value);
 };
 
 // 新增农事