educode_sales 1.10.23 → 1.10.25

data/app/views/educode_sales/plans/edit_week.html.erb

@@ -14,6 +14,12 @@
       </div>
     </div>
     <% end %>
+    <div class="layui-inline">
+      <label class="layui-form-label required">计划类型</label>
+      <div class="layui-input-inline">
+        <%= select_tag "common_id", options_for_select(@commons,  @sale_plan.common_id),  class: 'required' %>
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
       <div class="layui-input-inline" style="width: 500px">

data/app/views/educode_sales/plans/index.json.jbuilder

@@ -12,6 +12,7 @@ json.data do
     json.follow_ups_count d.business.follow_ups_count
     json.finish_rate "#{d.finish_rate}%"
     json.updated_at d.updated_at.to_s
+    json.assign d.assign&.user&.real_name
   end
 end
 

data/app/views/educode_sales/plans/new_month.html.erb

@@ -6,6 +6,20 @@
         <input type="text" lay-verify="required" class="layui-input" id="new_month_month" autocomplete="off" name="month">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label required">计划类型</label>
+      <div class="layui-input-inline">
+        <%= select_tag "common_id", options_for_select(@commons), include_blank: true,  class: 'required' %>
+      </div>
+    </div>
+    <% if can?(:assign, EducodeSales::SalePlan) && @business && @business.staff_id != @current_admin.id %>
+      <div class="layui-inline">
+        <label class="layui-form-label required">指派给</label>
+        <div class="layui-input-inline">
+          <%= select_tag "assign_id", options_for_select(@staffs), include_blank: true,  class: 'required' %>
+        </div>
+      </div>
+    <% end %>
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
       <div class="layui-input-inline" style="width: 500px">

data/app/views/educode_sales/plans/new_week.html.erb

@@ -12,6 +12,20 @@
         <%= select_tag "weekly", options_for_select(@weeks,@week), class: 'required' %>
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label required">计划类型</label>
+      <div class="layui-input-inline">
+        <%= select_tag "common_id", options_for_select(@commons),include_blank: true,  class: 'required' %>
+      </div>
+    </div>
+    <% if can?(:assign, EducodeSales::SalePlan) && @business && @business.staff_id != @current_admin.id %>
+      <div class="layui-inline">
+        <label class="layui-form-label required">指派给</label>
+        <div class="layui-input-inline">
+          <%= select_tag "assign_id", options_for_select(@staffs), include_blank: true,  class: 'required' %>
+        </div>
+      </div>
+    <% end %>
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
       <div class="layui-input-inline" style="width: 500px">

data/config/routes.rb

@@ -379,6 +379,9 @@ EducodeSales::Engine.routes.draw do
       get :history
       get :show_teachers
       get :new_follow_up
+      get :show_follow
+      get :follow_list
+      get :edit_follow_record
       get :follow_ups
       post :add_advise
       get :upload_file
@@ -459,5 +462,6 @@ EducodeSales::Engine.routes.draw do
   end
 
   resources :teacher_follows
+  resources :idea_follows
 
 end

data/db/migrate/20230629130033_add_clazz_to_money_plans.rb

@@ -0,0 +1,6 @@
+class AddClazzToMoneyPlans < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_money_plans, :common_id, :integer
+    add_column :educode_sales_money_plans, :assign_id, :integer, comment: "指定者"
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.23'
+  VERSION = '1.10.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.23
+  version: 1.10.25
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -154,6 +154,7 @@ files:
 - app/controllers/educode_sales/customers_controller.rb
 - app/controllers/educode_sales/follow_ups_controller.rb
 - app/controllers/educode_sales/home_controller.rb
+- app/controllers/educode_sales/idea_follows_controller.rb
 - app/controllers/educode_sales/idea_recycles_controller.rb
 - app/controllers/educode_sales/ideas_controller.rb
 - app/controllers/educode_sales/import_teachers_controller.rb
@@ -428,6 +429,8 @@ files:
 - app/views/educode_sales/ideas/edit_follow_record.html.erb
 - app/views/educode_sales/ideas/files.html.erb
 - app/views/educode_sales/ideas/files.json.jbuilder
+- app/views/educode_sales/ideas/follow_list.html.erb
+- app/views/educode_sales/ideas/follow_list.json.jbuilder
 - app/views/educode_sales/ideas/follow_ups.json.jbuilder
 - app/views/educode_sales/ideas/history.html.erb
 - app/views/educode_sales/ideas/import.html.erb
@@ -741,6 +744,7 @@ files:
 - db/migrate/20230614141225_create_educode_sales_tags.rb
 - db/migrate/20230614141628_create_educode_sales_follow_up_tags.rb
 - db/migrate/20230614142145_create_educode_sales_watch_follow_ups.rb
+- db/migrate/20230629130033_add_clazz_to_money_plans.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb