diff --git a/static/js/project/listingItems/itemsList.js b/static/js/project/listingItems/itemsList.js index be55583..7eda625 100644 --- a/static/js/project/listingItems/itemsList.js +++ b/static/js/project/listingItems/itemsList.js @@ -49,10 +49,10 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime', 'swiper deptId: 100, projectNumber: '', projectShowStatus: '', - signupStartTime: '', - signupStopTime: '', - biddingStartTime: '', - biddingStopTime: '', + // signupStartTime: '', + // signupStopTime: '', + // biddingStartTime: '', + // biddingStopTime: '', pageNum: 1, pageSize: 20, } @@ -268,6 +268,7 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime', 'swiper tabCheck = function (deptId) { module.data.deptId = deptId; + console.log(deptId) $('#locInfoall').attr("class", "auction_hall_table_tab auction_loc"); $("#deptLocationContent div").attr("class", "auction_hall_table_tab auction_loc"); if (deptId == '') { @@ -358,14 +359,39 @@ define(['jquery', "template", "Tools", "itemsApi", "paging", 'dateTime', 'swiper module.data.form.deptId = module.data.deptId; module.data.form.projectNumber = module.data.projectNumber; module.data.form.projectShowStatus = module.data.projectShowStatus; - module.data.form.signupStartTime = $('#signStartTimeStr').val(); - module.data.form.signupStopTime = $('#signEndTimeStr').val(); - module.data.form.biddingStartTime = $('#auctionStartTimeStr').val(); - module.data.form.biddingStopTime = $('#endTimeStr').val(); + + console.log($('#signStartTimeStr').val()!=null) + + if (module.data.form.signupStartTime){ + delete module.data.form.signupStartTime; + } + if (module.data.form.signupStopTime){ + delete module.data.form.signupStopTime; + } + if (module.data.form.biddingStartTime){ + delete module.data.form.biddingStartTime; + } + if (module.data.form.biddingStopTime){ + delete module.data.form.biddingStopTime; + } + + if ($('#signStartTimeStr').val()!=''){ + module.data.form.signupStartTime = $('#signStartTimeStr').val(); + } + if ($('#signEndTimeStr').val()!=''){ + module.data.form.signupStopTime = $('#signEndTimeStr').val(); + } + if ($('#auctionStartTimeStr').val()!=''){ + module.data.form.biddingStartTime = $('#auctionStartTimeStr').val(); + } + if ($('#endTimeStr').val()!=''){ + module.data.form.biddingStopTime = $('#endTimeStr').val(); + } + module.data.form.pageNum = module.data.pageNum; module.data.form.pageSize = module.data.pageSize; - //console.log(module.data.form) + console.log(module.data.form) if (module.data.searchType == 'gyxm'){ tools.doGet(itemsList, module.data.form, module.itemList, true); diff --git a/view/listingItems/itemsList.html b/view/listingItems/itemsList.html index f411f2f..2c5c229 100644 --- a/view/listingItems/itemsList.html +++ b/view/listingItems/itemsList.html @@ -181,7 +181,7 @@