From 2a624920a5519cc4cd59b03cbb950a5432db6682 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, 8 Mar 2022 21:45:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../XmProjectPhaseForProduct.vue              | 30 ++++----------
 .../core/xmProjectPhase/XmProjectPhaseMng.vue | 40 +++++++------------
 .../xmProjectPhase/XmProjectPhaseSelect.vue   |  5 ++-
 3 files changed, 25 insertions(+), 50 deletions(-)

diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseForProduct.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseForProduct.vue
index 68afb51f..8fad88fc 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseForProduct.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseForProduct.vue
@@ -15,7 +15,7 @@
 				
 				<el-button  class="hidden-md-and-down"  @click="loadMenusToXmProductPhase(sels)" v-loading="load.edit" icon="el-icon-s-data">由需求汇总进度数据</el-button> 
 				<el-button   @click="batchEditVisible=true" v-loading="load.edit" icon="el-icon-edit">批量修改</el-button> 
-				<el-button   @click="batchDel" v-loading="load.del" icon="el-icon-delete">删除</el-button> 
+				<el-button type="danger"   @click="batchDel" v-loading="load.del" icon="el-icon-delete">删除</el-button> 
 			</span> 
 			<el-popover
 				placement="top-start"
@@ -62,15 +62,15 @@
 				</el-table-column>
 				  <el-table-column prop="phaseName" label="计划名称" min-width="150" show-overflow-tooltip> 
 					 <template slot-scope="scope">   
-						<span>
+						<span class="vlink"   @click="showEdit(scope.row)">
 							<span v-show="scope.row.milestone=='1'">
 								<i class="el-icon-star-on"></i>
 							</span>
 							<span v-show="scope.row.isKeyPath=='1'"> 
 								<i class="el-icon-s-help"></i>
 							</span>
-							<el-link :icon="scope.row.ntype=='1'?'el-icon-folder-opened':''" type="primary" @click="showEdit(scope.row)">{{scope.row.seqNo}} &nbsp;&nbsp;  
-							</el-link>
+							{{scope.row.seqNo}} &nbsp; 
+							 
 							{{scope.row.phaseName}}  
 							<font v-for="item in [calcTaskStateByTime(scope.row.beginDate,scope.row.endDate,scope.row.actRate,scope.phaseStatus)]" :key="item.status"><el-tag :type="item.status">{{item.remark}}</el-tag></font> 
 						</span>
@@ -111,23 +111,11 @@
 						 <font v-if="options.xmPhaseStatus.some(i=>i.id==scope.row.phaseStatus)">{{options.xmPhaseStatus.find(i=>i.id==scope.row.phaseStatus).name}}</font>
 					</template>
 				</el-table-column>     
-				<el-table-column  prop="bizFlowState" label="审批状态" width="100" >  
-					<template slot-scope="scope">
-						<el-tooltip  :content="showApprovaInfo(scope.row)" placement="bottom" effect="light">
-						<el-tag v-if="scope.row.flowState=='0'|| !scope.row.flowState">未发审</el-tag> 
-						<el-tag v-else-if="scope.row.flowState=='1'">审核中</el-tag> 
-						<el-tag v-else-if="scope.row.flowState=='2'">已通过</el-tag>
-						<el-tag v-else-if="scope.row.flowState=='3'">未通过</el-tag>
-						<el-tag v-else-if="scope.row.flowState=='4'">已取消</el-tag> 
-						</el-tooltip> 
-					</template>
-				</el-table-column>  
 				<el-table-column    label="操作" width="200" >  
 					<template slot-scope="scope">
 						<el-popover style="padding-left:10px;" 
 							placement="top-start"
-							width="250"
-							v-if="scope.row.ntype=='1'"
+							width="250" 
 							trigger="click" > 
 							<el-row> 
 								<el-col :span="24" style="padding-top:5px;">
@@ -138,14 +126,12 @@
 								</el-col>  
 							</el-row>   
 							<el-button type="text"  slot="reference" icon="el-icon-plus">子计划</el-button>
-						</el-popover>   
-						
-						<el-button type="text"  @click="showEdit(scope.row)" icon="el-icon-edit">编辑</el-button> 
-						<el-button type="text" :disabled="scope.row.childrenCnt>0"  @click="handleDel(scope.row)" icon="el-icon-delete">删除</el-button>   
+						</el-popover>    
+						<el-button type="text"  @click="showEdit(scope.row)" icon="el-icon-edit">编辑</el-button>   
 							<span v-if="scope.row.ntype!='1'">
 								<el-dropdown @command="handleCommand" :hide-on-click="false"> 
 									<span class="el-dropdown-link">
