From 6aff7211d63cce7495909df19f6e7e8b23ff89af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 26 Feb 2022 20:11:15 +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

---
 .../xmProjectGroup/XmProjectGroupEdit.vue     |  12 +-
 .../core/xmProjectGroup/XmProjectGroupMng.vue |  26 +++-
 .../XmProjectGroupUserAdd.vue                 | 117 ------------------
 .../XmProjectGroupUserEdit.vue                |   5 +-
 .../XmProjectGroupUserMng.vue                 |   5 +-
 5 files changed, 33 insertions(+), 132 deletions(-)
 delete mode 100644 src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue

diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
index 980eca4b..e46fb2b6 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
@@ -6,8 +6,9 @@
 		<!--编辑界面 XmProjectGroup xm_project_group--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editFormRef">   
 				<el-form-item label="小组名称" prop="groupName">
-					<el-input v-model="editForm.groupName" placeholder="团队名称"> 
-					</el-input>
+					<el-input v-model="editForm.groupName" placeholder="团队名称">
+						<template v-if="currOpType=='edit'" slot="append">{{editForm.lvl}}级</template>
+					</el-input>  
 				</el-form-item>   
 				<el-form-item label="负责人" prop="leaderUsername"> 
 					<el-form-item label="组长" prop="leaderUsername">
@@ -17,10 +18,7 @@
 						<el-input v-model="editForm.assUsername" placeholder="副组长姓名" @click.native="showUserSelect('ass')"></el-input>
 						<font color="red">如果没用副组长可以设置为项目助理、小组助理等，具有组长同等权限</font>
 					</el-form-item>  
-				</el-form-item>   
-				<el-form-item label="级别" prop="lvl" v-if="currOpType=='edit'">
-					{{editForm.lvl}}级
-				</el-form-item>       
+				</el-form-item>          
 			</el-form>
 		</el-row>
 
@@ -78,7 +76,7 @@
 					]
 				},
 				editForm: {
-					id:'',groupName:'',projectId:'',pgTypeId:'',pgTypeName:'',leaderUserid:'',leaderUsername:'',ctime:'',ltime:'',productId:'',branchId:'',pgClass:'',pgroupId:'',lvl:'',pidPaths:'',isTpl:'',assUserid:'',assUsername:'',childrenCnt:'',userCnt:'',qxCode:'',calcWorkload:'',ntype:''
+					id:'',groupName:'',projectId:'',pgTypeId:'',pgTypeName:'',leaderUserid:'',leaderUsername:'',ctime:'',ltime:'',productId:'',branchId:'',pgClass:'',pgroupId:'',lvl:'',pidPaths:'',isTpl:'',assUserid:'',assUsername:'',childrenCnt:'',userCnt:'',qxCode:'',calcWorkload:'',ntype:'',crowBranchId:'',crowBranchName:'',isCrow:''
 				},
 				
 				userType:"leader",
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
index f08bb7c4..ca6e09d9 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
@@ -196,15 +196,30 @@
 				var groupsTree=treeTool.translateDataToTree(groups,'pgroupId','id')
 				var topLabel="组织架构"
 				var currNodeType=''
-				var topdata={}
+				var topdata={} 
 				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 if(this.selProject && this.selProject.id){
 					topLabel=this.selProject.name+"-项目组织架构"
 					currNodeType='project'
 					topdata=this.selProject
+					topdata.leaderUserid=this.selProject.pmUserid
+					topdata.leaderUsername=this.selProject.pmUsername
+					topdata.assUserid=this.selProject.assUserid
+					topdata.assUsername=this.selProject.assUsername
+				}else if(this.xmIteration){
+					
+					topLabel=this.xmIteration.iterationName+"-迭代组织架构"
+					currNodeType='iteration'
+					topdata=this.xmIteration
+					topdata.leaderUserid=this.xmIteration.admUserid
+					topdata.leaderUsername=this.xmIteration.admUsername 
 				}
 				var data=[{
 					...topdata,
@@ -255,12 +270,12 @@
 				},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
 				addFormVisible: false,//新增xmProjectGroup界面是否显示
 				addForm: {
-					id:'',groupName:'',projectId:'',pgTypeId:'',pgTypeName:'',leaderUserid:'',leaderUsername:'',ctime:'',ltime:'',productId:'',branchId:'',pgClass:'',pgroupId:'',lvl:'',pidPaths:'',isTpl:'',assUserid:'',assUsername:'',childrenCnt:'',userCnt:'',qxCode:'',calcWorkload:'',ntype:''
+					id:'',groupName:'',projectId:'',pgTypeId:'',pgTypeName:'',leaderUserid:'',leaderUsername:'',ctime:'',ltime:'',productId:'',branchId:'',pgClass:'',pgroupId:'',lvl:'',pidPaths:'',isTpl:'',assUserid:'',assUsername:'',childrenCnt:'',userCnt:'',qxCode:'',calcWorkload:'',ntype:'',crowBranchId:'',crowBranchName:'',isCrow:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				editForm: {
-					id:'',groupName:'',projectId:'',pgTypeId:'',pgTypeName:'',leaderUserid:'',leaderUsername:'',ctime:'',ltime:'',productId:'',branchId:'',pgClass:'',pgroupId:'',lvl:'',pidPaths:'',isTpl:'',assUserid:'',assUsername:'',childrenCnt:'',userCnt:'',qxCode:'',calcWorkload:'',ntype:''
+					id:'',groupName:'',projectId:'',pgTypeId:'',pgTypeName:'',leaderUserid:'',leaderUsername:'',ctime:'',ltime:'',productId:'',branchId:'',pgClass:'',pgroupId:'',lvl:'',pidPaths:'',isTpl:'',assUserid:'',assUsername:'',childrenCnt:'',userCnt:'',qxCode:'',calcWorkload:'',ntype:'',crowBranchId:'',crowBranchName:'',isCrow:''
 				},
 				maxTableHeight:300,
 
@@ -575,8 +590,8 @@
 				<div class={'diy-wrapper', node.isCurrent ? 'current-select' : ''}>
 					<div class={'diy-con-name',node.data.userid? 'el-icon-user':''}>{node.data.label}<div></div></div>
 					<div class="diy-con-content">
-						{node.data.leaderUsername?
-							(<div> 负责人 {node.data.leaderUsername }</div> 
+						{node.data.leaderUsername||node.data.assUsername?
+							(<div> 负责人 {node.data.leaderUsername?node.data.leaderUsername:'' }  {node.data.assUsername?node.data.assUsername:''}</div> 
 							)
 						:   
 						    (<div>   </div>)
@@ -638,6 +653,7 @@
 	color: black;
 }
 .diy-con-content{
+	padding-top:5px;
 	color:dimgrey;
 	font-size: 12px;
 }
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue
deleted file mode 100644
index a175e779..00000000
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserAdd.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-	<section class="page-container page-full-height padding border">
-		<el-row>
-			<!--新增界面 XmProjectGroupUser xm_project_group_user--> 
-			<el-form :model="addForm"  label-width="120px" :rules="addFormRules" ref="addForm">
-				<el-form-item label="主键" prop="id">
-					<el-input v-model="addForm.id" placeholder="主键" ></el-input>
-				</el-form-item> 
-				<el-form-item label="团队编号" prop="groupId">
-					<el-input v-model="addForm.groupId" placeholder="团队编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="团队成员编号" prop="userid">
-					<el-input v-model="addForm.userid" placeholder="团队成员编号" ></el-input>
-				</el-form-item> 
-				<el-form-item label="团队成员" prop="username">
-					<el-input v-model="addForm.username" placeholder="团队成员" ></el-input>
-				</el-form-item> 
-				<el-form-item>
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.add" type="primary" @click.native="addSubmit" :disabled="load.add==true">提交</el-button>  
-					</el-col>
-				</el-form-item> 
-			</el-form>
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 
-	import { addXmProjectGroupUser } from '@/api/xm/core/xmProjectGroupUser';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmProjectGroupUser','visible'],
-		watch: {
-	      'xmProjectGroupUser':function( xmProjectGroupUser ) {
-	        this.addForm = xmProjectGroupUser;
-	      },
-	      'visible':function(visible) { 
-	      	if(visible==true){
-	      		//从新打开页面时某些数据需要重新加载，可以在这里添加
-	      	}
-	      } 
-	    },
-		data() {
-			return {
-				options:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				addFormRules: {
-					id: [
-						//{ required: true, message: '主键不能为空', trigger: 'blur' }
-					]
-				},
-				//新增界面数据 xm_project_group_user
-				addForm: {
-					id:'',groupId:'',userid:'',username:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="addFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['addForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//新增提交XmProjectGroupUser xm_project_group_user 父组件监听@submit="afterAddSubmit"
-			addSubmit: function () {
-				
-				this.$refs.addForm.validate((valid) => {
-					if (valid) {
-						
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.add=true
-							let params = Object.assign({}, this.addForm); 
-							addXmProjectGroupUser(params).then((res) => {
-								this.load.add=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['addForm'].resetFields();
-									this.$emit('submit');//  @submit="afterAddSubmit"
-								}
-								this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err  => this.load.add=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-			
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-project-group-user-edit':XmProjectGroupUserEdit
-		},
-		mounted() {
-			this.addForm=Object.assign(this.addForm, this.xmProjectGroupUser);  
-			/**在下面写其它函数***/
-			
-		}//end mounted
-	}
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
index 006598cd..585046b4 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
@@ -41,6 +41,9 @@
 				<el-form-item label="0-项目，1-产品" prop="pgClass">
 					<el-input v-model="editForm.pgClass" placeholder="0-项目，1-产品"></el-input>
 				</el-form-item> 
+				<el-form-item label="原归属机构名称" prop="obranchName">
+					<el-input v-model="editForm.obranchName" placeholder="原归属机构名称"></el-input>
+				</el-form-item> 
 			</el-form>
 		</el-row>
 
@@ -93,7 +96,7 @@
 					]
 				},
 				editForm: {
-					joinTime:'',groupId:'',userid:'',username:'',outTime:'',status:'',obranchId:'',isPri:'',seqNo:'',projectId:'',productId:'',pgClass:''
+					joinTime:'',groupId:'',userid:'',username:'',outTime:'',status:'',obranchId:'',isPri:'',seqNo:'',projectId:'',productId:'',pgClass:'',obranchName:''
 				},
 
 			}//end return
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
index cb43592c..1f4acc1b 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
@@ -23,6 +23,7 @@
 				<el-table-column prop="projectId" label="项目编号" min-width="80" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="productId" label="产品编号" min-width="80" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="pgClass" label="0-项目，1-产品" min-width="80" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="obranchName" label="原归属机构名称" min-width="80" show-overflow-tooltip></el-table-column>
 				<el-table-column label="操作" width="180" fixed="right">
 				    <template slot="header">
                         <el-button @click="showAdd" icon="el-icon-plus" circle> </el-button>
@@ -96,12 +97,12 @@
 				},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
 				addFormVisible: false,//新增xmProjectGroupUser界面是否显示
 				addForm: {
-					joinTime:'',groupId:'',userid:'',username:'',outTime:'',status:'',obranchId:'',isPri:'',seqNo:'',projectId:'',productId:'',pgClass:''
+					joinTime:'',groupId:'',userid:'',username:'',outTime:'',status:'',obranchId:'',isPri:'',seqNo:'',projectId:'',productId:'',pgClass:'',obranchName:''
 				},
 				
 				editFormVisible: false,//编辑界面是否显示
 				editForm: {
-					joinTime:'',groupId:'',userid:'',username:'',outTime:'',status:'',obranchId:'',isPri:'',seqNo:'',projectId:'',productId:'',pgClass:''
+					joinTime:'',groupId:'',userid:'',username:'',outTime:'',status:'',obranchId:'',isPri:'',seqNo:'',projectId:'',productId:'',pgClass:'',obranchName:''
 				},
 				maxTableHeight:300,
 			}