优化

src/components/Mdp/index.scss

@@ -4,33 +4,33 @@
   margin-right: 5px;
   align-items: center;
   cursor: pointer;
-  height: 40px;
-  line-height: 40px;
-  .field-avater {
+  height: 36px;
+  line-height: 36px;
+  .field-avater {  
     background-color: #ff9f73;
   }
 
   .field-info {
-    height: 40px;
-    line-height: 40px;
+    height: 36px;
+    line-height: 36px;
     margin-left: 10px;
     display: flex;
     flex-direction: column;
     .field-value {
-      height: 20px;
-      line-height: 20px;
+      height: 18px;
+      line-height: 18px;
       font-size: 0.75rem;
     }
     .field-label {
-      height: 20px;
-      line-height: 20px;
+      height: 18px;
+      line-height: 18px;
       font-size: 0.75rem;
       color: #c0c4cc;
     }
   }
   .field-oper {
-    height: 40px;
-    line-height: 40px;
+    height: 36px;
+    line-height: 36px;
     margin-left: 5px;
     margin-right: 5px; 
     display: none;
@@ -43,10 +43,10 @@
   display: inline;
 }
 .dashed-circle {
-  width: 40px;
-  height: 40px;
+  width: 36px;
+  height: 36px;
   border: 2px dashed #000000;
-  border-radius: 40px/40px;
+  border-radius: 36px/36px;
 }
 .field-box:hover .dashed-circle {
   border: 2px dashed #409eff;
@@ -54,7 +54,7 @@
 
 
 .avatar-container {
-  height: 40px;
+  height: 36px;
   display: flex;
   align-items: center;
   .avatar-wrapper {

src/views/xm/core/xmMenu/XmMenuAdd.vue

@@ -2,51 +2,38 @@
 	<section class="padding">
 		<el-row class="page-main ">
 			<!--新增界面 XmMenu 项目需求表--> 
-			<el-form :model="addForm"  label-width="120px" label-position="left" :rules="addFormRules" ref="addForm"> 
-						<el-row :gutter="10"> 
-							<el-col :span="6">
-								<el-form-item label="序号名称" prop="seqNo" > 
+			<el-form :model="addForm"  label-width="125px" label-position="left" :rules="addFormRules" ref="addForm"> 
+						<el-row class="label-font-color">归属产品：{{ addForm.productName}} &nbsp;&nbsp;产品编号：{{ addForm.productId }}</el-row>
+						<el-row :gutter="10">  
+							<el-col :span="24">
+								<el-form-item prop="menuName">
 									<template slot="label">
 										<div  class="icon" :style="{backgroundColor: calcMenuLabel.color }">
 											<i :class="calcMenuLabel.icon"></i>
-										</div>  
+										</div>   
 										{{calcMenuLabel.label}}
-									</template>
-									<el-input v-model="addForm.seqNo" title="序号 如 1.1，1.2.3，1.3.2等" style="width:100%;" placeholder="如1.0 ， 1.1 ， 1.1.1等" ></el-input> 
-								</el-form-item>  
-							</el-col>
-							<el-col :span="18">
-								<el-form-item label="" prop="menuName" label-width="0px">
-									<el-input v-model="addForm.menuName" placeholder="名称" title="名称"></el-input>
+									</template> 
+									<el-input v-model="addForm.menuName" placeholder="名称" title="名称"> 
+									</el-input>
 								</el-form-item>   
 							</el-col>
 						</el-row>
-						<el-row>
-							<el-col :span="8">
-								<el-form-item label="归属产品" prop="productId">
-									<font v-if="addForm.productId">{{addForm.productName?addForm.productName:addForm.productId}}</font>
-								</el-form-item>
-							</el-col>
-							<el-col :span="8">
-								<el-form-item v-if="!addForm.pmenuId" :label="addForm.dclass==='3'?'归属特性':(addForm.dclass==='2'?'归属史诗':'归属')" prop="pmenuId">
-										无
-									</el-form-item>  
-									
-									<el-form-item  v-else :label="addForm.dclass==='3'?'归属特性':(addForm.dclass==='2'?'归属史诗':'归属')" prop="pmenuId">  
-										<div   v-if="addForm.dclass==='2'"  class="icon" style="background-color:  rgb(255, 153, 51);">
-											<i class="el-icon-s-promotion"></i>
-										</div> 
-										<div   v-if="addForm.dclass==='3'"  class="icon" style="background-color:  rgb(0, 153, 51);">
-											<i class="el-icon-s-flag"></i>
-										</div> 
-										  {{addForm.pmenuName?addForm.pmenuName:addForm.pmenuId}} 
-									</el-form-item>  
-							</el-col> 
+						<el-row class="padding"> 
+								<el-col :span="8">
+									<mdp-field-x v-if="!addForm.pmenuId" v-model="addForm.pmenuName" :disabled="true" label="上级需求"> </mdp-field-x>
+
+									<mdp-field-x v-else 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"
+											@click="showPmenu"  
+											title="查看上级"
+											icon="el-icon-upload2"> 查看上级</el-button> 
+									</mdp-field-x>  
+								</el-col> 
+								<el-col  :span="8">
+									<mdp-select-user-xm  label="负责人" v-model="addForm" userid-key="mmUserid" username-key="mmUsername" @change="editXmTaskSomeFields(addForm,'mmUserid',$event)"></mdp-select-user-xm>   
+								</el-col>
 								<el-col  :span="8">
-									<el-form-item label="负责人" prop="mmUserid">
-										<el-tag type="text" v-if="addForm.mmUserid" closable @close="clearMmUser">{{addForm.mmUsername}}</el-tag> 
-										<el-button type="text" @click="mmUserSelectVisible=true">选跟进人</el-button>
-									</el-form-item>   
+									<mdp-select-user-xm  label="提出人" v-model="addForm" userid-key="proposerId" username-key="proposerName" @change="editXmTaskSomeFields(addForm,'proposerId',$event)"></mdp-select-user-xm>   
 								</el-col>
 						</el-row> 
 						<el-row>
@@ -74,18 +61,19 @@
 						</el-row>
 						
 						<el-row> 
+							
 							<el-col :span="8">
-								<el-form-item  label="版本号" prop="sinceVersion" >   
-									<el-input style="max-width:90%;" v-model="addForm.sinceVersion" placeholder="请输入需求归属的版本号"> 
+								<el-form-item label="排序序号" prop="seqNo">  
+									 <el-input style="max-width:90%;" v-model="addForm.seqNo" placeholder="请输入排序序号"> 
 									</el-input>  
-								</el-form-item>   
+								</el-form-item>
 							</el-col> 
 							<el-col :span="8">
-								<el-form-item label="提出人" prop="proposerId">
-									<el-tag type="text" v-if="addForm.proposerId" closable @close="clearProposer">{{addForm.proposerName}}</el-tag> 
-									<el-button type="text" @click="selectProposer">选提出人</el-button>
+								<el-form-item  label="版本号" prop="sinceVersion" >   
+									<el-input style="max-width:90%;" v-model="addForm.sinceVersion" placeholder="请输入需求归属的版本号"> 
+									</el-input>  
 								</el-form-item>   
-							</el-col>
+							</el-col>  
 							<el-col :span="8">
 								<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>
@@ -123,6 +111,7 @@
 	import { mapGetters } from 'vuex'	
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
 
+	import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm'
 	
 	export default { 
 		computed: {
@@ -305,7 +294,7 @@
 		},//end method
 		components: {  
 			//在下面添加其它组件 'xm-menu-edit':XmMenuEdit
-			UsersSelect
+			UsersSelect,MdpSelectUserXm
 		},
 		mounted() {
 			
@@ -326,12 +315,12 @@
 
 .icon {
   color: #fff;
-  height: 20px;
-  width: 20px;
+  height: 36px;
+  width: 36px;
   border-radius: 15px;
   text-align: center;
-  line-height: 20px;
-  font-size: 14px;
+  line-height: 36px;
+  font-size: 18px;
   display: inline-block;
   margin-right: 5px;
 } 

src/views/xm/core/xmMenu/XmMenuEdit.vue

@@ -75,6 +75,8 @@
 			</el-col>
 			<el-col :span="20"> 
 			<el-form :model="editForm"  label-width="100px" label-position="left" :rules="editFormRules" ref="editForm">
+						<el-row class="label-font-color">编号：{{editForm.menuId}} &nbsp;&nbsp;<span v-if="editForm.productName">归属产品：{{ editForm.productName}} &nbsp;&nbsp;</span>归属产品编号：{{ editForm.productId }}</el-row>
+
 						<el-row>
 							<el-col :span="6">
 								<el-form-item label="序号名称" prop="seqNo" > 
@@ -88,12 +90,7 @@
 								</el-form-item>
 							</el-col>
 						</el-row>
-						<el-row>
-							<el-col :span="8">
-								<el-form-item label="归属产品" prop="productId">
-									<font v-if="editForm.productId">{{editForm.productName?editForm.productName:editForm.productId}}</font>
-								</el-form-item>
-							</el-col>
+						<el-row> 
 							<el-col :span="8">
 								<el-form-item v-if="!editForm.pmenuId" :label="editForm.dclass==='3'?'归属特性':(editForm.dclass==='2'?'归属史诗':'归属')" prop="pmenuId">
 										无