Browse Source

查询条件优化

master
陈裕财 5 years ago
parent
commit
ddb7c7f946
  1. 97
      src/views/xm/core/xmProduct/XmProductMng.vue
  2. 63
      src/views/xm/core/xmProduct/XmProductSelect.vue
  3. 79
      src/views/xm/core/xmProject/XmProjectMng.vue
  4. 15
      src/views/xm/core/xmTask/XmTaskMng.vue

97
src/views/xm/core/xmProduct/XmProductMng.vue

@ -10,6 +10,57 @@
<el-button type="primary" @click="showAdd" icon="el-icon-plus">产品</el-button>
<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete"></el-button>
<el-popover
placement="top-start"
title=""
width="400"
trigger="click" >
<el-row>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">
产品查询范围
</font>
<el-select size="mini" v-model="filters.queryScope" style="width:100%;" placeholder="产品查询范围">
<el-option :label="userInfo.branchName+'机构下所有的产品'" value="branchId"></el-option>
<el-option label="我相关的产品" value="compete"></el-option>
<el-option label="按产品编号精确查找" value="productId"></el-option>
<el-option label="后台智能匹配" value=""></el-option>
</el-select>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-input v-if="filters.queryScope=='productId'" size="mini" v-model="filters.id" style="width:100%;" placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">
</el-input>
</el-col>
<el-col v-show="!selProject&&filters.queryScope!='productId'" :span="24" style="padding-top:5px;">
<font class="more-label-font">创建时间:</font>
<el-date-picker
v-model="dateRanger"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
value-format="yyyy-MM-dd"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
></el-date-picker>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">
产品名称:
</font>
<el-input size="mini" v-model="filters.key" style="width:100%;" placeholder="输入产品名字关键字">
</el-input>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-button type="primary" size="mini" @click="searchXmProducts" >查询</el-button>
</el-col>
</el-row>
<el-button slot="reference" icon="el-icon-more" circle></el-button>
</el-popover>
</el-row>
<el-row class="app-container">
<!--列表 XmProduct 产品表-->
@ -55,12 +106,7 @@
</el-col>
</el-row>
<el-button slot="reference" icon="el-icon-more" circle></el-button>
</el-popover>
</el-popover>
</template>
</el-table-column>
</el-table>
@ -110,9 +156,14 @@
])
},
data() {
const beginDate = new Date();
const endDate = new Date();
beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
return {
filters: {
key: ''
key: '',
queryScope:'compete',//compete/branchId/''/productId
id:'',//
},
xmProducts: [],//
pageInfo:{//
@ -141,6 +192,11 @@
iterationVisible:false,
productStateVisible:false,
tableHeight:300,
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
pickerOptions: util.pickerOptions('datarange'),
/**begin 自定义属性请在下面加 请加备注**/
/**end 自定义属性请在上面加 请加备注**/
@ -205,7 +261,28 @@
orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
}
params.orderBy= orderBys.join(",")
}
params.queryScope=this.filters.queryScope
if(this.filters.queryScope=='productId'){
if(!this.filters.id){
this.$message({ message:"您选择了按产品编号精确查找模式,请输入产品编号", type: 'error' });
return;
}
params.id=this.filters.id
}
if(this.filters.queryScope=="branchId"){
params.branchId=this.userInfo.branchId
params.projectId=null;
}
if(!this.selProject && this.filters.queryScope!='productId'){
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({ message: "创建日期范围不能为空", type: 'error' });
return;
}
params.ctimeStart=this.dateRanger[0]+" 00:00:00"
params.ctimeEnd=this.dateRanger[1]+" 23:59:59"
}
if(this.filters.key!==""){
params.key="%"+this.filters.key+"%"
@ -348,4 +425,10 @@
<style scoped>
.more-label-font{
text-align:center;
float:left;
padding-top:10px;
}
</style>

63
src/views/xm/core/xmProduct/XmProductSelect.vue

@ -10,7 +10,7 @@
<el-popover
placement="top-start"
title=""
width="200"
width="400"
trigger="click" >
<el-row>
<el-col :span="24" style="padding-top:5px;">
@ -18,38 +18,42 @@
产品查询范围
</font>
<el-select size="mini" v-model="filters.queryScope" style="width:100%;" placeholder="产品查询范围">
<el-option label="全公司" value="branchId"></el-option>
<el-option label="我相关" value="compete"></el-option>
<el-option label="产品编号" value="productId"></el-option>
<el-option label="智能匹配" value=""></el-option>
<el-option :label="userInfo.branchName+'机构下所有的产品'" value="branchId"></el-option>
<el-option label="我相关的产品" value="compete"></el-option>
<el-option label="产品编号精确查找" value="productId"></el-option>
<el-option label="后台智能匹配" value=""></el-option>
</el-select>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font" v-if="filters.queryScope=='branchId'">
查询{{userInfo.branchName}}机构下所有的产品
</font>
<font class="more-label-font" v-else-if="filters.queryScope=='productId'">
产品编号精确查找
</font>
<font class="more-label-font" v-else-if="filters.queryScope=='compete'">
自动计算与{{userInfo.username}}有关的产品
</font>
<font class="more-label-font" v-else>
智能匹配
</font>
<el-col :span="24" style="padding-top:5px;">
<el-input v-if="filters.queryScope=='productId'" size="mini" v-model="filters.id" style="width:100%;" placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">
</el-input>
</el-col>
<el-col v-show="!selProject&&filters.queryScope!='productId'" :span="24" style="padding-top:5px;">
<font class="more-label-font">创建时间:</font>
<el-date-picker
v-model="dateRanger"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
value-format="yyyy-MM-dd"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
></el-date-picker>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">
模糊查询关键字:
产品名称:
</font>
<el-input size="mini" v-model="filters.key" style="width:100%;" placeholder="输入产品名字关键字">
</el-input>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-button size="mini" @click="searchXmProducts" >查询</el-button>
<el-button type="primary" size="mini" @click="searchXmProducts" >查询</el-button>
</el-col>
</el-row>
<el-button slot="reference" size="mini" icon="el-icon-more" circle></el-button>
@ -61,7 +65,7 @@
</el-table-column>
<el-table-column v-if="isSelectProduct==true" label="操作" width="100" fixed="right" >
<template slot-scope="scope">
<el-button @click="selectedProduct( scope.row,scope.$index)">选择</el-button>
<el-button type="primary" @click="selectedProduct( scope.row,scope.$index)">选择</el-button>
</template>
</el-table-column>
</el-table>
@ -86,6 +90,9 @@
])
},
data() {
const beginDate = new Date();
const endDate = new Date();
beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
return {
filters: {
key: '',
@ -119,6 +126,11 @@
iterationVisible:false,
productStateVisible:false,
tableHeight:300,
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
pickerOptions: util.pickerOptions('datarange'),
/**begin 自定义属性请在下面加 请加备注**/
@ -188,7 +200,14 @@
params.branchId=this.userInfo.branchId
params.projectId=null;
}
if(!this.selProject && this.filters.queryScope!='productId'){
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({ message: "创建日期范围不能为空", type: 'error' });
return;
}
params.ctimeStart=this.dateRanger[0]+" 00:00:00"
params.ctimeEnd=this.dateRanger[1]+" 23:59:59"
}
this.load.list = true;
listXmProductWithState(params).then((res) => {

79
src/views/xm/core/xmProject/XmProjectMng.vue

@ -26,27 +26,44 @@
<el-popover
placement="top-start"
title=""
width="200"
trigger="hover" >
width="400"
trigger="click" >
<el-row>
<el-col :span="24" style="padding-top:5px;">
<el-checkbox v-model="finishFlag">未结束</el-checkbox>
<el-checkbox v-model="finishFlag">只查未结束项目</el-checkbox>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-tag v-if="filters.productId" closable @close="onProductClose">{{filters.productName}}</el-tag><el-button v-else type="text" plain @click.native="productSelectVisible=true">按产品过滤</el-button>
<font v-if="filters.productId" class="more-label-font">产品:</font> <el-tag v-if="filters.productId" closable @close="onProductClose">{{filters.productName}}</el-tag><el-button v-else @click.native="productSelectVisible=true" size="mini">选择产品</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-button :loading="load.list" v-if="!showType" :class="{'changebtn-active':showType}" plain type="text" @click="showType=true" icon="el-icon-menu"></el-button>
<el-button :loading="load.list" v-else :class="{'changebtn-active':!showType}" plain type="text" @click="showType=false" icon="el-icon-more"></el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-checkbox v-model="showType" :false-label="false" :true-label="true">直观展示</el-checkbox>
</el-col>
<el-col :span="24" style="padding-top:5px; ">
<el-button class="hidden-lg-and-up hidden-btn" style="margin-left:10px;" @click="handleSelect('myExecuserStatus3')">我验收成功</el-button>
<el-button class="hidden-lg-and-up hidden-btn" @click="handleSelect('myExecuserStatus4')">我验收失败</el-button>
<el-button class="hidden-lg-and-up hidden-btn" @click="handleSelect('myExecuserStatus5')">我付款中</el-button>
<el-button class="hidden-xl-and-up hidden-btn" @click="handleSelect('myExecuserStatus6')">我付款成功</el-button>
<el-button class="hidden-xl-and-up hidden-btn" @click="handleSelect('myExecuserStatus7')">我放弃</el-button>
<el-button size="mini" class="hidden-lg-and-up hidden-btn" style="margin-left:10px;" @click="handleSelect('myExecuserStatus3')">我验收成功</el-button>
<el-button size="mini" class="hidden-lg-and-up hidden-btn" @click="handleSelect('myExecuserStatus4')">我验收失败</el-button>
<el-button size="mini" class="hidden-lg-and-up hidden-btn" @click="handleSelect('myExecuserStatus5')">我付款中</el-button>
<el-button size="mini" class="hidden-xl-and-up hidden-btn" @click="handleSelect('myExecuserStatus6')">我付款成功</el-button>
<el-button size="mini" class="hidden-xl-and-up hidden-btn" @click="handleSelect('myExecuserStatus7')">我放弃</el-button>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<font class="more-label-font">创建时间:</font>
<el-date-picker
v-model="dateRanger"
type="daterange"
align="right"
unlink-panels
range-separator="至"
start-placeholder="开始日期"
end-placeholder="完成日期"
value-format="yyyy-MM-dd"
:default-time="['00:00:00','23:59:59']"
:picker-options="pickerOptions"
></el-date-picker>
</el-col>
<el-col :span="24" style="padding-top:5px;">
<el-button size="mini" type="primary" icon="el-icon-search" @click="searchXmProjects">查询</el-button>
</el-col>
</el-row>
<el-button type="text" class="right-btn" slot="reference" icon="el-icon-d-arrow-right"></el-button>
</el-popover>
@ -223,14 +240,18 @@
watch: {
"showType": function(val){
console.log("shotType_change");
this.xmProjects = [];
this.getXmProjects();
//this.xmProjects = [];
//this.getXmProjects();
},
"finishFlag":function(val){
this.searchXmProjects();
}
},
data() {
const beginDate = new Date();
const endDate = new Date();
beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
return {
filters: {
key: '',
@ -270,6 +291,11 @@
xmRecordVisible: false,
productSelectVisible:false,
tableHeight:300,
dateRanger: [
util.formatDate.format(beginDate, "yyyy-MM-dd"),
util.formatDate.format(endDate, "yyyy-MM-dd")
],
pickerOptions: util.pickerOptions('datarange'),
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@ -313,10 +339,12 @@
}else{
//params.xxx=xxxxx
}
this.load.list = true;
if(this.showType){
params = {};
}
if(!this.dateRanger || this.dateRanger.length==0){
this.$message({ message: "创建日期范围不能为空", type: 'error' });
return;
}
this.load.list = true;
if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
let orderBys=[];
for(var i=0;i<this.pageInfo.orderFields.length;i++){
@ -331,8 +359,9 @@
params = this.menuFilter(params);
if(this.filters.productId){
params.productId = this.filters.productId
}
params.branchId = this.userInfo.branchId;
}
params.createTimeStart=this.dateRanger[0]+" 00:00:00"
params.createTimeEnd=this.dateRanger[1]+" 23:59:59"
listXmProject(params).then((res) => {
var tips=res.data.tips;
if(tips.isOk){
@ -810,4 +839,10 @@
overflow-y: auto;
}
}
.more-label-font{
text-align:center;
float:left;
padding-top:10px;
}
</style>

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

@ -6,8 +6,8 @@
</el-col>
<el-col :span="isTaskCenter!='1' && currentProject?20:24" class="app-container">
<el-row>
<el-select v-model="filters.selKey" placeholder="请选择任务状态" clearable @change="changeSelKey">
<el-option class="showall" value="all" label="全部状态">全部状态</el-option>
<el-select v-model="selkey" placeholder="请选择任务状态" clearable @change="changeSelKey">
<el-option class="showall" value="" label="全部状态">全部状态</el-option>
<el-option value="work" label="未完成">未完成</el-option>
<el-option value="finish" label="已完成">已完成</el-option>
<el-option value="myFocus" label="我关注">我关注</el-option>
@ -22,7 +22,7 @@
<el-option value="myExecuserStatus7" label="我放弃的">我放弃的</el-option>
</el-select>
<el-select v-model="filters.taskType" placeholder="请选择任务类型" clearable @change="changeTaskType">
<el-option class="showall" value="all" label="全部类型">全部类型</el-option>
<el-option class="showall" value="" label="全部类型">全部类型</el-option>
<el-option v-for="(i,index) in options.taskType" :value="i.optionValue" :label="i.optionName" :key="index">{{i.optionName}}</el-option>
</el-select>
<el-checkbox v-model="filters.taskOut" true-label="1" false-label="">众包</el-checkbox>
@ -614,14 +614,15 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 3 );
return {
filters: {
key: '',
key: '',
isMyTask: '0',//01
selProject:null,
skillTags:[],
taskOut:'',//10//
menus:[],
createUser:null,//
executor:null//
executor:null,//
taskType:'',
},
xmTasks: [],//
pageInfo:{//
@ -660,7 +661,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
/**begin 自定义属性请在下面加 请加备注**/
taskStateList: ["待领取","已领取执行中","已完工","已结算"],
selkey: "all",
selkey: "",
drawerVisible: false,
progress_show: true,
isChild: false,
@ -704,7 +705,7 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
changeSelKey(index){
this.selkey = index;
this.getXmTasks();
this.searchXmTasks();
},
changeTaskType(index){
this.filters.taskType = index;

Loading…
Cancel
Save