Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_web

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 == ''){

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

view/bidding/biddingList.html

@@ -138,7 +138,7 @@
                             <script id="deptTypeData" type="text/html">
                                 <div class="auction_hall_table_tab auction_hall_table_tab_select" onclick="typeCheck('')" id="standardTypeAll">全部</div>
                                 {{each deptTypeList as value i}}
-                                <div class="auction_hall_table_tab" id="standardType{{value.dictSort}}" onclick="typeCheck({{value.dictSort}},{{value.dictCode}})">{{value.dictLabel}}</div>
+                                <div class="auction_hall_table_tab" id="standardType{{value.dictSort}}" onclick="typeCheck({{value.dictSort}},{{value.dictValue}})">{{value.dictLabel}}</div>
                                 {{/each}}
                             </script>
                             <div class="auction_all_one2" id="deptTypeContent"></div>
@@ -154,7 +154,7 @@
                         <div class="auction_all_right">
                             <script id="deptLocationData" type="text/html">
                                 {{each deptLocationList as value i}}
-                                <div class="auction_hall_table_tab auction_loc" id="locInfoall{{value.deptId}}" onclick="tabCheck({{value.deptId}})">{{value.deptName}}</div>
+                                <div class="auction_hall_table_tab auction_loc" id="locInfoall{{value.deptId}}" data="{{value.deptId}}" onclick="tabCheck({{value.deptId}})">{{value.deptName}}</div>
                                 {{/each}}
                                 <div class="clear"></div>
                             </script>
@@ -192,28 +192,28 @@
                     </td>
                 </tr>
                 <tr class="auction_tr">
-                    <td class="auction_td">报名时间</td>
+                    <td class="auction_td">报名结束时间</td>
                     <td style="position: relative">
-                        <input type="text" class="data_input datas_input" placeholder="请选择日期" id="signStartTimeStr">
+                        <input type="text" class="data_input datas_input" placeholder="请选择日期" id="signStartTimeStr" autocomplete="off">
                         <img class="input_data_icon" src="../../static/images/data_input.png" alt="data_input"/>
 
                         <div class="data_input_line"></div>
 
-                        <input type="text" class="data_input2 datas_input" placeholder="请选择日期" id="signEndTimeStr">
+                        <input type="text" class="data_input2 datas_input" placeholder="请选择日期" id="signEndTimeStr" autocomplete="off">
                         <img class="input_data_icon input_data_icon2" src="../../static/images/data_input.png" alt="data_input"/>
 
                         <!--  <div class="input_data_btn" onclick="sign_query()">查询</div> -->
                     </td>
                 </tr>
                 <tr class="auction_tr">
-                    <td class="auction_td">竞价时间</td>
+                    <td class="auction_td">竞价结束时间</td>
                     <td style="position: relative">
-                        <input type="text" class="data_input3 datas_input" placeholder="请选择日期" id="auctionStartTimeStr">
+                        <input type="text" class="data_input3 datas_input" placeholder="请选择日期" id="auctionStartTimeStr" autocomplete="off">
                         <img class="input_data_icon" src="../../static/images/data_input.png" alt="data_input"/>
 
                         <div class="data_input_line"></div>
 
-                        <input type="text" class="data_input4 datas_input" placeholder="请选择日期" id="endTimeStr">
+                        <input type="text" class="data_input4 datas_input" placeholder="请选择日期" id="endTimeStr" autocomplete="off">
                         <img class="input_data_icon input_data_icon2" src="../../static/images/data_input.png" alt="data_input"/>
 
                         <div class="input_data_btn" onclick="goSearch()">查询</div>
@@ -231,8 +231,8 @@
             <tr>
                 <td>项目名称</td>
                 <td>竞价方式</td>
-                <td>报名截止时间</td>
-                <td>竞价开始时间</td>
+                <td>报名结束时间</td>
+                <td>竞价结束时间</td>
                 <td>标的底价</td>
                 <td>当前报价</td>
                 <td>竞价状态</td>
@@ -246,7 +246,7 @@
                         <td title="{{value.projectName}}">{{value.projectName}}</td>
                         <td>{{value.biddingType}}</td>
                         <td>{{value.signupStopTime}}</td>
-                        <td>{{value.biddingStartTime}}</td>
+                        <td>{{value.biddingStopTime}}</td>
                         <td>{{value.price}}</td>
                         <td>{{value.money}}</td>
                         <td>{{value.timeType}}</td>

view/listingItems/itemsList.html

@@ -138,7 +138,7 @@
                             <script id="deptTypeData" type="text/html">
                                 <div class="auction_hall_table_tab auction_hall_table_tab_select" onclick="typeCheck('')" id="standardTypeAll">全部</div>
                                 {{each deptTypeList as value i}}
-                                    <div class="auction_hall_table_tab" id="standardType{{value.dictSort}}" onclick="typeCheck({{value.dictSort}},{{value.dictCode}})">{{value.dictLabel}}</div>
+                                    <div class="auction_hall_table_tab" id="standardType{{value.dictSort}}" onclick="typeCheck({{value.dictSort}},{{value.dictValue}})">{{value.dictLabel}}</div>
                                 {{/each}}
                             </script>
                             <div class="auction_all_one2" id="deptTypeContent"></div>
@@ -155,7 +155,7 @@
                             <div class="auction_all_one" id="deptLocationContent">
                                 <script id="deptLocationData" type="text/html">
                                     {{each deptLocationList as value i}}
-                                    <div class="auction_hall_table_tab auction_loc" id="locInfoall{{value.deptId}}" onclick="tabCheck({{value.deptId}})">{{value.deptName}}</div>
+                                    <div class="auction_hall_table_tab auction_loc" id="locInfoall{{value.deptId}}" data="{{value.deptId}}" onclick="tabCheck({{value.deptId}})">{{value.deptName}}</div>
                                     {{/each}}
                                     <div class="clear"></div>
                                 </script>
@@ -193,28 +193,28 @@
                     </td>
                 </tr>
                 <tr class="auction_tr">
-                    <td class="auction_td">报名时间</td>
+                    <td class="auction_td">报名结束时间</td>
                     <td style="position: relative">
-                        <input type="text" class="data_input datas_input" placeholder="请选择日期" id="signStartTimeStr">
+                        <input type="text" class="data_input datas_input" placeholder="请选择日期" id="signStartTimeStr" autocomplete="off">
                         <img class="input_data_icon" src="../../static/images/data_input.png" alt="data_input"/>
 
                         <div class="data_input_line"></div>
 
-                        <input type="text" class="data_input2 datas_input" placeholder="请选择日期" id="signEndTimeStr">
+                        <input type="text" class="data_input2 datas_input" placeholder="请选择日期" id="signEndTimeStr" autocomplete="off">
                         <img class="input_data_icon input_data_icon2" src="../../static/images/data_input.png" alt="data_input"/>
 
                         <!--  <div class="input_data_btn" onclick="sign_query()">查询</div> -->
                     </td>
                 </tr>
                 <tr class="auction_tr">
-                    <td class="auction_td">竞价时间</td>
+                    <td class="auction_td">竞价结束时间</td>
                     <td style="position: relative">
-                        <input type="text" class="data_input3 datas_input" placeholder="请选择日期" id="auctionStartTimeStr">
+                        <input type="text" class="data_input3 datas_input" placeholder="请选择日期" id="auctionStartTimeStr" autocomplete="off">
                         <img class="input_data_icon" src="../../static/images/data_input.png" alt="data_input"/>
 
                         <div class="data_input_line"></div>
 
-                        <input type="text" class="data_input4 datas_input" placeholder="请选择日期" id="endTimeStr">
+                        <input type="text" class="data_input4 datas_input" placeholder="请选择日期" id="endTimeStr" autocomplete="off">
                         <img class="input_data_icon input_data_icon2" src="../../static/images/data_input.png" alt="data_input"/>
 
                         <div class="input_data_btn" onclick="goSearch()">查询</div>