educode_sales 0.6.8 → 0.7.2

data/app/views/educode_sales/sales/index.html.erb

@@ -7,7 +7,7 @@
     <span style="float: right;padding-right: 10px">年度</span>
   </form>
   <hr>
-  <table class="layui-hide" id="table" lay-filter="table" ></table>
+  <table class="layui-hide" id="table" lay-filter="table"></table>
 </div>
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
@@ -16,32 +16,32 @@
 </script>
 <script type="text/html" id="business_a">
   <div class="layui-text">
-   <a href="/missions/businesses?clazz_id={{d.a_clazz_id}}&staff_id={{d.id}}">{{d.business_a}}</a>
+    <a href="/missions/businesses?clazz_id={{d.a_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_a}}</a>
   </div>
 </script>
 <script type="text/html" id="business_b">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.b_clazz_id}}&staff_id={{d.id}}">{{d.business_b}}</a>
+    <a href="/missions/businesses?clazz_id={{d.b_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_b}}</a>
   </div>
 </script>
 <script type="text/html" id="business_c">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.c_clazz_id}}&staff_id={{d.id}}">{{d.business_c}}</a>
+    <a href="/missions/businesses?clazz_id={{d.c_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_c}}</a>
   </div>
 </script>
 <script type="text/html" id="business_d">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.d_clazz_id}}&staff_id={{d.id}}">{{d.business_d}}</a>
+    <a href="/missions/businesses?clazz_id={{d.d_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_d}}</a>
   </div>
 </script>
 <script type="text/html" id="business_e">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.e_clazz_id}}&staff_id={{d.id}}">{{d.business_e}}</a>
+    <a href="/missions/businesses?clazz_id={{d.e_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_e}}</a>
   </div>
 </script>
 <script type="text/html" id="business_o">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.o_clazz_id}}&staff_id={{d.id}}">{{d.business_o}}</a>
+    <a href="/missions/businesses?clazz_id={{d.o_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_o}}</a>
   </div>
 </script>
 <script type="text/html" id="school_count">

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

@@ -60,7 +60,7 @@ json.data do
       json.school_count school_count
       follow_school_count = (EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").where(staff_id: d.id).pluck(:business_id).uniq).pluck(:school_id)).uniq.size
       json.follow_school_count follow_school_count
-      json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size + EducodeSales::FollowUp.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size
+      json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").size + EducodeSales::FollowUp.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").size
       follow_school_rate = (follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0).round(2)
       json.follow_school_rate follow_school_rate.to_s + '%'
       follow_department_rate = (follow_school_count!=0 ? school_count.to_f * 110 / follow_school_count : 0).round(2)

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

@@ -25,11 +25,17 @@
       </div>
     </div>
     <div class="layui-form-item">
-      <label class="layui-form-label required">负责区域</label>
+      <label class="layui-form-label">负责区域</label>
       <div class="layui-input-block">
         <div id="area" class="demo-transfer"></div>
       </div>
     </div>
+    <div class="layui-form-item" >
+      <label class="layui-form-label">监管学校</label>
+      <div class="layui-input-inline" style="">
+        <div id="edit_assign_follow" style="width: 1140px;"></div>
+      </div>
+      </div>
     <div class="layui-form-item">
       <label class="layui-form-label required">生效日期</label>
       <div class="layui-input-block">
@@ -85,6 +91,40 @@
                 return false
             }
         })
