From 6b92b7d4b54b9ce9dcd9dc7c41b8534a19a3441c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 24 Jul 2022 23:52:34 +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/styles/mdp.scss                     | 43 +++++++++++--------------
 src/views/xm/core/xmMenu/XmMenuAdd.vue  | 12 +------
 src/views/xm/core/xmMenu/XmMenuEdit.vue | 31 ++++++++++++++++++
 3 files changed, 51 insertions(+), 35 deletions(-)

diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss
index 124e2cfb..9a3370f4 100644
--- a/src/styles/mdp.scss
+++ b/src/styles/mdp.scss
@@ -284,32 +284,27 @@ table tr.hover-row{
 .title-font-size{
   font-size:28px;
 }
-
-.title-box{
-
-	height: 40px;
-}
-.title-box:hover .el-input .el-input__inner{  
-   	border: 1px solid #dcdfe6 !important;
-	padding:0 0px;
-	font-size:1.5rem;
-	height: 40px; 
-
+ 
+.big-icon {
+  color: #fff;
+  height: 36px;
+  width: 36px;
+  border-radius: 15px;
+  text-align: center;
+  line-height: 36px;
+  font-size: 18px;
+  display: inline-block; 
 } 
- .title-box:hover .el-input .el-input__inner:focus{  
-   	border: 1px solid #7287ef !important;
-	padding:0 0px;
-	font-size:1.5rem;
-	height: 40px; 
-
+.small-icon {
+  color: #fff;
+  height: 36px;
+  width: 36px;
+  border-radius: 15px;
+  text-align: center;
+  line-height: 36px;
+  font-size: 18px;
+  display: inline-block; 
 } 
-.title-box .el-input .el-input__inner{ 
-    border: 0px solid #dcdfe6 !important;
-	padding:0 1px; 
-	font-size:1.5rem; 
-	height: 40px;
-}
- 
 /*此处根据不同屏幕分配率显示不同的样式*/
 /*手机端*/
 @media only screen and (min-width: 0px) and (max-width: 768px) {  
diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index 6db473c1..cb980d8b 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue
@@ -313,15 +313,5 @@
 
 <style scoped>
 
-.icon {
-  color: #fff;
-  height: 36px;
-  width: 36px;
-  border-radius: 15px;
-  text-align: center;
-  line-height: 36px;
-  font-size: 18px;
-  display: inline-block;
-  margin-right: 5px;
-} 
+
 </style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 490315f0..f39ee571 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -76,7 +76,38 @@
 			<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 :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>   
+										{{calcMenuLabel.label}}
+									</template> 
+									<el-input v-model="editForm.menuName" placeholder="名称" title="名称"> 
+									</el-input>
+								</el-form-item>   
+							</el-col>
+						</el-row>
+						<el-row class="padding"> 
+								<el-col :span="8">
+									<mdp-field-x v-if="!editForm.pmenuId" v-model="editForm.pmenuName" :disabled="true" label="上级需求"> </mdp-field-x>
 
+									<mdp-field-x v-else v-model="editForm.pmenuName" :label="editForm.dclass==='3'?'归属特性':(editForm.dclass==='2'?'归属史诗':'归属')" :icon="editForm.dclass==='2'?'el-icon-s-promotion':'el-icon-s-flag'" :color="editForm.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="editForm" userid-key="mmUserid" username-key="mmUsername" @change="editXmTaskSomeFields(editForm,'mmUserid',$event)"></mdp-select-user-xm>   
+								</el-col>
+								<el-col  :span="8">
+									<mdp-select-user-xm  label="提出人" v-model="editForm" userid-key="proposerId" username-key="proposerName" @change="editXmTaskSomeFields(editForm,'proposerId',$event)"></mdp-select-user-xm>   
+								</el-col>
+						</el-row> 
 						<el-row>
 							<el-col :span="6">
 								<el-form-item label="序号名称" prop="seqNo" >