From cb67e29139723ff5254395f668678accf567d094 Mon Sep 17 00:00:00 2001 From: qinmingyuan <279378275@qq.com> Date: Sun, 8 Sep 2024 13:33:55 +0800 Subject: [PATCH] productions --- app/controllers/factory/admin/component_parts_controller.rb | 3 ++- .../admin/component_parts/_index/_product_tr.html.erb | 1 - app/views/factory/admin/component_parts/index.html.erb | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/factory/admin/component_parts_controller.rb b/app/controllers/factory/admin/component_parts_controller.rb index cf93c19f5..a9c450614 100644 --- a/app/controllers/factory/admin/component_parts_controller.rb +++ b/app/controllers/factory/admin/component_parts_controller.rb @@ -5,7 +5,8 @@ class Admin::ComponentPartsController < Admin::BaseController before_action :set_new_component_part, only: [:new, :create] def index - @component_parts = @component.component_parts.order(part_id: :asc).page(params[:page]) + @component_parts = @component.component_parts.order(part_id: :asc) + @productions = @component.part_taxon.productions.where.not(id: @component_parts.pluck(:part_id)).includes(:product) end private diff --git a/app/views/factory/admin/component_parts/_index/_product_tr.html.erb b/app/views/factory/admin/component_parts/_index/_product_tr.html.erb index 43a8dc600..6e1352952 100644 --- a/app/views/factory/admin/component_parts/_index/_product_tr.html.erb +++ b/app/views/factory/admin/component_parts/_index/_product_tr.html.erb @@ -8,4 +8,3 @@ -<%= render partial: 'production', layout: 'production_tr', collection: model.productions, as: :model %> diff --git a/app/views/factory/admin/component_parts/index.html.erb b/app/views/factory/admin/component_parts/index.html.erb index 76103dddf..1137d0644 100644 --- a/app/views/factory/admin/component_parts/index.html.erb +++ b/app/views/factory/admin/component_parts/index.html.erb @@ -11,5 +11,8 @@ <% end %> <%= render layout: 'product_table' do %> - <%= render partial: 'product_tbody', layout: 'product_tr', collection: @component.part_taxon.products, as: :model %> + <% @productions.group_by(&:product).each do |product, productions| %> + <%= render partial: 'product_tbody', layout: 'product_tr', locals: { model: product } %> + <%= render partial: 'production', layout: 'production_tr', collection: productions, as: :model %> + <% end %> <% end %>