From d4d7f812a69b539203b6514d0a8bece07a64f241 Mon Sep 17 00:00:00 2001
From: daiao <35855898@qq.com>
Date: Wed, 20 Mar 2019 23:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A5=E9=94=99=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ec_years_controller.rb              | 1 +
 app/views/ec_majors/_major_addAcademicYear.html.erb | 2 +-
 app/views/ec_years/create.js.erb                    | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/ec_years_controller.rb b/app/controllers/ec_years_controller.rb
index 7d696a2b..e04d9506 100644
--- a/app/controllers/ec_years_controller.rb
+++ b/app/controllers/ec_years_controller.rb
@@ -38,6 +38,7 @@ class EcYearsController < ApplicationController
                     (!@major_school.template_major && @major_manager ? "立即配置" : "查看")
     @years = @major_school.ec_years
     @years = paginateHelper @years, 10
+    logger.info("1370740521")
     respond_to do |format|
       format.js
     end
diff --git a/app/views/ec_majors/_major_addAcademicYear.html.erb b/app/views/ec_majors/_major_addAcademicYear.html.erb
index abe559c1..224f3a47 100644
--- a/app/views/ec_majors/_major_addAcademicYear.html.erb
+++ b/app/views/ec_majors/_major_addAcademicYear.html.erb
@@ -17,7 +17,7 @@
     </div>
     <li class="clearfix mt10 edu-txt-center">
       <a href="javascript:void(0);" class="task-btn mr10" onclick="hideModal()">取消</a>
-      <a href="javascript:void(0);" class="task-btn task-btn-orange ml20" onclick="submit_data();">确定</a>
+      <a href="javascript:void(0);" class="task-btn task-btn-orange ml20" onclick="submit_data(); hideModal();">确定</a>
     </li>
   </div>
 </div>
diff --git a/app/views/ec_years/create.js.erb b/app/views/ec_years/create.js.erb
index 70099414..86148957 100644
--- a/app/views/ec_years/create.js.erb
+++ b/app/views/ec_years/create.js.erb
@@ -2,5 +2,4 @@
   notice_box("该界别已经存在,请勿重复创建")
 <% else %>
   $("#year_list").html('<%= j(render :partial => "ec_major_schools/year_list") %>')
-  hideModal();
 <% end %>
\ No newline at end of file