diff --git a/src/api/xm/core/xmProjectGroupUser.js b/src/api/xm/core/xmProjectGroupUser.js
index 34bff9ff..89af01c5 100644
--- a/src/api/xm/core/xmProjectGroupUser.js
+++ b/src/api/xm/core/xmProjectGroupUser.js
@@ -27,4 +27,6 @@ export const batchDelXmProjectGroupUser = params => { return axios.post(`${base}
export const editXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/edit`, params); };
//新增一条xm_project_group_user
-export const addXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/add`, params); };
\ No newline at end of file
+export const addXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/add`, params); };
+//批量删除xm_project_group_user params=[{groupId:'团队编号 主键',userid:'团队成员编号 主键'}]
+export const batchAddXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/batchAdd`, params); };
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
index da64f8e3..324c37e0 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
@@ -30,7 +30,7 @@
-
+
- 新增下级小组
- 通过模板批量导入下级小组
+ 新增下级小组
+ 通过模板批量导入下级小组
- 新增下级小组
- 通过模板批量导入下级小组
+ 新增下级小组
+ 通过模板批量导入下级小组
- 新增下级小组
- 通过模板批量导入下级小组
- 修改小组信息
- 新增组员
- 删除小组
+ 新增下级小组
+ 通过模板批量导入下级小组
+ 修改小组信息
+ 新增组员
+ 删除小组
- 删除组员
+ 删除组员
@@ -167,7 +167,7 @@
import { listImGroup} from '@/api/mdp/im/group/imGroup';
import { publishMessage} from '@/api/mdp/im/imPush';
- import { listXmProjectGroupUser, delXmProjectGroupUser, batchDelXmProjectGroupUser } from '@/api/xm/core/xmProjectGroupUser';
+ import { listXmProjectGroupUser, delXmProjectGroupUser, batchDelXmProjectGroupUser,batchAddXmProjectGroupUser } from '@/api/xm/core/xmProjectGroupUser';
import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@@ -358,16 +358,28 @@
},
//显示新增界面 XmProjectGroup xm_project_group
showAdd: function () {
+ if(this.xmProduct && this.xmProduct.id){
+ this.addForm.productId=this.xmProduct.id
+ this.addForm.pgClass="1"
+ this.addForm.projectId=""
+ }else{
+ this.addForm.productId=""
+ this.addForm.pgClass="0"
+ this.addForm.projectId=this.selProject.id
+ }
this.addFormVisible = true;
//this.addForm=Object.assign({}, this.editForm);
},
afterAddSubmit(){
this.addFormVisible=false;
this.pageInfo.count=true;
+ this.groupOperSelectVisible=false;
this.getXmProjectGroups();
},
afterEditSubmit(){
this.editFormVisible=false;
+ this.groupOperSelectVisible=false;
+ this.getXmProjectGroups();
},
//选择行xmProjectGroup
selsChange: function (sels) {
@@ -378,7 +390,8 @@
this.$confirm('确认删除该记录吗?', '提示', {
type: 'warning'
}).then(() => {
- this.load.del=true;
+ this.load.del=true;
+ this.groupOperSelectVisible=false;
let params = { id: row.id };
delXmProjectGroup(params).then((res) => {
this.load.del=false;
@@ -400,6 +413,7 @@
this.load.del=true;
batchDelXmProjectGroup(this.sels).then((res) => {
this.load.del=false;
+ this.groupOperSelectVisible=false;
var tips=res.data.tips;
if( tips.isOk ){
this.pageInfo.count=true;
@@ -472,6 +486,38 @@
onUserSelected: function(groupUsers) {
this.userSelectVisible = false;
+ this.load.add=true;
+ if(groupUsers==null||groupUsers.length==0){
+ return;
+ }
+ var params=groupUsers.map(i=>{
+ var u={
+ userid:i.userid,
+ username:i.username,
+ groupId:this.editForm.id,
+ }
+ if(this.editForm.pgClass=='1'){
+ u.projectId=null
+ u.productId=this.xmProduct.id
+ u.pgClass=this.editForm.pgClass
+ }else{
+ u.projectId=this.selProject.id
+ u.productId=null
+ u.pgClass=this.editForm.pgClass
+ }
+ return u;
+ })
+ batchAddXmProjectGroupUser(params).then(res=>{
+
+ this.load.add=false;
+ this.groupOperSelectVisible=false;
+ var tips = res.data.tips
+ if(tips.isOk){
+ this.searchXmProjectGroups()
+ }
+ this.$message({ showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});
+ })
+
},
delGroupUser(index,vindex) {
},
@@ -523,7 +569,8 @@
delXmProjectGroupUser(params).then((res) => {
this.load.del=false;
var tips=res.data.tips;
- if(tips.isOk){
+ if(tips.isOk){
+ this.groupOperSelectVisible=false;
this.pageInfo.count=true;
this.getXmProjectGroups();
}