diff --git a/package.json b/package.json
index b7bd98b7..72df3bc8 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,6 @@
"@jiaminghi/data-view": "^2.10.0",
"axios": "0.17.1",
"clipboard": "1.7.1",
- "vue-clipboard2": "^0.3.1",
"codemirror": "5.32.0",
"dayjs": "^1.8.29",
"decimal.js": "^10.2.0",
@@ -25,9 +24,9 @@
"echarts": "3.8.5",
"element-ui": "^2.13.0",
"file-saver": "2.0.1",
+ "font-awesome": "4.7.0",
"gantt-elastic": "^1.0.11",
"gantt-elastic-header": "^0.1.11",
- "font-awesome": "4.7.0",
"html2canvas": "^1.0.0-alpha.9",
"js-cookie": "2.2.0",
"js-md5": "^0.7.3",
@@ -43,14 +42,16 @@
"simplemde": "1.11.2",
"sortablejs": "1.7.0",
"vue": "2.6.14",
+ "vue-clipboard2": "^0.3.1",
"vue-contextmenujs": "^1.3.10",
"vue-count-to": "1.0.13",
"vue-cropper": "^0.2.9",
"vue-gantt-schedule-timeline-calendar": "^1.0.33",
"vue-i18n": "7.3.2",
+ "vue-okr-tree": "^1.0.10",
+ "vue-print-nb": "^1.7.5",
"vue-router": "3.0.1",
"vuedraggable": "2.15.0",
- "vue-print-nb": "^1.7.5",
"vuex": "3.0.1",
"wl-gantt": "^1.0.4",
"xlsx": "^0.14.5"
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index cbc3b0f0..a3d04413 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -21,7 +21,8 @@
{{filters.tags[0].tagName.substr(0,5)}}等({{filters.tags.length}})个
需求
-
+ 删除
+
汇总进度
+
+
+
导入项目组
@@ -185,15 +188,40 @@
import XmProjectGroupStateMng from '../xmProjectGroupState/XmProjectGroupStateMng';//修改界面
import {mapGetters} from 'vuex'
+ import {VueOkrTree} from 'vue-okr-tree';
+ import 'vue-okr-tree/dist/vue-okr-tree.css'
export default {
computed: {
...mapGetters([
'workShop','userInfo','roles'
- ])
+ ]),
+ okrTreeData(){
+ var groups=this.xmProjectGroupFormworkSels;
+ groups.forEach(i=>{
+ i.label=i.groupName
+ if(i.groupUsers){
+ var groupUsers=i.groupUsers;
+ groupUsers.forEach(i=>i.label=i.username)
+ i.children=groupUsers
+ }
+ })
+ var topLabel="组织架构"
+ if(this.xmProduct&&this.xmProduct.id){
+ topLabel=this.xmProduct.name+"-产品组织架构"
+ }else if(this.selProject && this.selProject.id){
+ topLabel=this.selProject.name+"-项目组织架构"
+ }
+ var data=[{
+ label:topLabel,
+ children:groups
+ }
+ ]
+ return data;
+ }
},
//
- props: ['visible',"selGroups",'selProject','isSelectSingleUser','isSelectMultiUser'],
+ props: ['visible',"selGroups",'selProject','isSelectSingleUser','isSelectMultiUser','xmProduct'],
watch: {
"selGroups": function(selGroups) {
if(this.selGroups){
@@ -556,7 +584,7 @@
}, //end methods
components: {
- UsersSelect,XmProjectGroupStateMng
+ UsersSelect,XmProjectGroupStateMng,VueOkrTree
//在下面添加其它组件
},
mounted() {
diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
index ddbd0c1b..1fa399fb 100644
--- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
+++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue
@@ -15,6 +15,7 @@
由任务汇总进度数据
批量修改
+ 删除
-
+
+
+
+