Browse Source

优化

master
陈裕财 4 years ago
parent
commit
09300d743f
  1. 2
      src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
  2. 2
      src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
  3. 2
      src/views/xm/core/xmProject/XmProjectComplex.vue
  4. 17
      src/views/xm/core/xmTask/XmTaskMng.vue

2
src/views/xm/core/xmProduct/XmProductForProjectComplex.vue

@ -10,7 +10,7 @@
width="400" width="400"
trigger="click"> trigger="click">
<xm-product-select :auto-select="true" :sel-project="selProject" :xm-iteration="xmIteration" @row-click="onProductRowClick" @clear-select="onProductClearSelect"></xm-product-select> <xm-product-select :auto-select="true" :sel-project="selProject" :xm-iteration="xmIteration" @row-click="onProductRowClick" @clear-select="onProductClearSelect"></xm-product-select>
<el-link type="warning" slot="reference" @click.stop="showProjectSelect" icon="el-icon-search"><font style="font-size:14px;">{{xmProduct?xmProduct.productName:'选择产品'}}</font></el-link>
<el-link type="warning" slot="reference" icon="el-icon-search"><font style="font-size:14px;">{{xmProduct?xmProduct.productName:'选择产品'}}</font></el-link>
</el-popover> </el-popover>
</div> </div>
</el-tab-pane> </el-tab-pane>

2
src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue

@ -232,7 +232,7 @@ import XmProjectSelect from '../xmProject/XmProjectSelect.vue';
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.load.add=true; this.load.add=true;
this.addForm.iterationId=this.xmIteration.id;
this.addForm.projectId=this.selProject.id;
this.addForm.productId= product.id; this.addForm.productId= product.id;
addXmProductProjectLink(this.addForm).then((res) => { addXmProductProjectLink(this.addForm).then((res) => {
this.load.del=false; this.load.del=false;

2
src/views/xm/core/xmProject/XmProjectComplex.vue

@ -10,7 +10,7 @@
width="400" width="400"
trigger="click"> trigger="click">
<xm-project-select :auto-select="true" :xm-iteration="xmIteration" :xm-product="xmProduct" @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select> <xm-project-select :auto-select="true" :xm-iteration="xmIteration" :xm-product="xmProduct" @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select>
<el-link type="warning" slot="reference" @click.stop="showProjectSelect" icon="el-icon-search"><font style="font-size:14px;">{{selProject?selProject.name:'选择项目'}}</font></el-link>
<el-link type="warning" slot="reference" icon="el-icon-search"><font style="font-size:14px;">{{selProject?selProject.name:'选择项目'}}</font></el-link>
</el-popover> </el-popover>
</div> </div>

17
src/views/xm/core/xmTask/XmTaskMng.vue

@ -144,7 +144,7 @@
icon="el-icon-del" icon="el-icon-del"
>删除</el-button >删除</el-button
> >
<el-popover v-if="workItemType=='projectPlan'"
<el-popover v-if="workItemType=='projectPlan'|| workItemType=='productPlan'"
placement="top-start" placement="top-start"
title="选择创建计划/任务的方式" title="选择创建计划/任务的方式"
width="300" width="300"
@ -179,7 +179,7 @@
<el-button <el-button
slot="reference" slot="reference"
v-if=" v-if="
isTaskCenter != '1' && isMy != '1' && !xmProduct && !xmIteration
isTaskCenter != '1' && isMy != '1' && !xmIteration
" "
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@ -503,7 +503,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-dropdown <el-dropdown
@command="handleCommand" @command="handleCommand"
v-if="isTaskCenter != '1' && isMy != '1' && scope.row.ntype=='1' && workItemType=='projectPlan'"
v-if="isTaskCenter != '1' && isMy != '1' && scope.row.ntype=='1' && (workItemType=='projectPlan' || workItemType=='productPlan')"
:disabled="scope.row.ntype!='1'" :disabled="scope.row.ntype!='1'"
> >
<span class="el-dropdown-link"> <span class="el-dropdown-link">
@ -1560,11 +1560,20 @@ export default {
this.$notify({ this.$notify({
showClose: true, showClose: true,
message: "当前为任务节点,任务节点下不能再创建新的子项", message: "当前为任务节点,任务节点下不能再创建新的子项",
type: "error",
type: "warning",
}); });
return false; return false;
} }
return true; return true;
}else{
if(!this.filters.selProject || !this.filters.selProject.id){
this.$notify({
showClose: true,
message: "请先选择项目",
type: "warning",
});
return false;
}
} }
return true; return true;

Loading…
Cancel
Save