diff --git a/static/js/project/bidding/biddingList.js b/static/js/project/bidding/biddingList.js index 636bacc..9e89e96 100644 --- a/static/js/project/bidding/biddingList.js +++ b/static/js/project/bidding/biddingList.js @@ -22,7 +22,7 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT //总页数 pageCount:0, //标的物选中项id - deptId:'', + deptId:'100', //标的所在地选中 secondDeptId:'', //标的物类型ID @@ -38,13 +38,13 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT //竞价结束时间 biddingStopTime:'', form:{ - deptId:'', + deptId:100, projectNumber:'', projectShowStatus:'', - signupStartTime:'', - signupStopTime:'', - biddingStartTime:'', - biddingStopTime:'', + // signupStartTime:'', + // signupStopTime:'', + // biddingStartTime:'', + // biddingStopTime:'', pageNum:1, pageSize:1, } @@ -327,13 +327,40 @@ define(['jquery', "template", "Tools", "biddingApi", "itemsApi", "paging",'dateT 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(); + + // module.data.form.signupStartTime= $('#signStartTimeStr').val(); + // module.data.form.signupStopTime= $('#signEndTimeStr').val(); + // module.data.form.biddingStartTime= $('#auctionStartTimeStr').val(); + // module.data.form.biddingStopTime= $('#endTimeStr').val(); module.data.form.pageNum= module.data.pageNum; module.data.form.pageSize= module.data.pageSize; + 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(); + } + console.log(module.data.form) tools.doGet(biddingList, module.data.form, module.biddingList, true);