fe / yohobuy-portal-fe2 · Commits

Go to a project

Authored by 马力
Commit 931e42166d51ce8fca588da58c6c23b323843be7 2 parents f3f3e6f4 259249ac

Merge branch 'dev_意见反馈' into gray

Inline Side-by-side
Showing 2 changed files with 16 additions and 14 deletions
@@ -50,6 +50,10 @@ @@ -50,6 +50,10 @@
50 <div class="panel-col"> 50 <div class="panel-col">
51 <a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a> 51 <a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
52 <a id="filter-all" href="/suggest/suggest/index" class="btn btn-info">全部</a> 52 <a id="filter-all" href="/suggest/suggest/index" class="btn btn-info">全部</a>
  53 +
  54 + </div>
  55 + <div class="panel-col">
  56 + <a id="batchExport" href="javascript:;" class="btn btn-info">批量导出</a>
53 </div> 57 </div>
54 </div> 58 </div>
55 </div> 59 </div>
@@ -112,7 +116,6 @@ @@ -112,7 +116,6 @@
112 </label> 116 </label>
113 </div> 117 </div>
114 <div class="pull-right" style="margin-top: -10px; margin-bottom: 10px;"> 118 <div class="pull-right" style="margin-top: -10px; margin-bottom: 10px;">
115 - <a id="batchExport" href="javascript:;" class="btn btn-primary">批量导出</a>  
116 <a id="batchPublish" href="javascript:;" class="btn btn-primary">批量发送</a> 119 <a id="batchPublish" href="javascript:;" class="btn btn-primary">批量发送</a>
117 </div> 120 </div>
118 </script> 121 </script>
@@ -311,18 +311,17 @@ $(document).on('click', '#batchPublish', function () { @@ -311,18 +311,17 @@ $(document).on('click', '#batchPublish', function () {
311 * 批量导出 311 * 批量导出
312 */ 312 */
313 $(document).on('click', '#batchExport', function () { 313 $(document).on('click', '#batchExport', function () {
314 - var selectedArr = g.selected,  
315 - len = selectedArr.length,  
316 - idList = [];  
317 - if (len <= 0) {  
318 - common.util.__tip('请选择反馈', 'warning');  
319 - return; 314 + var getResult=function(){
  315 + return {
  316 + uid: common.util.__input('uid-filter'),
  317 + startTime: common.util.__input('startTime'),
  318 + endTime: common.util.__input('endTime'),
  319 + isHot: common.util.__input('isHot-filter'),
  320 + status: status,
  321 + clientType: common.util.__input('clientType-filter'),
  322 + appVersion: common.util.__input('choose-appVersion'),
  323 + replyPersonId: common.util.__input('choose-replyPersonName')
  324 + }
320 } 325 }
321 - $.each(selectedArr, function (i, value) {  
322 - idList.push(value['id']);  
323 - });  
324 - var data = {  
325 - id: idList.join(",")  
326 - };  
327 - window.open("/ajax/down?queryConf=" + JSON.stringify(data) + "&type=suggestExport"); 326 + window.open("/ajax/down?queryConf=" + JSON.stringify(getResult()) + "&type=suggestExport");
328 }); 327 });