diff --git a/src/common/js/util.js b/src/common/js/util.js
index ea607759..cdff579f 100644
--- a/src/common/js/util.js
+++ b/src/common/js/util.js
@@ -1,26 +1,110 @@
 var SIGN_REGEXP = /([yMdhsmH])(\1*)/g
 var DEFAULT_PATTERN = 'yyyy-MM-dd'
+
 function padding(s, len) {
   var len = len - (s + '').length
-  for (var i = 0; i < len; i++) { s = '0' + s }
+  for (var i = 0; i < len; i++) {
+    s = '0' + s
+  }
   return s
 }
 
+
+
 export default {
+
+  getPositionTop(node) {
+      var top = node.offsetTop;
+      var parent = node.offsetParent;
+      while(parent != null) {
+          top += parent.offsetTop;
+          parent = parent.offsetParent;
+      }
+      return top;
+  },
+  /**
+   * 获取时间的前后几分钟
+   * @param {starTime,endTime} string yyyy-MM-dd HH:ss string yyyy-MM-dd HH:ss
+   * @return {formatdate} string
+   */
+  timeDifference(starTime, endTime) {
+    //转成时间戳
+    if (starTime) {
+      let starDate = new Date(starTime),
+        endDate = new Date(endTime)
+      let starStamps = starDate.getTime(),
+        endStamps = endDate.getTime(),
+        betweenStamps = ''
+      betweenStamps = Math.abs((parseInt(endStamps - starStamps)))
+
+      let minute = parseInt(betweenStamps / 60000) //取分钟
+      return minute
+    } else {
+      console.log('时间空')
+    }
+
+  },
+  /**
+   * 获取时间的前后几分钟
+   * @param {dateTime,type,minuteNum} string yyyy-MM-dd HH:mm:ss string number
+   * @return {formatdate} string
+   */
+  getAboutTime(dateTime, minuteNum) {
+    let string = dateTime.replace(/-/g, "/"),
+      date = new Date(string),
+      timeStamps = '',
+      dateObj = '',
+      hour = '',
+      minute = '',
+      formatdate = ''
+    timeStamps = date.setTime(date.getTime() - parseInt(minuteNum) * 60000)
+    dateObj = new Date(timeStamps)
+
+    hour = dateObj.getHours()
+    if (hour < 10) {
+      hour = '0' + hour
+    }
+    minute = dateObj.getMinutes()
+    if (minute < 10) {
+      minute = '0' + minute
+    }
+
+    formatdate = hour + ":" + minute //设置时间格式
+    return formatdate
+  },
+  //时间2020-09-30
+  getDate() {
+    var date = new Date()
+    var myyear = date.getFullYear();
+    var mymonth = date.getMonth() + 1;
+    var myweekday = date.getDate();
+    if (mymonth < 10) {
+      mymonth = "0" + mymonth;
+    }
+    if (myweekday < 10) {
+      myweekday = "0" + myweekday;
+    }
+
+    return (myyear + "-" + mymonth + "-" + myweekday);
+  },
+
   getQueryStringByName: function(name) {
     var reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i')
     var r = window.location.search.substr(1).match(reg)
     var context = ''
-    if (r != null) { context = r[2] }
+    if (r != null) {
+      context = r[2]
+    }
     reg = null
     r = null
     return context == null || context == '' || context == 'undefined' ? '' : context
   },
 
-  fmoney(s,n) {
+  fmoney(s, n) {
     n = n > 0 && n <= 20 ? n : 2;
     s = parseFloat((s + "").replace(/[^\d\.-]/g, "")).toFixed(n) + "";
-    var l = s.split(".")[0].split("").reverse(), r = s.split(".")[1];
+    var l = s.split(".")[0].split("").reverse(),
+      r = s.split(".")[1];
     var t = "";
     for (let i = 0; i < l.length; i++) {
       t += l[i] + ((i + 1) % 3 == 0 && (i + 1) != l.length ? "," : "");
@@ -29,26 +113,26 @@ export default {
   },
 
   isNull(obj) {
-    if(obj === null || obj === '' || obj === undefined) {
-       return true;
+    if (obj === null || obj === '' || obj === undefined) {
+      return true;
     }
     return false;
   },
   /**
    * 字段转成驼峰命名
-   * @param {*} name 
+   * @param {*} name
    */
   toCamel(name) {
-    return name.replace(/\_(\w)/g, function(all, letter){
-        return letter.toUpperCase();
+    return name.replace(/\_(\w)/g, function(all, letter) {
+      return letter.toUpperCase();
     });
   },
   /**
    * 驼峰转下横线
-   * @param {*} name 
+   * @param {*} name
    */
   toLine(name) {
-    return name.replace(/([A-Z])/g,"_$1").toLowerCase();
+    return name.replace(/([A-Z])/g, "_$1").toLowerCase();
   },
   formatDate: {
 
@@ -56,14 +140,22 @@ export default {
       pattern = pattern || DEFAULT_PATTERN
       return pattern.replace(SIGN_REGEXP, function($0) {
         switch ($0.charAt(0)) {
-          case 'y': return padding(date.getFullYear(), $0.length)
-          case 'M': return padding(date.getMonth() + 1, $0.length)
-          case 'd': return padding(date.getDate(), $0.length)
-          case 'w': return date.getDay() + 1
-          case 'h': return padding(date.getHours(), $0.length)
-          case 'H': return padding(date.getHours(), $0.length)
-          case 'm': return padding(date.getMinutes(), $0.length)
-          case 's': return padding(date.getSeconds(), $0.length)
+          case 'y':
+            return padding(date.getFullYear(), $0.length)
+          case 'M':
+            return padding(date.getMonth() + 1, $0.length)
+          case 'd':
+            return padding(date.getDate(), $0.length)
+          case 'w':
+            return date.getDay() + 1
+          case 'h':
+            return padding(date.getHours(), $0.length)
+          case 'H':
+            return padding(date.getHours(), $0.length)
+          case 'm':
+            return padding(date.getMinutes(), $0.length)
+          case 's':
+            return padding(date.getSeconds(), $0.length)
         }
       })
     },
@@ -76,12 +168,24 @@ export default {
           var _int = parseInt(matchs2[i])
           var sign = matchs1[i]
           switch (sign.charAt(0)) {
-            case 'y': _date.setFullYear(_int); break
-            case 'M': _date.setMonth(_int - 1); break
-            case 'd': _date.setDate(_int); break
-            case 'h': _date.setHours(_int); break
-            case 'm': _date.setMinutes(_int); break
-            case 's': _date.setSeconds(_int); break
+            case 'y':
+              _date.setFullYear(_int);
+              break
+            case 'M':
+              _date.setMonth(_int - 1);
+              break
+            case 'd':
+              _date.setDate(_int);
+              break
+            case 'h':
+              _date.setHours(_int);
+              break
+            case 'm':
+              _date.setMinutes(_int);
+              break
+            case 's':
+              _date.setSeconds(_int);
+              break
           }
         }
         return _date
@@ -90,176 +194,179 @@ export default {
     },
 
   },
-  
+
   //type date/daterange
-  pickerOptions: function(type){ 
-    if(type!='datarange'){
-      var shortcuts= [{
+  pickerOptions: function(type) {
+    if (type != 'datarange') {
+      var shortcuts = [{
         text: '今天',
         onClick(picker) {
-        picker.$emit('pick', new Date());
+          picker.$emit('pick', new Date());
         }
       }, {
         text: '昨天',
         onClick(picker) {
-        const date = new Date();
-        date.setTime(date.getTime() - 3600 * 1000 * 24);
-        picker.$emit('pick', date);
+          const date = new Date();
+          date.setTime(date.getTime() - 3600 * 1000 * 24);
+          picker.$emit('pick', date);
         }
       }, {
         text: '前一周',
         onClick(picker) {
-        const date = new Date();
-        date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
-        picker.$emit('pick', date);
+          const date = new Date();
+          date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+          picker.$emit('pick', date);
         }
       }, {
         text: '前两周',
         onClick(picker) {
-        const date = new Date();
-        date.setTime(date.getTime() - 3600 * 1000 * 24 * 7 * 2);
-        picker.$emit('pick', date);
+          const date = new Date();
+          date.setTime(date.getTime() - 3600 * 1000 * 24 * 7 * 2);
+          picker.$emit('pick', date);
         }
       }, {
         text: '前四周',
         onClick(picker) {
-        const date = new Date();
-        date.setTime(date.getTime() - 3600 * 1000 * 24 * 7 * 4);
-        picker.$emit('pick', date);
+          const date = new Date();
+          date.setTime(date.getTime() - 3600 * 1000 * 24 * 7 * 4);
+          picker.$emit('pick', date);
         }
       }, {
         text: '后一周',
         onClick(picker) {
-        const date = new Date();
-        date.setTime(date.getTime() + 3600 * 1000 * 24 * 7);
-        picker.$emit('pick', date);
+          const date = new Date();
+          date.setTime(date.getTime() + 3600 * 1000 * 24 * 7);
+          picker.$emit('pick', date);
         }
       }, {
         text: '后两周',
         onClick(picker) {
-        const date = new Date();
-        date.setTime(date.getTime() + 3600 * 1000 * 24 * 7 *2);
-        picker.$emit('pick', date);
+          const date = new Date();
+          date.setTime(date.getTime() + 3600 * 1000 * 24 * 7 * 2);
+          picker.$emit('pick', date);
         }
       }, {
         text: '后一月',
         onClick(picker) {
-        const date = new Date();
-        date.setTime(date.getTime() + 3600 * 1000 * 24 * 7 * 4);
-        picker.$emit('pick', date);
+          const date = new Date();
+          date.setTime(date.getTime() + 3600 * 1000 * 24 * 7 * 4);
+          picker.$emit('pick', date);
         }
       }, {
         text: '后两月',
         onClick(picker) {
-        const date = new Date();
-        date.setTime(date.getTime() + 3600 * 1000 * 24 * 7 * 8);
-        picker.$emit('pick', date);
+          const date = new Date();
+          date.setTime(date.getTime() + 3600 * 1000 * 24 * 7 * 8);
+          picker.$emit('pick', date);
         }
       }, {
         text: '后四月',
         onClick(picker) {
-        const date = new Date();
-        date.setTime(date.getTime() + 3600 * 1000 * 24 * 7 * 16);
-        picker.$emit('pick', date);
+          const date = new Date();
+          date.setTime(date.getTime() + 3600 * 1000 * 24 * 7 * 16);
+          picker.$emit('pick', date);
         }
       }]
-      return {shortcuts:shortcuts};
-    }else{
-      var shortcuts= [
-        {
+      return {
+        shortcuts: shortcuts
+      };
+    } else {
+      var shortcuts = [{
           text: "前一周",
           onClick(picker) {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-          picker.$emit("pick", [start, end]);
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit("pick", [start, end]);
           }
         },
         {
           text: "前两周",
           onClick(picker) {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 2);
-          picker.$emit("pick", [start, end]);
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 2);
+            picker.$emit("pick", [start, end]);
           }
         },
         {
-          text: "前一个月",
+          text: "前三周",
           onClick(picker) {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-          picker.$emit("pick", [start, end]);
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7 * 3);
+            picker.$emit("pick", [start, end]);
           }
         },
         {
-          text: "前三个月",
+          text: "前一个月",
           onClick(picker) {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-          picker.$emit("pick", [start, end]);
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit("pick", [start, end]);
           }
         },
         {
-          text: "前一年",
+          text: "前三个月",
           onClick(picker) {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 360);
-          picker.$emit("pick", [start, end]);
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit("pick", [start, end]);
           }
         },
         {
           text: "后一周",
           onClick(picker) {
-          const end = new Date();
-          const start = new Date();
-          end.setTime(start.getTime() + 3600 * 1000 * 24 * 7);
-          picker.$emit("pick", [start, end]);
+            const end = new Date();
+            const start = new Date();
+            end.setTime(start.getTime() + 3600 * 1000 * 24 * 7);
+            picker.$emit("pick", [start, end]);
           }
         },
         {
           text: "后两周",
           onClick(picker) {
-          const end = new Date();
-          const start = new Date();
-          end.setTime(start.getTime() + 3600 * 1000 * 24 * 7 * 2);
-          picker.$emit("pick", [start, end]);
+            const end = new Date();
+            const start = new Date();
+            end.setTime(start.getTime() + 3600 * 1000 * 24 * 7 * 2);
+            picker.$emit("pick", [start, end]);
           }
         },
         {
-          text: "后一个月",
+          text: "后三周",
           onClick(picker) {
-          const end = new Date();
-          const start = new Date();
-          end.setTime(start.getTime() + 3600 * 1000 * 24 * 30);
-          picker.$emit("pick", [start, end]);
+            const end = new Date();
+            const start = new Date();
+            end.setTime(start.getTime() + 3600 * 1000 * 24 * 7 * 3);
+            picker.$emit("pick", [start, end]);
           }
         },
         {
-          text: "后三个月",
+          text: "后一个月",
           onClick(picker) {
-          const end = new Date();
-          const start = new Date();
-          end.setTime(start.getTime() + 3600 * 1000 * 24 * 90);
-          picker.$emit("pick", [start, end]);
+            const end = new Date();
+            const start = new Date();
+            end.setTime(start.getTime() + 3600 * 1000 * 24 * 30);
+            picker.$emit("pick", [start, end]);
           }
         },
         {
-          text: "后一年",
+          text: "后三个月",
           onClick(picker) {
-          const end = new Date();
-          const start = new Date();
-          end.setTime(start.getTime() + 3600 * 1000 * 24 * 360);
-          picker.$emit("pick", [start, end]);
+            const end = new Date();
+            const start = new Date();
+            end.setTime(start.getTime() + 3600 * 1000 * 24 * 90);
+            picker.$emit("pick", [start, end]);
           }
         }
-        ]
-      return {shortcuts:shortcuts};;
-    } 
-    
+      ]
+      return {
+        shortcuts: shortcuts
+      };;
+    }
+
   },
 
 }
diff --git a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
index 9f800456..c3431ea5 100644
--- a/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
+++ b/src/views/xm/core/xmProjectGroup/XmProjectGroupMng.vue
@@ -41,10 +41,11 @@
 					<el-button type="primary" @click="showAdd" icon="el-icon-plus"  v-loading="load.add">新增下级小组</el-button>  
 				</el-row> 
 				<el-row v-if="currNodeType=='group'">  
-					
+					<el-button type="primary" @click="showGroupState" icon="el-icon-s-data"  v-loading="load.add">查看小组进度</el-button>   
 					<el-button type="primary" @click="showAddSub(editForm)" icon="el-icon-plus"  v-loading="load.add">新增下级小组</el-button>   
 					<el-button @click="showEdit(editForm)" icon="el-icon-edit"  v-loading="load.edit">修改小组信息</el-button> 
 					<el-button @click="userSelectVisible=true" icon="el-icon-plus"  v-loading="load.add">新增组员</el-button> 
+					<el-button @click="groupUserVisible=true" icon="el-icon-search"  v-loading="load.add">查看组员</el-button> 
 					<el-button type="danger" @click="handleDel(editForm)" icon="el-icon-delete"  v-loading="load.del">删除小组</el-button>
 				</el-row> 
 				<el-row v-if="currNodeType=='groupUser'">  
@@ -141,8 +142,12 @@
 			<el-drawer v-if="selProject" :title="selProject==null?'操作日志':selProject.name+'团队操作日志'" center   :visible.sync="xmRecordVisible"  size="50%"  :close-on-click-modal="false" append-to-body>
 				<xm-record :obj-type="'group'" :visible="xmRecordVisible" :project-id="selProject.id"    :simple="1"></xm-record>
 			</el-drawer>
-			<el-drawer v-if="selProject" :title="selProject==null?'进度':selProject.name+'团队进度'" center   :visible.sync="xmProjectGroupStateVisible"  size="80%"  :close-on-click-modal="false" append-to-body>
-				<xm-project-group-state-mng  :sel-project="selProject" :visible="xmProjectGroupStateVisible" ></xm-project-group-state-mng>
+			<el-drawer  title="小组进度数据查看" center   :visible.sync="xmProjectGroupStateVisible"  size="80%"  :close-on-click-modal="false" append-to-body>
+				<xm-project-group-state-mng  :sel-project="selProject" :xm-product="xmProduct" :xm-project-group="editForm" :visible="xmProjectGroupStateVisible" ></xm-project-group-state-mng>
+			</el-drawer>
+			
+			<el-drawer   center  :title="(editForm==null?editForm.groupName:'')+'小组成员管理'" :visible.sync="groupUserVisible"  size="80%"  :close-on-click-modal="false" append-to-body>
+				<xm-project-group-user-mng  :xm-project-group="editForm" :visible="groupUserVisible" ></xm-project-group-user-mng>
 			</el-drawer>
 	    </el-row>
 	</section>
@@ -166,11 +171,12 @@
 
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
 	import  XmProjectGroupStateMng from '../xmProjectGroupState/XmProjectGroupStateMng';//修改界面
+	import  XmProjectGroupUserMng from '../xmProjectGroupUser/XmProjectGroupUserMng';//修改界面
 	
 	export default {
 	    name:'xmProjectGroupMng',
 		components: {
-		    XmProjectGroupEdit,VueOkrTree,UsersSelect,XmProjectGroupStateMng,
+		    XmProjectGroupEdit,VueOkrTree,UsersSelect,XmProjectGroupStateMng,XmProjectGroupUserMng,
 		},
 		props:["visible","selProject" ,"isSelectSingleUser","isSelectMultiUser",'xmProduct','xmIteration'],
 		computed: {
@@ -298,6 +304,7 @@
 				groupRoleDescVisible:false, 
 				groupOperSelectVisible:false,
 				currNodeType:'',//project/product/iteration/group/groupUser
+				groupUserVisible:false,
 			}
 		},//end data
 		methods: { 
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
index 585046b4..8afb0c72 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserEdit.vue
@@ -5,44 +5,31 @@
 		<el-row class="page-main">
 		<!--编辑界面 XmProjectGroupUser xm_project_group_user--> 
 			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editFormRef">
-				<el-form-item label="加入时间" prop="joinTime">
-					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.joinTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
-				</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="离队时间" 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 label="当前状态0参与中1已退出团队" prop="status">
-					<el-input v-model="editForm.status" placeholder="当前状态0参与中1已退出团队"></el-input>
-				</el-form-item> 
-				<el-form-item label="组员原归属机构编号" prop="obranchId">
-					<el-input v-model="editForm.obranchId" placeholder="组员原归属机构编号"></el-input>
+				
+				<el-form-item :label="editForm.pgClass=='1'?'产品编号':'项目编号'" prop="pgClass">
+					{{editForm.projectId?editForm.projectId:''}}{{editForm.productId?editForm.productId:''}}
 				</el-form-item> 
-				<el-form-item label="是否私人加入0否1是" prop="isPri">
-					<el-input v-model="editForm.isPri" placeholder="是否私人加入0否1是"></el-input>
+				<el-form-item label="小组名称" prop="groupName">
+					<el-input v-model="editForm.groupName" 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开始" prop="seqNo">
+				<el-form-item label="" prop="status">
+					<el-checkbox v-model="editForm.status" true-label="1" false-label="0" placeholder="当前状态">是否已加入</el-checkbox>
+					<el-checkbox v-model="editForm.isPri" true-label="1" false-label="0" placeholder="是否私人加入">是否私人加入</el-checkbox>
+				</el-form-item>  
+				<el-form-item label="排序号" prop="seqNo">
 					<el-input-number v-model="editForm.seqNo" :min="0" :max="200"></el-input-number>
-				</el-form-item> 
-				<el-form-item label="项目编号" prop="projectId">
-					<el-input v-model="editForm.projectId" placeholder="项目编号"></el-input>
-				</el-form-item> 
-				<el-form-item label="产品编号" prop="productId">
-					<el-input v-model="editForm.productId" placeholder="产品编号"></el-input>
-				</el-form-item> 
-				<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>   
 				<el-form-item label="原归属机构名称" prop="obranchName">
 					<el-input v-model="editForm.obranchName" placeholder="原归属机构名称"></el-input>
+				</el-form-item>  
+				<el-form-item label="加入时间" prop="joinTime">
+					<el-date-picker type="date" placeholder="选择日期" v-model="editForm.joinTime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
+				</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>
 		</el-row>
@@ -92,7 +79,7 @@
 				dicts:{},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
 				editFormRules: {
 					groupId: [
-						//{ required: true, message: '团队编号不能为空', trigger: 'blur' }
+						//{ required: true, message: '小组编号不能为空', trigger: 'blur' }
 					]
 				},
 				editForm: {
diff --git a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
index 1f4acc1b..5539cf5f 100644
--- a/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
+++ b/src/views/xm/core/xmProjectGroupUser/XmProjectGroupUserMng.vue
@@ -3,31 +3,34 @@
 		<el-row>
 			<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input>
 			<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmProjectGroupUsers" icon="el-icon-search">查询</el-button>
-			<el-button type="primary" @click="showAdd" icon="el-icon-plus"> </el-button>
-			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button>
+ 			<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button>
 		</el-row>
 		<el-row class="padding-top">
 			<!--列表 XmProjectGroupUser xm_project_group_user-->
 			<el-table ref="xmProjectGroupUserTable" :data="xmProjectGroupUsers" :height="maxTableHeight" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
-				<el-table-column  type="selection" width="55" show-overflow-tooltip></el-table-column>
-				<el-table-column sortable type="index" width="55" show-overflow-tooltip></el-table-column>
+				<el-table-column  type="selection" width="55" ></el-table-column>
+				<el-table-column sortable type="index" width="55"></el-table-column>
+				
+				<el-table-column prop="pgClass" label="产品/团队编号" min-width="120" >
+					<template slot-scope="scope">{{scope.row.pgClass=='1'?'产品':'项目'}} 
+						&nbsp;&nbsp;{{scope.row.pgClass=='1'?scope.row.productId:scope.row.projectId}} 
+					</template>
+				</el-table-column>   
+				<el-table-column prop="groupName" label="组名" min-width="120" show-overflow-tooltip></el-table-column>
+ 				<el-table-column prop="username" label="成员姓名" min-width="120" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="joinTime" label="加入时间" min-width="80" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="groupId" label="团队编号" min-width="80" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="userid" label="团队成员编号" min-width="80" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="username" label="团队成员" min-width="80" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="outTime" label="离队时间" min-width="80" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="status" label="当前状态0参与中1已退出团队" min-width="80" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="obranchId" label="组员原归属机构编号" min-width="80" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="isPri" label="是否私人加入0否1是" min-width="80" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="seqNo" label="排序号--从1开始" min-width="80" show-overflow-tooltip></el-table-column>
-				<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="status" label="状态" min-width="80" show-overflow-tooltip> 
+					<template slot-scope="scope">  {{scope.row.status=='1'?'已加入':'已退出'}} 
+					</template>
+				</el-table-column>
+ 				<el-table-column prop="isPri" label="是否私人" min-width="80" show-overflow-tooltip> 
+					<template slot-scope="scope">  {{scope.row.isPri=='1'?'是':'否'}} 
+					</template>
+				 </el-table-column>
+				<el-table-column prop="seqNo" label="排序号" 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>
-                    </template>
+				<el-table-column label="操作" width="180" fixed="right"> 
 					<template scope="scope">
 						<el-button type="primary" @click="showEdit( scope.row,scope.$index)" icon="el-icon-edit"></el-button>
 						<el-button type="danger" @click="handleDel(scope.row,scope.$index)" icon="el-icon-delete"></el-button>
@@ -38,12 +41,12 @@
 		</el-row>
 		<el-row>
 			<!--编辑 XmProjectGroupUser xm_project_group_user界面-->
-			<el-drawer title="编辑xm_project_group_user" :visible.sync="editFormVisible"  size="60%"  append-to-body   :close-on-click-modal="false">
+			<el-drawer title="编辑组员信息" :visible.sync="editFormVisible"  size="60%"  append-to-body   :close-on-click-modal="false">
 				  <xm-project-group-user-edit op-type="edit" :xm-project-group-user="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-project-group-user-edit>
 			</el-drawer>
 
 			<!--新增 XmProjectGroupUser xm_project_group_user界面-->
-			<el-drawer title="新增xm_project_group_user" :visible.sync="addFormVisible"  size="60%"  append-to-body  :close-on-click-modal="false">
+			<el-drawer title="新增组员信息" :visible.sync="addFormVisible"  size="60%"  append-to-body  :close-on-click-modal="false">
 				<xm-project-group-user-edit op-type="add" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-project-group-user-edit>
 			</el-drawer>
 	    </el-row>
@@ -63,7 +66,7 @@
 		components: {
 		    XmProjectGroupUserEdit,
 		},
-		props:['visible'],
+		props:['visible','xmProjectGroup'],
 		computed: {
 		    ...mapGetters(['userInfo']),
 
@@ -157,6 +160,10 @@
 					params.key=this.filters.key
 				}
 
+				if(this.xmProjectGroup){
+					params.groupId=this.xmProjectGroup.id
+				}
+
 				this.load.list = true;
 				listXmProjectGroupUser(params).then((res) => {
 					var tips=res.data.tips;
@@ -199,7 +206,7 @@
 					type: 'warning'
 				}).then(() => { 
 					this.load.del=true;
-					let params = { groupId: row.groupId };
+					let params = { userid:row.userid,groupId: row.groupId };
 					delXmProjectGroupUser(params).then((res) => {
 						this.load.del=false;
 						var tips=res.data.tips;