diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 6c78950e..2e97de4d 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -10,6 +10,57 @@
产品
+
+
+
+
+ 产品查询范围：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 创建时间:
+
+
+
+
+
+ 产品名称:
+
+
+
+
+
+ 查询
+
+
+
+
@@ -55,12 +106,7 @@
-
-
-
-
-
-
+
@@ -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 @@
\ No newline at end of file
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index 1fb18cc7..1014d095 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -10,7 +10,7 @@
@@ -18,38 +18,42 @@
产品查询范围：
-
-
-
-
+
+
+
+
-
-
- 查询{{userInfo.branchName}}机构下所有的产品
-
-
- 产品编号精确查找：
-
-
- 自动计算与{{userInfo.username}}有关的产品
-
-
- 智能匹配
-
+
+
+
+ 创建时间:
+
+
- 模糊查询关键字:
+ 产品名称:
- 查询
+ 查询
@@ -61,7 +65,7 @@
- 选择
+ 选择
@@ -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) => {
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 977bcd78..5c90b617 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -26,27 +26,44 @@
+ width="400"
+ trigger="click" >
- 未结束
+ 只查未结束项目
- {{filters.productName}}按产品过滤
+ 产品: {{filters.productName}}选择产品
-
-
-
-
-
+
+ 直观展示
+
- 我验收成功
- 我验收失败
- 我付款中
- 我付款成功
- 我放弃
+ 我验收成功
+ 我验收失败
+ 我付款中
+ 我付款成功
+ 我放弃
+
+
+ 创建时间:
+
+
+
+ 查询
+
@@ -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 {
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;
+}
\ No newline at end of file
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 4d36573c..0a26d8c6 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -6,8 +6,8 @@
-
- 全部状态
+
+ 全部状态
未完成
已完成
我关注
@@ -22,7 +22,7 @@
我放弃的
- 全部类型
+ 全部类型
{{i.optionName}}
众包
@@ -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',//0不区分我的，1 时我的任务
selProject:null,
skillTags:[],
taskOut:'',//1只查众包任务，0//只查本机构任务
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;