From 0710627100be7a93b0cdbca036d280f5540b21eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com>
Date: Tue, 9 May 2023 16:46:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/js/project/bidding/biddingList.js | 47 +++++++++++++++++++-----
 1 file changed, 37 insertions(+), 10 deletions(-)

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);