educode_sales 0.9.48 → 0.9.50

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

@@ -34,11 +34,17 @@
          </div>
        </div>
        <div class="layui-inline">
-         <label class="layui-form-label ">微信号</label>
-         <div class="layui-input-block">
-           <input type="text" name="wechat" autocomplete="off"  class="layui-input" placeholder="请输入微信号">
+         <label class="layui-form-label ">手机号</label>
+         <div class="layui-input-block" style="width: 188px;">
+           <input type="text" name="mobile" autocomplete="off"  class="layui-input" placeholder="请输入手机号">
          </div>
        </div>
+       <div class="layui-inline">
+        <label class="layui-form-label ">微信号</label>
+        <div class="layui-input-block" style="width: 188px;">
+          <input type="text" name="wechat" autocomplete="off"  class="layui-input" placeholder="请输入微信号">
+        </div>
+      </div>
     </div>
     <div class="layui-form-item">
       <label class="layui-form-label">教研助理</label>

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

@@ -37,6 +37,12 @@
 " class="layui-textarea"></textarea>
       </div>
     </div>
+    <div class="layui-form-item layui-form-text">
+      <label class="layui-form-label">团队建议</label>
+      <div class="layui-input-block">
+        <textarea name="advise" placeholder="此处可以填写来自团队好的建议，没有可不填" class="layui-textarea"></textarea>
+      </div>
+    </div>
     <div class="layui-inline" style="padding-left: 50px">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_follow_up">提交
       </button>

data/app/views/layouts/educode_sales/application.html.erb

@@ -77,9 +77,6 @@
             <% if can? :read, EducodeSales::SalePlan %>
               <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/6.销售计划.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售计划</a></dd>
             <% end %>
-            <% if can?(:show, EducodeSales::AssessmentsSetting) || can?(:show_result, EducodeSales::AssessmentsSetting) %>
-              <dd><a href="/missions/assessments" class="<%= current?('layui-this', assessments_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/assessment.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>绩效考核</a></dd>
-            <% end %>
             <% if can? :sales, EducodeSales::Staff %>
               <dd><a href="/missions/sales" class="<%= current?('layui-this', sales_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/3.销售分工.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售分工</a>
               </dd>
@@ -118,17 +115,52 @@
             <% end %>
           </dl>
         </li>
+        <% if can?(:show, EducodeSales::AssessmentsSetting) || can?(:show_result, EducodeSales::AssessmentsSetting) %>
+          <li class="layui-nav-item layui-nav-itemed menu-li">
+            <a class="" href="javascript:;"><b><%= image_tag "educode_sales/1.销售活动.png", size: "15" %>
+              <i style="padding-right: 25px"></i>绩效管理</b></a>
+            <dl class="layui-nav-child">
+              <dd>
+                <a href="/missions/assessments" class="<%= current?('layui-this', assessments_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/assessment.png", size: "15" %>
+                  <i style="font-size: 25px;  padding-right: 15px"></i>绩效考核</a></dd>
+            </dl>
+          </li>
+          <li class="layui-nav-item layui-nav-itemed menu-li">
+            <a class="" href="javascript:;"><b><%= image_tag "educode_sales/11.活动运营.png", size: "15" %>
+              <i style="font-size: 25px;  padding-right: 25px"></i>方案支撑</b></a>
+            <dl class="layui-nav-child">
+              <dd>
+                <a href="/missions/ideas" class="<%= current?('layui-this', ideas_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/6.销售计划.png", size: "15" %>
+                  <i style="font-size: 25px;  padding-right: 15px"></i>方案管理</a></dd>
+              <dd>
+                <a href="/missions/idea_recycles" class="<%= current?('layui-this', idea_recycles_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/回收站.png", size: "15" %>
+                  <i style="font-size: 25px;  padding-right: 15px"></i>方案回收站</a></dd>
+            </dl>
+          </li>
+        <% end %>
         <% if @current_admin.is_admin || @current_admin.code == 'userbe' %>
           <li class="layui-nav-item layui-nav-itemed menu-li">
