From b23952eb61ec3f045f4cc59c729faa097cc03ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 17 Feb 2023 18:12: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

---
 src/views/xm/core/xmFunc/XmFuncSelect.vue |  8 ++++----
 src/views/xm/core/xmMenu/XmMenuAdd.vue    | 24 +++++++++++------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/xm/core/xmFunc/XmFuncSelect.vue b/src/views/xm/core/xmFunc/XmFuncSelect.vue
index 10ae75a1..11be77cf 100644
--- a/src/views/xm/core/xmFunc/XmFuncSelect.vue
+++ b/src/views/xm/core/xmFunc/XmFuncSelect.vue
@@ -1,10 +1,10 @@
 <template>
 	<section>
 		<el-row>
-			<el-input v-model="filters.key" style="width: 60%;" placeholder="模块名称"   clearable></el-input> 
-			<span style="float:right;"> 
-                    <el-button type="primary" @click="searchXmFuncs" icon="el-icon-search" title="查询"> </el-button>
-                    <el-button type="primary" @click="showAdd" icon="el-icon-plus" title="添加顶级模块">  </el-button> 
+			<el-input v-model="filters.key" style="width:50%;" placeholder="模块名称"   clearable></el-input> 
+            <el-button  @click="searchXmFuncs" icon="el-icon-search" title="查询"> </el-button>
+			<span style="float:right;">  
+                    <el-button  @click="showAdd" icon="el-icon-plus" title="添加顶级模块">  </el-button> 
 		    </span>
 		</el-row>
 		<el-row class="padding-top">
diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index 8bba14a0..67c8a81c 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue
@@ -1,6 +1,6 @@
 <template>
 	<section class="padding">
-		<el-row class="page-main ">
+		<el-row>
 			<!--新增界面 XmMenu 项目需求表--> 
 			<el-form :model="addForm"  label-width="125px" label-position="left" :rules="addFormRules" ref="addForm"> 
 						 
@@ -15,7 +15,7 @@
 									</el-input>
 									<el-row class="label-font-color"><span v-if="addForm.productName">归属产品：{{ addForm.productName}} &nbsp;&nbsp;|&nbsp;&nbsp;</span><span v-if="addForm.productId"> 产品编号：{{ addForm.productId }}&nbsp;&nbsp;|&nbsp;&nbsp;</span><span v-if="  addForm.iterationName ">迭代名称：{{addForm.iterationName}}&nbsp;&nbsp;|&nbsp;&nbsp;</span><span v-if="addForm.iterationId">迭代编号：{{addForm.iterationId}}</span></el-row>
 								</el-form-item>    
-						<el-row class="padding"> 
+						<el-row class="padding-bottom"> 
 								<el-col :span="8" v-if="xmMenu.dclass!='1'"> 
 									<mdp-field-x v-if="(!parentMenu || !parentMenu.menuId) && (!xmMenu || !xmMenu.pmenuId) " v-model="addForm.pmenuName" :label="addForm.dclass==='3'?'归属特性':(addForm.dclass==='2'?'归属史诗':'归属')" :icon="addForm.dclass==='2'?'el-icon-s-promotion':'el-icon-s-flag'" :color="addForm.dclass==='2'?'rgb(255, 153, 51)':'rgb(0, 153, 51)'">
 										<el-button slot="oper"
@@ -37,7 +37,7 @@
 									<mdp-select-user-xm  label="提出人" v-model="addForm" userid-key="proposerId" username-key="proposerName"></mdp-select-user-xm>   
 								</el-col>
 						</el-row> 
-						<el-row>
+						<el-row class="padding-top">
 							<el-col :span="8">
 								<el-form-item  label="需求类型" prop="dtype" >   
 									<el-select v-model="addForm.dtype">
@@ -62,14 +62,6 @@
 						</el-row>
 						
 						<el-row> 
-							<el-col :span="12"> 
-								<el-form-item  label="归属模块" prop="funcName" v-if="addForm.dclass>='3'"> 
-									{{ addForm.funcName }}
-										<el-button
-											@click="funcVisible=true"  
-											title="设置模块" > 设置</el-button>  
-								</el-form-item>
-							</el-col> 
 							<el-col :span="12">
 								<el-form-item label="排序序号" prop="seqNo">  
 									 <el-input style="max-width:90%;" v-model="addForm.seqNo" placeholder="请输入排序序号"> 
@@ -82,6 +74,14 @@
 									</el-input>  
 								</el-form-item>   
 							</el-col>  
+							<el-col :span="12"> 
+								<el-form-item  label="归属模块" prop="funcName" v-if="addForm.dclass>='3'"> 
+									{{ addForm.funcName }}
+										<el-button
+											@click.native="funcVisible=true"  
+											title="设置模块" > 设置</el-button>  
+								</el-form-item>
+							</el-col> 
 							<el-col :span="12">
 								<el-form-item label="截止时间" prop="startTime">  
 									 <mdp-date-range type="daterange" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" v-model="addForm" start-key="startTime" end-key="endTime"></mdp-date-range>
@@ -110,7 +110,7 @@
 		</el-dialog>
 		
 		<el-dialog append-to-body title="模块选择"  :visible.sync="funcVisible" size="40%" top="20px"  :close-on-click-modal="false">
-			<xm-func-select :show-select="true" class="padding-left padding-right" v-if="funcVisible"  @select="onFuncSelected" :xm-product="{id:editForm.productId,productName:editForm.productName}"></xm-func-select>
+			<xm-func-select :show-select="true" class="padding-left padding-right" v-if="funcVisible"  @select="onFuncSelected" :xm-product="{id:addForm.productId,productName:addForm.productName}"></xm-func-select>
 		</el-dialog>
 	</section>
 </template>