educode_sales 0.9.68 → 0.9.69

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

@@ -0,0 +1,69 @@
+follow_up_ids = EducodeSales::AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+follow_count = 0
+json.data do
+  json.array! @businesses do |d|
+    json.(d, :p_stage, :p_difficulty, :p_special, :p_status, :p_staff_id, :p_sale_staff_id, :p_course_time, :p_platform_time, :p_deploy_time, :p_accept_time, :p_pre_money_time, :p_actual_money_time, :p_money, :p_content, :p_deleted_at, :p_deleter_id)
+    json.p_staff d.p_staff&.user&.real_name
+    json.p_sale_staff d.p_sale_staff&.user&.real_name
+    json.p_deleter d.p_deleter&.user&.real_name
+    bidded_date = d.last_follow_up&.bidded_date
+    stage = d.last_follow_up&.stage&.name
+
+    json.p_state (bidded_date.present? && Time.now > bidded_date + 1.month && d.p_stage.blank? && stage == '已中标') || (d.p_pre_money_time.present? && Time.now > d.p_pre_money_time && d.p_actual_money_time.blank?) || (d.p_pre_accept_time.present? && Time.now > d.p_pre_accept_time && d.p_accept_time.blank?) ? "延期" : "正常"
+    json.id d.id
+    json.number d.number
+    json.name d.name
+    json.department d.department&.name
+    json.school d.department&.school&.name
+    json.school_id d.department&.school_id
+    follow_ups_count = d['follow_ups_counts'] || 0
+    json.follow_ups_count follow_ups_count
+    follow_count += follow_ups_count
+    json.follow_up_id d.last_follow_up_id
+    json.clazz d.clazz&.name || ""
+    json.clazz_changed d.last_follow_up&.clazz_changed || false
+    json.stage d.last_follow_up&.stage&.name
+    json.invitation_at d.last_follow_up&.invitation_at.to_s
+    json.reception_at d.last_follow_up&.reception_at.to_s
+    json.bidded_date d.last_follow_up&.bidded_date.to_s
+    json.signed_date d.last_follow_up&.signed_date.to_s
+    json.o_business_deployment  EducodeSales::FollowUp::BUSINESS_DEPLOYMENT[1..-1].to_h.invert[d.last_follow_up&.o_business_deployment]
+    json.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
+    json.created_at d.created_at.to_s
+    json.no_followup_days (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_manages d.last_follow_up&.assign_follow_ups.present? ? (d.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.staff&.user&.real_name
+    json.divide_rate d.divide_rate
+    json.divide_money d.divide_amount.to_f.round(2)
+    json.budget_amount d.budget_amount.to_f.round(2)  #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
+    json.area d.department&.school&.province
+    if d.department&.school
+      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+    else
+      json.property ''
+    end
+    json.sale_way d.last_follow_up&.place&.name.present? ? '渠道' : '直销'
+    json.year d.last_follow_up&.year.to_s
+    json.total_amount d.last_follow_up&.total_amount.to_f.round(2)
+    json.actual_amount d.last_follow_up&.actual_amount.to_f.round(2)
+    json.return_money d.return_money
+    json.wait_return_money d.wait_return_money.to_f.round(2)
+    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '实际回款').present? ? (d.last_follow_up.money_plans.where(clazz: '实际回款').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
+    json.place d.last_follow_up&.place&.name
+    json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff&.user&.real_name : d.staff&.user&.real_name
+    json.source d.source
+    json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
+    json.current_staff_id @current_admin.id
+    json.staff_id d.staff_id
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
+    json.self_flag (d.staff_id == @current_admin.id) || (d.last_follow_up_id.in? follow_up_ids)
+    json.followed  d.users.pluck(:user_id).include?(@current_admin.user.id) ? 1 : 0 # d.users.where(user_id:@current_admin.user.id).first ? 1 : 0
+    json.is_deleted @is_deleted
+    end
+end
+
+json.totalRow do
+  json.follow_ups_count follow_count.to_i.to_s
+end
+json.code 0
+json.count @businesses.total_count
+json.msg 'succcess'

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

@@ -19,6 +19,18 @@
           <%= select_tag "professional_title", options_for_select(['教授', '研究员', '副教授', '副研究员', '讲师', '助理研究员', '助理教授'], @person&.professional_title), { include_blank: true } %>
         </div>
       </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">生态经理</label>
+        <div class="layui-input-inline">
+            <%= select_tag "staff_manage", options_for_select(@staff_manage), { 'lay-filter': 'staff_manage', include_blank: true } %>
+        </div>
+        </div>
+        <div class="layui-inline">
+        <label class="layui-form-label">最新跟进人</label>
+        <div class="layui-input-inline">
+            <%= select_tag "staff_id", options_for_select(@follow_upers), { 'lay-filter': 'staff_id', include_blank: true } %>
+        </div>
+        </div>
       <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">导流来源</label>
         <div class="layui-input-inline">
@@ -183,7 +195,11 @@
                     width: 130,
                     title: '部门',
                     templet:'<div><span title="{{d.department}}">{{d.department}}</span></div>'
-
+                },
+                {
+                    field: 'majors',
+                    width: 160,
+                    title: '专业',
                 },
                 {
                     field: 'professional_title',

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

@@ -27,6 +27,8 @@ json.data do
 
     json.staff_manage @staff_manages[d.department&.school&.province]&.join(",")
 
+    json.majors d.department&.department_majors&.pluck(:name).present? ? d.department&.department_majors&.pluck(:name).join("，") : ""
+
     json.follow_person d.follow_up&.staff&.user&.real_name || ''
     json.created_on d.user.present? ? d.user.created_on.to_s(:date) : ''
     json.last_login_on (d.user.present? && d.user.last_login_on.present?) ? d.user.last_login_on.to_s(:date) : ''

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

@@ -92,6 +92,16 @@
             <% end %>
           </dl>
         </li>
+        <% if can? :read, EducodeSales::Customer %>
+          <li class="layui-nav-item layui-nav-itemed menu-li">
+            <a class="" href="javascript:;"><b><%= image_tag "educode_sales/客户管理.png", size: "15" %>
+              <i style="padding-right: 25px"></i>客户管理</b></a>
+            <dl class="layui-nav-child">
+              <dd><a href="/missions/customers/list" class="<%= current?('layui-this', list_customers_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 %>
         <li class="layui-nav-item layui-nav-itemed menu-li">
           <a class="" href="javascript:;"><b><%= image_tag "educode_sales/7.运营活动.png", size: "15" %>
             <i style="font-size: 25px;  padding-right: 25px"></i>运营活动</b></a>
@@ -145,6 +155,21 @@
           </li>
         <% end %>
 
+        <% if can?(:read, EducodeSales::Project) %>
+          <li class="layui-nav-item layui-nav-itemed menu-li">
+            <a class="" href="javascript:;"><b><%= image_tag "educode_sales/5.渠道管理.png", size: "15" %>
+              <i style="font-size: 25px;  padding-right: 25px"></i>项目管理</b></a>
+            <dl class="layui-nav-child">
+              <dd>
+                <a href="/missions/projects" class="<%= current?('layui-this', projects_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/7.运营活动.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" %>

data/config/routes.rb

@@ -44,6 +44,7 @@ EducodeSales::Engine.routes.draw do
       post :batch_update_school_tags
       get :majors
       get :new_major
+      get :list
     end
 
     member do
@@ -54,6 +55,7 @@ EducodeSales::Engine.routes.draw do
       post :major
       put :update_major
       delete :delete_major
+      get :edit_major
     end
   end
 
@@ -84,6 +86,7 @@ EducodeSales::Engine.routes.draw do
       put :update_money
       delete :delete_money
       put :update_advise
+      put :comment
     end
   end
 
@@ -260,6 +263,15 @@ EducodeSales::Engine.routes.draw do
     end
   end
 
+  resources :projects do
+    collection do
+      get :detail
+      get :history
+      post :recycle
+    end
+    member do
+    end
+  end
   resources :ideas do
     collection do
       get :detail

data/db/migrate/20230411134203_add_realname_to_teacher.rb

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

data/db/migrate/20230412083510_add_p_staff_id_to_businesses.rb

@@ -0,0 +1,20 @@
+class AddPStaffIdToBusinesses < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_businesses, :p_stage, :integer, comment: '项目阶段'
+    add_column :educode_sales_businesses, :p_difficulty, :integer, comment: '项目难度'
+    add_column :educode_sales_businesses, :p_special, :integer, comment: '定制'
+    add_column :educode_sales_businesses, :p_status, :integer, comment: '交付'
+    add_column :educode_sales_businesses, :p_staff_id, :integer, comment: '指派人'
+    add_column :educode_sales_businesses, :p_sale_staff_id, :integer, comment: '销售经理'
+    add_column :educode_sales_businesses, :p_course_time, :date, comment: '课程交付时间'
+    add_column :educode_sales_businesses, :p_platform_time, :date, comment: '平台交付时间'
+    add_column :educode_sales_businesses, :p_deploy_time, :date, comment: '现场部署时间'
+    add_column :educode_sales_businesses, :p_accept_time, :date, comment: '实际验收时间'
+    add_column :educode_sales_businesses, :p_pre_money_time, :date, comment: '拟定回款时间'
+    add_column :educode_sales_businesses, :p_actual_money_time, :date, comment: '实际回款时间'
+    add_column :educode_sales_businesses, :p_money, :float, default: 0, comment: '回款'
+    add_column :educode_sales_businesses, :p_content, :text, comment: '问题备注'
+    add_column :educode_sales_businesses, :p_deleted_at, :datetime, comment: '删除时间'
+    add_column :educode_sales_businesses, :p_deleter_id, :integer, comment: '删除人'
+  end
+end

data/db/migrate/20230412092000_create_business_histories.rb

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

data/db/migrate/20230413015619_add_permissions_to_projects.rb

@@ -0,0 +1,11 @@
+class AddPermissionsToProjects < ActiveRecord::Migration[5.2]
+  def change
+    last_position = EducodeSales::Permission.all.order(position: :asc).last&.position.to_i
+    EducodeSales::Permission.create(name: '查看项目', subject: 'Project', action: 'read', clazz: 'project', position: last_position + 1)
+    # EducodeSales::Permission.create(name: '添加项目', subject: 'Project', action: 'create', clazz: 'project', position: last_position + 2)
+    EducodeSales::Permission.create(name: '编辑项目', subject: 'Project', action: 'update', clazz: 'project', position: last_position + 3)
+    EducodeSales::Permission.create(name: '移除项目', subject: 'Project', action: 'destroy', clazz: 'project', position: last_position + 4)
+    EducodeSales::Permission.create(name: '恢复项目', subject: 'Project', action: 'recycle', clazz: 'project', position: last_position + 5)
+    EducodeSales::Permission.create(name: '查看历史记录', subject: 'Project', action: 'read_history', clazz: 'project', position: last_position + 6)
+  end
+end

data/db/migrate/20230413031029_add_pre_time_to_businesses.rb

@@ -0,0 +1,5 @@
+class AddPreTimeToBusinesses < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_businesses, :p_pre_accept_time, :date, comment: '拟定验收时间'
+  end
+end

data/lib/educode_sales/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.68
+  version: 0.9.69
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-07 00:00:00.000000000 Z
+date: 2023-04-14 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
@@ -119,6 +120,7 @@ files:
 - app/assets/javascripts/educode_sales/extent/miniPage.js
 - app/assets/javascripts/educode_sales/extent/request.js
 - app/assets/javascripts/educode_sales/extent/select_input.js
+- app/assets/javascripts/educode_sales/extent/treeTable.js
 - app/assets/javascripts/educode_sales/extent/xm-select.js
 - app/assets/javascripts/educode_sales/jquery.cxselect.js
 - app/assets/javascripts/educode_sales/layui.js
@@ -162,6 +164,7 @@ files:
 - app/controllers/educode_sales/operations_controller.rb
 - app/controllers/educode_sales/places_controller.rb
 - app/controllers/educode_sales/plans_controller.rb
+- app/controllers/educode_sales/projects_controller.rb
 - app/controllers/educode_sales/recycles_controller.rb
 - app/controllers/educode_sales/results_controller.rb
 - app/controllers/educode_sales/roles_controller.rb
@@ -196,6 +199,7 @@ files:
 - app/models/educode_sales/business.rb
 - app/models/educode_sales/business_clazz_change.rb
 - app/models/educode_sales/business_export_record.rb
+- app/models/educode_sales/business_history.rb
 - app/models/educode_sales/business_info.rb
 - app/models/educode_sales/business_level.rb
 - app/models/educode_sales/business_number_record.rb
@@ -221,6 +225,7 @@ files:
 - app/models/educode_sales/permission.rb
 - app/models/educode_sales/place.rb
 - app/models/educode_sales/place_area.rb
+- app/models/educode_sales/project.rb
 - app/models/educode_sales/recycle.rb
 - app/models/educode_sales/result.rb
 - app/models/educode_sales/role.rb
@@ -294,9 +299,12 @@ files:
 - app/views/educode_sales/customers/edit.html.erb
 - app/views/educode_sales/customers/edit_department.html.erb
 - app/views/educode_sales/customers/edit_follow_record.html.erb
+- app/views/educode_sales/customers/edit_major.html.erb
 - app/views/educode_sales/customers/give.html.erb
 - app/views/educode_sales/customers/index.html.erb
 - app/views/educode_sales/customers/index.json.jbuilder
+- app/views/educode_sales/customers/list.html.erb
+- app/views/educode_sales/customers/list.json.jbuilder
 - app/views/educode_sales/customers/majors.json.jbuilder
 - app/views/educode_sales/customers/new.html.erb
 - app/views/educode_sales/customers/new_department.html.erb
@@ -431,6 +439,11 @@ files:
 - app/views/educode_sales/plans/show_week.html.erb
 - app/views/educode_sales/plans/show_weekly.html.erb
 - app/views/educode_sales/plans/years_plan.json.jbuilder
+- app/views/educode_sales/projects/detail.html.erb
+- app/views/educode_sales/projects/edit.html.erb
+- app/views/educode_sales/projects/history.html.erb
+- app/views/educode_sales/projects/index.html.erb
+- app/views/educode_sales/projects/index.json.jbuilder
 - app/views/educode_sales/recycles/_business.html.erb
 - app/views/educode_sales/recycles/_monthPlan.html.erb
 - app/views/educode_sales/recycles/_monthly.html.erb
@@ -593,6 +606,11 @@ 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
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -601,7 +619,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -616,8 +634,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: []