diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue index d7fef73d..52f8e295 100644 --- a/src/views/xm/core/xmProject/XmProjectMng.vue +++ b/src/views/xm/core/xmProject/XmProjectMng.vue @@ -2,7 +2,7 @@
- + @@ -13,57 +13,67 @@ - - - + - + 查询 - - - 显示方式: + width="600" + trigger="click" > + + + + 表格 卡片 - - - {{templateVisible?'隐藏模板':'显示模板'}} - 新手导航 - - - - 项目: - - + + + + + + + + - - 项目编号: - - - - 创建时间: - - - - 查询 - - + + + + + + + @@ -181,115 +191,122 @@ - - - - + + + + + + + + + + - - - - - - - - + + + @@ -397,17 +414,15 @@ this.searchXmProjects(); } }, - data() { - - const beginDate = new Date(); - const endDate = new Date(); - beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 ); + data() { return { filters: { key: '', productId:'', productName:'', id:'',//项目编号 + createTimeStart:'', + createTimeEnd:'', }, xmProjects: [],//查询结果 pageInfo:{//分页数据 @@ -435,16 +450,14 @@ }, /**begin 自定义属性请在下面加 请加备注**/ menukey: "all", - showType: true, + showType: false, showInfo: false, selectProject: null, finishFlag: false, xmRecordVisible: false, productSelectVisible:false, - maxTableHeight:300, - dateRanger: [ ], - pickerOptions: util.getPickerOptions('datarange'), - xmProjectCopy:{ + maxTableHeight:300, + xmProjectCopy:{ id:'',name:'',code:'',isTpl:'',copyPhase:'1',copyTask:'1',copyGroup:'1',copyGroupUser:'0',copyProduct:'1',tplType:'2', }, copyToVisible:false, @@ -492,10 +505,6 @@ //params.xxx=this.filters.key }else{ //params.xxx=xxxxx - } - - if(this.dateRanger&&this.dateRanger.length==2){ - } this.load.list = true; if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){ @@ -516,8 +525,8 @@ if(this.filters.status){ params.status = this.filters.status } - params.createTimeStart=this.dateRanger[0] - params.createTimeEnd=this.dateRanger[1] + params.createTimeStart=this.filters.createTimeStart + params.createTimeEnd=this.filters.createTimeEnd listXmProject(params).then((res) => { var tips=res.data.tips; if(tips.isOk){ @@ -821,14 +830,12 @@ onProductSelected:function(product){ this.filters.productId=product.id - this.filters.productName=product.productName - this.getXmProjects() + this.filters.productName=product.productName this.productSelectVisible=false; }, onProductClose:function(){ this.filters.productId='' - this.filters.productName='' - this.getXmProjects() + this.filters.productName='' }, onCopyToBtnClick(row){