diff --git a/static/js/project/bidding/biddingList.js b/static/js/project/bidding/biddingList.js index 4d0c964..909db7f 100644 --- a/static/js/project/bidding/biddingList.js +++ b/static/js/project/bidding/biddingList.js @@ -66,33 +66,33 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT tools.getWebConfig(); $("#signStartTimeStr").datetime({ - type:"date", - value:[2019,9,31], - success:function(res){ + type: "date", + value: [new Date().getFullYear(),new Date().getMonth()+1,new Date().getDate()], + success: function (res) { console.log(res) } }) $("#signEndTimeStr").datetime({ - type:"date", - value:[2019,9,31], - success:function(res){ + type: "date", + value: [new Date().getFullYear(),new Date().getMonth()+1,new Date().getDate()], + success: function (res) { console.log(res) } }) $("#auctionStartTimeStr").datetime({ - type:"date", - value:[2019,9,31], - success:function(res){ + type: "date", + value: [new Date().getFullYear(),new Date().getMonth()+1,new Date().getDate()], + success: function (res) { console.log(res) } }) $("#endTimeStr").datetime({ - type:"date", - value:[2019,9,31], - success:function(res){ + type: "date", + value: [new Date().getFullYear(),new Date().getMonth()+1,new Date().getDate()], + success: function (res) { console.log(res) } }) @@ -211,6 +211,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT $("#secondDept div").attr("class","auction_hall_table_tab auction_loc"); if(id == '' && secondDeptId == ''){ $('#locInfoSecondall').addClass('auction_hall_table_tab_select'); + module.data.deptId = $('#deptLocationContent div.auction_hall_table_tab_select').attr("data"); }else{ $('#locInfoall'+id).addClass('auction_hall_table_tab_select'); module.data.deptId = secondDeptId; @@ -230,6 +231,10 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT } typeCheck = function(id,projectNumber){ + if(projectNumber==undefined){ + // projectNumber为undefined时,置空(直接传递给后台接口导致搜索问题) + projectNumber = ""; + } module.data.projectNumber = projectNumber;//标的物类型ID document.getElementById('standardTypeAll').className = 'auction_hall_table_tab'; if(id == ''){ diff --git a/static/js/project/listingItems/itemsList.js b/static/js/project/listingItems/itemsList.js index 69e781d..164df20 100644 --- a/static/js/project/listingItems/itemsList.js +++ b/static/js/project/listingItems/itemsList.js @@ -232,6 +232,7 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime'], functi $("#secondDept div").attr("class", "auction_hall_table_tab auction_loc"); if (id == '' && secondDeptId == '') { $('#locInfoSecondall').addClass('auction_hall_table_tab_select'); + module.data.deptId = $('#deptLocationContent div.auction_hall_table_tab_select').attr("data"); } else { $('#locInfoall' + id).addClass('auction_hall_table_tab_select'); module.data.deptId = secondDeptId; @@ -269,6 +270,10 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime'], functi } typeCheck = function (id, projectNumber) { + if(projectNumber==undefined){ + // projectNumber为undefined时,置空(直接传递给后台接口导致搜索问题) + projectNumber = ""; + } module.data.projectNumber = projectNumber;//标的物类型ID console.log(id+'----------------'+projectNumber) document.getElementById('standardTypeAll').className = 'auction_hall_table_tab'; diff --git a/view/bidding/biddingList.html b/view/bidding/biddingList.html index 56f5ee9..7be3707 100644 --- a/view/bidding/biddingList.html +++ b/view/bidding/biddingList.html @@ -138,7 +138,7 @@
@@ -154,7 +154,7 @@
@@ -192,28 +192,28 @@ - 报名时间 + 报名结束时间 - + data_input
- + data_input - 竞价时间 + 竞价结束时间 - + data_input
- + data_input
查询
@@ -231,8 +231,8 @@ 项目名称 竞价方式 - 报名截止时间 - 竞价开始时间 + 报名结束时间 + 竞价结束时间 标的底价 当前报价 竞价状态 @@ -246,7 +246,7 @@ {{value.projectName}} {{value.biddingType}} {{value.signupStopTime}} - {{value.biddingStartTime}} + {{value.biddingStopTime}} {{value.price}} {{value.money}} {{value.timeType}} diff --git a/view/listingItems/itemsList.html b/view/listingItems/itemsList.html index 76f270c..611e966 100644 --- a/view/listingItems/itemsList.html +++ b/view/listingItems/itemsList.html @@ -138,7 +138,7 @@
@@ -155,7 +155,7 @@
@@ -193,28 +193,28 @@ - 报名时间 + 报名结束时间 - + data_input
- + data_input - 竞价时间 + 竞价结束时间 - + data_input
- + data_input
查询