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

优化条件选择 更多条件

master
陈裕财 3 years ago
parent
716a4a68f5
commit
2d6bfa860e
4 changed files with 135 additions and 83 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. 6
      src/permission.js
  2. 2
      src/views/login/components/login.vue
  3. 39
      src/views/xm/core/xmQuestion/XmQuestionMng.vue
  4. 171
      src/views/xm/core/xmTask/XmTaskMng.vue

6
src/permission.js
View File

@ -153,13 +153,13 @@ function getQueryVariable(variable,url){
function setIndexPath() { function setIndexPath() {
var indexPath=null var indexPath=null
var url=window.location.href; var url=window.location.href;
if(url.indexOf("/login")<=0){
if(url.indexOf("/login")<0){
var indexOf=url.indexOf("/#") var indexOf=url.indexOf("/#")
if(indexOf > 0){ if(indexOf > 0){
indexPath=url.substring(indexOf+2) indexPath=url.substring(indexOf+2)
localStorage.setItem("index-path",indexPath);
sessionStorage.setItem("index-path",indexPath);
}else{ }else{
localStorage.setItem("index-path",null);
sessionStorage.setItem("index-path",null);
} }
} }
} }

2
src/views/login/components/login.vue
View File

@ -312,7 +312,7 @@ export default {
}, },
//角色身份验证 //角色身份验证
rolesChecked(){ rolesChecked(){
var indexPath=localStorage.getItem("index-path");
var indexPath=sessionStorage.getItem("index-path");
if(!indexPath){ if(!indexPath){
indexPath="/" indexPath="/"
} }

39
src/views/xm/core/xmQuestion/XmQuestionMng.vue
View File

@ -27,7 +27,7 @@
<el-popover <el-popover
placement="top-start" placement="top-start"
title="更多条件、操作" title="更多条件、操作"
width="500"
width="800"
v-model="moreVisible" v-model="moreVisible"
trigger="manual" > trigger="manual" >
@ -38,39 +38,47 @@
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row> <el-row>
<font class="more-label-font">创建者:</font>
<mdp-select-user-xm label="选择创建者" v-model="filters.createUser" :clearable="true"></mdp-select-user-xm>
</el-row>
<el-row>
<font class="more-label-font">指派给:</font>
<mdp-select-user-xm label="选择负责人" v-model="filters.handlerUser" :clearable="true"></mdp-select-user-xm>
<el-col :span="12">
<font class="more-label-font">创建者:</font>
<mdp-select-user-xm label="选择创建者" v-model="filters.createUser" :clearable="true"></mdp-select-user-xm>
</el-col>
<el-col :span="12">
<font class="more-label-font">指派给:</font>
<mdp-select-user-xm label="选择负责人" v-model="filters.handlerUser" :clearable="true"></mdp-select-user-xm>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<font class="more-label-font">需求:</font> <font class="more-label-font">需求:</font>
<font v-if=" filters.menus && filters.menus.length>0"> <font v-if=" filters.menus && filters.menus.length>0">
<el-tag v-for="(item,index) in filters.menus" :key="index" closable @close="clearFiltersMenu(item)">{{item.menuName.substr(0,10)}}</el-tag> <el-tag v-for="(item,index) in filters.menus" :key="index" closable @close="clearFiltersMenu(item)">{{item.menuName.substr(0,10)}}</el-tag>
</font> </font>
<el-button v-else @click="showMenu" type="plian" icon="el-icon-search">选需求</el-button> <el-button v-else @click="showMenu" type="plian" icon="el-icon-search">选需求</el-button>
</el-row>
<el-row>
</el-col>
<el-col :span="12">
<font class="more-label-font">缺陷编号:</font> <font class="more-label-font">缺陷编号:</font>
<el-input v-model="filters.id" style="width:200px;" clearable></el-input> <el-input v-model="filters.id" style="width:200px;" clearable></el-input>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<font class="more-label-font">优先级:</font> <font class="more-label-font">优先级:</font>
<el-select v-model="filters.priority" placeholder="请选择优先级" clearable style="width:200px;"> <el-select v-model="filters.priority" placeholder="请选择优先级" clearable style="width:200px;">
<el-option v-for="(b,index) in dicts['priority']" :value="b.id" :key="index" :label="b.name">{{b.name}} <el-option v-for="(b,index) in dicts['priority']" :value="b.id" :key="index" :label="b.name">{{b.name}}
</el-option> </el-option>
</el-select> </el-select>
</el-row>
<el-row>
</el-col>
<el-col :span="12">
<font class="more-label-font">解决方案:</font> <font class="more-label-font">解决方案:</font>
<el-select v-model="filters.solution" placeholder="请选择解决方案" clearable style="width:200px;"> <el-select v-model="filters.solution" placeholder="请选择解决方案" clearable style="width:200px;">
<el-option v-for="(b,index) in dicts['bugSolution']" :value="b.id" :key="index" :label="b.name">{{b.name}} <el-option v-for="(b,index) in dicts['bugSolution']" :value="b.id" :key="index" :label="b.name">{{b.name}}
</el-option> </el-option>
</el-select> </el-select>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<font class="more-label-font">创建时间:</font> <font class="more-label-font">创建时间:</font>
<el-date-picker <el-date-picker
v-model="dateRanger" v-model="dateRanger"
@ -84,8 +92,8 @@
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
</el-row>
<el-row>
</el-col>
<el-col :span="12">
<font class="more-label-font">更新时间:</font> <font class="more-label-font">更新时间:</font>
<el-date-picker <el-date-picker
v-model="ltimeRanger" v-model="ltimeRanger"
@ -99,6 +107,7 @@
:default-time="['00:00:00','23:59:59']" :default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions" :picker-options="pickerOptions"
></el-date-picker> ></el-date-picker>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-button type="primary" style="float:right;" icon="el-icon-search" @click="searchXmQuestions">查询</el-button> <el-button type="primary" style="float:right;" icon="el-icon-search" @click="searchXmQuestions">查询</el-button>
@ -1094,4 +1103,8 @@
margin-top: 10px; margin-top: 10px;
margin-right: 40px; margin-right: 40px;
} }
>>> .el-date-editor--daterange.el-input, .el-date-editor--daterange.el-input__inner, .el-date-editor--timerange.el-input, .el-date-editor--timerange.el-input__inner {
width: 250px;
}
</style> </style>