-            <a class="" href="javascript:;"><b><%= image_tag "educode_sales/13.系统设置.png",size:"15"%><i  style="font-size: 25px;  padding-right: 25px"></i>系统设置</b></a>
+            <a class="" href="javascript:;"><b><%= image_tag "educode_sales/13.系统设置.png", size: "15" %>
+              <i style="font-size: 25px;  padding-right: 25px"></i>系统设置</b></a>
             <dl class="layui-nav-child">
               <% if @current_admin.is_admin %>
-              <dd><a href="/missions/roles" class="<%= current?('layui-this', roles_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/14.角色管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>角色管理</a></dd>
-              <dd><a href="/missions/staffs" class="<%= current?('layui-this', staffs_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/15.人员管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>人员管理</a></dd>
-              <dd><a href="/missions/commons" class="<%= current?('layui-this', commons_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/16.字典列表.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>字典列表</a></dd>
+                <dd>
+                  <a href="/missions/roles" class="<%= current?('layui-this', roles_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/14.角色管理.png", size: "15" %>
+                    <i style="font-size: 25px;  padding-right: 15px"></i>角色管理</a></dd>
+                <dd>
+                  <a href="/missions/staffs" class="<%= current?('layui-this', staffs_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/15.人员管理.png", size: "15" %>
+                    <i style="font-size: 25px;  padding-right: 15px"></i>人员管理</a></dd>
+                <dd>
+                  <a href="/missions/commons" class="<%= current?('layui-this', commons_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/16.字典列表.png", size: "15" %>
+                    <i style="font-size: 25px;  padding-right: 15px"></i>字典列表</a></dd>
               <% end %>
               <% if @current_admin.code == 'userbe' %>
-              <dd><a href="/missions/user_behaviors" class="<%= current?('layui-this', user_behaviors_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/9.运营分工.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>行为分析</a></dd>
+                <dd>
+                  <a href="/missions/user_behaviors" class="<%= current?('layui-this', user_behaviors_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/9.运营分工.png", size: "15" %>
+                    <i style="font-size: 25px;  padding-right: 15px"></i>行为分析</a></dd>
+              <% end %>
+              <% if @current_admin.is_admin %>
+              <dd><a href="/missions/logs" class="<%= current?('layui-this', logs_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/9.运营分工.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>操作日志</a></dd>
               <% end %>
             </dl>
           </li>

data/config/routes.rb

@@ -19,6 +19,8 @@ EducodeSales::Engine.routes.draw do
   resources :sessions do
   end
 
+  resources :logs
+
   resources :user_behaviors
   resources :customer_extensions do
   end
@@ -236,6 +238,23 @@ EducodeSales::Engine.routes.draw do
     end
   end
 
+  resources :ideas do
+    collection do
+      get :detail
+      get :history
+    end
+    member do
+    end
+  end
+  resources :idea_recycles do
+    collection do
+      get :detail
+      get :history
+    end
+    member do
+    end
+  end
+
   resources :activities do
     collection do
       get :show_teachers

data/db/migrate/20230227061043_create_educode_sales_ideas.rb

@@ -0,0 +1,28 @@
+class CreateEducodeSalesIdeas < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_ideas do |t|
+      t.references :school, index: true, comment: "学校"
+      t.string :name, comment: "名称"
+      t.integer :level, comment: "优先级"
+      t.integer :user_id, comment: "指派人"
+      t.integer :status, comment: "状态"
+      t.integer :types, comment: "类型"
+      t.integer :model, comment: "部署模式"
+      t.float :hardware, comment: "硬件规模"
+      t.float :project, comment: "项目规模"
+      t.float :money, comment: "项目预算"
+      t.integer :creator_id, comment: "发布人"
+      t.date :end_time, comment: "截止时间"
+      t.integer :history_type, comment: "历史合作"
+      t.text :content, comment: "反馈情况"
+      t.integer :deleter_id, comment: "删除人"
+      t.boolean :is_deleted, default: false, comment: "是否删除"
+      t.datetime :deleted_at, comment: "删除时间"
+      t.references :department, index: true, comment: "部门"
+      t.integer :manager_name, comment: "负责人"
+      t.integer :manager_phone, comment: "负责人电话"
+      t.text :history_record, comment: "修改记录"
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230227070206_change_to_educode_sales_ideas.rb

