From 88d642bd7426349c879768a16f49da228ce693a2 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, 4 May 2022 22:54:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xm/core/components/XmProjectSelect.vue    |  6 +-
 src/views/xm/core/xmGroup/XmGroupMng.vue      | 80 +++++--------------
 src/views/xm/core/xmMenu/XmMenuMngBatch.vue   |  6 +-
 src/views/xm/core/xmMenu/XmMenuWithPlan.vue   | 12 +--
 src/views/xm/core/xmProduct/XmProductMng.vue  | 12 +--
 .../xm/core/xmProduct/XmProductTplMng.vue     |  6 +-
 .../xm/core/xmQuestion/XmQuestionAdd.vue      |  7 +-
 7 files changed, 34 insertions(+), 95 deletions(-)

diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index b083e1fd..eae4de7a 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -241,11 +241,11 @@
 			rowClick: function(row, event, column){
 				this.editForm=row
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-				this.selectedProduct(row)
+				this.selectedProject(row)
 				this.projectVisible=false;
 				this.moreVisible=false;
 			},
-			selectedProduct:function(row){
+			selectedProject:function(row){
 				this.editForm=row
 				this.$emit('selected',row);
 				this.projectVisible=false;
@@ -283,7 +283,7 @@
 			clearSelect(){
 				this.$refs.table.setCurrentRow();
 				this.$emit("clear");
-				this.selectedProduct(null);
+				this.selectedProject(null);
 				this.projectVisible=false;
 				this.moreVisible=false;
 			},
diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue
index 5fa13710..e91d7832 100644
--- a/src/views/xm/core/xmGroup/XmGroupMng.vue
+++ b/src/views/xm/core/xmGroup/XmGroupMng.vue
@@ -1,7 +1,7 @@
 <template>
 	<section class="page-container border padding" >
 		<el-row>  
-			<xm-project-select style="display:inline;" v-if="!selProject" :auto-select="true"   :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClearSelect"></xm-project-select>
+			<xm-project-select style="display:inline;" v-if="!selProject" :auto-select="true"   :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @selected="onProjectRowClick" @clear="onProjectClearSelect"></xm-project-select>
 			
 			<el-input v-model="filters.key" style="width:15%;" clearable placeholder="名称过滤"></el-input>   
 			<el-button  type="primary" @click="searchXmGroups" icon="el-icon-search">刷新</el-button> 
@@ -53,11 +53,7 @@
 				<el-row v-if="currNodeType=='project'">   
 					<el-button type="primary" @click="loadNexGroup" icon="el-icon-search" v-loading="load.add">加载下一级小组</el-button>  
 					<el-button @click="showProjectGroupAdd" icon="el-icon-plus" v-loading="load.add">新增项目小组</el-button>  
-				</el-row> 
-				<el-row v-else-if="currNodeType=='product'">  
-					<el-button type="primary" @click="loadNexGroup" icon="el-icon-search" v-loading="load.add">加载下一级小组</el-button>  
-					<el-button type="primary" @click="showProductGroupAdd" icon="el-icon-plus"  v-loading="load.add">新增产品小组</el-button> 
-				</el-row> 
+				</el-row>  
 				<el-row v-else-if="currNodeType=='group'">  
 					<el-row>
 						<el-button type="primary" @click="loadNexGroup" icon="el-icon-search" v-loading="load.add">加载下一级小组</el-button>  
@@ -73,11 +69,7 @@
 				</el-row> 
 				<el-row v-else-if="currNodeType=='groupUser'">  
 					<el-button type="danger" icon="el-icon-delete" @click="handleDelGroupUser(editForm)" v-loading="load.del">删除组员</el-button>
-				</el-row> 
-				<el-row v-else>  
-					<el-button type="primary" @click="loadNexGroup" icon="el-icon-search" v-loading="load.add">加载下一级小组</el-button>  
- 					<el-button type="primary" @click="selectProjectVisible=true" icon="el-icon-plus" v-loading="load.add">新增项目小组</el-button>  
-				</el-row>
+				</el-row>  
 			</el-dialog>
 			
 			<el-drawer append-to-body
@@ -255,8 +247,8 @@ XmProductSelect,XmProjectSelect,
 				})
 				var groupsTree=treeTool.translateDataToTree(groups,'pgroupId','id')
 				var topLabel=this.userInfo.branchName+"-组织架构"
