优化

src/views/xm/core/xmMenu/XmMenuEdit.vue

@@ -37,12 +37,13 @@
 									</el-form-item>
 								</el-col>
 								<el-col :span="12">
-									<el-form-item v-if="parentMenu" label="需求池" prop="pmenuId"> 
-										<el-link type="primary"  :icon="'el-icon-folder-opened'">{{parentMenu.seqNo}} &nbsp; &nbsp; {{parentMenu.menuName}}</el-link> 
-									</el-form-item>  
-									<el-form-item v-if="!parentMenu" label="需求池" prop="pmenuId">
+									<el-form-item v-if="!editForm.pmenuId" label="需求池" prop="pmenuId">
 										无归属需求池
 									</el-form-item>  
+									
+									<el-form-item  v-else label="需求池" prop="pmenuId"> 
+										<el-link type="primary"  :icon="'el-icon-folder-opened'">  {{editForm.pmenuName?editForm.pmenuName:editForm.pmenuId}}</el-link> 
+									</el-form-item>  
 								</el-col>
 							</el-row> 
 							<el-row> 

src/views/xm/core/xmMenu/XmMenuMng.vue

@@ -2,7 +2,6 @@
 	<section class="padding">
 		<el-row v-if=" !batchEditVisible">  
 			<el-col :span="24" class="padding-left">
-				
 					<el-row>   
 						
 						<el-select v-model="filters.dtype" clearable placeholder="需求类型">
@@ -61,6 +60,8 @@
 							</el-row>   
 							<el-button type="primary"    slot="reference" icon="el-icon-plus">需求</el-button>
 						</el-popover>
+						
+						<el-button  @click="batchEditVisible=true">批量修改</el-button>
 						<el-button  @click="showParentMenu">更换上级</el-button>
  						<el-button  v-if="!selProject&&!xmIteration&&disabledMng!=false"  type="danger" @click="batchDel" icon="el-icon-delete">删除</el-button> 
 
@@ -164,7 +165,7 @@
 										 <span>{{scope.row.ctime}} </span>  
 								</template>
 							</el-table-column> 
-							<el-table-column prop="menuName" label="负责人"  min-width="100" show-overflow-tooltip> 
+							<el-table-column prop="menuName" label="跟进人"  min-width="100" show-overflow-tooltip> 
 								<template slot-scope="scope"> 
 										 <span>{{scope.row.mmUsername}} </span>  
 								</template>
@@ -195,7 +196,7 @@
 							</el-table-column>   
 							
 						</el-table>
-						<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
+						
 							
 					</el-row> 
 				<!--编辑 XmMenu xm_project_menu界面-->
@@ -248,9 +249,10 @@
 			</el-col> 	 
 		</el-row>
 		
-		<el-row v-if="batchEditVisible && filters.product" :span="24">
-			<xm-menu-mng-batch :sel-project="selProject"  @no-batch-edit="noBatchEdit" :product="filters.product"></xm-menu-mng-batch>
+		<el-row v-if="batchEditVisible">
+			<xm-menu-mng-batch :xm-menus="xmMenus"  @no-batch-edit="noBatchEdit" :product="filters.product"></xm-menu-mng-batch>
 		</el-row>
+		<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
 		
 		<el-drawer append-to-body title="标签条件" :visible.sync="tagSelectVisible"  size="60%">
 			<tag-mng :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]" :jump="true" @select-confirm="onTagSelected">
@@ -313,7 +315,7 @@
 			
       xmMenusTreeData() {  
 				let xmMenus = JSON.parse(JSON.stringify(this.xmMenus || []));  
-				let xmMenusTreeData = treeTool.translateDataToTree(xmMenus,"pmenuId","id");  
+				let xmMenusTreeData = treeTool.translateDataToTree(xmMenus,"pmenuId","menuId");  
 				 return xmMenusTreeData;
 			},
 			isPmUser(){

src/views/xm/core/xmTask/XmTaskMngBatch.vue

@@ -9,11 +9,6 @@
           icon="el-icon-finished"
           >保存</el-button
         >
-        <el-button
-          type="success"
-          @click="handlePopover(null, 'add')"
-          icon="el-icon-plus"
-        ></el-button>
         <el-button
           @click="noBatchEdit"
           v-loading="load.edit"
@@ -42,37 +37,7 @@
         >
           <el-table-column type="selection" width="50" fixed="left"></el-table-column>
           <el-table-column prop="sortLevel" label="序号/名称" width="350" fixed="left">
-            <template slot-scope="scope"> 
-              <el-popover placement="top" width="400" trigger="click">
-                <div style="text-align: center; margin: 0">
-                  <div
-                    :ref="'task_' + scope.$index"
-                    :data-task-id="scope.row.id"
-                  ></div>
-				  <!--
-                  <el-button
-                    type="primary"
-                    @click="handlePopover(scope.row, 'highestPmenuId')"
-                    >成为顶级节点</el-button
-                  >
-				  -->
-                  <el-button
-                    type="danger"
-                    @click="handlePopover(scope.row, 'delete')"
-                    >删除当前行</el-button
-                  >
-                  <el-button
-                    type="success"
-                    @click="handlePopover(scope.row, 'addSub')"
-                    >增加子行</el-button
-                  >
-                </div>
-                <el-button
-                  slot="reference" 
-                  :type="scope.row.opType ? 'success' : 'plain'"
-                  icon="el-icon-edit"
-                ></el-button>
-              </el-popover>
+            <template slot-scope="scope">  
               <el-input
                 style="width: 100px"
                 v-model="scope.row.sortLevel"