diff --git a/src/components/dateRange/index.vue b/src/components/dateRange/index.vue index f2c41f68..f164e24b 100644 --- a/src/components/dateRange/index.vue +++ b/src/components/dateRange/index.vue @@ -111,8 +111,8 @@ export default { var end=new Date(); start.setTime(now.getTime() + 3600 * 1000 * 24 * this.defaultRange[0]); end.setTime(now.getTime() + 3600 * 1000 * 24 * this.defaultRange[1]); - this.dateRange.push(util.formatDate.format(start,this.valueFormat)) - this.dateRange.push(util.formatDate.format(end,this.valueFormat)) + this.dateRange.push(util.formatDate(start,this.valueFormat)) + this.dateRange.push(util.formatDate(end,this.valueFormat)) this.onDateRangeChange(this.dateRange); } } diff --git a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue index 9a65a84e..6ba3ac77 100644 --- a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue +++ b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue @@ -87,7 +87,7 @@ }, dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... - dateRanger:[], + maxTableHeight:300, visible:false, xmProjectWorkloadSetDays:[],