Merge branch 'develop' into educoder

app/controllers/managements_controller.rb

@@ -3511,14 +3511,17 @@ end
     apply_action.update_attributes(status: (params[:type] == "1" ? 2 : 1), reason: reject_reason, reject_description: params[:reject_description], dealer_id: User.current.id, noticed: false)
 
     User.where(:id => apply_action.user_id).first.update_attributes(:certification => (params[:type] == "1" ? 2 : 1))
-    user_id = User.find_by_sql("select id from users where concat(lastname,firstname) like '%#{search}%'")
-    @authorizations = ApplyAction.where(:container_type => "TrialAuthorization", :status => 0, :user_id => user_id).includes(:user)
-    @autu_count = @authorizations.count
-    @limit = 15
-    @is_remote = true
-    @autu_pages = Paginator.new @autu_count, @limit, params['page'] || 1
-    @offset ||= @autu_pages.offset
-    @authorizations = paginateHelper @authorizations, @limit
+
+    if params[:reject_type] != "revocation"
+      user_id = User.find_by_sql("select id from users where concat(lastname,firstname) like '%#{search}%'")
+      @authorizations = ApplyAction.where(:container_type => "TrialAuthorization", :status => 0, :user_id => user_id).includes(:user)
+      @autu_count = @authorizations.count
+      @limit = 15
+      @is_remote = true
+      @autu_pages = Paginator.new @autu_count, @limit, params['page'] || 1
+      @offset ||= @autu_pages.offset
+      @authorizations = paginateHelper @authorizations, @limit
+    end
     respond_to do |format|
       format.js
     end

app/helpers/managements_helper.rb

@@ -4,7 +4,7 @@ module ManagementsHelper
   def user_phone_addr phone
     addr = "--"
     unless phone.nil?
-      result = nil # MobInfo.lookup(phone[0,7])
+      result = MobInfo.lookup(phone[0,7])
       if result.present?
         addr = "#{result[:province]}-#{result[:city]}"
       end
@@ -15,7 +15,7 @@ module ManagementsHelper
   def user_ip_addr ip
     addr = "--"
     unless ip.nil?
-      result = nil # SM.find_by_ip(ip)
+      result = SM.find_by_ip(ip)
       if result.present?
         addr = "#{result[:province]}-#{result[:city]}"
       end

app/views/managements/_reject_authorization_model.html.erb

@@ -1,6 +1,6 @@
 <div class="modal reject-auth-modal" style="position: fixed;left: 0;top: 0;width: 100%;height: 100%;z-index: 100;display: none;">
   <div class="mask" style="position: absolute;width: 100%;height: 100%;background:rgba(0,0,0,1);opacity:0.5;"></div>
-  <div class="task-popup" style="width:600px;position: relative;margin: 100px auto 0;border-radius:10px;">
+  <div class="task-popup" style="width:600px;position: relative;margin: 80px auto 0;border-radius:10px;">
     <div class=" task-popup-title clearfix task-popup-bggrey">
       <%= title %>
     </div>
@@ -62,6 +62,8 @@
               <textarea class="remarktextarea fl panel-box-sizing candiate_answer" name="reject_description" placeholder="为选择的撤销原因补充备注说明...."></textarea>
             </li>
 
+            <li class="ml20 error color-red" style="display: none;"></li>
+
             <li class="clearfix mt20 edu-txt-center mb20">
               <a href="javascript:void(0);" class="task-btn mr10 cancel-btn">取消</a>
               <a href="javascript:void(0);" class="task-btn task-btn-orange ml20 submit-btn">确定</a>
@@ -77,11 +79,23 @@
     var modal = $(".modal.reject-auth-modal");
     var form = modal.find("#reject-auth-form");
     var applyIdInput = form.find("input[name='apply_id']");
+    var error = modal.find(".error");
 
     modal.on('click', '.submit-btn', function(){
+      if (!formValid()) { return; }
       form.submit();
     });
 
+    var formValid = function () {
+      error.html("").hide();
+      if (form.find("input[name='reasons[]']:checked").length == 0 || form.find("textarea[name='reject_description']").val() == '') {
+        error.html("原因和说明不能为空，请完善后再确认提交").show();
+        return false;
+      }
+
+      return true;
+    };
+
     var hideRejectModalFunc = function(){
       applyIdInput.val('');
       form.find("textarea[name='reject_description']").val('');