-										<i class="el-icon-more"></i>
+										更多<i class="el-icon-arrow-down el-icon--right"></i>
 									</span>
 									<el-dropdown-menu slot="dropdown">
 										<el-dropdown-item icon="el-icon-edit"   :command="{type:'showTaskForBatchRelTasksWithPhase',row:scope.row}">批量关联需求</el-dropdown-item>	
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index bbe1cf71..7b3be788 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -15,7 +15,7 @@
 				
 				<el-button  class="hidden-md-and-down"  @click="loadTasksToXmProjectPhase(sels)" v-loading="load.edit" icon="el-icon-s-data">由任务汇总进度数据</el-button> 
 				<el-button   @click="batchEditVisible=true" v-loading="load.edit" icon="el-icon-edit">批量修改</el-button> 
-				<el-button   @click="batchDel" v-loading="load.del" icon="el-icon-delete">删除</el-button> 
+				<el-button type="danger"  @click="batchDel" v-loading="load.del" icon="el-icon-delete">删除</el-button> 
 			</span> 
 			<el-popover
 				placement="top-start"
@@ -70,28 +70,29 @@
 			<!--列表 XmProjectPhase xm_project_phase-->
 			<el-table lazy :load="loadXmProjectPhaseLazy" ref="table" :height="tableHeight" v-show="!gstcVisible "  default-expand-all :data="projectPhaseTreeData"  :summary-method="getSummariesForNoBatchEdit"  :show-summary="true"  row-key="id" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 					
-				<el-table-column  type="selection"  width="80"> 
+				<el-table-column  type="selection"  width="50"> 
+				</el-table-column>
+				<el-table-column  type="index"  width="50"> 
 				</el-table-column>
 				  <el-table-column prop="phaseName" label="计划名称" min-width="150" show-overflow-tooltip> 
 					 <template slot-scope="scope">   
-						<span>
+						<span class="vlink"    @click="showEdit(scope.row)">
 							<span v-show="scope.row.milestone=='1'">
 								<i class="el-icon-star-on"></i>
 							</span>
 							<span v-show="scope.row.isKeyPath=='1'"> 
 								<i class="el-icon-s-help"></i>
 							</span>
-							<el-link :icon="scope.row.ntype=='1'?'el-icon-folder-opened':''" type="primary" @click="showEdit(scope.row)">{{scope.row.seqNo}} &nbsp;&nbsp;  
-							</el-link>
-							{{scope.row.phaseName}}  
-							<font v-for="item in [calcTaskStateByTime(scope.row.beginDate,scope.row.endDate,scope.row.actRate,scope.phaseStatus)]" :key="item.status"><el-tag :type="item.status">{{item.remark}}</el-tag></font> 
+							{{scope.row.seqNo}} &nbsp;  
+								{{scope.row.phaseName}}  
+								<font v-for="item in [calcTaskStateByTime(scope.row.beginDate,scope.row.endDate,scope.row.actRate,scope.phaseStatus)]" :key="item.status"><el-tag :type="item.status">{{item.remark}}</el-tag></font> 
 						</span>
 					 </template>
 				</el-table-column>   
 				<el-table-column  prop="mngUsername" label="责任人" width="80" show-overflow-tooltip> 
 					<template  slot-scope="scope">
-						<el-button type="text" v-if="!scope.row.mngUserid"  v-model="scope.row.mngUsername" @click="groupUserSelectVisible=true" icon="el-icon-setting">去设置</el-button>  
-						<el-link v-else type="primary"   @click="groupUserSelectVisible=true">{{scope.row.mngUsername}}</el-link>
+						<el-link type="primary" title="还没设置负责人，点击去设置" v-if="!scope.row.mngUserid"  v-model="scope.row.mngUsername" @click="groupUserSelectVisible=true" icon="el-icon-setting">去设置</el-link>  
+						<el-link v-else    @click="groupUserSelectVisible=true">{{scope.row.mngUsername}}</el-link>
 					</template>
 				</el-table-column>
 				<el-table-column  prop="beginDate" label="起止时间" width="120" show-overflow-tooltip>
