diff --git a/config/index.js b/config/index.js
index 93f12903..eaa3c001 100644
--- a/config/index.js
+++ b/config/index.js
@@ -10,7 +10,7 @@ module.exports = {
assetsSubDirectory: '',
assetsPublicPath: '/',
proxyTable: {
- /**
+
'/api/m1/xm': {
target: 'http://localhost:7067',
changeOrigin: true,
@@ -18,7 +18,7 @@ module.exports = {
'^/api/m1/xm': '/xm'
}
},
-
+ /**
'/api/m1/sys': {
target: 'http://localhost:7015',
changeOrigin: true,
diff --git a/src/views/xm/core/xmProduct/XmProductInfo.vue b/src/views/xm/core/xmProduct/XmProductInfo.vue
index d9e4b7c8..e8adb246 100644
--- a/src/views/xm/core/xmProduct/XmProductInfo.vue
+++ b/src/views/xm/core/xmProduct/XmProductInfo.vue
@@ -25,10 +25,11 @@
需求
-
+
+
计划
+ -->
财务
@@ -164,9 +166,9 @@
-
+
-
+
@@ -195,6 +197,7 @@
import { mapGetters } from 'vuex';
import xmTaskMng from '../xmTask/XmTaskMng';
+ import xmPlan from '../xmTask/XmPlan';
import xmGroupMng from '../xmGroup/XmGroupMng';
import xmGroupSelect from '../xmGroup/XmGroupSelect';
@@ -450,6 +453,7 @@
XmProjectForLinkComplex,
XmProjectForLink,
XmReport,
+ xmPlan,
//在下面添加其它组件
},
mounted() {
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 0e8b693b..105ea9e8 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -24,9 +24,11 @@
产品
+
任务
@@ -127,7 +129,7 @@
-
+
@@ -166,8 +168,7 @@
import xmCost from './XmProjectCost';
import xmBudget from './XmProjectBudgetCost';
import xmContract from '../xmContract/XmContractMng';
- import xmEnvList from '../xmProjectEnvList/XmProjectEnvListMng';
- import xmPhaseMng from '../xmPhase/XmPhaseMng';
+ import xmEnvList from '../xmProjectEnvList/XmProjectEnvListMng';
import xmMenuMng from '../xmMenu/XmMenuMng';
import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
@@ -177,6 +178,7 @@
import XmProductForLinkComplex from '../xmProduct/XmProductForLinkComplex.vue';
import XmReport from '@/views/xm/rpt/reportIndex';
+import XmPlan from '../xmTask/XmPlan.vue';
export default {
props: ["selProject","visible"],
@@ -374,8 +376,7 @@
},//end methods
components: {
- xmTaskMng,
- xmPhaseMng,
+ xmTaskMng,
xmGroupMng,
xmExchange,
xmQuestion,
@@ -396,6 +397,7 @@
XmProjectOverviewComplex,
XmProductForLinkComplex,
XmReport,
+XmPlan,
//在下面添加其它组件
},
mounted() {
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
new file mode 100644
index 00000000..908665ed
--- /dev/null
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -0,0 +1,2067 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 由用户故事快速创建计划 (推荐)
+
+
+
+
+
+
+ 从模板快速导入计划
+
+
+
+
+
+
+ 直接创建计划
+
+
+
+
+
+
+
+
+
+
+ 产品:
+
+
+ 需求:
+
+ {{ item.menuName.substr(0, 10) }}
+
+ 选需求
+
+
+ 责任人:
+ {{ this.filters.createUser.username }}
+ 选责任人
+ 我的
+
+
+ 执行人:
+ {{ this.filters.executor.username }}
+ 选执行人
+ 我的
+
+
+ 创建时间:
+
+
+
+ 标签:
+ 选择标签
+ {{ skill.skillName }}
+
+
+ 查询
+
+
+
+
+ 批量删除
+
+
+
+
+ 刷新全部计划进度数据
+
+
+ 更多
+
+
+
+
+ 甘特图
+ 敏捷看板
+ 表格
+
+ 视图
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.sortLevel }} {{ scope.row.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/xm/core/xmTask/XmPlan.vue b/src/views/xm/core/xmTask/XmPlan.vue
new file mode 100644
index 00000000..adb19591
--- /dev/null
+++ b/src/views/xm/core/xmTask/XmPlan.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index addaff2a..dae1803d 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -112,48 +112,11 @@
-
-
-
-
-
-
- 由用户故事快速创建计划 (推荐)
-
-
-
-
-
-
- 从模板快速导入计划
-
-
-
-
-
-
- 直接创建计划
-
+
@@ -192,10 +155,7 @@
@@ -421,10 +381,7 @@
-
-
-
-
+
@@ -948,8 +905,7 @@ import { mapGetters } from "vuex";
import xmExecuserMng from "../xmTaskExecuser/XmTaskExecuserForTask";
import xmSkillMng from "../xmTaskSkill/XmTaskSkillMng";
import skillMng from "@/views/xm/core/skill/skillMng";
-import { batchAddSkill } from "@/api/xm/core/xmTaskSkill";
-import xmPhaseMng from "../xmPhase/XmPhaseSelect";
+import { batchAddSkill } from "@/api/xm/core/xmTaskSkill";
import { sn } from "@/common/js/sequence";
import xmTaskTemplateMng from "../xmTaskTemplate/XmTaskTemplateMng";
import xmExchangeMng from "../xmExchange/XmExchangeMng";
@@ -1009,6 +965,7 @@ export default {
},
props: [
+ "parentTask",
"selProject",
"isTaskCenter",
"isMy",
@@ -1040,6 +997,9 @@ export default {
xmIteration: function () {
this.getXmTasks();
},
+ "parentTask.id":function(){
+ this.searchXmTasks();
+ }
},
data() {
const beginDate = new Date();
@@ -1171,8 +1131,7 @@ export default {
skillVisible: false,
skillIds: [],
taskSkills: [],
- taskTemplateVisible: false,
- parentTask: null,
+ taskTemplateVisible: false,
projectInfoVisible: false,
menuVisible: false,
menuDetailVisible: false,
@@ -1546,8 +1505,7 @@ export default {
showAdd: function (ntype) {
if(!this.checkCanAdd()){
return;
- }
- this.parentTask = null;
+ }
this.addForm.ntype=ntype;
this.addFormVisible = true;
},
@@ -2307,6 +2265,9 @@ export default {
if(this.queryScope=="planTask"||this.queryScope=='plan'){
params.lvls=this.filters.lvls
}
+ if(this.parentTask && this.parentTask.id){
+ params.parentTaskid=this.parentTask.id
+ }
return params;
},
loadXmTaskLazy(tree, treeNode, resolve) {
@@ -2525,8 +2486,7 @@ export default {
XmTaskAgileKanban,
xmExecuserMng,
xmSkillMng,
- skillMng,
- xmPhaseMng,
+ skillMng,
xmTaskTemplateMng,
XmProjectSelect,
xmExchangeMng,