diff --git a/src/api/xm/core/xmProjectGroup.js b/src/api/xm/core/xmProjectGroup.js
index bd913eef..be0ad367 100644
--- a/src/api/xm/core/xmProjectGroup.js
+++ b/src/api/xm/core/xmProjectGroup.js
@@ -6,7 +6,7 @@ let base = config.getCoreBasePath();
/**
- * xm_project_group
+ * xm_group
*1 默认只开放普通查询,所有查询,只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】},后台都会自动按分页查询 其它 api用到再打开,没用到的api请注释掉,
*2 查询、新增、修改的参数格式 params={id:'主键 主键',groupName:'团队名称',projectId:'项目编号-属于产品线则可为空',pgTypeId:'项目团队类型编号',pgTypeName:'团队类型名称',leaderUserid:'团队负责人',leaderUsername:'负责人姓名',ctime:'创建时间',ltime:'更新时间',productId:'产品编号,属于项目组的团队则可为空',branchId:'机构编号',pgClass:'团队类别0项目1产品',pgroupId:'上级团队编号',lvl:'级别0级1级2级3级4级',pidPaths:'上级编号路径逗号分割,0,开始,本组编号+逗号结束',isTpl:'是否为模板',assUserid:'副组长编号',assUsername:'副组长姓名',childrenCnt:'下级团队数量',userCnt:'组员数量',qxCode:'权限码',calcWorkload:'是否计算工作量0否1是',ntype:'节点类型0管理团队、1执行团队'}
**/
@@ -14,19 +14,19 @@ let base = config.getCoreBasePath();
//普通查询 条件之间and关系
export const listXmProjectGroup = params => { return axios.get(`${base}/xm/core/xmProjectGroup/list`, { params: params }); };
-//模糊查询xm_project_group 条件之间or关系
+//模糊查询xm_group 条件之间or关系
//export const listXmProjectGroupKey = params => { return axios.get(`${base}/xm/core/xmProjectGroup/listKey`, { params: params }); };
-//删除一条xm_project_group params={id:'主键 主键'}
+//删除一条xm_group params={id:'主键 主键'}
export const delXmProjectGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/del`,params); };
-//批量删除xm_project_group params=[{id:'主键 主键'}]
+//批量删除xm_group params=[{id:'主键 主键'}]
export const batchDelXmProjectGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/batchDel`, params); };
-//修改一条xm_project_group记录
+//修改一条xm_group记录
export const editXmProjectGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/edit`, params); };
-//新增一条xm_project_group
+//新增一条xm_group
export const addXmProjectGroup = params => { return axios.post(`${base}/xm/core/xmProjectGroup/add`, params); };
export const getGroups = params => { return axios.get(`${base}/xm/core/xmProjectGroup/getGroups`, { params: params }); };
diff --git a/src/api/xm/core/xmProjectGroupFormwork.js b/src/api/xm/core/xmProjectGroupFormwork.js
index 8b0ac037..2b310ff6 100644
--- a/src/api/xm/core/xmProjectGroupFormwork.js
+++ b/src/api/xm/core/xmProjectGroupFormwork.js
@@ -4,7 +4,7 @@ import config from '@/common/config'
let base = config.getCoreBasePath();
/**
- * xm_project_group_formwork
+ * xm_group_formwork
*1 默认只开放普通查询,所有查询,只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】},后台都会自动按分页查询 其它 api用到再打开,没用到的api请注释掉,
*2 查询、新增、修改的参数格式 params={id:'主键 主键',branchId:'机构编号',groupName:'团队名称',isPub:'是否公共,0为否,1为是'}
**/
diff --git a/src/api/xm/core/xmProjectGroupUser.js b/src/api/xm/core/xmProjectGroupUser.js
index 89af01c5..7b432352 100644
--- a/src/api/xm/core/xmProjectGroupUser.js
+++ b/src/api/xm/core/xmProjectGroupUser.js
@@ -6,7 +6,7 @@ let base = config.getCoreBasePath();
/**
- * xm_project_group_user
+ * xm_group_user
*1 默认只开放普通查询,所有查询,只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】},后台都会自动按分页查询 其它 api用到再打开,没用到的api请注释掉,
*2 查询、新增、修改的参数格式 params={groupId:'团队编号 主键',userid:'团队成员编号 主键',joinTime:'加入时间',username:'团队成员',outTime:'离队时间',status:'当前状态0参与中1已退出团队',obranchId:'组员原归属机构编号',isPri:'是否私人加入0否1是',seqNo:'排序号--从1开始',projectId:'项目编号',productId:'产品编号',pgClass:'0-项目,1-产品'}
**/
@@ -14,19 +14,19 @@ let base = config.getCoreBasePath();
//普通查询 条件之间and关系
export const listXmProjectGroupUser = params => { return axios.get(`${base}/xm/core/xmProjectGroupUser/list`, { params: params }); };
-//模糊查询xm_project_group_user 条件之间or关系
+//模糊查询xm_group_user 条件之间or关系
//export const listXmProjectGroupUserKey = params => { return axios.get(`${base}/xm/core/xmProjectGroupUser/listKey`, { params: params }); };
-//删除一条xm_project_group_user params={groupId:'团队编号 主键',userid:'团队成员编号 主键'}
+//删除一条xm_group_user params={groupId:'团队编号 主键',userid:'团队成员编号 主键'}
export const delXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/del`,params); };
-//批量删除xm_project_group_user params=[{groupId:'团队编号 主键',userid:'团队成员编号 主键'}]
+//批量删除xm_group_user params=[{groupId:'团队编号 主键',userid:'团队成员编号 主键'}]
export const batchDelXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/batchDel`, params); };
-//修改一条xm_project_group_user记录
+//修改一条xm_group_user记录
export const editXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/edit`, params); };
-//新增一条xm_project_group_user
+//新增一条xm_group_user
export const addXmProjectGroupUser = params => { return axios.post(`${base}/xm/core/xmProjectGroupUser/add`, params); };
-//批量删除xm_project_group_user params=[{groupId:'团队编号 主键',userid:'团队成员编号 主键'}]
+//批量删除xm_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/api/xm/core/xmProjectGroupUserCandidate.js b/src/api/xm/core/xmProjectGroupUserCandidate.js
index 0c2adfd6..432e255f 100644
--- a/src/api/xm/core/xmProjectGroupUserCandidate.js
+++ b/src/api/xm/core/xmProjectGroupUserCandidate.js
@@ -6,7 +6,7 @@ let base = config.getCoreBasePath();
/**
- * xm_project_group_user_candidate
+ * xm_group_user_candidate
*1 默认只开放普通查询,所有查询,只要上传 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】},后台都会自动按分页查询 其它 api用到再打开,没用到的api请注释掉,
*2 查询、新增、修改的参数格式 params={id:'主键 主键',groupId:'团队编号',userid:'团队成员编号',username:'团队成员',isHead:'是否组长,1是,0否',createTime:'成为候选人时间',candidateStatus:'候选状态0候选排对中1已加入项目做2已退出候选名单',outTime:'退出时间'}
**/
@@ -14,17 +14,17 @@ let base = config.getCoreBasePath();
//普通查询 条件之间and关系
export const listXmProjectGroupUserCandidate = params => { return axios.get(`${base}/xm/core/xmProjectGroupUserCandidate/list`, { params: params }); };
-//模糊查询xm_project_group_user_candidate 条件之间or关系
+//模糊查询xm_group_user_candidate 条件之间or关系
//export const listXmProjectGroupUserCandidateKey = params => { return axios.get(`${base}/xm/core/xmProjectGroupUserCandidate/listKey`, { params: params }); };
-//删除一条xm_project_group_user_candidate params={id:'主键 主键'}
+//删除一条xm_group_user_candidate params={id:'主键 主键'}
export const delXmProjectGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmProjectGroupUserCandidate/del`,params); };
-//批量删除xm_project_group_user_candidate params=[{id:'主键 主键'}]
+//批量删除xm_group_user_candidate params=[{id:'主键 主键'}]
export const batchDelXmProjectGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmProjectGroupUserCandidate/batchDel`, params); };
-//修改一条xm_project_group_user_candidate记录
+//修改一条xm_group_user_candidate记录
export const editXmProjectGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmProjectGroupUserCandidate/edit`, params); };
-//新增一条xm_project_group_user_candidate
+//新增一条xm_group_user_candidate
export const addXmProjectGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmProjectGroupUserCandidate/add`, params); };
\ No newline at end of file
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
index c1a644ef..8ebd70b8 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupEdit.vue
@@ -3,7 +3,7 @@
-
+
@@ -105,7 +105,7 @@
this.$refs['editFormRef'].resetFields();
this.$emit('cancel');
},
- //新增、编辑提交XmProjectGroup xm_project_group父组件监听@submit="afterEditSubmit"
+ //新增、编辑提交XmProjectGroup xm_group父组件监听@submit="afterEditSubmit"
saveSubmit: function () {
this.$refs.editFormRef.validate((valid) => {
if (valid) {
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
index 722aa3a7..edaf6d75 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
@@ -23,12 +23,12 @@
>
-
+
-
+
@@ -416,7 +416,7 @@ XmProductSelect,
this.load.list = false;
}).catch( err => this.load.list = false );
},
- //获取列表 XmProjectGroup xm_project_group
+ //获取列表 XmProjectGroup xm_group
getXmProjectGroups() {
let params = {
pageSize: this.pageInfo.pageSize,
@@ -472,12 +472,12 @@ XmProductSelect,
}).catch( err => this.load.list = false );
},
- //显示编辑界面 XmProjectGroup xm_project_group
+ //显示编辑界面 XmProjectGroup xm_group
showEdit: function ( row,index ) {
this.editFormVisible = true;
this.editForm = Object.assign({}, row);
},
- //显示新增界面 XmProjectGroup xm_project_group
+ //显示新增界面 XmProjectGroup xm_group
showAdd: function () {
this.addForm={...this.addFormInit}
if(this.currNodeType=='product'){
@@ -502,7 +502,7 @@ XmProductSelect,
//this.addForm=Object.assign({}, this.editForm);
},
- //显示新增界面 XmProjectGroup xm_project_group
+ //显示新增界面 XmProjectGroup xm_group
showAddSub: function (row) {
if(!row){
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
index a99a87d7..e7d04286 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
@@ -3,7 +3,7 @@
-
+
@@ -94,7 +94,7 @@
this.$refs['editFormRef'].resetFields();
this.$emit('cancel');
},
- //新增、编辑提交XmProjectGroupUser xm_project_group_user父组件监听@submit="afterEditSubmit"
+ //新增、编辑提交XmProjectGroupUser xm_group_user父组件监听@submit="afterEditSubmit"
saveSubmit: function () {
this.$refs.editFormRef.validate((valid) => {
if (valid) {
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
index 21011893..cc99a3f9 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
@@ -8,7 +8,7 @@
-
+
@@ -42,12 +42,12 @@
-
+
-
+
@@ -146,7 +146,7 @@
this.pageInfo.count=true;
this.getXmProjectGroupUsers();
},
- //获取列表 XmProjectGroupUser xm_project_group_user
+ //获取列表 XmProjectGroupUser xm_group_user
getXmProjectGroupUsers() {
let params = {
pageSize: this.pageInfo.pageSize,
@@ -192,12 +192,12 @@
}).catch( err => this.load.list = false );
},
- //显示编辑界面 XmProjectGroupUser xm_project_group_user
+ //显示编辑界面 XmProjectGroupUser xm_group_user
showEdit: function ( row,index ) {
this.editFormVisible = true;
this.editForm = Object.assign({}, row);
},
- //显示新增界面 XmProjectGroupUser xm_project_group_user
+ //显示新增界面 XmProjectGroupUser xm_group_user
showAdd: function () {
this.addFormVisible = true;
//this.addForm=Object.assign({}, this.editForm);
diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue
index df80d260..96e3e080 100644
--- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue
+++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue
@@ -1,7 +1,7 @@
-
+
@@ -70,7 +70,7 @@
//{ required: true, message: '主键不能为空', trigger: 'blur' }
]
},
- //新增界面数据 xm_project_group_user_candidate
+ //新增界面数据 xm_group_user_candidate
addForm: {
id:'',groupId:'',userid:'',username:'',isHead:'',createTime:'',candidateStatus:'',outTime:''
}
@@ -85,7 +85,7 @@
this.$refs['addForm'].resetFields();
this.$emit('cancel');
},
- //新增提交XmProjectGroupUserCandidate xm_project_group_user_candidate 父组件监听@submit="afterAddSubmit"
+ //新增提交XmProjectGroupUserCandidate xm_group_user_candidate 父组件监听@submit="afterAddSubmit"
addSubmit: function () {
this.$refs.addForm.validate((valid) => {
diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue
index c7fa07ee..722dccff 100644
--- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue
+++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue
@@ -1,7 +1,7 @@
-
+
@@ -70,7 +70,7 @@
//{ required: true, message: '主键不能为空', trigger: 'blur' }
]
},
- //编辑界面数据 XmProjectGroupUserCandidate xm_project_group_user_candidate
+ //编辑界面数据 XmProjectGroupUserCandidate xm_group_user_candidate
editForm: {
id:'',groupId:'',userid:'',username:'',isHead:'',createTime:'',candidateStatus:'',outTime:''
}
@@ -85,7 +85,7 @@
this.$refs['editForm'].resetFields();
this.$emit('cancel');
},
- //编辑提交XmProjectGroupUserCandidate xm_project_group_user_candidate父组件监听@submit="afterEditSubmit"
+ //编辑提交XmProjectGroupUserCandidate xm_group_user_candidate父组件监听@submit="afterEditSubmit"
editSubmit: function () {
this.$refs.editForm.validate((valid) => {
if (valid) {
diff --git a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
index 3f21402d..ee363ac4 100644
--- a/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
+++ b/src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue
@@ -3,11 +3,11 @@
查询
- +xm_project_group_user_candidate
+ +xm_group_user_candidate
批量删除
-
+
@@ -28,13 +28,13 @@
-
-
+
+
-
-
+
+
@@ -118,7 +118,7 @@
this.pageInfo.count=true;
this.getXmProjectGroupUserCandidates();
},
- //获取列表 XmProjectGroupUserCandidate xm_project_group_user_candidate
+ //获取列表 XmProjectGroupUserCandidate xm_group_user_candidate
getXmProjectGroupUserCandidates() {
let params = {
pageSize: this.pageInfo.pageSize,
@@ -152,12 +152,12 @@
}).catch( err => this.load.list = false );
},
- //显示编辑界面 XmProjectGroupUserCandidate xm_project_group_user_candidate
+ //显示编辑界面 XmProjectGroupUserCandidate xm_group_user_candidate
showEdit: function ( row,index ) {
this.editFormVisible = true;
this.editForm = Object.assign({}, row);
},
- //显示新增界面 XmProjectGroupUserCandidate xm_project_group_user_candidate
+ //显示新增界面 XmProjectGroupUserCandidate xm_group_user_candidate
showAdd: function () {
this.addFormVisible = true;
//this.addForm=Object.assign({}, this.editForm);