@@ -123,23 +124,11 @@
 						 <font v-if="options.xmPhaseStatus.some(i=>i.id==scope.row.phaseStatus)">{{options.xmPhaseStatus.find(i=>i.id==scope.row.phaseStatus).name}}</font>
 					</template>
 				</el-table-column>     
-				<el-table-column  prop="bizFlowState" label="审批状态" width="100" >  
-					<template slot-scope="scope">
-						<el-tooltip  :content="showApprovaInfo(scope.row)" placement="bottom" effect="light">
-						<el-tag v-if="scope.row.flowState=='0'|| !scope.row.flowState">未发审</el-tag> 
-						<el-tag v-else-if="scope.row.flowState=='1'">审核中</el-tag> 
-						<el-tag v-else-if="scope.row.flowState=='2'">已通过</el-tag>
-						<el-tag v-else-if="scope.row.flowState=='3'">未通过</el-tag>
-						<el-tag v-else-if="scope.row.flowState=='4'">已取消</el-tag> 
-						</el-tooltip> 
-					</template>
-				</el-table-column>  
 				<el-table-column    label="操作" width="200" >  
 					<template slot-scope="scope">
 						<el-popover style="padding-left:10px;" 
 							placement="top-start"
-							width="250"
-							v-if="scope.row.ntype=='1'"
+							width="250" 
 							trigger="click" > 
 							<el-row> 
 								<el-col :span="24" style="padding-top:5px;">
@@ -155,12 +144,11 @@
 							<el-button type="text"  slot="reference" icon="el-icon-plus">子计划</el-button>
 						</el-popover>   
 						
-						<el-button type="text"  @click="showEdit(scope.row)" icon="el-icon-edit">编辑</el-button> 
-						<el-button type="text" :disabled="scope.row.childrenCnt>0"  @click="handleDel(scope.row)" icon="el-icon-delete">删除</el-button>   
+						<el-button type="text"  @click="showEdit(scope.row)" icon="el-icon-edit">编辑</el-button>  
 							<span v-if="scope.row.ntype!='1'">
-								<el-dropdown @command="handleCommand" :hide-on-click="false"> 
+								<el-dropdown @command="handleCommand" :hide-on-click="false">  
 									<span class="el-dropdown-link">
-										<i class="el-icon-more"></i>
+										更多<i class="el-icon-arrow-down el-icon--right"></i>
 									</span>
 									<el-dropdown-menu slot="dropdown">
 										<el-dropdown-item icon="el-icon-edit"   :command="{type:'showTaskForBatchRelTasksWithPhase',row:scope.row}">批量关联任务</el-dropdown-item>	
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
index 00132908..d78d0cbb 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseSelect.vue
@@ -4,11 +4,12 @@
 		<el-table  lazy :load="loadXmProjectPhaseLazy" :height="tableHeight" ref="selectPhaseTable" :data="projectPhaseTreeData"    :show-summary="false"  row-key="id" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
  			<el-table-column prop="phaseName" label="计划名称"  show-overflow-tooltip> 
 				 <template slot="header" slot-scope="scope">
-					<div>计划  <el-tag  type="warning" v-if="editForm.id" closable @close="clearSelectPhase()"> {{editForm.phaseName}}</el-tag></div>
+					<span>计划  <el-tag  type="warning" v-if="editForm.id" closable @close="clearSelectPhase()"> <font class="hidden-md-and-down">{{editForm.phaseName}}</font><font class="hidden-lg-and-up" style="font-size:2px;">{{editForm.phaseName}}</font></el-tag></span>
 				</template>
 				<template slot-scope="scope">  
-					<i v-if="scope.row.ntype=='1'" class="el-icon-folder-opened"></i>{{scope.row.seqNo}} &nbsp;&nbsp;<el-tooltip v-if="scope.row.milestone=='1'" content="里程碑"><i  class="el-icon-star-on"></i></el-tooltip>{{scope.row.phaseName}}
+					<span class="vlink">{{scope.row.seqNo}} &nbsp;<el-tooltip v-if="scope.row.milestone=='1'" content="里程碑"><i  class="el-icon-star-on"></i></el-tooltip>{{scope.row.phaseName}}
 					<font  :color="scope.row.actRate>=100?'green':'#FF8C00'"> {{ (scope.row.actRate!=null?scope.row.actRate:0)+'%'}} </font>  
+					</span>
 				</template>
 			</el-table-column>   
 		</el-table>