From bb2c606cb2b8a0a2b93dc91eb0ada52424112068 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, 2 Mar 2022 01:57:54 +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/xmIteration/XmIterationSelect.vue | 2 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue              | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue
index 4d6885ef..251bd7a9 100644
--- a/src/views/xm/core/xmIteration/XmIterationSelect.vue
+++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue
@@ -52,7 +52,7 @@
 								<el-button  type="primary" icon="el-icon-search" @click="getXmIterations">查询</el-button>
 							</el-col> 
 						</el-row>
-						<el-button  slot="reference" icon="el-icon-more"></el-button>
+						<el-button type="text" slot="reference" icon="el-icon-more">更多条件</el-button>
 					</el-popover>
 				</template>
 					 <template slot-scope="scope">
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 7850d370..f555298d 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -4,7 +4,7 @@
 			<el-col :span="5" v-if="!xmProduct">
 				<xm-product-mng :sel-project="selProject" @row-click="onProductSelected" ref="xmProductMng" :xm-iteration="xmIteration" :simple="true"></xm-product-mng>
 			</el-col>
-			<el-col :span="xmProduct?24:19" class="padding-left">
+			<el-col :span="xmProduct?24:19" class="padding-left" v-show="filters.product && filters.product.id">
 					<el-row>  
 						<el-select  v-model="filters.status" placeholder="需求状态" clearable style="width: 100px;">
 							<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option> 
@@ -464,7 +464,7 @@
 				if( this.filters.product  && this.filters.product.id){
 					params.productId=this.filters.product.id
 				}else {
-					this.$notify({showClose: true, message: "请先选择产品", type: 'success' });
+					this.$notify({showClose: true, message: "请先选择产品", type: 'warning',position:'top-left' });
 					return;
 				} 
 					
@@ -924,9 +924,9 @@
 		},
 		mounted() {   
 			this.filters.product=this.xmProduct
-			if(this.xmProduct){
+			if(this.xmProduct && this.xmProduct.id){
 				this.productVisible=false;
-			}
+			} 
 			this.$nextTick(() => { 
 				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
 				this.getXmMenus();