+        var sales_list = xmSelect.render({
+            el: '#edit_assign_follow',
+            remoteSearch: true,
+            autoRow: true,
+            // clickClose: true,
+            delay: 1000,
+            tips: '支持名称/省份搜索,请至少输入一个字符',
+            searchTips: '支持名称/省份搜索,请至少输入一个字符',
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                if(!val){
+                    return cb([]);
+                }
+                $.ajax( '/missions/staff_schools', {
+                    method: 'get',
+                    data: {
+                        q: val,
+                        page: pageIndex
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        var data = res.data;
+                        if (res.code == 0) {
+                            cb(res.data, res.count);
+                        } else {
+                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                        }
+                    }
+                })
+            }
+        })
+        sales_list.setValue(gon.schools)
 
         //监听提交
         form.on('submit(saveBtn)', function (data) {
@@ -92,10 +132,11 @@
             layui.each(transfer.getData('area_list'), function (i, v) {
                 area_ids.push(v.value)
             })
-            if (area_ids.length == 0) {
-                layer.alert("请选择负责区域");
-                return false;
-            }
+            var schools = [];
+            sales_list.getValue().forEach(function(d) {
+                schools.push(d.value);
+            })
+            data.field['school_ids'] = schools;
             data.field['area_ids'] = area_ids;
             request.authPut("missions/staffs/" + parent.staff_id, data.field, function (res) {
                 console.log(res.success == false)

data/app/views/educode_sales/staffs/index.html.erb

@@ -87,6 +87,12 @@
           {
             field: 'area',
             title: '负责区域',
+              templet:'<div><span title="{{d.area}}">{{d.area}}</span></div>'
+          },
+          {
+            field: 'schools',
+            title: '监管学校',
+              templet:'<div><span title="{{d.schools}}">{{d.schools}}</span></div>'
           },
           {
             field: 'month',

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

@@ -4,6 +4,7 @@ json.data do
     json.id d.id
     json.name d.user.real_name
     json.role d.role&.name
+    json.schools d.staff_schools.map(&:school).map(&:name).join("、")
     json.job_type EducodeSales::Common.job_type_name[d.job_type]
     json.month d.month
     json.enabled_at d.enabled_at ? d.enabled_at.to_s(:date) : ''

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

@@ -257,7 +257,7 @@
 
 
 
-<!--未完成计划列表-->
+<!--计划回款计划列表-->
 <script type="text/html" id="unfinish_toolbar">
   <div class="layui-btn-container">
     <span class="table-label">跟进计划列表</span>

data/config/routes.rb

@@ -12,6 +12,7 @@ EducodeSales::Engine.routes.draw do
   get :no_permission, to: "home#no_permission"
   get :sales_staff, to: "home#sales_staff"
   get :sales_place, to: "home#sales_place"
+  get :staff_schools, to: "home#staff_schools"
 
   resources :sessions do
   end
@@ -83,6 +84,7 @@ EducodeSales::Engine.routes.draw do
   resources :businesses do
     collection do
       get :export_records
+      post :get_export_data
       get :add_export_records
       get :show_keys
       get :add_keys

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -15,6 +15,11 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       EducodeSales::Permission.create(name: '上传附件', subject: 'Business', action: 'upload_file', clazz: 'business', position: '11')
       EducodeSales::Permission.create(name: '下载附件', subject: 'Business', action: 'download_file', clazz: 'business', position: '11')
       EducodeSales::Permission.create(name: '删除附件', subject: 'Business', action: 'delete_file', clazz: 'business', position: '11')
+      #商机个人权限
+      EducodeSales::Permission.create(name: '编辑商机(本人商机)', subject: 'Business', action: 'self_edit_business', clazz: 'business', position: '5')
+      EducodeSales::Permission.create(name: '添加跟进记录(本人商机)', subject: 'Business', action: 'self_add_follow', clazz: 'business', position: '8')
+      EducodeSales::Permission.create(name: '编辑跟进记录(本人创建)', subject: 'Business', action: 'self_edit_follow', clazz: 'business', position: '9')
+      EducodeSales::Permission.create(name: '删除跟进记录(本人创建)', subject: 'Business', action: 'self_delete_follow', clazz: 'business', position: '10')
       #回款管理权限
       EducodeSales::Permission.create(name: '查看回款列表', subject: 'MoneyPlan', action: 'read', clazz: 'money_plan', position: '15')
 

data/db/migrate/20220125013811_create_educode_sales_staff_schools.rb

@@ -0,0 +1,10 @@
+class CreateEducodeSalesStaffSchools < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_staff_schools do |t|
+      t.references :staff
+      t.references :school
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20220125033552_create_educode_sales_customer_adds.rb

@@ -0,0 +1,9 @@
+class CreateEducodeSalesCustomerAdds < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_customer_adds do |t|
+      t.references :school
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.6.8'
+  VERSION = '0.7.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.2
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-24 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,6 +165,7 @@ files:
 - app/helpers/educode_sales/activities_helper.rb
 - app/helpers/educode_sales/application_helper.rb
 - app/helpers/educode_sales/business_helper.rb
+- app/helpers/educode_sales/follow_up_helper.rb
 - app/helpers/educode_sales/home_helper.rb
 - app/helpers/educode_sales/sessions_helper.rb
 - app/helpers/educode_sales/teachers_helper.rb
@@ -181,6 +182,7 @@ files:
 - app/models/educode_sales/common.rb
 - app/models/educode_sales/course_subject.rb
 - app/models/educode_sales/customer.rb
+- 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/follow_up.rb
@@ -201,6 +203,7 @@ files:
 - app/models/educode_sales/sale_report.rb
 - app/models/educode_sales/sale_trend.rb
 - app/models/educode_sales/staff.rb
+- app/models/educode_sales/staff_school.rb
 - app/models/educode_sales/teacher.rb
 - app/models/educode_sales/teacher_assign_follow.rb
 - app/models/educode_sales/teacher_follow.rb
@@ -216,6 +219,7 @@ files:
 - app/views/educode_sales/businesses/export_records.html.erb
 - app/views/educode_sales/businesses/export_records.json.jbuilder
 - app/views/educode_sales/businesses/file.html.erb
+- app/views/educode_sales/businesses/get_export_data.json.jbuilder
 - app/views/educode_sales/businesses/index.html.erb
 - app/views/educode_sales/businesses/index.json.jbuilder
 - app/views/educode_sales/businesses/new.html.erb
@@ -257,6 +261,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_schools.json.jbuilder
 - app/views/educode_sales/home/statistics.html.erb
 - app/views/educode_sales/money_plans/index.html.erb
 - app/views/educode_sales/money_plans/index.json.jbuilder
@@ -415,6 +420,8 @@ files:
 - db/migrate/20211220102720_add_position_to_commons.rb
 - db/migrate/20211221075146_add_school_id_to_educode_sales_businesses.rb
 - db/migrate/20220121060006_create_educode_sales_business_export_records.rb
+- db/migrate/20220125013811_create_educode_sales_staff_schools.rb
+- db/migrate/20220125033552_create_educode_sales_customer_adds.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb