From 84ffd57279f5f043a52157b4e57280d9c30bf457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 17 Jun 2021 17:11:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/xmIteration/XmIterationMng.vue    | 19 ++++++++++++-------
 .../xm/core/xmIteration/XmIterationSelect.vue | 11 +++++++----
 .../xmIterationMenu/XmIterationMenuMng.vue    |  2 ++
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index 09d035cd..8488607a 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -10,7 +10,7 @@
 				<el-option label="后台智能匹配" value=""></el-option>
 			</el-select>
 			<el-input v-if="filters.queryScope=='iterationId'"  v-model="filters.id" style="width:20%;"  placeholder="输入迭代编号" @keyup.enter.native="searchXmProducts"> </el-input> 
-			<el-date-picker v-model="dateRangerOnline" type="daterange" align="right" unlink-panels range-separator="至"
+			<el-date-picker v-if="filters.queryScope!='iterationId'" v-model="dateRangerOnline" type="daterange" align="right" unlink-panels range-separator="至"
 				start-placeholder="上线日期" end-placeholder="上线日期" value-format="yyyy-MM-dd"
 				class="hidden-md-and-down"
 				:default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions">
@@ -39,12 +39,12 @@
 						</el-select>
 					</el-col>
 					<el-col  :span="24"  style="padding-top:5px;"> 
-						<el-input v-if="filters.queryScope=='iterationId'" size="mini" v-model="filters.id" style="width:100%;"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">  
+						<el-input  v-if="filters.queryScope=='iterationId'" size="mini" v-model="filters.id" style="width:100%;"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">  
 						</el-input> 
 					</el-col>
-					<el-col  :span="24"  style="padding-top:5px;">
+					<el-col v-if="filters.queryScope!='iterationId'" :span="24"  style="padding-top:5px;">
 						<font class="more-label-font">上线时间:</font>
-						<el-date-picker
+						<el-date-picker size="mini"
 							v-model="dateRangerOnline"
 							type="daterange"
 							align="right"
@@ -57,7 +57,9 @@
 							:picker-options="pickerOptions"
 						></el-date-picker>
 					</el-col>
-					
+					<el-col :span="24" style="padding-top:5px;">
+							<font class="more-label-font">迭代名称:</font><el-input size="mini" v-model="filters.key" style="width: 60%;" placeholder="模糊查询"></el-input>
+					</el-col>
 					<el-col :span="24" style="padding-top:5px;">
 							<el-tag>默认只能查询本人创建的迭代、本人作为故事责任人参与的迭代</el-tag>
 					</el-col>
@@ -287,8 +289,11 @@
 					if(this.filters.queryScope=="branchId"){
 						params.branchId=this.userInfo.branchId
 					}
-					params.onlineTimeStart=this.dateRangerOnline[0]+" 00:00:00"
-					params.onlineTimeEnd=this.dateRangerOnline[1]+" 23:59:59"
+					if(this.filters.queryScope!="iterationId"){
+						params.onlineTimeStart=this.dateRangerOnline[0]+" 00:00:00"
+						params.onlineTimeEnd=this.dateRangerOnline[1]+" 23:59:59"
+					}
+					
 				}
 				this.load.list = true;
 				listXmIterationWithState(params).then((res) => {
diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue
index ffa5fb18..0fa07db0 100644
--- a/src/views/xm/core/xmIteration/XmIterationSelect.vue
+++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue
@@ -32,13 +32,13 @@
 										<el-option label="后台智能匹配" value=""></el-option>
 									</el-select>
 								</el-col>
-								<el-col  :span="24"  style="padding-top:5px;"> 
-									<el-input v-if="filters.queryScope=='iterationId'" size="mini" v-model="filters.id" style="width:100%;"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">  
+								<el-col v-if="filters.queryScope=='iterationId'" :span="24"  style="padding-top:5px;"> 
+									<el-input  size="mini" v-model="filters.id" style="width:100%;"  placeholder="输入迭代编号" @keyup.enter.native="searchXmProducts">  
 									</el-input> 
 								</el-col>
-								<el-col  :span="24"  style="padding-top:5px;">
+								<el-col v-if="filters.queryScope!='iterationId'" :span="24"  style="padding-top:5px;">
 									<font class="more-label-font">上线时间:</font>
-									<el-date-picker
+									<el-date-picker size="mini"
 										v-model="dateRangerOnline"
 										type="daterange"
 										align="right"
@@ -51,6 +51,9 @@
 										:picker-options="pickerOptions"
 									></el-date-picker>
 								</el-col>
+								<el-col :span="24" style="padding-top:5px;">
+										<font class="more-label-font">迭代名称:</font><el-input size="mini" v-model="filters.key" style="width: 60%;" placeholder="模糊查询"></el-input>
+								</el-col>
 								
 								<el-col :span="24" style="padding-top:5px;">
 									 <el-tag>默认只能查询本人创建的迭代、本人作为故事责任人参与的迭代</el-tag>
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index d3c413e2..74fed3fb 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -23,6 +23,8 @@
 								{{scope.row.seqNo}}&nbsp;&nbsp;{{scope.row.menuName}}
 							</template>
 						</el-table-column> 
+						<el-table-column prop="mmUsername" label="责任人"  width="140" >  
+						</el-table-column> 
 						<el-table-column label="操作" width="160" fixed="right">
 							<template slot-scope="scope">
 								<el-button type="primary" @click="handleDel(scope.row,scope.$index)" icon="el-icon-right">移出</el-button>