Browse Source

Merge pull request '新增GLCC PR检测全部选择' (#294) from KingChan/forgeplus:standalone_develop into standalone_develop

pull/347/head
KingChan 2 years ago
parent
commit
71ae7b3e57
2 changed files with 4 additions and 6 deletions
  1. +3
    -5
      app/queries/admins/glcc_examine_material.rb
  2. +1
    -1
      app/views/admins/glcc_pr_check/index.html.erb

+ 3
- 5
app/queries/admins/glcc_examine_material.rb View File

@@ -13,11 +13,9 @@ class Admins::GlccExamineMaterial < ApplicationQuery
materials = GlccMediumTermExamineMaterial.all

# term
term = params[:term] || [1,2]
if term.present?
materials = materials.where(term: term)
end
#year
term = params[:term].zero ? [1, 2] : params[:term]
materials = materials.where(term: term) if term.present?
#year
year = if params[:date]
params[:date][:year]
end


+ 1
- 1
app/views/admins/glcc_pr_check/index.html.erb View File

@@ -2,7 +2,7 @@
<%= form_tag(admins_glcc_pr_check_index_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
<div class="form-group mr-2">
<label for="status">考核选项:</label>
<% status_options = [['中期考核',1], ['结项考核', 2]] %>
<% status_options = [['全部',0]['中期考核',1], ['结项考核', 2]] %>
<%= select_tag(:term, options_for_select(status_options), class: 'form-control') %>
</div>


Loading…
Cancel
Save