Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into develop

src/views/plan/workbench/homePage/beta/index.vue

@@ -8,12 +8,12 @@
 					:isShowComponent="isShowComponent"
 					@calculateTableHeight="calculateTableHeight" />
 			</el-tab-pane>
-			<el-tab-pane label="正式订单" name="second">
+			<!-- <el-tab-pane label="正式订单" name="second">
 				<Order :customerId="customerId" :tableHeight="tableHeight" :isShowComponent="isShowComponent" />
 			</el-tab-pane>
 			<el-tab-pane label="产品需求" name="third">
 				<Product :customerId="customerId" :tableHeight="tableHeight" :isShowComponent="isShowComponent" />
-			</el-tab-pane>
+			</el-tab-pane> -->
 		</el-tabs>
 	</ContentContainer>
 </template>

src/views/plan/workbench/homePage/beta/predict/predictEdit.vue

@@ -235,7 +235,7 @@ export default {
 <style lang="less">
 .predict-edit-container {
 	.el-form-item {
-		margin-bottom: 20px;
+		margin-bottom: 10px;
 	}
 }
 </style>