educode_sales 0.9.73 → 0.9.74

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

@@ -63,8 +63,8 @@
               <dd><a href="/missions/businesses" class="<%= current?('layui-this', businesses_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>商机管理</a>
               </dd>
             <% end %>
-            <% if can? :contract_business, EducodeSales::Business %>
-              <dd><a href="/missions/businesses/contract" class="<%= current?('layui-this', contract_businesses_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>合同管理</a>
+            <% if can? :read_contract, EducodeSales::Business %>
+              <dd><a href="/missions/contracts" class="<%= current?('layui-this', contracts_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>合同管理</a>
               </dd>
             <% end %>
             <% if can? :read, EducodeSales::MoneyPlan %>
@@ -148,9 +148,9 @@
               <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>
+              <!--              <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 %>

data/config/routes.rb

@@ -14,6 +14,7 @@ EducodeSales::Engine.routes.draw do
   get :sales_staff, to: "home#sales_staff"
   get :sales_place, to: "home#sales_place"
   get :staff_schools, to: "home#staff_schools"
+  get :staff_business, to: "home#staff_business"
   get :staff_departments, to: "home#staff_departments"
   get :filter, to: "application#filter"
 
@@ -21,6 +22,15 @@ EducodeSales::Engine.routes.draw do
   resources :sessions do
   end
 
+  resources :contracts do
+    collection do
+      get :follow_ups
+      get :list
+      get :new_follow_up
+      post :add_follow_ups
+    end
+  end
+
   resources :logs
 
   resources :user_behaviors
@@ -291,8 +301,17 @@ EducodeSales::Engine.routes.draw do
     collection do
       get :detail
       get :history
+      get :show_teachers
+      get :new_follow_up
+      get :follow_ups
+      post :add_advise
+      get :upload_file
     end
     member do
+      get :show_schools
+      post :follow_up
+      put :update_advise
+      get :files
     end
   end
   resources :idea_recycles do

data/db/migrate/20230227061043_create_educode_sales_ideas.rb

@@ -11,10 +11,10 @@ class CreateEducodeSalesIdeas < ActiveRecord::Migration[5.2]
       t.float :hardware, comment: "硬件规模"
       t.float :project, comment: "项目规模"
       t.float :money, comment: "项目预算"
-      t.integer :creator_id, comment: "发布人"
+      t.integer :creator_id, comment: "申请人"
       t.date :end_time, comment: "截止时间"
       t.integer :history_type, comment: "历史合作"
-      t.text :content, comment: "反馈情况"
+      t.text :content, comment: "需求说明"
       t.integer :deleter_id, comment: "删除人"
       t.boolean :is_deleted, default: false, comment: "是否删除"
       t.datetime :deleted_at, comment: "删除时间"

data/db/migrate/20230430023424_add_plan_signed_date_to_follow_ups.rb

@@ -0,0 +1,21 @@
+class AddPlanSignedDateToFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :plan_signed_date, :date, comment: '计划签单时间'
+    add_column :educode_sales_follow_ups, :bidded_days, :integer, comment: '签单中标后天数'
+    add_column :educode_sales_follow_ups, :service_years, :integer, comment: '服务期验收后年数'
+    add_column :educode_sales_follow_ups, :signed_department_id, :integer, comment: '签约单位'
+    add_column :educode_sales_follow_ups, :signed_clazz, :integer, comment: '签约类型'
+    add_column :educode_sales_follow_ups, :info_clazz, :integer, comment: '信息类型'
+    add_column :educode_sales_follow_ups, :contract_name, :string, comment: '合同名称'
+    add_column :educode_sales_follow_ups, :funding_source, :integer, comment: '资金来源'
+    
+    EducodeSales::Permission.find_or_create_by(name: '查看数据', subject: 'Business', action: 'read_contract', clazz: 'contract')
+    EducodeSales::Permission.find_or_create_by(name: '添加跟进记录', subject: 'Business', action: 'add_contract_follow', clazz: 'contract')
+    EducodeSales::Permission.find_or_create_by(name: '指派售后', subject: 'Business', action: 'assign_contract', clazz: 'contract')
+    EducodeSales::Role.all.each do |r|
+      a = r.role_areas.find_or_initialize_by(clazz: 'Contract')
+      a.save
+    end
+    
+  end
+end

