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

优化

master
陈裕财 4 years ago
parent
3b3c20a014
commit
0e22eae17e
3 changed files with 42 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      src/views/xm/core/xmMenu/XmMenuMng.vue
  2. 13
      src/views/xm/core/xmProject/XmProjectAdd.vue
  3. 29
      src/views/xm/core/xmProject/XmProjectComplex.vue

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

@ -13,11 +13,16 @@
<el-select v-model="filters.status" placeholder="需求状态" clearable style="width: 100px;"> <el-select v-model="filters.status" placeholder="需求状态" clearable style="width: 100px;">
<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option> <el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.menuStatus" :key="index"></el-option>
</el-select> </el-select>
<el-select v-model="filters.taskFilterType" placeholder="是否分配任务" clearable style="width: 140px;">
<el-option value="not-join" label="未分配任何任务的需求"></el-option>
<el-option value="join" label="已分配任务的需求"></el-option>
<el-select v-model="filters.taskFilterType" placeholder="分配任务？" clearable style="width: 170px;">
<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="未分配任务到本项目"></el-option>
<el-option value="join-curr-project" label="已分配任务到本项目"></el-option>
</el-select>
<el-select v-model="filters.iterationFilterType" placeholder="加入迭代？" clearable style="width: 115px;">
<el-option value="not-join" label="未加入迭代"></el-option>
<el-option value="join" label="已加入迭代"></el-option>
</el-select> </el-select>
<el-input v-model="filters.key" style="width: 15%;" placeholder="需求名称查询" clearable> <el-input v-model="filters.key" style="width: 15%;" placeholder="需求名称查询" clearable>
</el-input> </el-input>
<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search"></el-button> <el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmMenus" icon="el-icon-search"></el-button>
@ -52,18 +57,6 @@
<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-col> </el-col>
<el-col :span="24" style="padding-top:5px;" >
<el-select v-model="filters.iterationFilterType" placeholder="是否加入过迭代？" clearable >
<el-option value="not-join" label="未加入任何迭代的需求"></el-option>
<el-option value="join" label="已加入迭代的需求"></el-option>
</el-select>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-select v-model="filters.taskFilterType" placeholder="是否分配了任务？" clearable >
<el-option value="not-join" label="未分配任何任务的需求"></el-option>
<el-option value="join" label="已分配任务的需求"></el-option>
</el-select>
</el-col>
<el-col :span="24" style="padding-top:5px;"> <el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">创建日期:</font> <font class="more-label-font">创建日期:</font>
<el-date-picker <el-date-picker

13
src/views/xm/core/xmProject/XmProjectAdd.vue
View File

@ -272,7 +272,7 @@
return this.addForm.totalReceivables return this.addForm.totalReceivables
} }
}, },
props:['visible'],
props:['visible','xmProduct'],
watch: { watch: {
'visible':function(visible) { 'visible':function(visible) {
if(visible==true){ if(visible==true){
@ -373,10 +373,6 @@
}, },
//编辑提交XmProject xm_project父组件监听@submit="afterEditSubmit" //编辑提交XmProject xm_project父组件监听@submit="afterEditSubmit"
addSubmit: function () { addSubmit: function () {
if(!this.roles.some(i=>i.roleid=='projectAdmin')){
this.$notify({showClose: true, message: "只有项目经理可以建立项目", type: 'error' });
return;
}
if ( if (
this.dateRanger != null && this.dateRanger != null &&
this.dateRanger.length == 2 this.dateRanger.length == 2
@ -392,16 +388,17 @@
this.$confirm('确认提交吗？', '提示', {}).then(() => { this.$confirm('确认提交吗？', '提示', {}).then(() => {
this.load.add=true this.load.add=true
let params = Object.assign({}, this.addForm); let params = Object.assign({}, this.addForm);
params.groups=this.xmGroups;
if(this.xmProduct && this.xmProduct.id){
params.links=[{productId:this.xmProduct.id}]
}
params.planIuserWorkload=this.autoParams.planIuserWorkload params.planIuserWorkload=this.autoParams.planIuserWorkload
params.planOuserWorkload=this.autoParams.planOuserWorkload params.planOuserWorkload=this.autoParams.planOuserWorkload
params.planWorkload=this.autoParams.planWorkload params.planWorkload=this.autoParams.planWorkload
addXmProject(params).then((res) => { addXmProject(params).then((res) => {
this.load.add=false; this.load.add=false;
var tips=res.data.tips; var tips=res.data.tips;
if(tips.isOk){ if(tips.isOk){
this.$emit('submit',params);// @submit="afterEditSubmit"
this.$emit('submit',res.data.data);// @submit="afterEditSubmit"
} }
this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' });
}).catch( err =>this.load.add=false); }).catch( err =>this.load.add=false);

29
src/views/xm/core/xmProject/XmProjectComplex.vue
View File

@ -9,10 +9,24 @@
placement="right" placement="right"
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 ref="xmProjectSelect" :auto-select="true" :xm-iteration="xmIteration" :xm-product="xmProduct" @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select>
<el-link type="warning" slot="reference" 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>
</el-tab-pane>
<el-tab-pane disabled>
<div slot="label">
<el-popover
placement="bottom"
width="800"
v-model="projectAddVisible"
trigger="manual">
<xm-project-add :visible="projectAddVisible" @cancel="projectAddVisible=false" @submit="afterProjectAddSubmit"></xm-project-add>
<el-link type="warning" slot="reference" @click="projectAddVisible=true" icon="el-icon-plus"><font style="font-size:14px;">项目</font></el-link>
</el-popover>
</div> </div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="项目概览" name="projectOverview" v-if="selProject&&selProject.id"> <el-tab-pane label="项目概览" name="projectOverview" v-if="selProject&&selProject.id">
@ -65,6 +79,7 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
import XmProductProjectForLink from '../xmProduct/XmProductProjectForLink.vue'; import XmProductProjectForLink from '../xmProduct/XmProductProjectForLink.vue';
import XmProjectOverview from "./XmProjectOverview"; import XmProjectOverview from "./XmProjectOverview";
import XmProjectAdd from './XmProjectAdd';//新增界面
export default { export default {
computed: { computed: {
@ -134,7 +149,7 @@ import XmProjectOverview from "./XmProjectOverview";
moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块 moduleType : '1' // 模块类型，1-系统类模块 2-系统外模块
} }
], ],
projectVisible:true,
projectAddVisible:false,
/**end 自定义属性请在上面加 请加备注**/ /**end 自定义属性请在上面加 请加备注**/
} }
},//end data },//end data
@ -150,11 +165,12 @@ import XmProjectOverview from "./XmProjectOverview";
this.selProject=null; this.selProject=null;
}, },
tabClick(tab){ tabClick(tab){
if(this.selProject==null || !this.selProject.id){
this.projectVisible=true;
this.$notify({showClose: true, message:"请先选中左边项目", type: 'warning'});
}
this.showPanel=tab.name this.showPanel=tab.name
},
afterProjectAddSubmit(project){
this.$refs.xmProjectSelect.xmProjects.push(project)
this.$refs.xmProjectSelect.rowClick(project);
this.projectAddVisible=false;
} }
},//end methods },//end methods
components: { components: {
@ -169,6 +185,7 @@ import XmProjectOverview from "./XmProjectOverview";
XmProjectSelect, XmProjectSelect,
XmProjectForLink, XmProjectForLink,
XmProductProjectForLink, XmProductProjectForLink,
XmProjectAdd,
XmProjectOverview, XmProjectOverview,
}, },
mounted() { mounted() {

Write Preview
Loading…
Cancel
Save