From 1c4d4ca4ce7198f281fa5e4891332e9fedba0553 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, 16 Feb 2022 19:22:02 +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/xmMenu/XmMenuAdd.vue  | 26 +++++++++++------
 src/views/xm/core/xmMenu/XmMenuEdit.vue | 38 ++++++++++++++-----------
 src/views/xm/core/xmMenu/XmMenuMng.vue  |  4 +--
 3 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index 25923e61..9a25f014 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue
@@ -3,19 +3,25 @@
 		<el-row class="page-main page-height-90">
 			<!--新增界面 XmMenu 项目需求表--> 
 			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
-				<el-form-item v-if="parentMenu" label="上级需求" prop="pmenuId">
-					 {{parentMenu.seqNo}} &nbsp; &nbsp; {{parentMenu.menuName}}
+				
+
+				<el-form-item v-if="parentMenu" label="所属需求集" prop="pmenuId"> 
+					<el-link type="primary"  :icon="'el-icon-folder-opened'">{{parentMenu.seqNo}} &nbsp; &nbsp; {{parentMenu.menuName}}</el-link> 
 				</el-form-item> 
-				<el-form-item v-if="!parentMenu" label="上级需求" prop="pmenuId">
-					无上级
+				<el-form-item v-if="!parentMenu" label="所属需求集" prop="pmenuId">
+					无归属需求集
 				</el-form-item> 
+				<el-form-item label="类型" prop="ntype">
+					 <el-radio v-model="addForm.ntype" label="1">需求集</el-radio>
+					<el-radio v-model="addForm.ntype" label="0">需求</el-radio>
+				</el-form-item> 
+				<el-form-item label="名称" prop="menuName">
+					<el-input v-model="addForm.menuName" placeholder="名称" ></el-input>
+				</el-form-item>   
 				<el-form-item label="序号" prop="seqNo">
 					<el-input v-model="addForm.seqNo" placeholder="如1.0 ， 1.1 ， 1.1.1等" ></el-input>
 					<span v-if="parentMenu" style="color:red;">建议：{{parentMenu.seqNo}}.{{parentMenu.children?parentMenu.children.length+1:1}} </span> 
 				</el-form-item> 
-				<el-form-item label="需求名称" prop="menuName">
-					<el-input v-model="addForm.menuName" placeholder="需求名称" ></el-input>
-				</el-form-item>  
 				<el-form-item label="负责人" prop="mmUserid">
 					 <el-tag v-if="addForm.mmUserid" closable @close="clearPmUser">{{addForm.mmUsername}}</el-tag>
 					 <el-tag v-else>未配置</el-tag> 
@@ -105,7 +111,7 @@
 				},
 				//新增界面数据 项目需求表
 				addForm: {
-						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',seqNo:'1',mmUserid:'',mmUsername:''
+						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',seqNo:'1',mmUserid:'',mmUsername:'',ntype:'0',childrenCnt:0,sinceVersion:''
 				},
 				userSelectVisible:false,
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
@@ -124,6 +130,10 @@
 					this.$message({showClose: true, message: '请选择产品/或者上级需求进行新增', type:'error' }); 
 					return;
 				}
+				if(this.parentMenu && this.parentMenu.ntype=="0"){
+					 this.$message({showClose: true, message: '需求集下不能再建立子需求', type:'error' }); 
+					return;
+				}
 				this.$refs.addForm.validate((valid) => {
 					if (valid) {
 
diff --git a/src/views/xm/core/xmMenu/XmMenuEdit.vue b/src/views/xm/core/xmMenu/XmMenuEdit.vue
index 0f7b7ccf..9a5eeb83 100644
--- a/src/views/xm/core/xmMenu/XmMenuEdit.vue
+++ b/src/views/xm/core/xmMenu/XmMenuEdit.vue
@@ -4,24 +4,30 @@
 			<el-tabs>
 				<el-tab-pane  label="需求详情">
 					<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
-            <el-row class="padding-bottom">
-              <el-steps :active="parseInt(editForm.status)" simple finish-status="success" align-center>
-                <el-step @click.native="on_click(0)" title="初始"></el-step>
-                <el-step @click.native="on_click(1)" title="设计中"></el-step>
-                <el-step @click.native="on_click(2)" title="开发中"></el-step>
-                <el-step @click.native="on_click(3)" title="测试中"></el-step>
-                <el-step @click.native="on_click(4)" title="uat测试"></el-step>
-                <el-step @click.native="on_click(5)" title="已上线"></el-step>
-                <el-step @click.native="on_click(6)" title="已下线"></el-step>
-                <el-step @click.native="on_click(7)" title="已删除"></el-step>
-              </el-steps>
-            </el-row>
+						<el-row class="padding-bottom">
+						<el-steps :active="parseInt(editForm.status)" simple finish-status="success" align-center>
+							<el-step @click.native="on_click(0)" title="初始"></el-step>
+							<el-step @click.native="on_click(1)" title="设计中"></el-step>
+							<el-step @click.native="on_click(2)" title="开发中"></el-step>
+							<el-step @click.native="on_click(3)" title="测试中"></el-step>
+							<el-step @click.native="on_click(4)" title="uat测试"></el-step>
+							<el-step @click.native="on_click(5)" title="已上线"></el-step>
+							<el-step @click.native="on_click(6)" title="已下线"></el-step>
+							<el-step @click.native="on_click(7)" title="已删除"></el-step>
+						</el-steps>
+						</el-row>
+						
+						<el-form-item label="类型" prop="ntype">
+							<el-radio disabled v-model="editForm.ntype" label="1">需求集</el-radio>
+							<el-radio disabled v-model="editForm.ntype" label="0">需求</el-radio>
+						</el-form-item> 
+						<el-form-item label="名称" prop="menuName">
+							<el-input v-model="editForm.menuName" placeholder="名称" ></el-input>
+						</el-form-item>
+						
 						<el-form-item label="序号" prop="seqNo">
 							<el-input v-model="editForm.seqNo" placeholder="如1.0 ， 1.1 ， 1.1.1等" ></el-input>
 						</el-form-item>
-						<el-form-item label="需求名称" prop="menuName">
-							<el-input v-model="editForm.menuName" placeholder="需求名称" ></el-input>
-						</el-form-item>
 						<el-form-item label="负责人" prop="mmUserid">
 							<el-tag v-if="editForm.mmUserid" closable @close="clearPmUser">{{editForm.mmUsername}}</el-tag>
 							<el-tag v-else>未配置</el-tag>
@@ -105,7 +111,7 @@ import XmMenuOverview from './XmMenuOverview.vue';
 				},
 				//新增界面数据 项目需求表
 				editForm: {
-						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',seqNo:'1',mmUserid:'',mmUsername:''
+						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',seqNo:'1',mmUserid:'',mmUsername:'',ntype:'0',childrenCnt:0,sinceVersion:''
 				},
 				userSelectVisible:false,
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index d244ec5b..4809eba2 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -303,13 +303,13 @@
 				addFormVisible: false,//新增xmMenu界面是否显示
 				//新增xmMenu界面初始化数据
 				addForm: {
-						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:''
+						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',ntype:'0',childrenCnt:0,sinceVersion:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				//编辑xmMenu界面初始化数据
 				editForm: {
-						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:''
+						menuId:'',menuName:'',pmenuId:'',productId:'',remark:'',status:'',online:'',demandUrl:'',codeUrl:'',designUrl:'',docUrl:'',helpUrl:'',operDocUrl:'',ntype:'0',childrenCnt:0,sinceVersion:''
 				},
 				parentMenu:null,
 				menuTemplateVisible:false,