Browse Source

优化

master
陈裕财 4 years ago
parent
commit
290c26f20b
  1. 7
      package.json
  2. 1
      src/views/xm/core/xmMenu/XmMenuMng.vue
  3. 1
      src/views/xm/core/xmProduct/XmProductTplMng.vue
  4. 34
      src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue
  5. 4
      src/views/xm/core/xmProjectPhase/XmProjectPhaseMng.vue

7
package.json

@ -17,7 +17,6 @@
"@jiaminghi/data-view": "^2.10.0", "@jiaminghi/data-view": "^2.10.0",
"axios": "0.17.1", "axios": "0.17.1",
"clipboard": "1.7.1", "clipboard": "1.7.1",
"vue-clipboard2": "^0.3.1",
"codemirror": "5.32.0", "codemirror": "5.32.0",
"dayjs": "^1.8.29", "dayjs": "^1.8.29",
"decimal.js": "^10.2.0", "decimal.js": "^10.2.0",
@ -25,9 +24,9 @@
"echarts": "3.8.5", "echarts": "3.8.5",
"element-ui": "^2.13.0", "element-ui": "^2.13.0",
"file-saver": "2.0.1", "file-saver": "2.0.1",
"font-awesome": "4.7.0",
"gantt-elastic": "^1.0.11", "gantt-elastic": "^1.0.11",
"gantt-elastic-header": "^0.1.11", "gantt-elastic-header": "^0.1.11",
"font-awesome": "4.7.0",
"html2canvas": "^1.0.0-alpha.9", "html2canvas": "^1.0.0-alpha.9",
"js-cookie": "2.2.0", "js-cookie": "2.2.0",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",
@ -43,14 +42,16 @@
"simplemde": "1.11.2", "simplemde": "1.11.2",
"sortablejs": "1.7.0", "sortablejs": "1.7.0",
"vue": "2.6.14", "vue": "2.6.14",
"vue-clipboard2": "^0.3.1",
"vue-contextmenujs": "^1.3.10", "vue-contextmenujs": "^1.3.10",
"vue-count-to": "1.0.13", "vue-count-to": "1.0.13",
"vue-cropper": "^0.2.9", "vue-cropper": "^0.2.9",
"vue-gantt-schedule-timeline-calendar": "^1.0.33", "vue-gantt-schedule-timeline-calendar": "^1.0.33",
"vue-i18n": "7.3.2", "vue-i18n": "7.3.2",
"vue-okr-tree": "^1.0.10",
"vue-print-nb": "^1.7.5",
"vue-router": "3.0.1", "vue-router": "3.0.1",
"vuedraggable": "2.15.0", "vuedraggable": "2.15.0",
"vue-print-nb": "^1.7.5",
"vuex": "3.0.1", "vuex": "3.0.1",
"wl-gantt": "^1.0.4", "wl-gantt": "^1.0.4",
"xlsx": "^0.14.5" "xlsx": "^0.14.5"

1
src/views/xm/core/xmMenu/XmMenuMng.vue

@ -21,6 +21,7 @@
<el-tag v-else @click="tagSelectVisible=true" closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}({{filters.tags.length}})</el-tag> <el-tag v-else @click="tagSelectVisible=true" closable @close="clearFiltersTag(filters.tags[0])">{{filters.tags[0].tagName.substr(0,5)}}({{filters.tags.length}})</el-tag>
<el-button v-if="!selProject&&!xmIteration&&disabledMng!=false" type="primary" @click="showAdd" icon="el-icon-plus">需求</el-button> <el-button v-if="!selProject&&!xmIteration&&disabledMng!=false" type="primary" @click="showAdd" icon="el-icon-plus">需求</el-button>
<el-button v-if="!selProject&&!xmIteration&&disabledMng!=false" type="danger" @click="batchDel" icon="el-icon-delete">删除</el-button>
<el-button v-if=" batchEditVisible==false&&disabledMng!=false " @click="loadTasksToXmMenuState" icon="el-icon-s-marketing">汇总进度</el-button> <el-button v-if=" batchEditVisible==false&&disabledMng!=false " @click="loadTasksToXmMenuState" icon="el-icon-s-marketing">汇总进度</el-button>
<el-popover <el-popover

