xm_project_group重命名->xm_group

src/api/xm/core/xmProjectGroupFormwork.js

@@ -8,12 +8,12 @@ let base = config.getCoreBasePath();
  *1    默认只开放普通查询，所有查询，只要上传	 分页参数 {currentPage:当前页码从1开始,pageSize:每页记录数,total:总记录【数如果是0后台会自动计算总记录数非0不会自动计算】}，后台都会自动按分页查询 其它 api用到再打开，没用到的api请注释掉，
  *2 查询、新增、修改的参数格式  params={id:'主键 主键',branchId:'机构编号',groupName:'团队名称',isPub:'是否公共，0为否，1为是'}
  **/
-export const listXmProjectGroupFormwork = params => { return axios.get(`${base}/xm/core/xmProjectGroupFormwork/list`, { params: params }); };
+export const listXmGroupFormwork = params => { return axios.get(`${base}/xm/core/xmGroupFormwork/list`, { params: params }); };
 
-export const delXmProjectGroupFormwork = params => { return axios.post(`${base}/xm/core/xmProjectGroupFormwork/del`,params); };
+export const delXmGroupFormwork = params => { return axios.post(`${base}/xm/core/xmGroupFormwork/del`,params); };
 
-export const batchDelXmProjectGroupFormwork = params => { return axios.post(`${base}/xm/core/xmProjectGroupFormwork/batchDel`, params); };
+export const batchDelXmGroupFormwork = params => { return axios.post(`${base}/xm/core/xmGroupFormwork/batchDel`, params); };
 
-export const editXmProjectGroupFormwork = params => { return axios.post(`${base}/xm/core/xmProjectGroupFormwork/edit`, params); };
+export const editXmGroupFormwork = params => { return axios.post(`${base}/xm/core/xmGroupFormwork/edit`, params); };
 
-export const addXmProjectGroupFormwork = params => { return axios.post(`${base}/xm/core/xmProjectGroupFormwork/add`, params); };   
+export const addXmGroupFormwork = params => { return axios.post(`${base}/xm/core/xmGroupFormwork/add`, params); };   

src/api/xm/core/xmProjectGroupUserCandidate.js

@@ -12,19 +12,19 @@ let base = config.getCoreBasePath();
  **/
  
 //普通查询 条件之间and关系  
-export const listXmProjectGroupUserCandidate = params => { return axios.get(`${base}/xm/core/xmProjectGroupUserCandidate/list`, { params: params }); };
+export const listXmGroupUserCandidate = params => { return axios.get(`${base}/xm/core/xmGroupUserCandidate/list`, { params: params }); };
 
 //模糊查询xm_group_user_candidate 条件之间or关系  
-//export const listXmProjectGroupUserCandidateKey = params => { return axios.get(`${base}/xm/core/xmProjectGroupUserCandidate/listKey`, { params: params }); };
+//export const listXmGroupUserCandidateKey = params => { return axios.get(`${base}/xm/core/xmGroupUserCandidate/listKey`, { params: params }); };
 
 //删除一条xm_group_user_candidate params={id:'主键 主键'}
-export const delXmProjectGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmProjectGroupUserCandidate/del`,params); };
+export const delXmGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmGroupUserCandidate/del`,params); };
 
 //批量删除xm_group_user_candidate  params=[{id:'主键 主键'}]
-export const batchDelXmProjectGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmProjectGroupUserCandidate/batchDel`, params); };
+export const batchDelXmGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmGroupUserCandidate/batchDel`, params); };
 
 //修改一条xm_group_user_candidate记录
-export const editXmProjectGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmProjectGroupUserCandidate/edit`, params); };
+export const editXmGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmGroupUserCandidate/edit`, params); };
 
 //新增一条xm_group_user_candidate