-				var currNodeType='branch'
-				var topdata={id:this.userInfo.branchId,branchName:this.userInfo.branchName,branchId:this.userInfo.branchId} 
+				var currNodeType='project'
+				var topdata={}
 				if(this.filters.selProject && this.filters.selProject.id){
 					topLabel=this.filters.selProject.name+"-项目组织架构"
 					currNodeType='project'
@@ -265,15 +257,9 @@ XmProductSelect,XmProjectSelect,
 					topdata.leaderUsername=this.filters.selProject.pmUsername
 					topdata.assUserid=this.filters.selProject.assUserid
 					topdata.assUsername=this.filters.selProject.assUsername
-				}else if(this.xmProduct && this.xmProduct.id){
-					topLabel=this.xmProduct.productName+"-产品组织架构"
-					currNodeType='product'
-					topdata=this.xmProduct
-					topdata.leaderUserid=this.xmProduct.pmUserid
-					topdata.leaderUsername=this.xmProduct.pmUsername
-					topdata.assUserid=this.xmProduct.assUserid
-					topdata.assUsername=this.xmProduct.assUsername
-				}
+				}else{
+					return []
+				} 
 				var data=[{
 					...topdata,
 					label:topLabel,
@@ -295,13 +281,7 @@ XmProductSelect,XmProjectSelect,
 			selProject(){
 				this.selProject=this.selProject;
 				this.getXmGroup();
-			},
-			xmProduct(){
-				this.getXmGroup();
-			},
-			xmIteration(){
-				this.getXmGroup();
-			},
+			}, 
 			"filters.key":function(val) {
 				this.$refs.tree.filter(val);
 			}, 
@@ -434,14 +414,12 @@ XmProductSelect,XmProjectSelect,
 					}  
 					params.orderBy= orderBys.join(",")
 				}
-				
+				if( !this.filters.selProject || !this.filters.selProject.id){
+					return;
+				}
 				if(this.filters.selProject && this.filters.selProject.id){
 					params.projectId=this.filters.selProject.id
-				}else if(this.xmProduct && this.xmProduct.id){
-					params.productId=this.xmProduct.id
-				}else if(this.xmIteration && this.xmIteration.id){
-					params.iterationId=this.xmIteration.id
-				}
+				} 
 				if(this.filters.key){
 					params.key=this.filters.key
 				}
@@ -453,22 +431,9 @@ XmProductSelect,XmProjectSelect,
 				}
 				if(this.filters.mngUsernamekey){
 					params.mngUsernamekey=this.filters.mngUsernamekey
-				}
-				if(this.pgClass==='0'||!this.pgClass){
-					if(!params.projectId){
-						return;
-					}
-				}else if(this.pgClass==='1'){
-					if(!params.productId){
-						return;
-					}
-				}
+				} 
 				var func=getGroups
