From 3c5c412ba7bb5c6d34875525c8ddfff75f618ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 4 Jul 2021 17:21:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=85=E4=BA=8B=E7=95=8C=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmMenu/XmMenuMng.vue      | 9 ++++++---
 src/views/xm/core/xmMenu/XmMenuMngBatch.vue | 9 ++++++---
 src/views/xm/core/xmMenu/XmMenuWithPlan.vue | 2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 22a1616f..69c4e672 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -202,7 +202,7 @@
 		</el-row>
 		
 		<el-row v-if="batchEditVisible && filters.product" :span="24">
-			<xm-menu-mng-batch  @no-batch-edit=noBatchEdit :product="filters.product"></xm-menu-mng-batch>
+			<xm-menu-mng-batch :sel-project="selProject"  @no-batch-edit="noBatchEdit" :product="filters.product"></xm-menu-mng-batch>
 		</el-row>
 	</section>
 </template>
@@ -813,9 +813,12 @@
 			if(this.filters.product==null){
 				this.productVisible=true;
 			}
-			this.$nextTick(() => {
+			this.$nextTick(() => { 
 				var clientRect=this.$refs.table.$el.getBoundingClientRect();
-				var subHeight=70/1000 * window.innerHeight; 
+				var subHeight=65/1000 * window.innerHeight; 
+				if(this.selProject){
+					subHeight=110/1000 * window.innerHeight; 
+				} 
 				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				this.getXmMenus();
           });  
diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
index 47db1baa..9b8c409b 100644
--- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
@@ -94,8 +94,8 @@
 			</el-row>
 			<el-row style="padding-top:12px;"> 
 				<el-table ref="table" :max-height="tableHeight" :data="xmMenusTreeData" class="drag-table" default-expand-all  row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
-					<el-table-column sortable type="selection" width="45"></el-table-column>
-					<el-table-column sortable prop="seqNo"  label="序号" min-width="100">
+					<el-table-column  type="selection" width="45"></el-table-column>
+					<el-table-column  prop="seqNo"  label="序号" min-width="100">
 						<template slot-scope="scope">
 							<div style="display:flex;width:100%;">
 								<el-popover
@@ -1087,7 +1087,10 @@
 				this.getXmMenus();
 				var clientRect=this.$refs.table.$el.getBoundingClientRect();
 				var subHeight=65/1000 * window.innerHeight; 
-				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight;  
+				if(this.selProject){
+					subHeight=110/1000 * window.innerHeight; 
+				} 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
 				
 				
           }); 
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index 94407324..df4abfb8 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -94,7 +94,7 @@
 				  
 		</el-row>
 		<el-row v-show="batchEditVisible">
-			<el-table :data="xmMenusTreeData"   row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+			<el-table :max-height="tableHeight" :data="xmMenusTreeData"   row-key="menuId" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  
  					<el-table-column prop="menuName" label="故事名称" min-width="150" >
 						<template slot-scope="scope">