end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
陈裕财 4 years ago
parent
b26eb66ccd
commit
e6dd632523
9 changed files with 61 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/views/mdp/workflow/ru/task/TaskMng.vue
  2. 34
      src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
  3. 2
      src/views/xm/core/xmIteration/XmIterationInfo.vue
  4. 20
      src/views/xm/core/xmMenu/XmMenuMng.vue
  5. 6
      src/views/xm/core/xmProduct/XmProductInfo.vue
  6. 4
      src/views/xm/core/xmProduct/XmProductOverviewComplex.vue
  7. 4
      src/views/xm/core/xmProject/XmProjectEdit.vue
  8. 6
      src/views/xm/core/xmProject/XmProjectInfo.vue
  9. 17
      src/views/xm/core/xmProject/XmProjectOverviewComplex.vue

1
src/views/mdp/workflow/ru/task/TaskMng.vue
View File

@ -1039,6 +1039,7 @@
afterEditSubmit() {
this.editFormVisible = false;
this.getTasks();
this.$emit("submit")
},
// 选择行task
selsChange: function(sels) {

src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue → src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
View File

2
src/views/xm/core/xmIteration/XmIterationInfo.vue
View File

@ -74,7 +74,7 @@
import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
import xmTestCaseExecMng from '../xmTestCaseExec/XmTestCaseExecMng';
import XmIterationForProjectComplex from '../xmIteration/XmIterationForProjectComplex.vue';
import XmIterationForProjectComplex from './XmIterationForLinkComplex.vue';
import XmIterationOverviewComplex from '../xmIteration/XmIterationOverviewComplex.vue';
import XmProductForProjectComplex from '../xmProduct/XmProductForProjectComplex.vue';
import XmProjectComplex from '../xmProject/XmProjectComplex.vue';

20
src/views/xm/core/xmMenu/XmMenuMng.vue
View File

@ -22,16 +22,16 @@
<el-link title="迭代，点击选择、清除选择" @click="iterationVisible=true" type="warning" slot="reference" v-if="!xmIteration" icon="el-icon-search"><font style="font-size:14px;">{{filters.iteration?filters.iteration.iterationName:'选择迭代'}}</font></el-link>
</el-popover>
<el-select v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable style="width: 160px;">
<el-option value="not-join-any-project" label="未分配任务"></el-option>
<el-option value="join-any-project" label="已分配任务"></el-option>
<el-option value="not-join-curr-project" label="未分配任务到本项目" v-if="selProject && selProject.id"></el-option>
<el-option value="join-curr-project" label="已分配任务到本项目" v-if="selProject && selProject.id"></el-option>
<el-option value="not-join-any-project" label="未分配过任务的需求"></el-option>
<el-option value="join-any-project" label="已分配过任务的需求"></el-option>
<el-option value="not-join-curr-project" :label="'未分配任务到项目【'+selProject.name+'】'" v-if="selProject && selProject.id"></el-option>
<el-option value="join-curr-project" :label="'已分配任务到本项目【'+selProject.name+'】'" v-if="selProject && selProject.id"></el-option>
</el-select>
<el-select v-model="filters.iterationFilterType" placeholder="加入过迭代？" clearable style="width: 160px;">
<el-option value="not-join-any-iteration" label="未加入过迭代"></el-option>
<el-option value="join-any-iteration" label="已加入过迭代"></el-option>
<el-option value="not-join-curr-iteration" label="未加入本迭代" v-if="filters.iteration && filters.iteration.id"></el-option>
<el-option value="join-curr-iteration" label="已加入本迭代" v-if="filters.iteration && filters.iteration.id"></el-option>
<el-option value="not-join-curr-iteration" :label="'未加入迭代【'+filters.iteration.iterationName+'】'" v-if="filters.iteration && filters.iteration.id"></el-option>
<el-option value="join-curr-iteration" :label="'已加入本迭代【'+filters.iteration.iterationName+'】'" v-if="filters.iteration && filters.iteration.id"></el-option>
</el-select>
<el-select v-model="filters.dtype" clearable placeholder="需求类型">
@ -156,11 +156,11 @@
<el-table-column prop="iterationName" label="迭代" min-width="120" show-overflow-tooltip>
<template slot="header">
迭代
<el-popover v-if="xmIteration && xmIteration.id"
<el-popover
placement="top"
width="300"
v-model="linkIterationPopoverVisible">
<p>将需求加入还是移出迭代 <span v-if="xmIteration && xmIteration.id">【{{xmIteration.iterationName}}】</span>?</p>
<p>将需求加入还是移出迭代 <span v-if="filters.iteration && filters.iteration.id">【{{filters.iteration.iterationName}}】</span>?</p>
<div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="doBatchDelXmIterationMenu">移出</el-button>
<el-button type="primary" size="mini" @click="doBatchAddXmIterationMenu">加入</el-button>
@ -1012,7 +1012,7 @@
}
var params={
menuIds:this.sels.map(i=>i.menuId),
iterationId:this.xmIteration.id
iterationId:this.filters.iteration.id
}
batchDelXmIterationMenu(params).then(res=>{
var tips =res.data.tips;
@ -1029,7 +1029,7 @@
}
var params={
menuIds:this.sels.map(i=>i.menuId),
iterationId:this.xmIteration.id
iterationId:this.filters.iteration.id
}
batchAddXmIterationMenu(params).then(res=>{
var tips =res.data.tips;

6
src/views/xm/core/xmProduct/XmProductInfo.vue
View File

@ -151,7 +151,7 @@
</el-menu>
<xm-product-overview-complex v-if="infotype=='产品概览'" :xm-product="xmProduct"></xm-product-overview-complex>
<xm-iteration-for-project-complex v-if="infotype=='迭代'" ref="xmIterationMng" :xm-product="xmProduct"></xm-iteration-for-project-complex>
<xm-iteration-for-link-complex v-if="infotype=='迭代'" ref="xmIterationMng" :xm-product="xmProduct"></xm-iteration-for-link-complex>
<xm-project-complex v-if="infotype=='项目'" ref="xmProjectForLink" :xm-product="xmProduct"></xm-project-complex>
<xm-menu-mng v-if="infotype=='需求'" :xm-product="xmProduct"></xm-menu-mng>
<xm-task-mng v-if="infotype=='产品任务'" ptype="1" queryScope="task" ref="productXmTaskMng" :xm-product="xmProduct" key="productXmTaskMng"></xm-task-mng>
@ -210,7 +210,7 @@
import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
import xmTestCaseExecMng from '../xmTestCaseExec/XmTestCaseExecMng';
import XmIterationForProjectComplex from '../xmIteration/XmIterationForProjectComplex.vue';
import XmIterationForLinkComplex from '../xmIteration/XmIterationForLinkComplex.vue';
import XmProductOverviewComplex from '../xmProduct/XmProductOverviewComplex.vue';
import XmProductForProjectComplex from './XmProductForProjectComplex.vue';
import XmProjectForLink from '../xmProject/XmProjectForLink.vue';
@ -437,7 +437,7 @@ import XmProjectForLink from '../xmProject/XmProjectForLink.vue';
xmProjectStateMng,
xmTestCaseExecMng,
xmGroupSelect,
XmIterationForProjectComplex,
XmIterationForLinkComplex,
XmProductOverviewComplex,
XmProductForProjectComplex,
XmProjectComplex,

4
src/views/xm/core/xmProduct/XmProductOverviewComplex.vue
View File

@ -8,10 +8,10 @@
<span slot="title">产品详情</span>
</el-menu-item>
<el-menu-item index="iterationProductLink">
<span slot="title">配置可见迭代</span>
<span slot="title">配置关联迭代</span>
</el-menu-item>
<el-menu-item index="productProjectLink">
<span slot="title">配置可见项目</span>
<span slot="title">配置关联项目</span>
</el-menu-item>
<el-menu-item index="productCalc">
<span slot="title">执行数据汇总计划</span>

4
src/views/xm/core/xmProject/XmProjectEdit.vue
View File

@ -615,9 +615,9 @@
}else if(bizKey=="xm_project_delay_approva"){
//延期审核
params.mainTitle='关于项目【'+row.name+"】延期的审批申请";
params.mainContext='项目编号：'+row.code+','+'项目名称：'+row.name+',项目结束时间由'+this.selProject.endTime+'变更为:'+row.endTime+',此次变更不涉及预算调整';
params.mainContext='项目编号：'+row.code+','+'项目名称：'+row.name+',项目结束时间由'+this.selProject.endTime+'变更为:'+this.dateRanger[1]+',此次变更不涉及预算调整';
params.restUrl=config.getXmBasePath()+"/xm/core/xmProject/processApprova";
params.flowVars.data.endTime=row.endTime
params.flowVars.data.endTime=this.dateRanger[1]
//this.html2canvas(document.querySelector(".editForm"),row,params);
this.$router.push({name:'ProcdefListForBizStart',params:params});
}else if(bizKey=="xm_project_start_approva"){

6
src/views/xm/core/xmProject/XmProjectInfo.vue
View File

@ -132,7 +132,7 @@
</el-menu>
<xm-project-overview-complex v-if="infotype=='项目概览'" :sel-project="selProject" @submit="afterEditSubmit"></xm-project-overview-complex>
<xm-iteration-for-project-complex v-if="infotype=='迭代'" ref="xmIterationMng" :sel-project="selProject"></xm-iteration-for-project-complex>
<xm-iteration-for-link-complex v-if="infotype=='迭代'" ref="xmIterationMng" :sel-project="selProject"></xm-iteration-for-link-complex>
<xm-product-for-project-complex v-if="infotype=='产品'" ref="xmProductComplex" :sel-project="selProject"></xm-product-for-project-complex>
<xm-menu-mng v-if="infotype=='需求'" :sel-project="selProject"></xm-menu-mng>
<xm-task-mng v-if="infotype=='任务'" ref="xmTaskMng" :sel-project="selProject" ptype="0" queryScope="task" key="task"></xm-task-mng>
@ -185,7 +185,7 @@
import xmMenuWithPlan from '../xmMenu/XmMenuWithPlan';
import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
import xmTestCaseExecMng from '../xmTestCaseExec/XmTestCaseExecMng';
import XmIterationForProjectComplex from '../xmIteration/XmIterationForProjectComplex.vue';
import XmIterationForLinkComplex from '../xmIteration/XmIterationForLinkComplex.vue';
import XmProjectOverviewComplex from './XmProjectOverviewComplex.vue';
import XmProductForProjectComplex from '../xmProduct/XmProductForProjectComplex.vue';
@ -412,7 +412,7 @@
xmProjectStateMng,
xmTestCaseExecMng,
xmGroupSelect,
XmIterationForProjectComplex,
XmIterationForLinkComplex,
XmProjectOverviewComplex,
XmProductForProjectComplex,
//在下面添加其它组件

17
src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
View File

@ -43,7 +43,7 @@
</el-row>
</div>
<task-mng v-if="showPanelName === 'currFlow' " ref="currFlow" :biz-parent-pkid="selProject.id" > </task-mng>
<task-mng v-if="showPanelName === 'currFlow' " ref="currFlow" :biz-parent-pkid="selProject.id" @submit="afterFlowSubmit"> </task-mng>
<procinst-mng v-if="showPanelName === 'hisFlow' " ref="hisFlow" isAll="true" :biz-parent-pkid="selProject.id"></procinst-mng>
</section>
</template>
@ -51,8 +51,7 @@
<script>
import util from "@/common/js/util"; // 全局公共库
//import Sticky from "@/components/Sticky"; // 粘性header组件
import { mapGetters } from "vuex";
import { listXmProjectState } from '@/api/xm/core/xmProjectState';
import { mapGetters } from "vuex";
import XmProjectOverview from './XmProjectOverview.vue';
import XmProjectDetail from './XmProjectDetail.vue';
import XmProductProjectLinkMng from '../xmProductProjectLink/XmProductProjectLinkMng.vue';
@ -61,6 +60,8 @@ import XmIterationLinkForProject from '../xmIterationLink/XmIterationLinkForProj
import TaskMng from '@/views/mdp/workflow/ru/task/TaskMng';
import ProcinstMng from '@/views//mdp/workflow/hi/procinst/ProcinstMng';
import { loadTasksToXmProjectState , loadTasksSettleToXmProjectState} from '@/api/xm/core/xmProjectState';
import { listXmProject} from '@/api/xm/core/xmProject';
export default {
components: { XmProjectOverview, XmProjectDetail, XmProductProjectLinkMng ,XmIterationLinkForProject,TaskMng,ProcinstMng},
@ -96,6 +97,16 @@ export default {
this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'});
}).catch( err => this.load.calcProject=false );
},
afterFlowSubmit(){
debugger;
listXmProject({id:this.selProject.id}).then(res=>{
var tips = res.data.tips;
if(tips.isOk){
var selProject=res.data.data[0]
this.afterEditSubmit(selProject)
}
})
}
},
mounted() {

Write Preview
Loading…
Cancel
Save