代销变价，品牌变价合作，批量导入&列表页面切换

@@ -137,12 +137,16 @@ $("#all-btn").click(function() {
 
 //批量导入按钮点击事件
 $('#import-btn').on('click', function() {
-    if ($('#basicTable').css('display') == 'none') {
-        location.reload();
-    }
-    $('#basicTable, .bulk-import').toggle();
-    $('.panel-default a').not('#import-btn').addClass('disabled');
-    $('.panel-default input, .panel-default select').attr('disabled', true);
+    $('#basicTable').hide();
+    $('#priceChangeSearch').hide();
+    $('.bulk-import').show();
+});
+
+//返回列表
+$('#return-btn').on('click', function() {
+    $('.bulk-import').hide();
+    $('#basicTable').show();
+    $('#priceChangeSearch').show();
 });
 
 $(' #sure-change, .priceTable-wrap').hide();

@@ -267,12 +267,16 @@ $("#all-btn").click(function() {
 
 //批量导入按钮点击事件
 $('#import-btn').on('click', function() {
-    if ($('#basicTable').css('display') == 'none') {
-        location.reload();
-    }
-    $('#basicTable, .bulk-import').toggle();
-    $('.panel-default a').not('#import-btn').addClass('disabled');
-    $('.panel-default input, .panel-default select').attr('disabled', true);
+    $('#basicTable').hide();
+    $('#priceChangeSearch').hide();
+    $('.bulk-import').show();
+});
+
+//返回列表
+$('#return-btn').on('click', function() {
+    $('.bulk-import').hide();
+    $('#basicTable').show();
+    $('#priceChangeSearch').show();
 });
 
 //批量导入

@@ -33,7 +33,7 @@
 </div>
 
 <div class="contentpanel">
-    <div class="panel panel-default" style="margin-bottom:10px;">
+    <div class="panel panel-default" id="priceChangeSearch" style="margin-bottom:10px;">
         <div class="panel-body">
             {{# filter}}
             <div class="row">
@@ -154,12 +154,15 @@
             {{/ bulkImport}}
         </div>
     </div>
+
     <div class="panel">
         <div class="dataTables_wrapper no-footer" id="basicTable"></div>
         
         {{# bulkImport}}
         <div class="panel bulk-import">
-            <div class="import-hd">
+            <a id="return-btn" href="javascript:;" class="btn btn-info" style="margin-bottom: 10px">返回列表</a>
+
+            <div class="import-hd" style="padding: 10px 20px; border: 1px solid #cccccc">
                 <span class="excel-upload-wrap">
                     <label>选择文件</label>
                     <input id="upload-input" name="file" class="btn btn-default excel-upload" type="file">
@@ -167,8 +170,8 @@
                 
                 <a class="excel-model" href="/ajax/link/{{download}}">表头下载</a>
                 <input id="sure-change" class="btn btn-primary" type="button" value="确定变价">
-
             </div>
+
             <ol id="error-msg" class="error-msg" style="color: red"></ol>
             <div class="priceTable-wrap">
                 
@@ -183,8 +186,6 @@
                 <a id="download-btn" class="btn btn-success" data-domain="{{domain}}" href="javascript:;">下载导入结果</a>
             </div>
         </div>
-
-        
         {{/ bulkImport}}
     </div>
 </div>