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

src/components/pageComponents/PlanList.vue

@@ -22,7 +22,7 @@
                 </el-menu>
             </el-anchor>
         </div>
-        <div class="expert-content" ref="containerRef">
+        <div class="expert-content" :style="{ height: curRole == 2 ? `calc(100% - 50px)` : 'calc(100% - 20px)' }" ref="containerRef">
             <slot :menuData="menuData">
                 <div v-for="(section, index) in menuData" :key="index" class="content-section">
                     <div
@@ -120,7 +120,7 @@ const handleEdit = (sub) => {
     if(curRole == 2 && props.isEdit){
         router.push({
             path: "/edit_plan",
-            query: { arrangeId: sub.schemeId }
+            query: { arrangeId: sub.arrangeId }
         });
     }
 };
@@ -224,7 +224,7 @@ const handleClick = (e) => {
     }
     .expert-content {
         width: calc(100% - 100px);
-        height: 100%;
+        height: calc(100% - 50px);
         overflow: auto;
         box-sizing: border-box;
         .content-section {

src/views/old_mini/plan/editPlan.vue

@@ -3,7 +3,8 @@
         <custom-header name="查看详情"></custom-header>
         <div class="edit-plan-content" v-if="contentData && Object.keys(contentData).length > 0">
             <record-item :record-item-data="contentData.farmWorkLib" title-mode="default" class="recipe-item" />
-            <prescription-table 
+            <prescription-table
+                v-if="contentData?.prescription"
                 :prescription-list="[contentData?.prescription]"
                 :usage-mode="contentData?.prescription?.usageMode"
                 :attention="contentData?.attention"
@@ -72,6 +73,8 @@ const contentData = ref({});
     background: #f2f3f5;
     .edit-plan-content {
         padding: 12px;
+        height: calc(100% - 40px - 82px);
+        overflow: auto;
         .record-item {
             margin: 0;
         }