1
src/views/xm/core/xmProduct/XmProductTplMng.vue

@ -141,7 +141,6 @@
pickerOptions: util.pickerOptions('datarange'), pickerOptions: util.pickerOptions('datarange'),
projectVisible:false, projectVisible:false,
productSelectVisible:false, productSelectVisible:false,
showType:false,
xmProductCopy:{ xmProductCopy:{
id:'',productName:'',code:'',isTpl:'',copyMenu:'1' id:'',productName:'',code:'',isTpl:'',copyMenu:'1'
}, },

34
src/views/xm/core/xmProjectGroupFormwork/XmProjectGroupFormwork.vue

@ -1,5 +1,8 @@
<template> <template>
<section class="page-container padding"> <section class="page-container padding">
<el-row>
<vue-okr-tree :data="okrTreeData"></vue-okr-tree>
</el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="primary" @click="showGroupFormwork" icon="el-icon-plus">导入项目组</el-button> <el-button v-if="!isSelectSingleUser && !isSelectMultiUser" type="primary" @click="showGroupFormwork" icon="el-icon-plus">导入项目组</el-button>
@ -185,15 +188,40 @@
import XmProjectGroupStateMng from '../xmProjectGroupState/XmProjectGroupStateMng';// import XmProjectGroupStateMng from '../xmProjectGroupState/XmProjectGroupStateMng';//
import {mapGetters} from 'vuex' import {mapGetters} from 'vuex'
import {VueOkrTree} from 'vue-okr-tree';
import 'vue-okr-tree/dist/vue-okr-tree.css'
export default { export default {
computed: { computed: {
...mapGetters([ ...mapGetters([
'workShop','userInfo','roles' '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: { watch: {
"selGroups": function(selGroups) { "selGroups": function(selGroups) {
if(this.selGroups){ if(this.selGroups){
@ -556,7 +584,7 @@
}, //end methods }, //end methods
components: { components: {
UsersSelect,XmProjectGroupStateMng
UsersSelect,XmProjectGroupStateMng,VueOkrTree
// //
}, },
mounted() { mounted() {

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

@ -15,6 +15,7 @@
<el-button class="hidden-md-and-down" @click="loadTasksToXmProjectPhase(sels)" v-loading="load.edit" icon="el-icon-s-data">由任务汇总进度数据</el-button> <el-button class="hidden-md-and-down" @click="loadTasksToXmProjectPhase(sels)" v-loading="load.edit" icon="el-icon-s-data">由任务汇总进度数据</el-button>
<el-button @click="batchEditVisible=true" v-loading="load.edit" icon="el-icon-edit">批量修改</el-button> <el-button @click="batchEditVisible=true" v-loading="load.edit" icon="el-icon-edit">批量修改</el-button>
<el-button @click="batchDel" v-loading="load.del" icon="el-icon-delete">删除</el-button>
</span> </span>
<el-popover <el-popover
placement="top-start" placement="top-start"
@ -62,6 +63,9 @@
<el-row class="padding-top" v-show="batchEditVisible==false"> <el-row class="padding-top" v-show="batchEditVisible==false">
<!--列表 XmProjectPhase xm_project_phase--> <!--列表 XmProjectPhase xm_project_phase-->
<el-table lazy :load="loadXmProjectPhaseLazy" ref="table" :height="tableHeight" v-show="!gstcVisible " default-expand-all :data="projectPhaseTreeData" :summary-method="getSummariesForNoBatchEdit" :show-summary="true" row-key="id" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;"> <el-table lazy :load="loadXmProjectPhaseLazy" ref="table" :height="tableHeight" v-show="!gstcVisible " default-expand-all :data="projectPhaseTreeData" :summary-method="getSummariesForNoBatchEdit" :show-summary="true" row-key="id" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @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="80">
</el-table-column>
<el-table-column prop="phaseName" label="计划名称" min-width="150" show-overflow-tooltip> <el-table-column prop="phaseName" label="计划名称" min-width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span> <span>

Loading…
Cancel
Save