171
src/views/xm/core/xmTask/XmTaskMng.vue
View File

@ -73,7 +73,7 @@
<el-popover <el-popover
placement="top-start" placement="top-start"
title="更多查询条件或者操作" title="更多查询条件或者操作"
width="700"
width="800"
trigger="manual" trigger="manual"
v-model="moreVisible" v-model="moreVisible"
> >
@ -99,18 +99,23 @@
</el-row> </el-row>
<el-divider></el-divider> <el-divider></el-divider>
<el-row> <el-row>
<font class="more-label-font">责任人:</font>
<mdp-select-user-xm label="选择责任人" v-model="filters.createUser" :clearable="true"></mdp-select-user-xm>
</el-row>
<el-row>
<font class="more-label-font">执行人:</font>
<mdp-select-user-xm label="选择执行人" v-model="filters.executor" :clearable="true"></mdp-select-user-xm>
<el-col :span="12">
<font class="more-label-font">责任人:</font>
<mdp-select-user-xm label="选择责任人" v-model="filters.createUser" :clearable="true"></mdp-select-user-xm>
</el-col>
<el-col :span="12">
<font class="more-label-font">执行人:</font>
<mdp-select-user-xm label="选择执行人" v-model="filters.executor" :clearable="true"></mdp-select-user-xm>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<font class="more-label-font">产品:</font <font class="more-label-font">产品:</font
> <xm-product-select :auto-select="false" :link-project-id="filters.selProject && filters.selProject.id?filters.selProject.id:null" @row-click="onProductSelected" @clear="onProductClearSelect"></xm-product-select> > <xm-product-select :auto-select="false" :link-project-id="filters.selProject && filters.selProject.id?filters.selProject.id:null" @row-click="onProductSelected" @clear="onProductClearSelect"></xm-product-select>
</el-row>
<el-row>
</el-col>
<el-col :span="12">
<font class="more-label-font">需求:</font> <font class="more-label-font">需求:</font>
<font v-if="filters.menus && filters.menus.length > 0"> <font v-if="filters.menus && filters.menus.length > 0">
<el-tag <el-tag
@ -124,9 +129,11 @@
<el-button v-else @click="showMenuStory" type="plian" icon="el-icon-search" <el-button v-else @click="showMenuStory" type="plian" icon="el-icon-search"
>选需求</el-button >选需求</el-button
> >
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<font class="more-label-font">技能:</font>
<el-col :span="12">
<font class="more-label-font">技能:</font>
<el-button <el-button
v-if="!filters.skillTags || filters.skillTags.length == 0" v-if="!filters.skillTags || filters.skillTags.length == 0"
icon="el-icon-search" icon="el-icon-search"
@ -142,42 +149,84 @@
@close="skillTagClear(skill)" @close="skillTagClear(skill)"
>{{ skill.skillName }}</el-tag >{{ skill.skillName }}</el-tag
> >
</el-col>
<el-col :span="12">
<font class="more-label-font">标签:</font>
<el-button
v-if="!filters.tags || filters.tags.length == 0"
@click.native="$refs.tagDialog.open()" icon="el-icon-search"
>选标签</el-button
>
<el-tag
v-else
@click="$refs.tagDialog.open()"
closable
@close="clearFiltersTag(filters.tags[0])"
>{{ filters.tags[0].tagName.substr(0, 5) }}等({{
filters.tags.length
}})个</el-tag
>
</el-col>
</el-row> </el-row>
<el-row>
<el-col :span="12" >
<font class="more-label-font">众包任务:</font>
<el-checkbox class="more-label-font"
v-model="filters.taskOut"
true-label="1"
false-label=""
>只查众包</el-checkbox
>
</el-col>
</el-row>
<el-row> <el-row>
<font class="more-label-font">标签:</font>
<el-button
v-if="!filters.tags || filters.tags.length == 0"
@click.native="$refs.tagDialog.open()" icon="el-icon-search"
>选标签</el-button
>
<el-tag
v-else
@click="$refs.tagDialog.open()"
closable
@close="clearFiltersTag(filters.tags[0])"
>{{ filters.tags[0].tagName.substr(0, 5) }}等({{
filters.tags.length
}})个</el-tag
>
</el-row>
<el-row>
<font class="more-label-font">众包任务:</font>
<el-checkbox class="more-label-font"
v-model="filters.taskOut"
true-label="1"
false-label=""
>众包</el-checkbox
>
</el-row>
<el-col :span="12">
<font class="more-label-font">最后变动日期:</font>
<mdp-date-range
v-model="filters"
type="daterange"
start-key="ltimeStart"
end-key="ltimeEnd"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
:auto-default="false"
key="ltime"
></mdp-date-range>
</el-col>
</el-row>
<el-row> <el-row>
<font class="more-label-font">计划开始时间:</font>
<el-col :span="12">
<font class="more-label-font">计划开始时间:</font>
<mdp-date-range
v-model="filters"
type="daterange"
start-key="planStartTimeStart"
end-key="planStartTimeEnd"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
:auto-default="false"
key="planStartTime"
></mdp-date-range>
</el-col>
<el-col :span="12">
<font class="more-label-font">实际开始时间:</font>
<mdp-date-range <mdp-date-range
v-model="filters" v-model="filters"
type="daterange" type="daterange"
start-key="planStartTimeStart"
end-key="planStartTimeEnd"
start-key="actStartTimeStart"
end-key="actStartTimeEnd"
unlink-panels unlink-panels
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
@ -185,11 +234,13 @@
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']" :default-time="['00:00:00', '23:59:59']"
:auto-default="false" :auto-default="false"
key="planStartTime"
></mdp-date-range> ></mdp-date-range>
</el-row>
</el-col>
</el-row>
<el-row> <el-row>
<font class="more-label-font">计划结束时间:</font>
<el-col :span="12">
<font class="more-label-font">计划结束时间:</font>
<mdp-date-range <mdp-date-range
v-model="filters" v-model="filters"
type="daterange" type="daterange"
@ -204,26 +255,9 @@
:auto-default="false" :auto-default="false"
key="planEndTime" key="planEndTime"
></mdp-date-range> ></mdp-date-range>
</el-row>
<el-row>
<font class="more-label-font">实际开始时间:</font>
<mdp-date-range
v-model="filters"
type="daterange"
start-key="actStartTimeStart"
end-key="actStartTimeEnd"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
:auto-default="false"
></mdp-date-range>
</el-row>
<el-row>
<font class="more-label-font">实际结束时间:</font>
</el-col>
<el-col :span="12">
<font class="more-label-font">实际结束时间:</font>
<mdp-date-range <mdp-date-range
v-model="filters" v-model="filters"
type="daterange" type="daterange"
@ -237,7 +271,8 @@
:default-time="['00:00:00', '23:59:59']" :default-time="['00:00:00', '23:59:59']"
:auto-default="false" :auto-default="false"
></mdp-date-range> ></mdp-date-range>
</el-row>
</el-col>
</el-row>
<el-row> <el-row>
<el-button style="float:right;" <el-button style="float:right;"
type="primary" type="primary"
@ -2195,7 +2230,7 @@ export default {
}; };
</script> </script>
<style scoped>
<style lang="scss" scoped>
.align-right { .align-right {
float: right; float: right;
} }
@ -2231,6 +2266,10 @@ export default {
font-size: 16px; font-size: 16px;
overflow-x: auto; overflow-x: auto;
overflow-y: hidden; overflow-y: hidden;
}
}
>>> .el-date-editor--daterange.el-input, .el-date-editor--daterange.el-input__inner, .el-date-editor--timerange.el-input, .el-date-editor--timerange.el-input__inner {
width: 250px;
}
</style> </style>
Write Preview
Loading…
Cancel
Save