@@ -0,0 +1,5 @@
+class ChangeToEducodeSalesIdeas < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :educode_sales_ideas, :user_id, :staff_id
+  end
+end

data/db/migrate/20230227125936_add_follow_at_to_teachers.rb

@@ -0,0 +1,6 @@
+class AddFollowAtToTeachers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_teachers, :followup_at, :datetime unless column_exists?(:educode_sales_teachers, :followup_at)
+    add_column :educode_sales_teacher_follows, :advise, :text unless column_exists?(:educode_sales_teacher_follows, :advise)
+  end
+end

data/db/migrate/20230228063555_create_educode_sales_idea_histories.rb

@@ -0,0 +1,10 @@
+class CreateEducodeSalesIdeaHistories < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_idea_histories do |t|
+      t.references :idea, index: true
+      t.references :staff, index: true
+      t.text :content
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230302074324_change_manager_for_ideas.rb

@@ -0,0 +1,6 @@
+class ChangeManagerForIdeas < ActiveRecord::Migration[5.2]
+  def change
+    change_column :educode_sales_ideas, :manager_phone, :string
+    change_column :educode_sales_ideas, :manager_name, :string
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.48'
+  VERSION = '0.9.50'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.48
+  version: 0.9.50
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ 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
@@ -151,8 +152,11 @@ 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_recycles_controller.rb
+- app/controllers/educode_sales/ideas_controller.rb
 - app/controllers/educode_sales/import_teachers_controller.rb
 - app/controllers/educode_sales/key_person_controller.rb
+- app/controllers/educode_sales/logs_controller.rb
 - app/controllers/educode_sales/money_plans_controller.rb
 - app/controllers/educode_sales/operation_plans_controller.rb
 - app/controllers/educode_sales/operation_reports_controller.rb
@@ -201,6 +205,8 @@ files:
 - app/models/educode_sales/customer_follow.rb
 - app/models/educode_sales/filter.rb
 - app/models/educode_sales/follow_up.rb
+- app/models/educode_sales/idea.rb
+- app/models/educode_sales/idea_history.rb
 - app/models/educode_sales/key_person.rb
 - app/models/educode_sales/login_history.rb
 - app/models/educode_sales/market_area.rb
@@ -297,6 +303,52 @@ files:
 - app/views/educode_sales/home/search_users.json.jbuilder
 - app/views/educode_sales/home/staff_schools.json.jbuilder
 - app/views/educode_sales/home/statistics.html.erb