-				this.load.list = true;
-				if( !params.productId && !params.projectId && !params.iterationId){
-					func=listXmGroup
-					params.lvl=1
-				}
+				this.load.list = true; 
 				func(params).then((res) => {
 					var tips=res.data.tips;
 					if(tips.isOk){ 
@@ -699,7 +664,9 @@ XmProductSelect,XmProjectSelect,
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
 			},
             initData: function(){
-				this.filters.selProject=this.selProject; 
+				if(this.selProject){
+					this.filters.selProject=this.selProject;  
+				} 
             },
 			renderCurrentClass (node) {
 				return 'label-bg-blue'
@@ -757,16 +724,7 @@ XmProductSelect,XmProjectSelect,
 				this.addForm.pgClass="0"
 				this.addFormVisible=true;
 				this.selectProjectVisible=false;
-			},
-			onProductConfirm(product){
-				this.addForm={...this.addFormInit}
-				this.addForm.productId=product.id
-				this.addForm.groupName=product.productName+"-管理小组"
-				this.addForm.projectName=product.productName
-				this.addForm.pgClass="1"
-				this.addFormVisible=true;
-				this.selectProductVisible=false;
-			},
+			}, 
 			onProjectRowClick(project){
 				this.filters.selProject=project;
 				this.searchXmGroups();
diff --git a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
index 707a67bc..e342f1f5 100644
--- a/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMngBatch.vue
@@ -152,11 +152,7 @@
 				this.$emit('no-batch-edit')
 			},
 			batchSaveMenu(){
-				
-				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
-					this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理、产品组长能够修改需求", type: 'error'}); 
-					return false;
-				}
+				 
 				if(this.valueChangeRows.length==0){
 					this.$notify.success("没有数据被修改");
 					return
diff --git a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
index 86811f29..63a27971 100644
--- a/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
+++ b/src/views/xm/core/xmMenu/XmMenuWithPlan.vue
@@ -411,11 +411,7 @@
 				}).catch( err  => this.load.add=false ); 
 			}, 
 			//批量删除xmMenu
-			batchDel: function () {
-				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
-					this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理、产品组长能够修改需求", type: 'error'}); 
-					return false;
-				}
+			batchDel: function () { 
 				
 				this.$confirm('确认删除选中记录吗？', '提示', {
 					type: 'warning'
@@ -505,11 +501,7 @@
 				}
 
 			},
-			showBatchEdit:function(){
-				if(!this.roles.some(i=>i.roleid=='productAdmin') && !this.roles.some(i=>i.roleid=='productTeamAdmin')){
-					this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理、产品组长能够修改需求", type: 'error'}); 
-					return false;
-				}
+			showBatchEdit:function(){ 
 				if(this.xmMenus.length==0 ){
 					this.$notify({position:'bottom-left',showClose:true,message:"没有数据可以修改", type: 'error'});
 					return ;
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 56aa3bc7..987a324e 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -511,11 +511,7 @@
 				this.editForm = Object.assign({}, row);
 			},
 			//显示新增界面 XmProduct 产品表
-			showAdd: function () {
-				if(!this.roles.some(i=>i.roleid=='productAdmin')){
-					this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理能够创建产品", type: 'error'});
-					return false;
-				}
+			showAdd: function () { 
 				this.addFormVisible = true;
 				//this.addForm=Object.assign({}, this.editForm);
 			},
@@ -569,11 +565,7 @@
 				}); 	
 			},
 			//批量删除xmProduct
-			batchDel: function () {
-				if(!this.roles.some(i=>i.roleid=='productAdmin')){
-					this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理能够删除产品", type: 'error'});
-					return false;
-				}
+			batchDel: function () { 
 				var mmSels=this.sels.filter(i=>i.pmUserid!=this.userInfo.userid)
 				if(mmSels.length>0){
 					this.$notify({position:'bottom-left',showClose:true,message: "只能删除你负责的产品", type: 'error'});
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index d4d8fc69..0fbdc456 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -283,11 +283,7 @@
 				this.editForm = Object.assign({}, row);
 			},
 			//显示新增界面 XmProduct 产品表
-			showAdd: function () {
-				if(!this.roles.some(i=>i.roleid=='productAdmin')){
-					this.$notify({position:'bottom-left',showClose:true,message: "只有产品经理能够创建产品", type: 'error'});
-					return false;
-				}
+			showAdd: function () { 
 				this.addFormVisible = true;
 				//this.addForm=Object.assign({}, this.editForm);
 			},
diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
index 45d6f9b3..97fca971 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
@@ -186,7 +186,12 @@
 	      'visible':function(visible) {
 	      	if(visible==true){
 				  //从新打开页面时某些数据需要重新加载，可以在这里添加
-				   this.addForm.qtype=this.qtype
+				  if(this.qtype){
+					   this.addForm.qtype=this.qtype
+				  }else{
+					   this.addForm.qtype='1'
+				  }
+				  
 				   this.addForm.id=sn('bug_')
 				   this.initByExec();