Browse Source

优化

master
陈裕财 4 years ago
parent
commit
6311bdc8d7
  1. 6
      src/views/xm/core/xmMenu/XmMenuMng.vue
  2. 6
      src/views/xm/core/xmQuestion/XmQuestionEdit.vue

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

@ -306,6 +306,7 @@
tags:[],
parentMenu:null,
parentMenuList:[],
status:'',
},
xmMenus: [],//
pageInfo:{//
@ -424,6 +425,9 @@
params.pmenuId=this.filters.parentMenu.menuId
}
if(this.filters.status){
params.status=this.filters.status
}
if( this.dateRanger && this.dateRanger.length==2){
params.ctimeStart=this.dateRanger[0]
params.ctimeEnd=this.dateRanger[1]
@ -431,7 +435,7 @@
if(this.filters.tags && this.filters.tags.length>0){
params.tagIdList=this.filters.tags.map(i=>i.tagId)
}
if(!(params.ctimeStart||params.pmenuId||params.projectId||params.iterationId||params.iterationFilterType||params.mmUserid||params.key||params.taskFilterType||params.tagIdList)){
if(!(params.ctimeStart||params.pmenuId||params.projectId||params.iterationId||params.iterationFilterType||params.mmUserid||params.key||params.taskFilterType||params.tagIdList||params.status)){
params.isTop="1"
}
return params;

6
src/views/xm/core/xmQuestion/XmQuestionEdit.vue

@ -1,5 +1,6 @@
<template>
<section class="page-container padding border">
<el-row class="page-main page-height-90">
<el-row class="padding">
<font class="font">{{editForm.name}}</font>
</el-row>
@ -24,7 +25,7 @@
<el-step title="已关闭(可重新激活)" description="测试通过后变为已关闭,已关闭缺陷可以重新激活"></el-step>
</el-steps>
</el-row>
<el-row class="page-main page-height-70">
<el-row>
<el-form :model="editForm" :rules="editFormRules" ref="editForm">
<el-form-item label="隶属任务\需求" prop="taskName">
<el-tooltip content="隶属任务"><el-tag closable @click="showSelectTask" @close.stop="handleCloseTaskTag">{{editForm.taskName?editForm.taskName:'未关联任务'}}</el-tag> </el-tooltip>
@ -107,7 +108,8 @@
<xm-menu-select :is-select-menu="true" @selected="onSelectedMenu" :sel-project="selProject"></xm-menu-select>
</el-drawer>
</el-row>
<el-row class="padding">
</el-row>
<el-row class="page-bottom">
<el-button @click.native="handleCancel">取消</el-button>
<el-button v-if="editForm.bugStatus !='closed'" v-loading="load.edit" type="primary" @click.native="handleQuestion(editForm.bugStatus)" :disabled="load.edit==true">保存</el-button>
<el-button v-if="editForm.bugStatus=='active'" v-loading="load.edit" type="primary" @click.native="handleQuestion('confirmed')" :disabled="load.edit==true">确认</el-button>

Loading…
Cancel
Save