data/db/migrate/20230430040332_create_educode_sales_contract_date_lists.rb

@@ -0,0 +1,15 @@
+class CreateEducodeSalesContractDateLists < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_contract_date_lists do |t|
+      t.references :follow_up
+      t.date :promise_date, comment: '约定日期'
+      t.integer :num, comment: '天数/工作日/年'
+      t.integer :clazz, comment: '类型：交货，验收，预收款，交付款，验收款，质保金'
+      t.date :plan_date, comment: '计划日期'
+      t.date :actual_date, comment: '实际日期'
+      t.references :staff
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230430104708_create_idea_follows.rb

@@ -0,0 +1,25 @@
+class CreateIdeaFollows < ActiveRecord::Migration[5.2]
+  def change
+    # 序号、最新进展、所属商机、单位、预算、状态、团队建议、销售经理、方案经理、跟进人、跟进时间、操作（详情、团队建议））
+    create_table :educode_sales_idea_follows do |t|
+      t.text :content
+      t.references :idea
+      t.references :school
+      t.float :money
+      t.integer :status
+      t.text :advise
+      t.references :sale_staff
+      t.references :idea_staff
+      t.references :staff
+      t.text :comment
+
+      t.timestamps
+    end
+    add_column :educode_sales_ideas, :idea_type, :integer
+    add_column :educode_sales_ideas, :other_staff_ids, :text
+    add_column :educode_sales_ideas, :idea_follows_count, :integer, default: 0
+    add_column :educode_sales_ideas, :last_idea_follow_id, :integer
+    add_column :educode_sales_ideas, :advise, :text
+    add_column :educode_sales_ideas, :business_id, :integer
+  end
+end

data/db/migrate/20230430121335_add_permissions_for_ideas.rb

@@ -0,0 +1,16 @@
+class AddPermissionsForIdeas < ActiveRecord::Migration[5.2]
+  def change
+    last_position = EducodeSales::Permission.all.order(position: :asc).last&.position.to_i
+
+    # 附件管理权限
+    EducodeSales::Permission.create(name: '查看附件', subject: 'Idea', action: 'show_file', clazz: 'idea', position: last_position + 1)
+    EducodeSales::Permission.create(name: '上传附件', subject: 'Idea', action: 'upload_file', clazz: 'idea', position: last_position + 2)
+    EducodeSales::Permission.create(name: '下载附件', subject: 'Idea', action: 'download_file', clazz: 'idea', position: last_position + 3)
+    EducodeSales::Permission.create(name: '删除附件', subject: 'Idea', action: 'delete_file', clazz: 'idea', position: last_position + 4)
+    EducodeSales::Permission.create(name: '查看跟进记录', subject: 'Idea', action: 'follow', clazz: 'idea', position: last_position + 8)
+    EducodeSales::Permission.create(name: '添加跟进记录', subject: 'Idea', action: 'add_follow', clazz: 'idea', position: last_position + 9)
+    EducodeSales::Permission.create(name: '编辑跟进记录', subject: 'Idea', action: 'update_follow', clazz: 'idea', position: last_position + 10)
+    EducodeSales::Permission.create(name: '删除跟进记录', subject: 'Idea', action: 'destroy_follow', clazz: 'idea', position: last_position + 11)
+    EducodeSales::Permission.create(name: '团队建议', subject: 'Idea', action: 'advise', clazz: 'idea', position: last_position + 12)
+  end
+end

data/db/migrate/20230430134710_create_educode_sales_assign_staffs.rb

@@ -0,0 +1,11 @@
+class CreateEducodeSalesAssignStaffs < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_assign_staffs do |t|
+      t.references :staff
+      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.73'
+  VERSION = '0.9.74'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.73
+  version: 0.9.74
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -148,6 +148,7 @@ files:
 - app/controllers/educode_sales/assessments_controller.rb
 - app/controllers/educode_sales/businesses_controller.rb
 - app/controllers/educode_sales/commons_controller.rb
+- app/controllers/educode_sales/contracts_controller.rb
 - app/controllers/educode_sales/customer_extensions_controller.rb
 - app/controllers/educode_sales/customer_follows_controller.rb
 - app/controllers/educode_sales/customers_controller.rb
@@ -197,6 +198,7 @@ files:
 - app/models/educode_sales/application_record.rb
 - app/models/educode_sales/assessments_setting.rb
 - app/models/educode_sales/assign_follow_up.rb
+- app/models/educode_sales/assign_staff.rb
 - app/models/educode_sales/business.rb
 - app/models/educode_sales/business_clazz_change.rb
 - app/models/educode_sales/business_export_record.rb
@@ -207,6 +209,7 @@ files:
 - app/models/educode_sales/business_relation_ship.rb
 - app/models/educode_sales/business_watch.rb
 - app/models/educode_sales/common.rb
+- app/models/educode_sales/contract_date_list.rb
 - app/models/educode_sales/course_subject.rb
 - app/models/educode_sales/customer.rb
 - app/models/educode_sales/customer_add.rb
@@ -216,6 +219,7 @@ files:
 - app/models/educode_sales/filter.rb
 - app/models/educode_sales/follow_up.rb
 - app/models/educode_sales/idea.rb
+- app/models/educode_sales/idea_follow.rb
 - app/models/educode_sales/idea_history.rb
 - app/models/educode_sales/key_person.rb
 - app/models/educode_sales/login_history.rb
@@ -268,6 +272,7 @@ files:
 - app/views/educode_sales/assessments/new.html.erb
 - app/views/educode_sales/assessments/progress.json.jbuilder
 - app/views/educode_sales/businesses/_contract.html.erb
+- app/views/educode_sales/businesses/_contract_list.html.erb
 - app/views/educode_sales/businesses/_follows.html.erb
 - app/views/educode_sales/businesses/contract.html.erb
 - app/views/educode_sales/businesses/contract.json.jbuilder
@@ -300,6 +305,13 @@ files:
 - app/views/educode_sales/commons/index.json.jbuilder
 - app/views/educode_sales/commons/new.html.erb
 - app/views/educode_sales/commons/show.json.jbuilder
+- app/views/educode_sales/contracts/_follows.html.erb
+- app/views/educode_sales/contracts/_list.html.erb
+- app/views/educode_sales/contracts/follow_ups.json.jbuilder
+- app/views/educode_sales/contracts/index.html.erb
+- app/views/educode_sales/contracts/index.json.jbuilder
+- app/views/educode_sales/contracts/list.js.erb
+- app/views/educode_sales/contracts/new_follow_up.html.erb
 - 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
@@ -334,6 +346,7 @@ files:
 - app/views/educode_sales/home/search_operation_teacher.json.jbuilder
 - app/views/educode_sales/home/search_teacher.json.jbuilder
 - app/views/educode_sales/home/search_users.json.jbuilder
+- app/views/educode_sales/home/staff_business.json.jbuilder
 - app/views/educode_sales/home/staff_departments.json.jbuilder
 - app/views/educode_sales/home/staff_schools.json.jbuilder
 - app/views/educode_sales/home/statistics.html.erb
@@ -359,6 +372,8 @@ files:
 - 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/_follows.html.erb
+- app/views/educode_sales/ideas/_index.html.erb
 - 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
@@ -369,18 +384,26 @@ files:
 - 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/files.html.erb
+- app/views/educode_sales/ideas/files.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
 - 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/new_follow_up.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/show_schools.html.erb
+- app/views/educode_sales/ideas/show_schools.json.jbuilder
+- app/views/educode_sales/ideas/show_teachers.html.erb
 - app/views/educode_sales/ideas/unfinish_plans.json.jbuilder
+- app/views/educode_sales/ideas/upload_file.html.erb
 - 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
@@ -625,6 +648,11 @@ files:
 - db/migrate/20230414031409_add_major_educode_sales_customer_follows.rb
 - db/migrate/20230414035655_create_educode_sales_eco_staffs.rb
 - db/migrate/20230428015007_add_deploy_time_follow_ups.rb
+- db/migrate/20230430023424_add_plan_signed_date_to_follow_ups.rb
+- db/migrate/20230430040332_create_educode_sales_contract_date_lists.rb
+- db/migrate/20230430104708_create_idea_follows.rb
+- db/migrate/20230430121335_add_permissions_for_ideas.rb
+- db/migrate/20230430134710_create_educode_sales_assign_staffs.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb