From 538dff5603b8cd3a1b9b0f75005d8aa17605b25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 2 Mar 2022 05:25:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xmProjectGroup/XmProjectGroupEdit.vue | 2 +- .../core/xmProjectGroup/XmProjectGroupMng.vue | 113 +++++++++++++++--- 2 files changed, 95 insertions(+), 20 deletions(-) diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue index cd0d08d2..d25fefed 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue @@ -123,7 +123,7 @@ this.editForm=res.data.data this.initData() this.currOpType="edit"; - this.$emit('submit');// @submit="afterAddSubmit" + this.$emit('submit',this.editForm);// @submit="afterAddSubmit" } this.$notify({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err =>this.load.edit=false); diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue index 4842ca40..708fbbfd 100644 --- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue +++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue @@ -1,6 +1,6 @@ @@ -182,11 +203,14 @@ import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; import XmProjectGroupStateMng from '../xmProjectGroupState/XmProjectGroupStateMng';//修改界面 import XmProjectGroupUserMng from '../xmProjectGroupUser/XmProjectGroupUserMng';//修改界面 + import XmProjectList from '../xmProject/XmProjectList'; + import XmProductSelect from '../xmProduct/XmProductSelect.vue'; export default { name:'xmProjectGroupMng', components: { - XmProjectGroupEdit,VueOkrTree,UsersSelect,XmProjectGroupStateMng,XmProjectGroupUserMng, + XmProjectGroupEdit,VueOkrTree,UsersSelect,XmProjectGroupStateMng,XmProjectGroupUserMng,XmProjectList, +XmProductSelect, }, props:["visible","selProject" ,"isSelectSingleUser","isSelectMultiUser",'xmProduct','xmIteration'], computed: { @@ -221,7 +245,7 @@ }) var groupsTree=treeTool.translateDataToTree(groups,'pgroupId','id') var topLabel="组织架构" - var currNodeType='' + var currNodeType='branch' var topdata={} if(this.xmProduct&&this.xmProduct.id){ topLabel=this.xmProduct.productName+"-产品组织架构" @@ -283,7 +307,7 @@ xmProjectGroups: [],//查询结果 pageInfo:{//分页数据 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。 - pageSize:10,//每页数据 + pageSize:50,//每页数据 count:false,//是否需要重新计算总记录数 pageNum:1,//当前页码、从1开始计算 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段 @@ -315,6 +339,8 @@ groupOperSelectVisible:false, currNodeType:'',//project/product/iteration/group/groupUser groupUserVisible:false, + selectProjectVisible:false, + selectProductVisible:false, } },//end data methods: { @@ -348,6 +374,37 @@ this.pageInfo.count=true; this.getXmProjectGroups(); }, + loadNexGroup(){ + debugger; + var params={} + if(this.currNodeType=='branch'||this.currNodeType=='iteration'){ + params.branchId=this.editForm.branchId + params.lvl=1 + }else if(this.currNodeType=='product'){ + params.projectId=this.editForm.id + params.lvl=1 + }else if(this.currNodeType=='product'){ + params.productId=this.editForm.id + params.lvl=1 + }else if(this.currNodeType=='group'){ + params.pgroupId=this.editForm.id + }else if(this.currNodeType=='groupUser'){ + return; + } + listXmProjectGroup(params).then((res) => { + var tips=res.data.tips; + if(tips.isOk){ + this.pageInfo.total = res.data.total; + this.pageInfo.count=false; + var childrens = res.data.data; + childrens=childrens.filter(i=>!this.xmProjectGroups.some(k=>k.id==i.id)) + this.xmProjectGroups.push(...childrens) + }else{ + this.$notify({ showClose:true, message: tips.msg, type: 'error' }); + } + this.load.list = false; + }).catch( err => this.load.list = false ); + }, //获取列表 XmProjectGroup xm_project_group getXmProjectGroups() { let params = { @@ -380,6 +437,7 @@ this.load.list = true; if( !params.productId && !params.projectId && !params.iterationId){ func=listXmProjectGroup + params.lvl=1 } func(params).then((res) => { var tips=res.data.tips; @@ -444,11 +502,12 @@ this.addFormVisible = true; //this.addForm=Object.assign({}, this.editForm); }, - afterAddSubmit(){ + afterAddSubmit(group){ this.addFormVisible=false; - this.pageInfo.count=true; + //this.pageInfo.count=true; this.groupOperSelectVisible=false; - this.getXmProjectGroups(); + this.xmProjectGroups.push(group) + //this.getXmProjectGroups(); }, afterEditSubmit(){ this.editFormVisible=false; @@ -650,6 +709,22 @@ }).catch( err => this.load.del=false ); }); }, + onPorjectConfirm(project){ + this.addForm.projectId=project.id + this.addForm.groupName=project.name+"-管理小组" + this.addForm.projectName=project.name + this.addForm.pgClass="0" + this.addFormVisible=true; + this.selectProjectVisible=false; + }, + onProductConfirm(product){ + 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; + } },//end methods mounted() { this.$nextTick(() => {