educode_sales 0.9.69 → 0.9.71

data/app/views/educode_sales/teachers/edit.html.erb

@@ -4,17 +4,24 @@
     <div class="layui-inline">
       <label class="layui-form-label required">姓名</label>
       <div class="layui-input-block">
-        <input type="text" name="name" autocomplete="off" lay-verify="required"
+        <input type="text" name="name" autocomplete="off" lay-verify="required" style="width: 198px"
                class="layui-input" placeholder="请输入" value="<%= @teacher.name %>">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label ">真实姓名</label>
+      <div class="layui-input-block">
+        <input type="text" name="realname" autocomplete="off" lay-verify="required" class="layui-input" placeholder="请输入" value="<%= @teacher.realname %>">
+      </div>
+    </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label ">职称</label>
       <div class="layui-input-block">
         <%= select_tag "professional_title", options_for_select(['教授', '研究员', '副教授', '副研究员', '讲师', '助理研究员', '助理教授'], @teacher.professional_title), { include_blank: true } %>
       </div>
     </div>
-    <br>
+   
     <div class="layui-inline">
       <label class="layui-form-label ">职务</label>
       <div class="layui-input-block">
@@ -22,13 +29,13 @@
                class="layui-input" placeholder="请输入" value="<%= @teacher.job %>">
       </div>
     </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label ">来源</label>
       <div class="layui-input-block">
         <%= select_tag "source_id", options_for_select(EducodeSales::Common.where(clazz: 'teacher_source').pluck(:name, :id), @teacher.source_id), { include_blank: true } %>
       </div>
     </div>
-    <br>
     <div class="layui-inline">
       <label class="layui-form-label ">微信号</label>
       <div class="layui-input-block">

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

@@ -26,6 +26,13 @@ json.data do
     json.latest_time (d['latest_time'] ? DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d['latest_time'].strftime("%Y-%m-%d")) : DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d.created_at.strftime("%Y-%m-%d"))).to_i
 
     json.staff_manage @staff_manages[d.department&.school&.province]&.join(",")
+    json.sales_manage @sales_manages[d.department&.school&.province]&.join(",")
+
+    if d.department_id
+      json.business_count EducodeSales::Business.where(department_id: d.department_id).size
+    else
+      json.business_count 0
+    end
 
     json.majors d.department&.department_majors&.pluck(:name).present? ? d.department&.department_majors&.pluck(:name).join("，") : ""
 
@@ -38,6 +45,7 @@ json.data do
     json.teacher_assist d.teacher_assign_follows.map{|t| t.staff.user.real_name}.join(',')
     teacher_follows_count += d.teacher_follows_count
     courses_counts += d.courses_count
+    json.realname d.realname
   end
 end
 

data/config/routes.rb

@@ -45,6 +45,8 @@ EducodeSales::Engine.routes.draw do
       get :majors
       get :new_major
       get :list
+      get :show_majors
+      get :show_customer_follow
     end
 
     member do
@@ -182,6 +184,7 @@ EducodeSales::Engine.routes.draw do
       get :plan_business_infos
       get :edit_bussiness_info_extra
       post :update_business_info_extra
+      get :staff_businesses
     end
     member do
       delete :delete_business_info

data/db/migrate/20230414031409_add_major_educode_sales_customer_follows.rb

@@ -0,0 +1,12 @@
+class AddMajorEducodeSalesCustomerFollows < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_customer_follows, :major_id, :integer
+    add_column :educode_sales_businesses, :major_id, :integer
+    add_column :educode_sales_teachers, :realname, :string
+
+    add_column :educode_sales_customer_adds, :department_id, :integer
+    add_column :educode_sales_customer_adds, :major_id, :integer
+    add_column :educode_sales_customer_adds, :sale_id, :integer, comment: '销售经理'
+    add_column :educode_sales_customer_adds, :contact_way, :string, comment: '联系方式'
+  end
+end

data/db/migrate/20230414035655_create_educode_sales_eco_staffs.rb

@@ -0,0 +1,11 @@
+class CreateEducodeSalesEcoStaffs < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_eco_staffs do |t|
+      t.references :staff, index: true
+      t.string :sourcable_type
+      t.integer :sourcable_id
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.69'
+  VERSION = '0.9.71'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.69
+  version: 0.9.71
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
-- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -211,6 +210,7 @@ files:
 - app/models/educode_sales/customer_add.rb
 - app/models/educode_sales/customer_extension.rb
 - app/models/educode_sales/customer_follow.rb
+- app/models/educode_sales/eco_staff.rb
 - app/models/educode_sales/filter.rb
 - app/models/educode_sales/follow_up.rb
 - app/models/educode_sales/idea.rb
@@ -310,10 +310,13 @@ files:
 - app/views/educode_sales/customers/new_department.html.erb
 - app/views/educode_sales/customers/new_follow_record.html.erb
 - app/views/educode_sales/customers/new_major.html.erb
+- app/views/educode_sales/customers/show_customer_follow.html.erb
+- app/views/educode_sales/customers/show_customer_follow.json.jbuilder
 - app/views/educode_sales/customers/show_department.json.jbuilder
 - app/views/educode_sales/customers/show_follow.html.erb
 - app/views/educode_sales/customers/show_follow.json.jbuilder
 - app/views/educode_sales/customers/show_follow_record.html.erb
+- app/views/educode_sales/customers/show_majors.html.erb
 - app/views/educode_sales/follow_ups/index.json.jbuilder
 - app/views/educode_sales/follow_ups/money_plans.json.jbuilder
 - app/views/educode_sales/follow_ups/teachers.json.jbuilder
@@ -606,11 +609,12 @@ files:
 - db/migrate/20230329135141_create_educode_sales_business_watches.rb
 - db/migrate/20230330141213_create_educode_sales_activity_follow_ups.rb
 - db/migrate/20230405074036_add_year_to_sale_plans.rb
-- db/migrate/20230411134203_add_realname_to_teacher.rb
 - db/migrate/20230412083510_add_p_staff_id_to_businesses.rb
 - db/migrate/20230412092000_create_business_histories.rb
 - db/migrate/20230413015619_add_permissions_to_projects.rb
 - db/migrate/20230413031029_add_pre_time_to_businesses.rb
+- db/migrate/20230414031409_add_major_educode_sales_customer_follows.rb
+- db/migrate/20230414035655_create_educode_sales_eco_staffs.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -619,7 +623,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -634,8 +638,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []

data/db/migrate/20230411134203_add_realname_to_teacher.rb

@@ -1,5 +0,0 @@
-class AddRealnameToTeacher < ActiveRecord::Migration[5.2]
-  def change
-    add_column :teachers, :realname, :string
-  end
-end