educode_sales 0.6.6 → 0.7.0

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

@@ -4,9 +4,43 @@
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加人员</button>
   </div>
 </script>
-
+<div class="layuimini-main  min-height-table" id="week_table_wraper">
+  <div class="layui-form layui-form-pane" lay-filter="week_plan_form_filter">
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">用户名</label>
+        <div class="layui-input-inline large-select">
+          <input type="text" class="layui-input" id="name" autocomplete="off" name="name">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">角色</label>
+        <div class="layui-input-inline">
+          <%= select_tag "role", options_for_select(EducodeSales::Role.all.pluck(:name, :id)), {'lay-filter': 'role', include_blank: true} %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">人员类型</label>
+        <div class="layui-input-inline large-select">
+          <%= select_tag "staff_type", options_for_select(EducodeSales::Common.where(clazz: 'staff_type').pluck(:name, :id)), {'lay-filter': 'staff_type', include_blank: true} %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">状态</label>
+        <div class="layui-input-inline large-select">
+          <%= select_tag "banned", options_for_select([["启用",0],["禁用",1]]), {'lay-filter': 'banned', include_blank: true} %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <button type="reset" lay-submit class="layui-btn layui-btn-primary" lay-filter="week_plan_reset">重置
+        </button>
+        <button type="submit" lay-submit class="layui-btn layui-btn-primary" lay-filter="week_plan_search">检索
+        </button>
+      </div>
+    </div>
+  </div>
 <table class="layui-hide" id="staff_filter" lay-filter="staff_filter"></table>
-
+</div>
 <script type="text/html" id="staff_bar">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <a class="layui-btn layui-btn-xs layui-btn-warm data-count-delete" lay-event="disable">禁用</a>
@@ -53,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',
@@ -97,6 +137,38 @@
         });
       }
     });
+      var sort = {}, search = {};
+      // table.on('sort(weekPlanTable)', function(obj) {
+      //     sort.field = obj.field;
+      //     sort.order = obj.type;
+      //     table.reload('weekPlanTable', {
+      //         initSort: obj,
+      //         where: {
+      //             sort: sort,
+      //             q: search
+      //         }
+      //     });
+      // })
+
+      // 监听搜索操作
+      form.on('submit(week_plan_search)', function (data) {
+          search = data.field
+          table.reload('staff_filter', {
+              page: {
+                  curr: 1
+              },
+              where: {q: search, sort : sort}
+          }, 'data');
+
+          return false;
+      });
+
+      form.on('submit(week_plan_reset)', function(data){
+          var field = data.field;
+          form.val('week_plan_form_filter', {name: '', role: '', staff_type: '', banned: ''})
+          return false;
+      });
+
     table.on('tool(staff_filter)', function (obj) {
       var data = obj.data;
       staff_id = data.id;

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/index.html.erb

@@ -68,7 +68,7 @@
         </button>
         <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_teachers">搜 索
         </button>
-        <a style="padding-left: 20px;color: #0000FF"  href="javascript:;" type="submit" class="" lay-submit lay-filter="show_hide">展开/收起
+        <a style="padding-left: 20px;color: #0000FF"  href="javascript:;" type="submit" class="" lay-submit lay-filter="show_hide">高级搜索
         </a>
       </div>
     </div>

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

@@ -71,7 +71,7 @@
               </dd>
             <% end %>
             <% if can? :read, EducodeSales::MoneyPlan %>
-              <dd><a href="/missions/money_plans" class="<%= current?('layui-this', money_plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/money_plans.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>回款管理</a>
+              <dd><a href="/missions/money_plans" class="<%= current?('layui-this', money_plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/money_plans.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>回款计划</a>
               </dd>
             <% end %>
             <% if can? :read, EducodeSales::Customer %>

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
@@ -82,6 +83,9 @@ 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
       get :show_follow

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -7,12 +7,19 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       t.timestamps
     end
     if EducodeSales::Permission.last.nil?
+      EducodeSales::Permission.create(name: '导出商机', subject: 'Business', action: 'export_business', clazz: 'business', position: '11')
+
 
       #附件管理权限
       EducodeSales::Permission.create(name: '查看附件', subject: 'Business', action: 'show_file', clazz: 'business', position: '11')
       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/20220121060006_create_educode_sales_business_export_records.rb

@@ -0,0 +1,10 @@
+class CreateEducodeSalesBusinessExportRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_business_export_records do |t|
+      t.string :name
+      t.references :staff
+
+      t.timestamps
+    end
+  end
+end

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.6'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.7.0
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -177,9 +177,11 @@ files:
 - app/models/educode_sales/application_record.rb
 - app/models/educode_sales/assign_follow_up.rb
 - app/models/educode_sales/business.rb
+- app/models/educode_sales/business_export_record.rb
 - 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
@@ -200,6 +202,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
@@ -212,7 +215,10 @@ files:
 - app/views/educode_sales/businesses/edit.html.erb
 - app/views/educode_sales/businesses/edit_follow_record.html.erb
 - app/views/educode_sales/businesses/edit_plan.html.erb
+- 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
@@ -254,6 +260,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
@@ -411,6 +418,9 @@ files:
 - db/migrate/20211215025029_create_educode_sales_customer_follows.rb
 - 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