From ea418485b48f2f6a6cbe6b243e2e449753db90db 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, 27 Mar 2022 06:51:47 +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

---
 src/views/xm/core/xmMenu/XmMenuMng.vue       | 124 +++++++++++++------
 src/views/xm/core/xmProduct/XmProductMng.vue |   8 ++
 src/views/xm/core/xmProject/XmProjectMng.vue |   8 ++
 3 files changed, 102 insertions(+), 38 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 6007eb3b..34a8b4c9 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -39,8 +39,8 @@
 							<el-row>  
 								<el-col  :span="24"  style="padding-top:5px;" >
 									<font class="more-label-font">标签条件:</font>  
-									<el-button type="text" v-if="!filters.tags||filters.tags.length==0" @click.native="tagSelectVisible=true">标签</el-button>
-									<el-tag v-else @click="tagSelectVisible=true"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
+									<el-button type="text" v-if="!filters.tags||filters.tags.length==0" @click.native="$refs.tagDialog.open()">标签</el-button>
+									<el-tag v-else @click="$refs.tagDialog.open()"   closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个</el-tag>
  
 								</el-col> 
 								<el-col :span="24"  style="padding-top:5px;">
@@ -229,7 +229,7 @@
 							<el-table-column prop="status" label="状态"  min-width="80"  sortable> 
 								<template slot-scope="scope"> 
 									<div class="cell-text">
-									{{dicts.menuStatus.some(i=>i.id==scope.row.status)?dicts.menuStatus.find(i=>scope.row.status==i.id).name:''}}
+										<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in [formatterMenuStatusDicts(scope.row.status)]" :key="index">{{item.name}}</el-button>
 									</div>
 									<span class="cell-bar">   
 										 <el-select  v-model="scope.row.status" placeholder="需求状态"  style="display:block;"  @change="editXmMenuSomeFields(scope.row,'status',$event)">
@@ -238,6 +238,18 @@
 									</span> 
 								</template>
 							</el-table-column>   
+							<el-table-column prop="priority"  label="优先级" width="100" sortable>   
+								<template slot-scope="scope"> 
+									<div class="cell-text">
+										<el-button style="display:block;" :type="item.className" plain round v-for="(item,index) in [formatterPriorityDicts(scope.row.priority)]" :key="index">{{item.name}}</el-button>
+ 									</div>
+									<span class="cell-bar">   
+										 <el-select  v-model="scope.row.priority" placeholder="优先级"  style="display:block;" @change="editXmMenuSomeFields(scope.row,'priority',$event)">
+												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.priority" :key="index"> </el-option> 
+										 </el-select>  
+									</span> 
+								</template>  
+							</el-table-column> 
 							<el-table-column prop="dtype" label="类型" width="100"  sortable v-if="false"> 
 								<template slot-scope="scope"> 
 									<div class="cell-text">
@@ -274,19 +286,6 @@
 									</span> 
 								</template>  
 							</el-table-column> 
-							<el-table-column prop="priority"  label="优先级" width="100" sortable>   
-								<template slot-scope="scope"> 
-									<div class="cell-text">
-										
-										{{formaterByDicts(scope.row,'priority',scope.row.priority)}}  
-									</div>
-									<span class="cell-bar">   
-										 <el-select  v-model="scope.row.priority" placeholder="优先级"  style="display:block;" @change="editXmMenuSomeFields(scope.row,'priority',$event)">
-												<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.priority" :key="index"> </el-option> 
-										 </el-select>  
-									</span> 
-								</template>  
-							</el-table-column> 
 							<el-table-column prop="iterationName" label="迭代" width="150" show-overflow-tooltip sortable>   
 								<template slot-scope="scope">  
 										{{scope.row.iterationName}}   
@@ -332,7 +331,7 @@
 										{{scope.row.tagNames}}  
 									</div>
 									<span class="cell-bar">   
-										 <el-button @click="showFieldTag(scope.row)">选标签</el-button>
+										 <el-button @click="$refs.tagDialog.open({data:scope.row,action:'editTagIds'})">选标签</el-button>
 									</span> 
 								</template>
 							</el-table-column> 
@@ -388,16 +387,9 @@
 		</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">
-			</tag-mng>
-		</el-drawer>
-		
-		<el-drawer append-to-body title="标签" :visible.sync="fieldTagVisible"  size="60%">
-			<tag-mng   :jump="true" @select-confirm="editXmMenuSomeFields(editForm,'tagIds',$event)">
-			</tag-mng>
-		</el-drawer>
-
+ 			<tag-dialog ref="tagDialog" :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]" :jump="true" @select-confirm="onTagSelected">
+			</tag-dialog> 
+ 
 		<el-drawer
 		append-to-body
 		title="需求选择"
@@ -442,7 +434,7 @@
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
 	
 	import XmMenuSelect from "../xmMenu/XmMenuSelect";
-  	import TagMng from "@/views/mdp/arc/tag/TagMng";
+  	import TagDialog from "@/views/mdp/arc/tag/TagDialog";
 
 	import {sn} from '@/common/js/sequence'
 
@@ -1044,15 +1036,18 @@
 				this.filters.tags.splice(index,1);
 				this.searchXmMenus();
 			},
