Merge branch 'dev_意见反馈' into test5.7.1

@@ -50,6 +50,10 @@
                 <div class="panel-col">
                     <a id="filter-btn" href="javascript:;" class="btn btn-info">查询</a>
                     <a id="filter-all" href="/suggest/suggest/index" class="btn btn-info">全部</a>
+
+                </div>
+                <div class="panel-col">
+                    <a id="batchExport" href="javascript:;" class="btn btn-info">批量导出</a>
                 </div>
             </div>
         </div>
@@ -112,7 +116,6 @@
         </label>
     </div>
     <div class="pull-right" style="margin-top: -10px; margin-bottom: 10px;">
-        <a id="batchExport" href="javascript:;" class="btn btn-primary">批量导出</a>
         <a id="batchPublish" href="javascript:;" class="btn btn-primary">批量发送</a>
     </div>
 </script>

@@ -311,18 +311,17 @@ $(document).on('click', '#batchPublish', function () {
  * 批量导出
  */
 $(document).on('click', '#batchExport', function () {
-    var selectedArr = g.selected,
-        len = selectedArr.length,
-        idList = [];
-    if (len <= 0) {
-        common.util.__tip('请选择反馈', 'warning');
-        return;
+    var getResult=function(){
+        return {
+            uid: common.util.__input('uid-filter'),
+            startTime: common.util.__input('startTime'),
+            endTime: common.util.__input('endTime'),
+            isHot: common.util.__input('isHot-filter'),
+            status: status,
+            clientType: common.util.__input('clientType-filter'),
+            appVersion: common.util.__input('choose-appVersion'),
+            replyPersonId: common.util.__input('choose-replyPersonName')
         }
-    $.each(selectedArr, function (i, value) {
-        idList.push(value['id']);
-    });
-    var data = {
-        id: idList.join(",")
-    };
-    window.open("/ajax/down?queryConf=" + JSON.stringify(data) + "&type=suggestExport");
+    }
+    window.open("/ajax/down?queryConf=" + JSON.stringify(getResult()) + "&type=suggestExport");
 });
\ No newline at end of file