From 4e7e36cbda696eb1478b4f8cd264cb49354abb51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 23 Mar 2022 03:10:36 +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

---
 .../xmIterationMenu/XmIterationMenuMng.vue    | 18 +++++++++--
 src/views/xm/core/xmMenu/XmMenuAdd.vue        |  2 ++
 src/views/xm/core/xmMenu/XmMenuEdit.vue       |  2 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue        |  9 +++---
 src/views/xm/core/xmMenu/XmMenuMngBatch.vue   | 31 ++++++++++++-------
 src/views/xm/core/xmMenu/XmMenuSelect.vue     | 10 ++++++
 src/views/xm/core/xmMenu/XmMenuWithPlan.vue   | 10 ++++++
 7 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index bc5c4843..c192c925 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -18,14 +18,26 @@
 					<el-table ref="table" :height="maxTableHeight" :data="xmIterationMenusTreeData"  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  type="selection" width="45"></el-table-column> 
 						
-						<el-table-column prop="productId" label="产品" min-width="120" >  
-						</el-table-column> 
 						<el-table-column prop="menuName" label="需求名称" min-width="140" > 
 							<template slot-scope="scope">
-								<el-link type="primary"  :icon="scope.row.ntype=='1'?'el-icon-folder-opened':''">{{scope.row.seqNo}}</el-link> 
+								
+							<div  v-if="scope.row.dclass=='1'" class="icon" style="background-color:  rgb(255, 153, 51);">
+								<i class="el-icon-s-promotion"></i>
+								</div> 
+								<div v-if="scope.row.dclass=='2'" class="icon" style="background-color:  rgb(0, 153, 51);">
+								<i class="el-icon-s-flag"></i>
+								</div>
+								<div v-if="scope.row.dclass=='3'" class="icon" style="background-color:  rgb(79, 140, 255);">
+								<i class="el-icon-document"></i>
+							</div>
+								<span class="vlink" type="primary">{{scope.row.seqNo}}
 								&nbsp;&nbsp;{{scope.row.menuName}}
+								</span> 
 							</template>
 						</el-table-column> 
+						
+						<el-table-column prop="productId" label="产品" min-width="120" >  
+						</el-table-column> 
 						<el-table-column prop="iterationName" label="迭代" min-width="120" >  
 						</el-table-column> 
 						<el-table-column prop="mmUsername" label="责任人"  width="140" >  
diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index 47dac768..0e2dfe40 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue
@@ -196,6 +196,8 @@
 						this.addForm.dclass='1'
 					}
 					
+				}else{
+					this.addFOrm.dclass=this.xmMenu.dclass
 				}
 	      	}
 	      } 
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index a4ada6a6..ab60a0b0 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -136,7 +136,7 @@
 								<br>手工填报：  指需求(不包括需求池)的数据来自手工填报，无论是否关联了任务，都不从任务汇总。
 							</font>
 						</el-collapse-item>
-						<el-collapse-item title="相关链接" name="4"> 
+						<el-collapse-item title="相关链接" name="5"> 
 							<el-form-item label="需求链接" prop="demandUrl"> 
 								<el-input v-model="editForm.demandUrl" placeholder="需求链接" ></el-input> 
 							</el-form-item>  
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index bd747028..5da7b8e6 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -160,20 +160,20 @@
 									<div   class="icon" style="background-color:  rgb(255, 153, 51);">
  										<i class="el-icon-s-promotion"></i>
 									</div>
-									<el-button   @click="showAdd">新建史诗</el-button> 
+									<el-button   @click="showAdd('1')">新建史诗</el-button> 
 								</el-col>  
 								<el-col :span="24" style="padding-top:5px;"> 
 									<div  class="icon" style="background-color:  rgb(0, 153, 51);">
 									<i class="el-icon-s-flag"></i>
 									</div>
-									<el-button   @click="showAdd">新建特性</el-button> 
+									<el-button   @click="showAdd('2')">新建特性</el-button> 
 								</el-col>  
 								<el-col :span="24" style="padding-top:5px;">
 									
 									<div  class="icon" style="background-color:  rgb(79, 140, 255);">
 									<i class="el-icon-document"></i>
 									</div> 
-									<el-button   @click="showAdd"  >新建用户故事</el-button> 
+									<el-button   @click="showAdd('3')"  >新建用户故事</el-button> 
 								</el-col>  
 
 
@@ -671,11 +671,12 @@
 				this.editForm = Object.assign({}, row);
 			},
 			//显示新增界面 XmMenu xm_project_menu
-			showAdd: function () {  
+			showAdd: function (dclass) {  
 				if(this.filters.product && this.filters.product.id){
 					this.parentMenu=null;
 					this.addForm.productId=this.filters.product.id
 					this.addForm.productName=this.filters.product.productName
+					this.addForm.dclass=dclass
 					this.addFormVisible = true;
 				}else{
 					this.productVisible=true;
diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
index 15569975..dce6feb9 100644
--- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
@@ -8,14 +8,23 @@
 			<el-row style="padding-top:12px;"> 
 				<el-table ref="table" :indent="16" lazy :load="loadXmMenusLazy" :height="maxTableHeight" :data="xmMenusTreeData" class="drag-table"   row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}"   highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 					<el-table-column  type="selection" width="45"></el-table-column>
-					<el-table-column  prop="seqNo"  label="序号" width="150">
-						<template slot-scope="scope"> 
-								<el-input   style="width:100%;"   v-model="scope.row.seqNo"  @change="fieldChange(scope.row,'seqNo')"></el-input>
+					<el-table-column  prop="seqNo"  label="序号" width="200" fixed="left">
+						<template slot-scope="scope">  
+							<div  v-if="scope.row.dclass=='1'" class="icon" style="background-color:  rgb(255, 153, 51);">
+								<i class="el-icon-s-promotion"></i>
+								</div> 
+								<div v-if="scope.row.dclass=='2'" class="icon" style="background-color:  rgb(0, 153, 51);">
+								<i class="el-icon-s-flag"></i>
+								</div>
+								<div v-if="scope.row.dclass=='3'" class="icon" style="background-color:  rgb(79, 140, 255);">
+								<i class="el-icon-document"></i>
+							</div>
+								<el-input   style="width:70%;"   v-model="scope.row.seqNo"  @change="fieldChange(scope.row,'seqNo')"></el-input> 
 						</template>
 					
 					</el-table-column>  
-					<el-table-column prop="menuName" label="需求名称" min-width="140"  show-overflow-tooltip> 
-						<template slot-scope="scope">
+					<el-table-column prop="menuName" label="需求名称" min-width="140"  show-overflow-tooltip fixed="left"> 
+						<template slot-scope="scope"> 
 							<el-input    v-model="scope.row.menuName"  @change="fieldChange(scope.row,'menuName')"></el-input>
 						</template>
 					</el-table-column> 
@@ -272,10 +281,10 @@
 	text-align:center;
 	float:left;
 	padding-top:5px;
-}  
-.el-table{ 
-	 box-sizing: border-box; 
-	/deep/ .cell {
+}   
+.el-table {
+  box-sizing: border-box;
+  /deep/ .cell {
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
     overflow: hidden;
@@ -284,7 +293,7 @@
     word-break: break-all;
     line-height: 23px;
     padding-right: 10px;
-	display: flex;
-	 }
+    display: flex;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index cb18eff8..087a5354 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -114,6 +114,16 @@
 						
 						<el-table-column prop="menuName" label="需求名称" min-width="140" > 
 							<template slot-scope="scope">
+								
+								<div  v-if="scope.row.dclass=='1'" class="icon" style="background-color:  rgb(255, 153, 51);">
+									<i class="el-icon-s-promotion"></i>
+									</div> 
+									<div v-if="scope.row.dclass=='2'" class="icon" style="background-color:  rgb(0, 153, 51);">
+									<i class="el-icon-s-flag"></i>
+									</div>
+									<div v-if="scope.row.dclass=='3'" class="icon" style="background-color:  rgb(79, 140, 255);">
+									<i class="el-icon-document"></i>
+								</div>
 								<span class="vlink" :class="scope.row.ntype==='1'?'el-icon-folder-opened':''"  @click="toMenu(scope.row)">{{scope.row.seqNo}}&nbsp;
 								{{scope.row.menuName}}</span> 
 							</template>
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index 1a80e04a..d64df5ec 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -18,6 +18,16 @@
 					<el-table-column sortable type="selection" width="40"></el-table-column>
  					<el-table-column prop="menuName" label="需求名称" min-width="150" >
 						<template slot-scope="scope"> 
+							
+							<div  v-if="scope.row.dclass=='1'" class="icon" style="background-color:  rgb(255, 153, 51);">
+								<i class="el-icon-s-promotion"></i>
+								</div> 
+								<div v-if="scope.row.dclass=='2'" class="icon" style="background-color:  rgb(0, 153, 51);">
+								<i class="el-icon-s-flag"></i>
+								</div>
+								<div v-if="scope.row.dclass=='3'" class="icon" style="background-color:  rgb(79, 140, 255);">
+								<i class="el-icon-document"></i>
+							</div>
 							<span class="vlink" type="primary" @click="toMenu(scope.row)"> {{scope.row.seqNo}}&nbsp; {{scope.row.menuName}} </span>
 						</template>
 					</el-table-column>