-			onTagSelected(tags){
-				
-				this.tagSelectVisible = false; 
-				if (!tags || tags.length == 0) { 
-					this.filters.tags=[]
-				}else{
-					this.filters.tags=tags
+			onTagSelected(tags,option){
+				if(option.action=='editTagIds'){
+					this.editXmMenuSomeFields(option.data,"tagIds",tags)
+				}else{ 
+					if (!tags || tags.length == 0) { 
+						this.filters.tags=[]
+					}else{
+						this.filters.tags=tags
+					}
+					this.searchXmMenus();
 				}
-				this.searchXmMenus();
+				
 			}, 
 			showParentMenu(){
 				if(this.filters.product && this.filters.product.id){
@@ -1242,7 +1237,60 @@
 				}else{
 					return "";
 				}
-			}
+			},
+			
+			formatterPriorityDicts(cellValue){
+				var key="priority";  
+				if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0   ){
+					return {id:cellValue,name:cellValue,className:'primary'};
+				}
+				var list=this.dicts[key].filter(i=>i.id==cellValue)
+				if(list.length>0){
+					var data= {...list[0],className:'primary'}
+					if(data.id=='0'){
+						data.className='danger'
+					}else if(data.id=='1'){
+						data.className='warning'
+					}else if(data.id=='2'){
+						data.className='success'
+					}else if(data.id=='3'){
+						data.className='primary'
+					}else if(data.id=='4'){
+						data.className='info'
+					}else{
+						data.className='primary'
+					}
+					return data;
+				}else{
+					return {id:cellValue,name:cellValue,className:'primary'}
+				}
+
+			},
+			formatterMenuStatusDicts: function(cellValue){
+				var key="menuStatus";  
+				if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0   ){
+					return {id:cellValue,name:cellValue,className:'primary'};
+				}
+				var list=this.dicts[key].filter(i=>i.id==cellValue)
+				if(list.length>0){
+					var data= {...list[0],className:'primary'}
+					if(data.id=='0'){
+						data.className='primary'
+					}else if(data.id=='1'){
+						data.className='warning'
+					}else if(data.id=='2'){
+						data.className='success'
+					}else if(data.id=='3'){
+						data.className='info'
+					} else{
+						data.className='danger'
+					}
+					return data;
+				}else{
+					return {id:cellValue,name:cellValue,className:'primary'}
+				}
+
+			}, 
 			 
 		},//end methods
 		components: { 
@@ -1256,7 +1304,7 @@
 			XmTaskListForMenu,
 			UsersSelect,
 			XmMenuMngBatch,
-		    TagMng,
+		    TagDialog,
 			XmMenuSelect,
 			XmItSelect,
 			XmMenuWorkload,
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 798d3698..6b0aa472 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -169,6 +169,14 @@
 							</template>
 						</el-table-column>
 						<el-table-column prop="pstatus" label="状态" width="100" sortable :formatter="formatPstatus"> 
+							<template slot-scope="scope"> 						
+								<el-tag v-if="scope.row.pstatus=='0'" type="info" effect="plain">{{formatPstatus(null,null,scope.row.pstatus)}}</el-tag> 								
+								<el-tag v-else-if="scope.row.pstatus=='1'  " type="primary" effect="plain">{{formatPstatus(null,null,scope.row.pstatus)}}</el-tag> 
+								<el-tag v-else-if="scope.row.pstatus=='2' " type="success" effect="plain">{{formatPstatus(null,null,scope.row.pstatus)}}</el-tag> 
+								<el-tag v-else-if="scope.row.pstatus=='3'" type="warning" effect="plain">{{formatPstatus(null,null,scope.row.pstatus)}}</el-tag> 
+ 								<el-tag v-else  type="danger" effect="plain">{{formatPstatus(null,null,scope.row.pstatus)}}</el-tag> 
+
+							</template>
 						</el-table-column>
 						<el-table-column prop="finishRate" label="进度" width="100" sortable>
 							<template slot-scope="scope"> 
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 809985b7..f86c8d9d 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -165,6 +165,14 @@
 							</template>
 						</el-table-column> 
 						<el-table-column prop="status" label="状态" width="80 sortable" :formatter="formatterByDicts"> 
+							<template slot-scope="scope"> 						
+								<el-tag v-if="scope.row.status=='0'" type="info" effect="plain">{{formatProjectStatus(scope.row.status)}}</el-tag> 								
+								<el-tag v-else-if="scope.row.status=='1' || scope.row.status=='2'|| scope.row.status=='3'" type="primary" effect="plain">{{formatProjectStatus(scope.row.status)}}</el-tag> 
+								<el-tag v-else-if="scope.row.status=='4' " type="warning" effect="plain">{{formatProjectStatus(scope.row.status)}}</el-tag> 
+								<el-tag v-else-if="scope.row.status=='5'||scope.row.status=='6' || scope.row.status=='7'|| scope.row.status=='8'" type="success" effect="plain">{{formatProjectStatus(scope.row.status)}}</el-tag> 
+ 								<el-tag v-else type="danger" effect="plain">{{formatProjectStatus(scope.row.status)}}</el-tag> 
+
+							</template>
 						</el-table-column>  
 						<el-table-column prop="totalProgress" label="进度" width="100" sortable>
 							<template slot-scope="scope">