From 62332fa9e7274e6059c7e073fa291caad1207c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 20 Apr 2021 21:37:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmMenu/XmMenuWithPlan.vue      | 16 ++++++++++++++--
 src/views/xm/core/xmMenuState/XmMenuStateMng.vue |  8 +++++++-
 src/views/xm/core/xmTask/XmTaskMngBatch.vue      | 10 +++++-----
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index 3e2fe970..81811c65 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -17,7 +17,7 @@
 					<el-table-column sortable type="selection" width="40"></el-table-column>
  					<el-table-column prop="menuName" label="故事名称" min-width="150" >
 						<template slot-scope="scope"> 
-							<el-link @click="toMenu(scope.row)">  {{scope.row.seqNo}}&nbsp;&nbsp;{{scope.row.menuName}} </el-link><el-button v-if="scope.row.projectId" type="text" @click="showTasks(scope.row)">任务</el-button><el-tag v-else type="warning">未关联任务</el-tag>
+							{{scope.row.seqNo}}&nbsp;<el-link type="primary" @click="toMenu(scope.row)">  {{scope.row.menuName}} </el-link>
 						</template>
 					</el-table-column>  
 					<el-table-column prop="planStatus" label="计划状态" width="100" :formatter="formatterOption"></el-table-column> 
@@ -57,6 +57,12 @@
 							<el-tag v-if="scope.row.onlineStatus=='1'" type="success">已上线</el-tag>
 						</template>
 					</el-table-column>
+					<el-table-column label="操作" width="100" fixed="right"  >
+						<template slot-scope="scope">
+							<el-button v-if="scope.row.projectId" type="text" @click="showTasks(scope.row)"  icon="el-icon-tickets">查看任务</el-button>
+							<el-tag v-else type="warning">未关联任务</el-tag>
+						</template>
+					</el-table-column>
 				</el-table>
 				<el-pagination v-if="!gstcVisible"  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> 
       <xm-gantt v-if="gstcVisible" :tree-data="xmMenusTreeData" :project-phase="selProject" :columns="ganrrColumns"></xm-gantt>
@@ -67,7 +73,7 @@
  
  					<el-table-column prop="menuName" label="故事名称" min-width="150" >
 						<template slot-scope="scope"> 
-							 {{scope.row.seqNo}}&nbsp;&nbsp;{{scope.row.menuName}} <el-button v-if="scope.row.projectId" type="text" @click="showTasks(scope.row)">任务</el-button><el-tag v-else type="warning">未关联任务</el-tag>
+							 {{scope.row.seqNo}}&nbsp;&nbsp;{{scope.row.menuName}} 
 						</template>
 					</el-table-column>  
 					<el-table-column prop="chargeUsername" label="负责人" min-width="80" >
@@ -99,6 +105,12 @@
 							</el-select>
 						</template>
 					</el-table-column> 
+					<el-table-column label="操作" width="100" fixed="right"  >
+						<template slot-scope="scope">
+							<el-button v-if="scope.row.projectId" type="text" @click="showTasks(scope.row)"  icon="el-icon-tickets">查看任务</el-button>
+							<el-tag v-else type="warning">未关联任务</el-tag>
+						</template>
+					</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>
diff --git a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
index d98a3bd6..beff3427 100644
--- a/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
+++ b/src/views/xm/core/xmMenuState/XmMenuStateMng.vue
@@ -13,7 +13,7 @@
 					<el-table-column sortable type="selection" width="40"></el-table-column>
  					<el-table-column prop="menuName" label="故事名称" min-width="150" >
 						<template slot-scope="scope"> 
-							<el-link @click="toMenu(scope.row)">  {{scope.row.seqNo}}&nbsp;&nbsp;{{scope.row.menuName}} </el-link><el-button v-if="scope.row.projectId" type="text" @click="showTasks(scope.row)">任务</el-button><el-tag v-else type="warning">未关联任务</el-tag>
+							<el-link @click="toMenu(scope.row)">  {{scope.row.seqNo}}&nbsp;&nbsp;{{scope.row.menuName}} </el-link>
 						</template>
 					</el-table-column>  
 					<el-table-column prop="planStatus" label="计划状态" width="100" :formatter="formatterOption"></el-table-column> 
@@ -53,6 +53,12 @@
 							<el-tag v-if="scope.row.onlineStatus=='1'" type="success">已上线</el-tag>
 						</template>
 					</el-table-column>
+					<el-table-column label="操作" width="100" fixed="right"  >
+						<template slot-scope="scope">
+							<el-button v-if="scope.row.projectId" type="text" @click="showTasks(scope.row)"  icon="el-icon-tickets">查看任务</el-button>
+							<el-tag v-else type="warning">未关联任务</el-tag>
+						</template>
+					</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> 
 				  
diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
index afdde3af..99862c5c 100644
--- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue
+++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue
@@ -8,11 +8,11 @@
 				<span style="margin-left:10px;font-size:14px;">内部人力总预算：</span><el-tag :type="taskBudgetData.surplusPhaseBudgetInnerUserAt>0?'warning':'danger'">{{(projectPhase.phaseBudgetInnerUserAt/10000).toFixed(2)}}万，剩{{(taskBudgetData.surplusPhaseBudgetInnerUserAt/10000).toFixed(2)}}万</el-tag>  
 				<span style="margin-left:10px;font-size:14px;">外购人力总预算：</span><el-tag :type="taskBudgetData.surplusPhaseBudgetOutUserAt>0?'warning':'danger'">{{(projectPhase.phaseBudgetOutUserAt/10000).toFixed(2)}}万，剩{{(taskBudgetData.surplusPhaseBudgetOutUserAt/10000).toFixed(2)}}万</el-tag>   
 				<div style="line-height:50px;float:right;margin-right:10px;"> 
-					<el-button type="danger"   @click="batchDel" v-loading="load.edit">批量删除</el-button>   
- 					<el-button type="warning"   @click="saveBatchEdit" v-loading="load.edit">批量保存</el-button>
-					<el-button type="success"  @click="handlePopover(null,'add')" >+任务</el-button>
-					<el-button type="primary"   @click="searchXmTasks" v-loading="load.list">查询</el-button>  
-					<el-button     @click="noBatchEdit" v-loading="load.edit">返回</el-button>  
+					<el-button type="danger"   @click="batchDel" v-loading="load.edit" icon="el-icon-delete">批量删除</el-button>   
+ 					<el-button type="warning"   @click="saveBatchEdit" v-loading="load.edit" icon="el-icon-finished">批量保存</el-button>
+					<el-button type="success"  @click="handlePopover(null,'add')" icon="el-icon-plus" >+任务</el-button>
+					<el-button type="primary"   @click="searchXmTasks" v-loading="load.list" icon="el-icon-search">查询</el-button>  
+					<el-button     @click="noBatchEdit" v-loading="load.edit" icon="el-icon-back">返回</el-button>  
 				</div>
 			</el-row> 
 			<el-row>