educode_sales 0.3.3 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d03c13290f7199b6950c19060fb7efc58f3d5bbd
-  data.tar.gz: a3bc8311248e48fcfa615906d5607a8d3347755a
+SHA256:
+  metadata.gz: c5f62ecb1fb5d2f9b42761618eae0525dd789bb69fc2522c108749eacfa26f05
+  data.tar.gz: a0ec504c642dfe71bc8bd513140d96bc82b9de444a48945ee245bb812bc4884b
 SHA512:
-  metadata.gz: ec1f20e0b7e6d6d4ffbcc89cab5fd6815ae26c37f836f027ac8065746e21546141fe26c15cad74f403bc80402bc4bf9e315ae099969bd24a84a33d1e329828ac
-  data.tar.gz: 35154b0f7e422796b80e80a7952485885cb4d4cb4718e9065db900b915aee9d4df8b11d87ae9bf56f25d9b09e8c11a0cf51e473b24f4f51a27d4af83e8979416
+  metadata.gz: d27c931c74c8ca700c4710d0b3fbd702152adbeb780de114324a07b4bca8de66cbc1b1f13fc82d11d873ec43ae2c8eb83422c98169e47c3c76f997e58c73a83a
+  data.tar.gz: bdd71543da8fc7cf0687374af51870da0c2950ebb10d7db232af4a58b8f26e13c1b31777b95d1c636125a8dbcc17b79317bcdcd682242080d5783604f332d155

data/app/controllers/educode_sales/businesses_controller.rb

@@ -9,6 +9,18 @@ module EducodeSales
         format.html do
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
+          @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business)
+          gon.menus = []
+          if can?(:create, EducodeSales::SalePlan)
+            gon.menus << { title: '添加周计划', event: 'week' }
+            gon.menus << { title: '添加月计划', event: 'month' }
+          end
+          if can?(:update, EducodeSales::Business)
+            gon.menus << { title: '编辑', event: 'edit' }
+          end
+          if can?(:destroy, EducodeSales::Business)
+            gon.menus << { title: '删除', event: 'delete' }
+          end
         end
         format.json do
           if @current_admin.is_admin?
@@ -25,7 +37,7 @@ module EducodeSales
               @businesses = Business
             end
           end
-          
+
           @businesses = @businesses
           if params[:q].present? && params[:q][:name].present?
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
@@ -43,21 +55,22 @@ module EducodeSales
             ").where("educode_sales_follow_ups.clazz_id = ?", params[:q][:business_type])
           end
           if params[:q].present? && params[:q][:business_step].present?
-            @businesses = @businesses.joins(" 
+            @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
             ").where("educode_sales_follow_ups.stage_id = ?", params[:q][:business_step])
           end
           if  params[:q].present? && params[:q][:place_id].present?
-            @businesses = @businesses.joins(" 
+            @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
             ").where("educode_sales_follow_ups.place_id = ?", params[:q][:place_id])
           end
 
           if params[:q].present? && params[:q][:area].present?
+            p = EducodeSales::Common.find(params[:q][:area]).name
             @businesses = @businesses.joins("
               JOIN departments ON educode_sales_businesses.department_id = departments.id
               JOIN schools ON departments.school_id = schools.id
-            ").where("province = ?", params[:q][:area])
+            ").where("province = ?", p)
           end
 
           if params[:q].present? && params[:q][:date].present?
@@ -73,12 +86,12 @@ module EducodeSales
           end
 
           @business_count = @businesses.count
-          
+
           @businesses = @businesses.select("
             educode_sales_businesses.*,
             last_follow.invitation_at,
             last_follow.reception_at,
-            last_follow.total_amount").joins(" 
+            last_follow.total_amount").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
           ").page(params[:page]).per(params[:limit])
         end
@@ -87,7 +100,7 @@ module EducodeSales
 
     def create
       department = Department.find(params[:department_id])
-      business = @current_admin.businesses.build(name: params[:name], department_id: department.id)
+      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source])
       if business.save
         render_success
       else
@@ -109,7 +122,7 @@ module EducodeSales
     def update
       business = Business.find(params[:id])
       department = Department.find(params[:department_id])
-      if business.update(name: params[:name], department_id: department.id)
+      if business.update(name: params[:name], department_id: department.id, source: params[:source])
         render_success
       else
         render_failure business

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -151,7 +151,7 @@ module EducodeSales
     end
 
     def teacher_params
-      params.permit(:professional_title, :job, :attitude_id, :sex, :birth_date, :remark)
+      params.permit(:professional_title, :job, :attitude_id, :sex, :birth_date, :remark, :tel)
     end
   end
 end

data/app/controllers/educode_sales/key_person_controller.rb

@@ -23,7 +23,7 @@ module EducodeSales
 
     private
     def key_params
-      params.permit(:attitude_id, :sex, :birth_date, :remark)
+      params.permit(:attitude_id, :sex, :birth_date, :remark, :tel)
     end
   end
 end

data/app/controllers/educode_sales/plans_controller.rb

@@ -59,7 +59,7 @@ module EducodeSales
     def create
       plan = @current_admin.sale_plans.build(plan_params)
       plan.month = params["month"] + "-1"
-      plan.business_id = @current_admin.businesses.find(params[:business_id]).id
+      plan.business = @current_admin.businesses.find_by(id: params[:business_id])
       if plan.save
         render_success
       else

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -10,16 +10,16 @@ module EducodeSales
       @years = (1..(Time.now.year - 2020)).map { |d| 2020 + d }
       year_time = "#{@year}-01-01 00:00:00"
       @sale_trend = SaleTrend.find_or_create_by(year: @year)
-      @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ?", year_time).sum(:total_amount)
+      @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ?", year_time).sum(:total_amount).round(2)
       stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-      @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, stage_ids).sum(:total_amount)
+      @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, stage_ids).sum(:total_amount).round(2)
       s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
-      @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, s_stage_ids).sum(:total_amount)
-      @return_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ?", year_time).sum(:return_money)
+      @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, s_stage_ids).sum(:total_amount).round(2)
+      @return_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ?", year_time).sum(:return_money).round(2)
       a = Common.where(clazz: '商机类型', name: 'A类').pluck(:id)
-      @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.clazz_id IN (?)", year_time, a).sum(:total_amount)
+      @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.clazz_id IN (?)", year_time, a).sum(:total_amount).round(2)
       b = Common.where(clazz: '商机类型', name: 'B类').pluck(:id)
-      @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.clazz_id IN (?)", year_time, b).sum(:total_amount)
+      @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.clazz_id IN (?)", year_time, b).sum(:total_amount).round(2)
     end
 
     def sale_trends

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?
@@ -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

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

@@ -68,7 +68,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

@@ -35,7 +35,7 @@
 
         table.render({
             elem: '#activities_table',
-            url: '/educode_sales/activities',
+            url: '/missions/activities',
             toolbar: '#activity_toolbar',
             defaultToolbar: [],
             cols: [
@@ -81,7 +81,6 @@
                 }
               ]
             ],
-            height: 700,
             limit: 20,
             page: true
         });
@@ -99,7 +98,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: '添加活动',
@@ -124,7 +123,7 @@
             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 +147,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 +176,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

@@ -16,9 +16,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>
@@ -69,7 +75,7 @@
       <span style="margin-top: 10px; float:left;">%</span>
     </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、有无预算；
@@ -120,7 +126,7 @@
 
     form.render();
     form.on('submit(update_follow_up)', function (data) {
-      request.authPut("educode_sales/follow_ups/<%= @follow_up.id%>", data.field, function (res) {
+      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");