+- app/views/educode_sales/idea_recycles/activities.json.jbuilder
+- app/views/educode_sales/idea_recycles/add_courses.html.erb
+- app/views/educode_sales/idea_recycles/add_event.html.erb
+- app/views/educode_sales/idea_recycles/add_keys.html.erb
+- app/views/educode_sales/idea_recycles/course_list.json.jbuilder
+- app/views/educode_sales/idea_recycles/course_subject.json.jbuilder
+- app/views/educode_sales/idea_recycles/daily_paper.html.erb
+- app/views/educode_sales/idea_recycles/detail.html.erb
+- app/views/educode_sales/idea_recycles/edit.html.erb
+- app/views/educode_sales/idea_recycles/edit_follow_record.html.erb
+- app/views/educode_sales/idea_recycles/history.html.erb
+- app/views/educode_sales/idea_recycles/import.html.erb
+- app/views/educode_sales/idea_recycles/index.html.erb
+- app/views/educode_sales/idea_recycles/index.json.jbuilder
+- app/views/educode_sales/idea_recycles/new.html.erb
+- app/views/educode_sales/idea_recycles/new_follow_record.html.erb
+- app/views/educode_sales/idea_recycles/search_new.html.erb
+- app/views/educode_sales/idea_recycles/show_class.html.erb
+- app/views/educode_sales/idea_recycles/show_follow.html.erb
+- app/views/educode_sales/idea_recycles/show_follow.json.jbuilder
+- app/views/educode_sales/idea_recycles/show_follow_record.html.erb
+- app/views/educode_sales/idea_recycles/unfinish_plans.json.jbuilder
+- app/views/educode_sales/ideas/activities.json.jbuilder
+- app/views/educode_sales/ideas/add_courses.html.erb
+- app/views/educode_sales/ideas/add_event.html.erb
+- app/views/educode_sales/ideas/add_keys.html.erb
+- app/views/educode_sales/ideas/course_list.json.jbuilder
+- app/views/educode_sales/ideas/course_subject.json.jbuilder
+- app/views/educode_sales/ideas/daily_paper.html.erb
+- app/views/educode_sales/ideas/detail.html.erb
+- app/views/educode_sales/ideas/edit.html.erb
+- app/views/educode_sales/ideas/edit_follow_record.html.erb
+- app/views/educode_sales/ideas/history.html.erb
+- app/views/educode_sales/ideas/import.html.erb
+- app/views/educode_sales/ideas/index.html.erb
+- app/views/educode_sales/ideas/index.json.jbuilder
+- app/views/educode_sales/ideas/new.html.erb
+- app/views/educode_sales/ideas/new_follow_record.html.erb
+- app/views/educode_sales/ideas/search_new.html.erb
+- app/views/educode_sales/ideas/show_class.html.erb
+- app/views/educode_sales/ideas/show_follow.html.erb
+- app/views/educode_sales/ideas/show_follow.json.jbuilder
+- app/views/educode_sales/ideas/show_follow_record.html.erb
+- app/views/educode_sales/ideas/unfinish_plans.json.jbuilder
+- app/views/educode_sales/logs/index.html.erb
+- app/views/educode_sales/logs/index.json.jbuilder
 - app/views/educode_sales/money_plans/index.html.erb
 - app/views/educode_sales/money_plans/index.json.jbuilder
 - app/views/educode_sales/operation_plans/_monthPlan.html.erb
@@ -403,6 +455,9 @@ files:
 - app/views/educode_sales/staffs/index.html.erb
 - app/views/educode_sales/staffs/index.json.jbuilder
 - app/views/educode_sales/staffs/new.html.erb
+- app/views/educode_sales/teacher_follows/index.json.jbuilder
+- app/views/educode_sales/teachers/_follows.html.erb
+- app/views/educode_sales/teachers/_index.html.erb
 - app/views/educode_sales/teachers/activities.json.jbuilder
 - app/views/educode_sales/teachers/add_courses.html.erb
 - app/views/educode_sales/teachers/add_event.html.erb
@@ -498,6 +553,11 @@ files:
 - db/migrate/20230209102302_create_educode_sales_staff_permissions.rb
 - db/migrate/20230215141612_add_mobile_to_teachers.rb
 - db/migrate/20230220144737_add_clazz_id_to_business.rb
+- db/migrate/20230227061043_create_educode_sales_ideas.rb
+- db/migrate/20230227070206_change_to_educode_sales_ideas.rb
+- db/migrate/20230227125936_add_follow_at_to_teachers.rb
+- db/migrate/20230228063555_create_educode_sales_idea_histories.rb
+- db/migrate/20230302074324_change_manager_for_ideas.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -506,7 +566,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -521,8 +581,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []