educode_sales 0.3.5 → 0.3.9

data/app/controllers/educode_sales/teachers_controller.rb

@@ -21,6 +21,18 @@ module EducodeSales
     def index
       respond_to do |format|
         format.html do
+          @more = can?(:create, EducodeSales::OperationPlan) || can?(:update, EducodeSales::Teacher) || can?(:destroy, EducodeSales::Teacher)
+          gon.menus = []
+          if can?(:create, EducodeSales::OperationPlan)
+            gon.menus << { title: '添加周计划', event: 'week' }
+            gon.menus << { title: '添加月计划', event: 'month' }
+          end
+          if can?(:update, EducodeSales::Teacher)
+            gon.menus << { title: '编辑', event: 'edit' }
+          end
+          if can?(:destroy, EducodeSales::Teacher)
+            gon.menus << { title: '删除', event: 'delete' }
+          end
         end
         format.json do
           if @current_admin.is_admin?
@@ -43,7 +55,7 @@ module EducodeSales
             @teachers = @teachers.where("educode_sales_teachers.name like ?", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:professional_title].present?
-            @teachers = @teachers.where("educode_sales_teachers.professional_title like ?", "%#{params[:q][:professional_title]}%")
+            @teachers = @teachers.where("educode_sales_teachers.professional_title = ?", "#{params[:q][:professional_title]}")
           end
           if params[:q].present? && params[:q][:regist_at].present?
             @teachers = @teachers.where("educode_sales_teachers.regist_at like ?", "%#{params[:q][:regist_at]}%")
@@ -59,7 +71,7 @@ module EducodeSales
             @teachers = @teachers.joins(:department).where("departments.id in (?)", departments_ids)
           end
           if params[:q].present? && params[:q][:area].present?
-            p = EducodeSales::Common.where(id: params[:q][:area]).pluck(:name)[0]
+            p = EducodeSales::Common.find(params[:q][:area]).name
             @teachers = @teachers.joins("
               JOIN departments ON educode_sales_teachers.department_id = departments.id
               JOIN schools ON departments.school_id = schools.id
@@ -79,7 +91,9 @@ module EducodeSales
       end
     end
 
-
+    def import
+      render layout: false
+    end
 
     def new
       render layout: false
@@ -98,8 +112,6 @@ module EducodeSales
       end
 
       if params[:activity_id].present? && params[:user_id].present?
-        @teacher_id = EducodeSales::Teacher.find_by(name: params[:name]).id
-
         # 把老师添加到活动列表，提取判断下老师列表是否存在
         find_teacher = Teacher.find_by(user_id: params[:user_id])
         if find_teacher

data/app/models/educode_sales/assign_follow_up.rb

@@ -0,0 +1,6 @@
+module EducodeSales
+  class AssignFollowUp < ApplicationRecord
+    belongs_to :staff
+    belongs_to :follow_up
+  end
+end

data/app/models/educode_sales/follow_up.rb

@@ -5,6 +5,7 @@ module EducodeSales
     has_many :money_plans, dependent: :destroy
     has_many :key_person
     has_many :teachers, through: :key_person
+    has_many :assign_follow_ups, dependent: :destroy
     belongs_to :staff
     belongs_to :stage, class_name: 'Common'
     belongs_to :clazz, class_name: 'Common'

data/app/models/educode_sales/key_person.rb

@@ -1,7 +1,7 @@
 module EducodeSales
   class KeyPerson < ApplicationRecord
     belongs_to :teacher
-    belongs_to :attitude, class_name: 'Common'
+    belongs_to :attitude, class_name: 'Common', optional: true
     belongs_to :follow_up, counter_cache: true
 
     enum sex: ['男', '女']

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

@@ -67,8 +67,7 @@
 
         //监听提交
         form.on('submit(data-reset-btn)', function (data) {
-            console.log(data.field);
-            request.authPut("educode_sales/activities/" + <%= @activity.id %>, data.field, function (res) {
+            request.authPut("missions/activities/" + <%= @activity.id %>, data.field, function (res) {
                 if (res.success === false) {
                     layer.alert(res.msg)
                 } else {

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

@@ -2,12 +2,14 @@
   <div class="layui-btn-container">
     <span class="table-label">活动列表</span>
     <% if can? :create, EducodeSales::Activity %>
-    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加活动</button>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import">导入数据</button>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加活动</button>
     <% end %>
   </div>
 </script>
-
+<div class="min-height-table">
 <table class="layui-hide" id="activities_table" lay-filter="activities_table"></table>
+</div>
 
 <script type="text/html" id="currentTableBar">
   <% if can? :update, EducodeSales::Activity %>
@@ -35,7 +37,7 @@
 
         table.render({
             elem: '#activities_table',
-            url: '/educode_sales/activities',
+            url: '/missions/activities',
             toolbar: '#activity_toolbar',
             defaultToolbar: [],
             cols: [
@@ -48,41 +50,42 @@
                 {
                   field: 'name',
                   title: '活动名称',
-                  width: 300,
+                  width: 400,
                   templet: '#teachers'
                 },
                 {
                   field: 'start_at',
-                  width: 200,
+                  width: 120,
                   title: '时间',
                   sort: true,
                 },
                 {
                   field: 'days',
                   title: '天数',
-                  width: 200
+                  width: 100
                 },
                 {
                   field: 'teachers_count',
                   title: '教师数',
-                  width: 200,
+                  width: 100,
                   templet: '#teachers_count'
                 },
                 {
                   field: 'students_count',
                   title: '学生数',
-                  width: 200
+                  width: 100
                 },
                 {
-                    title: '操作',
-                    width: 120,
-                    toolbar: '#currentTableBar',
-                    align: "center"
+                  title: '操作',
+                  width: 120,
+                  fixed: 'right',
+                  toolbar: '#currentTableBar',
+                  align: "center"
                 }
               ]
             ],
-            height: 700,
             limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
             page: true
         });
 
@@ -99,7 +102,7 @@
       })
         table.on('toolbar(activities_table)', function (obj) {
           if (obj.event === 'add') { // 监听添加操作
-            var content = miniPage.getHrefContent('/educode_sales/activities/new');
+            var content = miniPage.getHrefContent('/missions/activities/new');
             var openWH = miniPage.getOpenWidthHeight();
             index = layer.open({
               title: '添加活动',
@@ -118,13 +121,30 @@
               layer.full(index);
             });
           }
+          else if (obj.event === 'import') {  //
+              var content = miniPage.getHrefContent('/missions/teachers/import');
+              var openWH = miniPage.getOpenWidthHeight();
+              import_index = layer.open({
+                  title: '导入数据',
+                  type: 1,
+                  shade: 0.2,
+                  shadeClose: true,
+                  area: ['200px', '100px'],
+                  offset: 'auto',
+                  closeBtn: 0,
+                  content: content,
+              });
+              $(window).on("resize", function () {
+                  layer.full(index);
+              });
+          }
         });
 
         table.on('tool(activities_table)', function (obj) {
             var data = obj.data;
             var id = data.id
             if (obj.event === 'edit') {
-                var content = miniPage.getHrefContent('/educode_sales/activities/' + id + '/edit');
+                var content = miniPage.getHrefContent('/missions/activities/' + id + '/edit');
                 var openWH = miniPage.getOpenWidthHeight();
                 var index = layer.open({
                     title: '编辑',
@@ -148,14 +168,14 @@
                 return false;
             } else if (obj.event === 'delete') {
                 layer.confirm('确定删除' + data.name, function (index) {
-                    request.delete('educode_sales/activities/' + data.id, {}, function (res) {
+                    request.delete('missions/activities/' + data.id, {}, function (res) {
                         layer.close(index);
                         table.reload("activities_table")
                     })
                 });
             } else if (obj.event === 'teachers') {
                 activity_id = obj.data.id
-                var content = miniPage.getHrefContent('/educode_sales/activities/show_teachers');
+                var content = miniPage.getHrefContent('/missions/activities/show_teachers');
               openWH = miniPage.getOpenWidthHeight();
               index = layer.open({
                 title: '活动列表/' + data.name,
@@ -177,7 +197,7 @@
             }
              else if (obj.event === 'teachers_count') {
                 activity_id = obj.data.id
-                content = miniPage.getHrefContent('/educode_sales/activities/show_teachers');
+                content = miniPage.getHrefContent('/missions/activities/show_teachers');
               openWH = miniPage.getOpenWidthHeight();
               index2 = layer.open({
                 title: '活动列表/' + data.name,

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

@@ -69,7 +69,7 @@
 
         //监听提交
         form.on('submit(data-reset-btn)', function (data) {
-            request.authPost("educode_sales/activities", data.field, function (res) {
+            request.authPost("missions/activities", data.field, function (res) {
                 if (res.success === false) {
                     layer.alert(res.msg)
                 } else {

data/app/views/educode_sales/activities/show_teachers.html.erb

@@ -51,7 +51,7 @@
         table = layui.table;
         table.render({
             elem: '#show_teachers_table',
-            url: '/educode_sales/teachers?activity_id=' + parent.activity_id,
+            url: '/missions/teachers?activity_id=' + parent.activity_id,
             toolbar: '#teacher_toolbar',
             defaultToolbar: [],
             cols: [
@@ -176,7 +176,7 @@
          */
         table.on('toolbar(teachers_table)', function (obj) {
             if (obj.event === 'add') { // 手动添加
-                var content = miniPage.getHrefContent('/educode_sales/teachers/new');
+                var content = miniPage.getHrefContent('/missions/teachers/new');
                 var openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '手动添加',
@@ -192,8 +192,8 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'search_new') { // 搜索添加
-               var content = miniPage.getHrefContent('/educode_sales/teachers/new');
-                // var content = miniPage.getHrefContent('/educode_sales/teachers/search_new');
+               var content = miniPage.getHrefContent('/missions/teachers/new');
+                // var content = miniPage.getHrefContent('/missions/teachers/search_new');
                 var openWH = miniPage.getOpenWidthHeight();
                 activity_id = parent.activity_id;
                 index = layer.open({
@@ -221,7 +221,7 @@
             var data = obj.data;
             id = data.id
             if (obj.event === 'edit') { //编辑
-                var content = miniPage.getHrefContent('/educode_sales/teachers/' + id + '/edit');
+                var content = miniPage.getHrefContent('/missions/teachers/' + id + '/edit');
                 var openWH = miniPage.getOpenWidthHeight();
                 sindex = layer.open({
                     title: '编辑',
@@ -245,14 +245,14 @@
             } else if (obj.event === 'delete') {
                 console.log(data);
                 layer.confirm('确定删除' + data.name, function (index) {
-                    request.delete('educode_sales/teachers/' + data.id, {activity_id: activity_id}, function (res) {
+                    request.delete('missions/teachers/' + data.id, {activity_id: activity_id}, function (res) {
                       layer.close(index);
                       table.reload("activities_table")
                       table.reload("show_teachers_table")
                     })
                 });
             } else if (obj.event === 'addWeek') {
-                var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_week');
+                var content = miniPage.getHrefContent('/missions/operation_plans/new_week');
                 var openWH = miniPage.getOpenWidthHeight();
 
                 sindex = layer.open({
@@ -269,7 +269,7 @@
                     layer.full(sindex);
                 });
             } else if (obj.event === 'addMonth') {
-                var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_month');
+                var content = miniPage.getHrefContent('/missions/operation_plans/new_month');
                 var openWH = miniPage.getOpenWidthHeight();
                 sindex = layer.open({
                     title: '添加月计划',
@@ -287,7 +287,7 @@
 
             } else if (obj.event === 'courses') {
                 teacher_id = data.id
-                content = miniPage.getHrefContent('/educode_sales/teachers/add_courses?id='+data.id);
+                content = miniPage.getHrefContent('/missions/teachers/add_courses?id='+data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '课程方向',
@@ -307,7 +307,7 @@
                     layer.full(index);
                 });
             }else if (obj.event === 'event') {
-                content = miniPage.getHrefContent('/educode_sales/teachers/add_event');
+                content = miniPage.getHrefContent('/missions/teachers/add_event');
                 openWH = miniPage.getOpenWidthHeight();
                 teacher_id = obj.data.id
                 index = layer.open({
@@ -324,7 +324,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'class') {
-                content = miniPage.getHrefContent('/educode_sales/teachers/show_class');
+                content = miniPage.getHrefContent('/missions/teachers/show_class');
                 openWH = miniPage.getOpenWidthHeight();
                 user_id = obj.data.user_id
                 index = layer.open({
@@ -345,7 +345,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'follow') {
-                content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.id);
+                content = miniPage.getHrefContent('/missions/teachers/show_follow?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '跟进记录',

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

@@ -11,6 +11,14 @@
       <label class="layui-form-label required">单位部门</label>
       <div class="layui-input-block" id="department" style="width: 300px;"></div>
     </div>
+    <br>
+    <div class="layui-inline" style="padding-top: 20px">
+      <label class="layui-form-label ">商机来源</label>
+      <input id="source" type="text" name="source" autocomplete="off"  class="layui-input" value="<%=@business.source %>" style="width: 300px;" placeholder="请输入商机来源">
+    </div>
+    <div class="layui-inline" style="padding-top: 20px">
+      <p style="padding-left: 40px">请填写提供本商机的人名（如‘张明’）；如果为非头歌用户，请增加单位信息（如‘张明，华为公司’）</p>
+    </div>
     <div class="layui-form-item m-t-20">
       <div class="layui-input-block">
         <button class="layui-btn layui-btn-normal" lay-submit lay-filter="edit_business">提交</button>
@@ -47,7 +55,7 @@
           department_id = "";
           return cb([]);
         }
-        request.get('educode_sales/search?type=department&q=' + value, {}, function (res) {
+        request.get('missions/search?type=department&q=' + value, {}, function (res) {
           return cb(res)
         })
       }
@@ -62,16 +70,19 @@
         layer.alert("请选择单位部门")
         return false;
       } else {
-      request.authPut("educode_sales/businesses/" + parent.id, {
+      request.authPut("missions/businesses/" + parent.id, {
         department_id: department.getValue() || department_id,
-        name: data.field.name
+        name: data.field.name,
+        source: data.field.source
       }, function (res) {
         if (res.success == false) {
           layer.alert(res.msg)
         } else {
           layer.close(parent.sindex);
           parent.layer.close(parent.layer.getFrameIndex(window.name))
-          parent.table.reload('businesses_table')
+          parent.table.reload('businesses_table', {done: function() {
+            parent.drowpdwonRender()
+          }});
         }
       })
       }

data/app/views/educode_sales/businesses/edit_follow_record.html.erb

@@ -1,3 +1,4 @@
+<%= Gon::Base.render_data %>
 <h1 class="m-t-20 text-center"><%= @follow_up.business.name %></h1>
 <div class="layui-form layuimini-form">
   <div class="layui-form-item" style="padding: 25px">
@@ -16,9 +17,15 @@
     <br>
     <div class="layui-inline">
       <label class="layui-form-label required">项目类型</label>
-      <div class="layui-input-inline">
-         <%= select_tag "clazz_id", options_for_select(@clazz, @follow_up.clazz_id), class: 'required' %>
-      </div>
+      <%if  EducodeSales::FollowUp.where(business_id: @follow_up.business.id,clazz_id: EducodeSales::Common.find_by(name: "O类").id).count >= 2 %>
+        <div class="layui-input-inline">
+          <%= select_tag "clazz_id", options_for_select([['O类',EducodeSales::Common.find_by(name: "O类").id]]),:disabled => true, class: 'required' %>
+        </div>
+      <%else %>
+        <div class="layui-input-inline">
+          <%= select_tag "clazz_id", options_for_select(@clazz, @follow_up&.clazz_id), class: 'required' %>
+        </div>
+      <%end %>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">项目阶段</label>
@@ -68,8 +75,14 @@
       </div>
       <span style="margin-top: 10px; float:left;">%</span>
     </div>
+    <div class="layui-form-item">
+      <label class="layui-form-label">指定跟进人</label>
+      <div class="layui-input-inline">
+        <div id="edit_assign_follow" style="width: 512px;"></div>
+      </div>
+    </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label required">自我小结</label>
+      <label class="layui-form-label required">商机说明</label>
       <div class="layui-input-block">
         <textarea name="description" lay-verify="required" placeholder="此处可以填写：
 1、有无预算；
@@ -101,10 +114,11 @@
 </div>
 
 <script>
-  layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate'], function () {
+  layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {
     var form = layui.form,
       layer = layui.layer,
       table = layui.table,
+      xmSelect = layui.xmSelect,
       laytpl = layui.laytpl,
       request = layui.request,
       laydate = layui.laydate,
@@ -118,9 +132,43 @@
       elem: '#reception_at_edit'
     });
 
+    var sales_list = xmSelect.render({
+      el: '#edit_assign_follow',
+      remoteSearch: true,
+      clickClose: true,
+      delay: 1000,
+      paging: true,
+      pageRemote: true,
+      filterable: true,
+      remoteMethod: function (val, cb, show, pageIndex) {
+        $.ajax( '/missions/sales_staff', {
+          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.sales)
+
     form.render();
     form.on('submit(update_follow_up)', function (data) {
-      request.authPut("educode_sales/follow_ups/<%= @follow_up.id%>", data.field, function (res) {
+      var assign_follow = [];
+      sales_list.getValue().forEach(function(d) {
+        assign_follow.push(d.value);
+      })
+      data.field.assign_follow_up = assign_follow;
+      request.authPut("missions/follow_ups/<%= @follow_up.id%>", data.field, function (res) {
         if (res.success == false) {
           layer.alert(res.msg)
         } else {

data/app/views/educode_sales/businesses/edit_plan.html.erb

@@ -81,7 +81,7 @@
 
     //监听提交
     form.on('submit(add_return_money)', function (data) {
-      request.authPost("educode_sales/follow_ups/" + parent.follow_up_id + "/add_money", data.field, function (
+      request.authPost("missions/follow_ups/" + parent.follow_up_id + "/add_money", data.field, function (
         res) {
         if (res.success == false) {
           layer.alert(res.msg)
@@ -97,7 +97,7 @@
 
     table.render({
       elem: '#return_money_list',
-      url: '/educode_sales/follow_ups/' + parent.follow_up_id + '/money_plans',
+      url: '/missions/follow_ups/' + parent.follow_up_id + '/money_plans',
       cols: [
         [{
           field: 'id',
@@ -155,7 +155,7 @@
       data.clazz = clazz ? clazz : obj.data.clazz;
       data.plan_id = obj.data.id
       if (obj.event === 'edit') {
-        request.authPut('educode_sales/follow_ups/' + parent.follow_up_id + "/update_money", data,
+        request.authPut('missions/follow_ups/' + parent.follow_up_id + "/update_money", data,
           function (res) {
             if (res.success) {
               layer.alert('保存成功');
@@ -168,7 +168,7 @@
           })
       } else if (obj.event == 'delete') {
         layer.confirm('确定删除回款金额为' + data.amount + "的计划", function (index) {
-          request.delete('educode_sales/follow_ups/' + parent.follow_up_id + "/delete_money?plan_id=" + data.id, {}, function (res) {
+          request.delete('missions/follow_ups/' + parent.follow_up_id + "/delete_money?plan_id=" + data.id, {}, function (res) {
             layer.close(index);
             table.reload("return_money_list");
             table.reload("sale_plan_follow_table");