-export const addXmProjectGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmProjectGroupUserCandidate/add`, params); };
+export const addXmGroupUserCandidate = params => { return axios.post(`${base}/xm/core/xmGroupUserCandidate/add`, params); };

src/components/Guider/guiderData.js

@@ -36,7 +36,7 @@ var xmHomePage=[
     padding: 5,
     },
     {
-    element: '#XmProjectGroupAllMng',
+    element: '#XmGroupAllMng',
     popover: {
       title: ' ',
       description: '这里可以快速创建项目、产品团队、快速管理团队成员。',

src/router/routes_xm.js

@@ -148,8 +148,8 @@ export default {
       },
       // leaf: true,//只有一个节点
       children: [
-         { path: 'xmProjectGroup/XmProjectGroupAllMng', component: _import('xm/core/xmProjectGroup/XmProjectGroupAllMng'), name: 'XmProjectGroupAllMng', meta: { title: '团队管理' }}, 
-         { path: 'xmProjectGroupUser/XmProjectGroupUserMng', component: _import('xm/core/xmProjectGroupUser/XmProjectGroupUserMng'), name: 'XmProjectGroupUserMng', meta: { title: '成员管理' }}, 
+         { path: 'xmGroup/XmGroupAllMng', component: _import('xm/core/xmGroup/XmGroupAllMng'), name: 'XmGroupAllMng', meta: { title: '团队管理' }}, 
+         { path: 'xmGroupUser/XmGroupUserMng', component: _import('xm/core/xmGroupUser/XmGroupUserMng'), name: 'XmGroupUserMng', meta: { title: '成员管理' }}, 
       ]
     }
   ]

src/views/datav/xm/project/index.vue

@@ -42,7 +42,7 @@ import cards from './cards'
 	import config from '@/common/config';//全局公共库 
 	import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
   import { listXmProjectState  } from '@/api/xm/core/xmProjectState'; 
-  import { listXmProjectGroupState} from '@/api/xm/core/xmProjectGroupState';
+  import { listXmGroupState} from '@/api/xm/core/xmGroupState';
 	import { listXmProjectTaskTypeState } from '@/api/xm/core/xmProjectTaskTypeState';
   import { listXmRecord } from '@/api/xm/core/xmRecord';
   import { listXmProjectPhase } from '@/api/xm/core/xmProjectPhase';
@@ -192,10 +192,10 @@ export default {
       return digitalFlopData;
     },
     rankingBoardData(){
-      if( !this.xmProjectGroupStates || this.xmProjectGroupStates.length==0 ){
+      if( !this.xmGroupStates || this.xmGroupStates.length==0 ){
         return [];
       }
-      var rankingBoardData=this.xmProjectGroupStates.map(i=>{
+      var rankingBoardData=this.xmGroupStates.map(i=>{
         return {name:i.groupName,value:i.finishRate+'%'}
       })
       return rankingBoardData
@@ -274,7 +274,7 @@ export default {
         projectId:null,
       },
       xmProjectState:null,
-      xmProjectGroupStates:[],
+      xmGroupStates:[],
       xmProjectTaskTypeStates:[],
       xmRecords:[],
       xmProjectPhases:[],
@@ -291,7 +291,7 @@ export default {
         orderDirs:["desc"]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
       },
       
-      xmProjectGroupStatePageInfo:{//分页数据
+      xmGroupStatePageInfo:{//分页数据
         total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
         pageSize:5,//每页数据
         count:false,//是否需要重新计算总记录数
@@ -325,27 +325,27 @@ export default {
         }
       });
     },
-    getXmProjectGroupStates(){
+    getXmGroupStates(){
       let params = {
-					pageSize: this.xmProjectGroupStatePageInfo.pageSize,
-					pageNum: this.xmProjectGroupStatePageInfo.pageNum,
-					total: this.xmProjectGroupStatePageInfo.total,
-					count:this.xmProjectGroupStatePageInfo.count
+					pageSize: this.xmGroupStatePageInfo.pageSize,
+					pageNum: this.xmGroupStatePageInfo.pageNum,
+					total: this.xmGroupStatePageInfo.total,
+					count:this.xmGroupStatePageInfo.count
 				};
-				if(this.xmProjectGroupStatePageInfo.orderFields!=null && this.xmProjectGroupStatePageInfo.orderFields.length>0){
+				if(this.xmGroupStatePageInfo.orderFields!=null && this.xmGroupStatePageInfo.orderFields.length>0){
 					let orderBys=[];
-					for(var i=0;i<this.xmProjectGroupStatePageInfo.orderFields.length;i++){ 
-						orderBys.push(this.xmProjectGroupStatePageInfo.orderFields[i]+" "+this.xmProjectGroupStatePageInfo.orderDirs[i])
+					for(var i=0;i<this.xmGroupStatePageInfo.orderFields.length;i++){ 
+						orderBys.push(this.xmGroupStatePageInfo.orderFields[i]+" "+this.xmGroupStatePageInfo.orderDirs[i])
 					}  
 					params.orderBy= orderBys.join(",")
 				}  
       params.branchId=this.userInfo.branchId
       params.projectId=this.filters.projectId
-      listXmProjectGroupState(params).then(res=>{
+      listXmGroupState(params).then(res=>{
         var tips = res.data.tips;
         if(tips.isOk){
           if(res.data.data.length>0){
-             this.xmProjectGroupStates=res.data.data
+             this.xmGroupStates=res.data.data
           }
         }
       });
@@ -431,7 +431,7 @@ export default {
 				this.filters.projectId=this.$route.params.projectId;
 		}
     this.getXmProjectState();
-    this.getXmProjectGroupStates();
+    this.getXmGroupStates();
     this.getXmProjectTaskTypeStates();
     this.getXmRecords();
     this.getXmProjectPhases();

src/views/xm/XmOverview.vue

@@ -155,7 +155,7 @@
                   </div>
                   <div class="quick-menu-text">开发任务</div>
                 </div>  
-                <div class="quick-menu" @click="gotolink('/xm/core/xmProjectGroup/XmProjectGroupAllMng')" id="XmProjectGroupAllMng">
+                <div class="quick-menu" @click="gotolink('/xm/core/xmGroup/XmGroupAllMng')" id="XmGroupAllMng">
                   <div class="quick-menu-icon-outer">
                     <img src="../../assets/image/platform/module-organization.png" />
                   </div>

src/views/xm/core/xmIteration/XmIterationInfo.vue

@@ -56,8 +56,8 @@
 	import  XmProjectEdit from '../xmProject/XmProjectEdit';//修改界面
 	import { mapGetters } from 'vuex';
 	import xmTaskMng from '../xmTask/XmTaskMng';
-	import xmGroupMng from '../xmProjectGroup/XmProjectGroupMng';
-	import xmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect';
+	import xmGroupMng from '../xmGroup/XmGroupMng';
+	import xmGroupSelect from '../xmGroup/XmGroupSelect';
 
 	import xmExchange from '../xmExchange/XmExchangeMng';
 	import xmQuestion from '../xmQuestion/XmQuestionMng';
@@ -300,7 +300,7 @@
 			xmMenuWithPlan,
 			xmProjectStateMng,
 			xmTestCaseExecMng,
-			xmProjectGroupSelect,
+			xmGroupSelect,
 			XmIterationForProjectComplex, 
 			XmIterationOverviewComplex,
 			XmProductForProjectComplex, 

src/views/xm/core/xmMenu/XmMenuWithPlan.vue

@@ -168,7 +168,7 @@
 	import {  listXmMenuWithPlan } from '@/api/xm/core/xmMenu';
 	import { delXmMenuPlan, batchDelXmMenuPlan,batchAddPlanFromTasks, loadTasksToXmMenuPlan,batchEditXmMenuPlan} from '@/api/xm/core/xmMenuPlan'; 
 	
-	import XmGroupMng from '../xmProjectGroup/XmProjectGroupMng';
+	import XmGroupMng from '../xmGroup/XmGroupMng';
 	import XmTaskMng from '../xmTask/XmTaskMng'; 
    import XmMenuRichDetail from './XmMenuRichDetail';
   import XmGantt from '../components/xm-gantt';

src/views/xm/core/xmMenuState/XmMenuStateMng.vue

@@ -157,7 +157,7 @@
 
  	import { loadTasksToXmMenuState} from '@/api/xm/core/xmMenuState'; 
 	
-	import XmGroupMng from '../xmProjectGroup/XmProjectGroupMng';
+	import XmGroupMng from '../xmGroup/XmGroupMng';
 	import XmTaskMng from '../xmTask/XmTaskMng'; 
  	import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail';
 

src/views/xm/core/xmProduct/XmProductInfo.vue

@@ -175,8 +175,8 @@
 
 	import { mapGetters } from 'vuex';
 	import xmTaskMng from '../xmTask/XmTaskMng';
-	import xmGroupMng from '../xmProjectGroup/XmProjectGroupMng';
-	import xmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect';
+	import xmGroupMng from '../xmGroup/XmGroupMng';
+	import xmGroupSelect from '../xmGroup/XmGroupSelect';
 
 	import xmExchange from '../xmExchange/XmExchangeMng';
 	import xmQuestion from '../xmQuestion/XmQuestionMng';
@@ -419,7 +419,7 @@ import XmProjectForLink from '../xmProject/XmProjectForLink.vue';
 			xmMenuWithPlan,
 			xmProjectStateMng,
 			xmTestCaseExecMng,
-			xmProjectGroupSelect,
+			xmGroupSelect,
 			XmIterationForProjectComplex, 
 			XmProductOverviewComplex,
 			XmProductForProjectComplex,

src/views/xm/core/xmProject/XmProjectAdd.vue

@@ -340,7 +340,7 @@
 					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:0.06,planNouserAt:0,planInnerUserAt:0,planOutUserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:0.13,contractAmt:0,planInnerUserPrice:85,planOutUserPrice:100,planOutUserCnt:1,planInnerUserCnt:1,planWorkingHours:0,planInnerUserWorkload:0,planOutUserWorkload:0,budgetCtrl:'0',admUserid:'',admUsername:'',pmUserid:'',pmUsername:'',assUserid:'',assUsername:''
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				xmProjectGroups:[],
+				xmGroups:[],
 				userSelectType: "",
 				userSelectVisible: false,
 				groupSelectVisible:false,
@@ -363,7 +363,7 @@
 			},
 			//项目团队选择
 			onGroupSelected(groups){
-				this.xmProjectGroups=groups;
+				this.xmGroups=groups;
 				this.groupSelectVisible=false;
 			},
 
@@ -392,7 +392,7 @@
 						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
 							this.load.add=true
 							let params = Object.assign({}, this.addForm); 
-							params.groups=this.xmProjectGroups;
+							params.groups=this.xmGroups;
 							params.planInnerUserWorkload=this.autoParams.planInnerUserWorkload
 							
 							params.planOutUserWorkload=this.autoParams.planOutUserWorkload

src/views/xm/core/xmProject/XmProjectEdit.vue

@@ -172,7 +172,7 @@
 	import { uploadBase64 } from '@/api/mdp/arc/image'; 
 	
 	import { mapGetters } from 'vuex';  
-	import { getGroups } from '@/api/xm/core/xmProjectGroup';
+	import { getGroups } from '@/api/xm/core/xmGroup';
 	import html2canvas from 'html2canvas'
 	
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
@@ -397,7 +397,7 @@
 					id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:0.06,planNouserAt:0,planInnerUserAt:0,planOutUserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:0.13,contractAmt:0,planInnerUserPrice:85,planOutUserPrice:100,planOutUserCnt:1,planInnerUserCnt:1,planWorkingHours:0,planInnerUserWorkload:0,planOutUserWorkload:0,budgetCtrl:'0',admUserid:'',admUsername:'',pmUserid:'',pmUsername:'',assUserid:'',assUsername:''
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				xmProjectGroups:[],
+				xmGroups:[],
 				userSelectType: "",
 				userSelectVisible: false,
 				groupSelectVisible:false,
@@ -417,7 +417,7 @@
 			//选择接收人 
  
 			showProjectGroups:function(){
-				this.getXmProjectGroups();
+				this.getXmGroups();
 				this.groupSelectVisible=true;
 			},
 			//项目团队选择
@@ -473,7 +473,7 @@
 					}
 				});
 			}, 
-			getXmProjectGroups() {
+			getXmGroups() {
 				this.load.list = true;
 				let params = {};
 				params.projectId = this.editForm.id;
@@ -481,7 +481,7 @@
 				getGroups(params).then((res) => {
 					var tips=res.data.tips;
 					if(tips.isOk){ 
-						this.xmProjectGroups = res.data.data; 
+						this.xmGroups = res.data.data; 
 					}else{
 						this.$notify({showClose: true, message: tips.msg, type: 'error' });
 					} 

src/views/xm/core/xmProject/XmProjectInfo.vue

@@ -172,8 +172,8 @@
 	import  XmProjectEdit from './XmProjectEdit';//修改界面
 	import { mapGetters } from 'vuex';
 	import xmTaskMng from '../xmTask/XmTaskMng';
-	import xmGroupMng from '../xmProjectGroup/XmProjectGroupMng';
-	import xmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect';
+	import xmGroupMng from '../xmGroup/XmGroupMng';
+	import xmGroupSelect from '../xmGroup/XmGroupSelect';
 
 	import xmExchange from '../xmExchange/XmExchangeMng';
 	import xmQuestion from '../xmQuestion/XmQuestionMng';
@@ -416,7 +416,7 @@
 			xmMenuWithPlan,
 			xmProjectStateMng,
 			xmTestCaseExecMng,
-			xmProjectGroupSelect,
+			xmGroupSelect,
 			XmIterationForProjectComplex, 
 			XmProjectOverviewComplex,
 			XmProductForProjectComplex,

src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateAdd.vue

@@ -1,129 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<!--新增界面 XmProjectGroupUserCandidate xm_group_user_candidate--> 
-			<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 label="是否组长，1是，0否" prop="isHead">
-					<el-input v-model="addForm.isHead" placeholder="是否组长，1是，0否" ></el-input>
-				</el-form-item> 
-				<el-form-item label="成为候选人时间" prop="createTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.createTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="候选状态0候选排对中1已加入项目做2已退出候选名单" prop="candidateStatus">
-					<el-input v-model="addForm.candidateStatus" placeholder="候选状态0候选排对中1已加入项目做2已退出候选名单" ></el-input>
-				</el-form-item> 
-				<el-form-item label="退出时间" prop="outTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="addForm.outTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</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 { addXmProjectGroupUserCandidate } from '@/api/xm/core/xmProjectGroupUserCandidate';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmProjectGroupUserCandidate','visible'],
-		watch: {
-	      'xmProjectGroupUserCandidate':function( xmProjectGroupUserCandidate ) {
-	        this.addForm = xmProjectGroupUserCandidate;
-	      },
-	      '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_group_user_candidate
-				addForm: {
-					id:'',groupId:'',userid:'',username:'',isHead:'',createTime:'',candidateStatus:'',outTime:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="addFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['addForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//新增提交XmProjectGroupUserCandidate xm_group_user_candidate 父组件监听@submit="afterAddSubmit"
-			addSubmit: function () {
-				
-				this.$refs.addForm.validate((valid) => {
-					if (valid) {
-						
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.add=true
-							let params = Object.assign({}, this.addForm); 
-							addXmProjectGroupUserCandidate(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.$notify({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-candidate-edit':XmProjectGroupUserCandidateEdit
-		},
-		mounted() {
-			this.addForm=Object.assign(this.addForm, this.xmProjectGroupUserCandidate);  
-			/**在下面写其它函数***/
-			
-		}//end mounted
-	}
-
-</script>
-
-<style scoped>
-
-</style>

src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateEdit.vue

@@ -1,124 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row> 
-		<!--编辑界面 XmProjectGroupUserCandidate xm_group_user_candidate--> 
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editForm">
-				<el-form-item label="主键" prop="id">
-					<el-input v-model="editForm.id" placeholder="主键"></el-input>
-				</el-form-item> 
-				<el-form-item label="团队编号" prop="groupId">
-					<el-input v-model="editForm.groupId" placeholder="团队编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="团队成员编号" prop="userid">
-					<el-input v-model="editForm.userid" placeholder="团队成员编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="团队成员" prop="username">
-					<el-input v-model="editForm.username" placeholder="团队成员"></el-input>
-				</el-form-item> 
-				<el-form-item label="是否组长，1是，0否" prop="isHead">
-					<el-input v-model="editForm.isHead" placeholder="是否组长，1是，0否"></el-input>
-				</el-form-item> 
-				<el-form-item label="成为候选人时间" prop="createTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.createTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item label="候选状态0候选排对中1已加入项目做2已退出候选名单" prop="candidateStatus">
-					<el-input v-model="editForm.candidateStatus" placeholder="候选状态0候选排对中1已加入项目做2已退出候选名单"></el-input>
-				</el-form-item> 
-				<el-form-item label="退出时间" prop="outTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.outTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</el-form-item> 
-				<el-form-item> 
-					<el-col :span="24" :offset="8"> 
-						<el-button @click.native="handleCancel">取消</el-button>  
-						<el-button v-loading="load.edit" type="primary" @click.native="editSubmit" :disabled="load.edit==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 { editXmProjectGroupUserCandidate } from '@/api/xm/core/xmProjectGroupUserCandidate';
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		props:['xmProjectGroupUserCandidate','visible'],
-		watch: {
-	      'xmProjectGroupUserCandidate':function( xmProjectGroupUserCandidate ) {
-	        this.editForm = xmProjectGroupUserCandidate;
-	      },
-	      '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 },//查询中...
-				editFormRules: {
-					id: [
-						//{ required: true, message: '主键不能为空', trigger: 'blur' }
-					]
-				},
-				//编辑界面数据  XmProjectGroupUserCandidate xm_group_user_candidate
-				editForm: {
-					id:'',groupId:'',userid:'',username:'',isHead:'',createTime:'',candidateStatus:'',outTime:''
-				}
-				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
-				
-				/**end 在上面加自定义属性**/
-			}//end return
-		},//end data
-		methods: {
-			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
-			handleCancel:function(){
-				this.$refs['editForm'].resetFields();
-				this.$emit('cancel');
-			},
-			//编辑提交XmProjectGroupUserCandidate xm_group_user_candidate父组件监听@submit="afterEditSubmit"
-			editSubmit: function () {
-				this.$refs.editForm.validate((valid) => {
-					if (valid) {
-						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
-							this.load.edit=true
-							let params = Object.assign({}, this.editForm); 
-							editXmProjectGroupUserCandidate(params).then((res) => {
-								this.load.edit=false
-								var tips=res.data.tips;
-								if(tips.isOk){
-									this.$refs['editForm'].resetFields();
-									this.$emit('submit');//  @submit="afterEditSubmit"
-								}
-								this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-							}).catch( err =>this.load.edit=false);
-						});
-					}
-				});
-			}
-			/**begin 在下面加自定义方法,记得补上面的一个逗号**/
-				
-			/**end 在上面加自定义方法**/
-		},//end method
-		components: {  
-		    //在下面添加其它组件 'xm-project-group-user-candidate-edit':XmProjectGroupUserCandidateEdit
-		},
-		mounted() {
-			this.editForm=Object.assign(this.editForm, this.xmProjectGroupUserCandidate);  
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>

src/views/xm/core/xmProjectGroupUserCandidate/XmProjectGroupUserCandidateMng.vue

@@ -1,243 +0,0 @@
-<template>
-	<section class="page-container  padding border">
-		<el-row>
-			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> 
-			<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProjectGroupUserCandidates">查询</el-button>
-			<el-button type="primary" @click="showAdd">+xm_group_user_candidate</el-button>
-			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true">批量删除</el-button> 
-		</el-row>
-		<el-row class="page-main "> 
-			<!--列表 XmProjectGroupUserCandidate xm_group_user_candidate-->
-			<el-table ref="table" :height="tableHeight" :data="xmProjectGroupUserCandidates" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
-				<el-table-column sortable type="selection" width="40"></el-table-column>
-				<el-table-column sortable type="index" width="40"></el-table-column>
-				<el-table-column prop="id" label="主键" min-width="80" ></el-table-column>
-				<el-table-column prop="groupId" label="团队编号" min-width="80" ></el-table-column>
-				<el-table-column prop="userid" label="团队成员编号" min-width="80" ></el-table-column>
-				<el-table-column prop="username" label="团队成员" min-width="80" ></el-table-column>
-				<el-table-column prop="isHead" label="是否组长，1是，0否" min-width="80" ></el-table-column>
-				<el-table-column prop="createTime" label="成为候选人时间" min-width="80" ></el-table-column>
-				<el-table-column prop="candidateStatus" label="候选状态0候选排对中1已加入项目做2已退出候选名单" min-width="80" ></el-table-column>
-				<el-table-column prop="outTime" label="退出时间" min-width="80" ></el-table-column>
-				<el-table-column label="操作" width="160" fixed="right"  >
-					<template slot-scope="scope">
-						<el-button  @click="showEdit( scope.row,scope.$index)">改</el-button>
-						<el-button type="danger" @click="handleDel(scope.row,scope.$index)">删</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<el-pagination  layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination> 
-		
-			<!--编辑 XmProjectGroupUserCandidate xm_group_user_candidate界面-->
-			<el-drawer title="编辑xm_group_user_candidate" :visible.sync="editFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				  <xm-project-group-user-candidate-edit :xm-project-group-user-candidate="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-project-group-user-candidate-edit>
-			</el-drawer>
-	
-			<!--新增 XmProjectGroupUserCandidate xm_group_user_candidate界面-->
-			<el-drawer title="新增xm_group_user_candidate" :visible.sync="addFormVisible"  size="50%"  append-to-body   :close-on-click-modal="false">
-				<xm-project-group-user-candidate-add :xm-project-group-user-candidate="addForm" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-project-group-user-candidate-add>
-			</el-drawer> 
-		</el-row>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	//import Sticky from '@/components/Sticky' // 粘性header组件
-	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
-	import { listXmProjectGroupUserCandidate, delXmProjectGroupUserCandidate, batchDelXmProjectGroupUserCandidate } from '@/api/xm/core/xmProjectGroupUserCandidate';
-	import  XmProjectGroupUserCandidateAdd from './XmProjectGroupUserCandidateAdd';//新增界面
-	import  XmProjectGroupUserCandidateEdit from './XmProjectGroupUserCandidateEdit';//修改界面
-	import { mapGetters } from 'vuex'
-	
-	export default { 
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ])
-		},
-		data() {
-			return {
-				filters: {
-					key: ''
-				},
-				xmProjectGroupUserCandidates: [],//查询结果
-				pageInfo:{//分页数据
-					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:10,//每页数据
-					count:false,//是否需要重新计算总记录数
-					pageNum:1,//当前页码、从1开始计算
-					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-				},
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				sels: [],//列表选中数据
-				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				
-				addFormVisible: false,//新增xmProjectGroupUserCandidate界面是否显示
-				//新增xmProjectGroupUserCandidate界面初始化数据
-				addForm: {
-					id:'',groupId:'',userid:'',username:'',isHead:'',createTime:'',candidateStatus:'',outTime:''
-				},
-				
-				editFormVisible: false,//编辑界面是否显示
-				//编辑xmProjectGroupUserCandidate界面初始化数据
-				editForm: {
-					id:'',groupId:'',userid:'',username:'',isHead:'',createTime:'',candidateStatus:'',outTime:''
-				},
-				/**begin 自定义属性请在下面加 请加备注**/
-				
-				tableHeight:300,	
-				/**end 自定义属性请在上面加 请加备注**/
-			}
-		},//end data
-		methods: { 
-			handleSizeChange(pageSize) { 
-				this.pageInfo.pageSize=pageSize; 
-				this.getXmProjectGroupUserCandidates();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getXmProjectGroupUserCandidates();
-			},
-			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
-			sortChange( obj ){
-				var dir='asc';
-				if(obj.order=='ascending'){
-					dir='asc'
-				}else{
-					dir='desc';
-				}
-				if(obj.prop=='xxx'){
-					this.pageInfo.orderFields=['xxx'];
-					this.pageInfo.orderDirs=[dir];
-				}
-				this.getXmProjectGroupUserCandidates();
-			},
-			searchXmProjectGroupUserCandidates(){
-				 this.pageInfo.count=true; 
-				 this.getXmProjectGroupUserCandidates();
-			},
-			//获取列表 XmProjectGroupUserCandidate xm_group_user_candidate
-			getXmProjectGroupUserCandidates() {
-				let params = {
-					pageSize: this.pageInfo.pageSize,
-					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,
-					count:this.pageInfo.count
-				};
-				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
-					let orderBys=[];
-					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
-						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
-					}  
-					params.orderBy= orderBys.join(",")
-				}
-				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
-				}
-				this.load.list = true;
-				listXmProjectGroupUserCandidate(params).then((res) => {
-					var tips=res.data.tips;
-					if(tips.isOk){ 
-						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
-						this.xmProjectGroupUserCandidates = res.data.data;
-					}else{
-						this.$notify({showClose: true, message: tips.msg, type: 'error' });
-					} 
-					this.load.list = false;
-				}).catch( err => this.load.list = false );
-			},
-
-			//显示编辑界面 XmProjectGroupUserCandidate xm_group_user_candidate
-			showEdit: function ( row,index ) {
-				this.editFormVisible = true;
-				this.editForm = Object.assign({}, row);
-			},
-			//显示新增界面 XmProjectGroupUserCandidate xm_group_user_candidate
-			showAdd: function () {
-				this.addFormVisible = true;
-				//this.addForm=Object.assign({}, this.editForm);
-			},
-			afterAddSubmit(){
-				this.addFormVisible=false;
-				this.pageInfo.count=true;
-				this.getXmProjectGroupUserCandidates();
-			},
-			afterEditSubmit(){
-				this.editFormVisible=false;
-			},
-			//选择行xmProjectGroupUserCandidate
-			selsChange: function (sels) {
-				this.sels = sels;
-			}, 
-			//删除xmProjectGroupUserCandidate
-			handleDel: function (row,index) { 
-				this.$confirm('确认删除该记录吗?', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					let params = { id: row.id };
-					delXmProjectGroupUserCandidate(params).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if(tips.isOk){ 
-							this.pageInfo.count=true;
-							this.getXmProjectGroupUserCandidates();
-						}
-						this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			//批量删除xmProjectGroupUserCandidate
-			batchDel: function () {
-				
-				this.$confirm('确认删除选中记录吗？', '提示', {
-					type: 'warning'
-				}).then(() => { 
-					this.load.del=true;
-					batchDelXmProjectGroupUserCandidate(this.sels).then((res) => {
-						this.load.del=false;
-						var tips=res.data.tips;
-						if( tips.isOk ){ 
-							this.pageInfo.count=true;
-							this.getXmProjectGroupUserCandidates(); 
-						}
-						this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
-					}).catch( err  => this.load.del=false );
-				});
-			},
-			rowClick: function(row, event, column){
-				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-			}
-			/**begin 自定义函数请在下面加**/
-			
-				
-			/**end 自定义函数请在上面加**/
-			
-		},//end methods
-		components: { 
-		    'xm-project-group-user-candidate-add':XmProjectGroupUserCandidateAdd,
-		    'xm-project-group-user-candidate-edit':XmProjectGroupUserCandidateEdit,
-		    
-		    //在下面添加其它组件
-		},
-		mounted() { 
-			this.$nextTick(() => {
-				
-				
-				
-				this.tableHeight =  util.calcTableMaxHeight(".el-table"); 
-				this.getXmProjectGroupUserCandidates();
-        	}); 
-		}
-	}
-
-</script>
-
-<style scoped>
-
-</style>

src/views/xm/core/xmProjectPhase/XmProjectPhaseForProduct.vue

@@ -199,7 +199,7 @@
 	import {sn} from '@/common/js/sequence'
 	import { mapGetters } from 'vuex'
 import XmProjectPhaseBatch from './XmProjectPhaseBatch'; 
-import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
+import XmGroupSelect from '../xmGroup/XmGroupSelect.vue';
 import XmTaskList from '../xmTask/XmTaskList.vue';
 
   
@@ -1268,7 +1268,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue';
 		    'xm-project-phase-add':XmProjectPhaseAdd,
 		    'xm-project-phase-edit':XmProjectPhaseEdit,
 			
-      XmProjectPhaseTemplateMng,xmMenuSelect,XmGantt,XmProjectPhaseBatch,XmProjectGroupSelect,
+      XmProjectPhaseTemplateMng,xmMenuSelect,XmGantt,XmProjectPhaseBatch,XmGroupSelect,
 XmTaskList
         //在下面添加其它组件
 		},

src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue

@@ -220,7 +220,7 @@
 	import {sn} from '@/common/js/sequence'
 	import { mapGetters } from 'vuex'
 import XmProjectPhaseBatch from './XmProjectPhaseBatch'; 
-import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
+import XmGroupSelect from '../xmGroup/XmGroupSelect.vue';
 import XmTaskList from '../xmTask/XmTaskList.vue';
 
   
@@ -1306,7 +1306,7 @@ import XmTaskList from '../xmTask/XmTaskList.vue';
 		    'xm-project-phase-add':XmProjectPhaseAdd,
 		    'xm-project-phase-edit':XmProjectPhaseEdit,
 			
-      XmProjectPhaseTemplateMng,xmMenuSelect,XmGantt,XmProjectPhaseBatch,XmProjectGroupSelect,
+      XmProjectPhaseTemplateMng,xmMenuSelect,XmGantt,XmProjectPhaseBatch,XmGroupSelect,
 XmTaskList
         //在下面添加其它组件
 		},

src/views/xm/core/xmQuestion/XmQuestionAdd.vue

@@ -111,7 +111,7 @@
 	import {sn} from '@/common/js/sequence';
 	import VueEditor from '@/components/Tinymce/index';
 
-	import XmGroupMng from '../xmProjectGroup/XmProjectGroupSelect';
+	import XmGroupMng from '../xmGroup/XmGroupSelect';
 	import xmMenuSelect from '../xmMenu/XmMenuSelect';
 	import XmProjectList from '../xmProject/XmProjectList';
 

src/views/xm/core/xmQuestion/XmQuestionEdit.vue

@@ -144,7 +144,7 @@
 	import AttachmentUpload from "@/views/mdp/arc/archiveAttachment/AttachmentUpload"; //上传组件
 	import {sn} from '@/common/js/sequence';
 
-	import XmGroupMng from '../xmProjectGroup/XmProjectGroupSelect';
+	import XmGroupMng from '../xmGroup/XmGroupSelect';
 	import VueEditor from '@/components/Tinymce/index';
 	import XmTaskList from '../xmTask/XmTaskList';
 	import xmMenuSelect from '../xmMenu/XmMenuSelect';

src/views/xm/core/xmQuestion/XmQuestionMng.vue

@@ -216,7 +216,7 @@
 	import { mapGetters } from 'vuex'
 
 	import xmMenuSelect from '../xmMenu/XmMenuSelect';
-	import XmGroupMng from '../xmProjectGroup/XmProjectGroupMng';
+	import XmGroupMng from '../xmGroup/XmGroupMng';
 	import XmProjectList from '../xmProject/XmProjectList';
 
 	import  XmProductSelect from '../xmProduct/XmProductSelect';//修改界面

src/views/xm/core/xmTask/XmTaskAdd.vue

@@ -205,7 +205,7 @@
 	import {batchAddSkill } from '@/api/xm/core/xmTaskSkill';
 	import xmMenuSelect from '../xmMenu/XmMenuSelect';
 	import XmTaskList from '../xmTask/XmTaskList';
-	import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
+	import XmGroupSelect from '../xmGroup/XmGroupSelect.vue';
 
 	export default {
 		computed: {
@@ -524,7 +524,7 @@
 		},//end method
 		components: {
  			xmSkillMng,
-			skillMng,xmMenuSelect,XmTaskList,XmProjectGroupSelect
+			skillMng,xmMenuSelect,XmTaskList,XmGroupSelect
 			//在下面添加其它组件 'xm-task-edit':XmTaskEdit
 		},
 		mounted() {

src/views/xm/core/xmTask/XmTaskEdit.vue

@@ -219,7 +219,7 @@
 	import xmMenuSelect from '../xmMenu/XmMenuSelect';
 	import XmTaskList from '../xmTask/XmTaskList';
 	import XmExecuserMng from '../xmTaskExecuser/XmTaskExecuserMng';
-	import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
+	import XmGroupSelect from '../xmGroup/XmGroupSelect.vue';
 	import XmMenuRichDetail from '../xmMenu/XmMenuRichDetail';
 	import TagMng from "@/views/mdp/arc/tag/TagMng";
 
@@ -563,7 +563,7 @@
 		},//end method
 		components: { 
  			xmSkillMng,
-			skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmProjectGroupSelect,XmMenuRichDetail,TagMng,
+			skillMng,xmMenuSelect,XmTaskList,XmExecuserMng,XmGroupSelect,XmMenuRichDetail,TagMng,
 			//在下面添加其它组件 'xm-task-edit':XmTaskEdit
 		},
 		mounted() { 

src/views/xm/core/xmTask/XmTaskMng.vue

@@ -1031,7 +1031,7 @@ import XmProductSelect from "../xmProduct/XmProductSelect"; //修改界面
 import TagMng from "@/views/mdp/arc/tag/TagMng";
 
 import XmGantt from "../components/xm-gantt";
-import XmProjectGroupSelect from "../xmProjectGroup/XmProjectGroupSelect.vue";
+import XmGroupSelect from "../xmGroup/XmGroupSelect.vue";
 
 export default {
   computed: {
@@ -2432,7 +2432,7 @@ export default {
     XmMenuRichDetail,
     XmGantt,
     XmTaskMngBatch,
-    XmProjectGroupSelect,
+    XmGroupSelect,
     XmProductSelect,
     XmTaskAgileKanban,
     TagMng,

src/views/xm/core/xmTestCase/XmTestCaseMng.vue

@@ -137,7 +137,7 @@
 	import  XmProductSelect from '../xmProduct/XmProductSelect';//修改界面
 
 	import XmProjectList from '../xmProject/XmProjectList';
-	import XmGroupMng from '../xmProjectGroup/XmProjectGroupMng';
+	import XmGroupMng from '../xmGroup/XmGroupMng';
 	
 	export default { 
 		computed: {

src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue

@@ -220,7 +220,7 @@
 	import  XmTestCaseMng from '../xmTestCase/XmTestCaseMng';//修改界面
 	import XmProjectList from '../xmProject/XmProjectList';
 	import xmMenuSelect from '../xmMenu/XmMenuSelect';
-	import XmGroupMng from '../xmProjectGroup/XmProjectGroupMng';
+	import XmGroupMng from '../xmGroup/XmGroupMng';
 	import XmTaskList from '../xmTask/XmTaskList';
 	import  XmTestCaseEdit from '../xmTestCase/XmTestCaseEdit';//修改界面
 	import  XmQuestionMng from '../xmQuestion/XmQuestionMng';//修改界面