floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

调整Glcc PR

This commit is contained in:
kingChan 2024-06-12 17:36:24 +08:00
parent f6f3aa53f9
commit 1d81361c6a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/queries/admins/glcc_examine_material.rb
View File

@ -13,8 +13,7 @@ class Admins::GlccExamineMaterial < ApplicationQuery
materials = GlccMediumTermExamineMaterial.all materials = GlccMediumTermExamineMaterial.all
# term # term
term = params[:term] || [1, 2] materials = materials.where(term: params[:term]) if params[:term].present?
materials = materials.where(term: term) if term.present?
#year #year
year = if params[:date] year = if params[:date]
params[:date][:year] params[:date][:year]

2
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 %> <%= 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"> <div class="form-group mr-2">
<label for="status">考核选项：</label> <label for="status">考核选项：</label>
<% status_options = [['全部',]['中期考核',1], ['结项考核', 2]] %> <% status_options = [['全部','']['中期考核',1], ['结项考核', 2]] %>
<%= select_tag(:term, options_for_select(status_options), class: 'form-control') %> <%= select_tag(:term, options_for_select(status_options), class: 'form-control') %>
</div> </div>