educode_sales 0.1.7 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b586bc3b1634320b6fb34e4646577e51cd2eed
-  data.tar.gz: a05dcbb55cc2e2e8f3e7dfbc7671d5f89c24fca5
+  metadata.gz: 50c6f58b4bfd8062d4c7f0101e43454793e7cd46
+  data.tar.gz: 5afbd0111144d83941dbe35219508d65eb3af65d
 SHA512:
-  metadata.gz: 7099d303b654990b619fcad31ddf547c3412be01a359bb00c0fec6534f32a7764326d512916536d1dbd1710193bddb08b370096250c21fc5dedc976bfc786f12
-  data.tar.gz: 17ac1d2f5b4b134147ca1b77b53c340c04389269e2f1b8b89c9b89c90893eed640c5cb5980f0be28a10e8ada7c18f927d2b326069d1a0f47d237902f13b5f832
+  metadata.gz: 2538da04fa510bafc20f14f527581059d6776484293b8f2a2b405a6132e970cc0c2f3e7e6a6d33398ee286e3e2dbfd40eba5fa97df6dd1973eed1cf061433667
+  data.tar.gz: 6695eb57a9c754999e9b0d0b4e68f038b58efc7801012faf288a3f9d067db1c039abf9582a7f1af35b7f2b426494fd800a6223bdb08903fa83a52ba428859598

data/app/assets/stylesheets/educode_sales/app.css

@@ -255,4 +255,27 @@ td .layui-table-cell .layui-form-select {
 
 .large-select .layui-form-select dl {
   max-height: 220px;
+}
+
+.layui-form input::-webkit-input-placeholder,
+.layui-form textarea::-webkit-input-placeholder {
+  color: #ccc;
+}
+
+.layui-form input:-moz-placeholder,
+.layui-form textarea:-moz-placeholder {
+  /* Mozilla Firefox 4 to 18 */
+  color: #ccc;
+}
+
+.layui-form input::-moz-placeholder,
+.layui-form textarea::-moz-placeholder {
+  /* Mozilla Firefox 19+ */
+  color: #ccc;
+}
+
+.layui-form input:-ms-input-placeholder,
+.layui-form textarea:-ms-input-placeholder {
+  /* Internet Explorer 10+ */
+  color: #ccc;
 }

data/app/assets/stylesheets/educode_sales/public.css

@@ -45,3 +45,7 @@
   padding: 10px 20px 5px 20px;
   color: #6b6b6b;
 }
+
+input::placeholder {
+    font-size: 6px;
+}

data/app/controllers/educode_sales/businesses_controller.rb

@@ -7,7 +7,8 @@ module EducodeSales
       authorize! :read, Business
       respond_to do |format|
         format.html do
-          @staffs = Staff.joins(:user).map { |d| [d.user.real_name, d.id]}
+          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]}
         end
         format.json do
           if @current_admin.is_admin?
@@ -115,6 +116,15 @@ module EducodeSales
       end
     end
 
+    def updateMoney
+      business = Business.find(params[:id])
+      if business.update(return_money: params[:return_money])
+        render_success
+      else
+        render_failure business
+      end
+    end
+
     def destroy
       business = Business.find(params[:id])
       business.destroy
@@ -145,6 +155,7 @@ module EducodeSales
             @follow_ups = @follow_ups.order("created_at desc")
           end
           @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
+          @latest = @follow_ups.order(created_at: :desc).first
         end
       end
     end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -9,6 +9,19 @@ module EducodeSales
       follow_up.staff = @current_admin
       follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save
+        if @business.last_follow_up.present?
+          @business.last_follow_up.key_person.each do |d|
+            key_person = d.dup
+            key_person.follow_up_id = follow_up.id
+            key_person.save
+          end
+          @business.last_follow_up.money_plans.each do |d|
+            money = d.dup
+            money.staff = @current_admin
+            money.follow_up_id = follow_up.id
+            money.save
+          end
+        end
         @business.update(last_follow_up_id: follow_up.id)
         render_success
       else

data/app/controllers/educode_sales/home_controller.rb

@@ -12,28 +12,28 @@ module EducodeSales
     end
 
     def search_users
-      @users = User.where("lastname like ? OR login like ?", "%#{params[:q]}%", "%#{params[:q]}%").limit(10)
+      @users = User.where("lastname like :q OR login like :q OR phone like :q or mail like :q", q: "%#{params[:q]}%").limit(20)
     end
 
     def search
       if params[:type] == 'department'
-        @data = Department.where("name like ?", "%#{params[:q]}%").limit(10)
+        @data = Department.where("name like ?", "%#{params[:q]}%").limit(20)
         unless @data.present?
-          @data = Department.joins(:school).where("schools.name like ?", "%#{params[:q]}%").limit(10)
+          @data = Department.joins(:school).where("schools.name like ?", "%#{params[:q]}%").limit(20)
         end
       elsif params[:type] == "school"
-        data = School.where("name like ? ", "%#{params[:q]}%").limit(10)
+        data = School.where("name like ? ", "%#{params[:q]}%").limit(20)
       end
     end
 
     def search_teacher
-      @data = Teacher.where("name like ? and is_key = false", "%#{params[:q]}%").limit(10)
+      @data = Teacher.where("name like ? and is_key = false", "%#{params[:q]}%").limit(20)
       user_ids = @data.pluck(:user_id).compact.uniq
-      @data += User.joins(:user_extension).where.not(id: user_ids).where("identity='teacher'", user_ids).where("lastname like ?", "%#{params[:q]}%").limit(10)
+      @data += User.joins(:user_extension).where.not(id: user_ids).where("identity='teacher'", user_ids).where("lastname like ?", "%#{params[:q]}%").limit(20)
     end
 
     def search_edu_teacher
-      @data = User.joins(:user_extension).where("identity='teacher'").where("lastname like ? OR phone like ? OR mail like ?", "%#{params[:q]}%", "%#{params[:q]}%", "%#{params[:q]}%").limit(10)
+      @data = User.joins(:user_extension).where("identity='teacher'").where("lastname like ? OR phone like ? OR mail like ?", "%#{params[:q]}%", "%#{params[:q]}%", "%#{params[:q]}%").limit(20)
     end
 
   end

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -71,18 +71,18 @@ module EducodeSales
     end
 
     def destroy
-      sale_report = @current_admin.operation_reports.find(params[:id])
+      sale_report = OperationReport.find(params[:id])
       sale_report.destroy
         render_success
     end
 
     def edit
-      @sale_report = @current_admin.operation_reports.find(params[:id])
+      @sale_report = OperationReport.find(params[:id])
       render layout: false
     end
 
     def update
-      sale_report = @current_admin.operation_reports.find(params[:id])
+      sale_report = OperationReport.find(params[:id])
       sale_report.content = params[:content]
       if sale_report.save
         render_success

data/app/controllers/educode_sales/staffs_controller.rb

@@ -67,13 +67,14 @@ module EducodeSales
 
     def follow_up_schools
       staff = Staff.find(params[:id])
-      @schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at").page(params[:page]).per(params[:limit])
+      # @schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at").page(params[:page]).per(params[:limit])
+      @schools = EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_teacher_follows.updated_at) AS updated_at")+EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at")
       @count =  EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").count
     end
 
     def follow_up_departments
       staff = Staff.find(params[:id])
-      @schools = EducodeSales::Business.joins(:last_follow_up, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("departments.name, schools.name AS school, educode_sales_follow_ups.updated_at").page(params[:page]).per(params[:limit])
+      @schools = EducodeSales::Business.joins(:last_follow_up, [department: :school]).where("educode_sales_follow_ups.staff_id = #{staff.id}").select("departments.name, schools.name AS school, educode_sales_follow_ups.updated_at")+EducodeSales::Teacher.joins(:follow_up, [department: :school]).where("educode_sales_teacher_follows.staff_id = #{staff.id}").select("departments.name, schools.name AS school, educode_sales_teacher_follows.updated_at")
     end
 
 

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -15,6 +15,7 @@ module EducodeSales
         follow_up.courses_count = course_ids.size
       end
       if follow_up.save
+        @teacher.update(follow_up_id: follow_up.id)
         render_success
       else
         render_failure follow_up

data/app/controllers/educode_sales/teachers_controller.rb

@@ -207,6 +207,7 @@ module EducodeSales
             @follow_ups = @follow_ups.order("created_at desc")
           end
           @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
+          @latest = @follow_ups.order(created_at: :desc).first.created_at.to_s
         end
       end
     end

data/app/models/educode_sales/activity.rb

@@ -1,7 +1,7 @@
 module EducodeSales
   class Activity < ApplicationRecord
     belongs_to :staff
-    has_many :activity_teachers
+    has_many :activity_teachers, dependent: :destroy
     has_many :teachers, through: :activity_teachers, dependent: :restrict_with_exception
   end
 end

data/app/models/educode_sales/staff.rb

@@ -4,14 +4,13 @@ module EducodeSales
     belongs_to :role, optional: true
 
     has_many :market_areas, dependent: :destroy
-    has_many :follow_ups, dependent: :restrict_with_exception
-    has_many :operation_plans, dependent: :restrict_with_exception
-    has_many :operation_reports, dependent: :restrict_with_exception
-    has_many :sale_reports, dependent: :restrict_with_exception
-    has_many :follow_ups, dependent: :restrict_with_exception
-    has_many :teacher_follows, dependent: :restrict_with_exception
-    has_many :teachers, dependent: :restrict_with_exception
-    has_many :places, dependent: :restrict_with_exception
+    has_many :follow_ups, dependent: :destroy
+    has_many :operation_plans, dependent: :destroy
+    has_many :operation_reports, dependent: :destroy
+    has_many :sale_reports, dependent: :destroy
+    has_many :teacher_follows, dependent: :destroy
+    has_many :teachers, dependent: :destroy
+    has_many :places, dependent: :destroy
     has_many :businesses
     has_many :activities
     has_many :sale_plans, dependent: :destroy

data/app/models/educode_sales/teacher.rb

@@ -5,11 +5,12 @@ module EducodeSales
     has_many :teacher_follows, dependent: :destroy
     has_many :operation_plans, dependent: :destroy
     has_many :course_subjects, dependent: :destroy
+    has_many :key_person, dependent: :destroy
     belongs_to :department, optional: true
     belongs_to :staff
     belongs_to :user, optional: true
-    belongs_to :follow_up, counter_cache: true, optional: true
-
+    # belongs_to :follow_up, counter_cache: true, optional: true
+    belongs_to :follow_up, class_name: 'TeacherFollow', optional: true
     validates :user_id, uniqueness: { allow_blank: true, message: '已存在老师列表'}
 
 

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

@@ -22,7 +22,7 @@
   <a href="javascript:void(0);" lay-event="teachers" class="layui-table-link">{{ d.name}}</a>
 </script>
 <script type="text/html" id="teachers_count">
-  <a href="javascript:void(0);" lay-event="teachers" class="layui-table-link">{{ d.teachers_count}}</a>
+  <a href="javascript:void(0);" lay-event="teachers_count" class="layui-table-link">{{ d.teachers_count}}</a>
 </script>
 
 <script>
@@ -42,45 +42,45 @@
               [
                 {
                   field: 'id',
-                  title: '序号',
+                  title:'序号',type: 'numbers',
                   width: 60
                 },
                 {
                   field: 'name',
-                  width: 300,
                   title: '活动名称',
                   templet: '#teachers'
                 },
                 {
                   field: 'start_at',
-                  width: 180,
+                  width: 200,
                   title: '时间',
                   sort: true,
                 },
                 {
                   field: 'days',
                   title: '天数',
-                  width: 100
+                  width: 200
                 },
                 {
                   field: 'teachers_count',
                   title: '教师数',
-                  width: 100,
+                  width: 200,
                   templet: '#teachers_count'
                 },
                 {
                   field: 'students_count',
                   title: '学生数',
-                  width: 100
+                  width: 200
                 },
                 {
                     title: '操作',
-                    minWidth: 150,
+                    width: 120,
                     toolbar: '#currentTableBar',
                     align: "center"
                 }
               ]
             ],
+            limit: 20,
             page: true
         });
 
@@ -152,9 +152,9 @@
                     })
                 });
             } else if (obj.event === 'teachers') {
-              var content = miniPage.getHrefContent('/educode_sales/activities/show_teachers');
+                activity_id = obj.data.id
+                var content = miniPage.getHrefContent('/educode_sales/activities/show_teachers');
               openWH = miniPage.getOpenWidthHeight();
-              activity_id = obj.data.id;
               index = layer.open({
                 title: '活动列表/' + data.name,
                 type: 1,
@@ -173,6 +173,28 @@
               });
               return false;
             }
+             else if (obj.event === 'teachers_count') {
+                activity_id = obj.data.id
+                content = miniPage.getHrefContent('/educode_sales/activities/show_teachers');
+              openWH = miniPage.getOpenWidthHeight();
+              index2 = layer.open({
+                title: '活动列表/' + data.name,
+                type: 1,
+                shade: 0.2,
+                maxmin: true,
+                shadeClose: true,
+                area: [openWH[0] + 'px', openWH[1] + 'px'],
+                offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                content: content,
+                success: function (layero, index) {
+                  form.render('select');
+                },
+              });
+              $(window).on("resize", function () {
+                layer.full(index);
+              });
+              return false;
+            }
         });
 
     });

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

@@ -1,7 +1,6 @@
 <script type="text/html" id="teacher_toolbar">
   <div class="layui-btn-container">
     <span class="table-label">教师列表</span>
-    <!-- <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="search_new"> 添加
     </button>
   </div>
@@ -10,9 +9,6 @@
 <table class="layui-hide" id="show_teachers_table" style="min-height: 300px;" lay-filter="teachers_table"></table>
 </div>
 <script type="text/html" id="show_teachersTableBar">
-  <!-- <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addWeek">添加周计划</a>
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addMonth">添加月计划</a> -->
-  <!-- <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-danger data-count-delete" lay-event="delete">删除</a>
 </script>
 <script type="text/html" id="name">
@@ -63,7 +59,7 @@
                  {
                     field: 'id',
                     width: 120,
-                    title: '序号',
+                    title:'序号',type: 'numbers',
                 },
                 {
                     field: 'name',
@@ -247,10 +243,11 @@
                 });
                 return false;
             } else if (obj.event === 'delete') {
+                console.log(data);
                 layer.confirm('确定删除' + data.name, function (index) {
-                    request.delete('educode_sales/businesses/' + data.id, {}, function (res) {
+                    request.delete('educode_sales/teachers/' + data.id, {}, function (res) {
                         layer.close(index);
-                        table.reload("teachers_table")
+                        table.reload("show_teachers_table")
                     })
                 });
             } else if (obj.event === 'addWeek') {
@@ -288,7 +285,8 @@
                 });
 
             } else if (obj.event === 'courses') {
-                content = miniPage.getHrefContent('/educode_sales/teachers/add_courses');
+                teacher_id = data.id
+                content = miniPage.getHrefContent('/educode_sales/teachers/add_courses?id='+data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '课程方向',
@@ -298,12 +296,16 @@
                     shadeClose: true,
                     area: [openWH[0] + 'px', openWH[1] + 'px'],
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
-                    content: content
+                    content: content,
+                    success: function (layero, index) {
+                        // 重新渲染弹层中的下拉选择框select
+                        // form.render('select');
+                    }
                 });
                 $(window).on("resize", function () {
-                  layer.full(index);
+                    layer.full(index);
                 });
-            } else if (obj.event === 'event') {
+            }else if (obj.event === 'event') {
                 content = miniPage.getHrefContent('/educode_sales/teachers/add_event');
                 openWH = miniPage.getOpenWidthHeight();
                 teacher_id = obj.data.id
@@ -342,7 +344,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'follow') {
-                content = miniPage.getHrefContent('/educode_sales/teachers/show_follow');
+                content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '跟进记录',

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

@@ -1,6 +1,6 @@
 <%= Gon::Base.render_data %>
 <div class="layuimini-main edit-table">
-  <div class="layui-form layuimini-form" lay-filter="teacher_form">
+  <div class="layui-form layuimini-form" lay-filter="teacher_form" id="show_plan_box">
     <fieldset class="table-search-fieldset">
       <legend>添加回款计划</legend>
       <div class="layui-form-item">
@@ -56,10 +56,15 @@
   </div>
 </script>
 <script type="text/html" id="return_money_tabar">
+  {{#  if(parent.is_latest){ }}
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">保存</a>
   <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="delete">删除</a>
+  {{#  } }}
 </script>
 <script>
+    if(!parent.is_latest){
+        document.getElementById("show_plan_box").style.display="none";//隐藏
+    }
   layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'laydate'], function () {
     var form = layui.form,
       layer = layui.layer,
@@ -97,7 +102,7 @@
         [{
           field: 'id',
           width: 80,
-          title: 'ID',
+          title:'序号',type: 'numbers',
           sort: true
         }, {
           field: 'date_at',

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

@@ -115,7 +115,7 @@
               {
                 field: 'id',
                 width: 60,
-                title: '序号',
+                title:'序号',type: 'numbers',
               },
               {
                 field: 'name',
@@ -138,15 +138,15 @@
                 width: 60,
                 templet: '#show_follow'
               },
-              {
-                field: 'teachers_count',
-                width: 100,
-                title: '关键人',
-                templet: '#show_keys'
-              },
+              // {
+              //   field: 'teachers_count',
+              //   width: 100,
+              //   title: '关键人',
+              //   templet: '#show_keys'
+              // },
               {
                 field: 'clazz',
-                width: 80,
+                width: 60,
                 title: '类型'
               },
               {
@@ -156,13 +156,13 @@
               },
               {
                 field: 'invitation_at',
-                width: 120,
+                width: 105,
                 title: '招标时间',
                 sort: true
               },
               {
                 field: 'reception_at',
-                width: 120,
+                width: 105,
                 title: '验收时间',
                 sort: true
               },
@@ -183,6 +183,11 @@
                 width: 110,
                 title: '渠道'
               },
+              {
+                field: 'last_follow_person',
+                width: 120,
+                title: '跟进人'
+              },
               {
                 title: '操作',
                 minWidth: 300,
@@ -192,6 +197,7 @@
               }
             ]
           ],
+          limit: 20,
           page: true,
           skin: 'line'
       });
@@ -317,6 +323,7 @@
                 });
 
             } else if (obj.event === 'show_keys') {
+                business_id = obj.data.id
                 follow_up_id = obj.data.follow_up_id;
                 content = miniPage.getHrefContent('/educode_sales/businesses/show_keys');
                 openWH = miniPage.getOpenWidthHeight();
@@ -338,6 +345,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'show_follow') {
+                business_id = obj.data.id
                 content = miniPage.getHrefContent('/educode_sales/businesses/show_follow?id=' + id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({

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

@@ -6,7 +6,8 @@ json.data do
     json.school d.department.school.name
     json.follow_ups_count d.follow_ups_count
     json.follow_up_id d.last_follow_up_id
-    json.teachers_count d.follow_ups.sum(:key_people_count)
+    # json.teachers_count d.follow_ups.sum(:key_people_count)
+    # json.teachers_count EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).present? ? EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).key_people_count : 0
     json.clazz d.last_follow_up&.clazz&.name
     json.stage d.last_follow_up&.stage&.name
     json.invitation_at d.last_follow_up&.invitation_at.to_s
@@ -14,6 +15,7 @@ json.data do
     json.total_amount d.last_follow_up&.total_amount
     json.return_money d.return_money
     json.place d.last_follow_up&.place&.name
+    json.last_follow_person d.last_follow_up_id.present? ? EducodeSales::Staff.find(EducodeSales::Business.find_by(last_follow_up_id: d.last_follow_up_id).staff_id).user.real_name : ''
   end
 end
 json.code 0

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

@@ -1,7 +1,7 @@
 <div class="layui-form layuimini-form">
    <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
-      <label class="layui-form-label required">名称</label>
+      <label class="layui-form-label required">商机名称</label>
       <div class="layui-input-block">
         <input type="text" name="name" autocomplete="off" lay-verify="required" class="layui-input" style="width: 300px;">
       </div>

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

@@ -124,8 +124,18 @@
       form.render();
     
       form.on('submit(add_follow_up)', function (data) {
-        data.field.business_id = "<%= @business.id %>";
-        request.authPost("educode_sales/follow_ups", data.field, function (res) {
+          console.log(data);
+          data.field.business_id = "<%= @business.id %>";
+          console.log(data.field.business_id);
+          request.authPut("educode_sales/businesses/" + data.field.business_id +"/updateMoney/", {
+              return_money: 0
+          }, function (res) {
+              if (res.success == false) {
+                  layer.alert(res.msg)
+              } else {
+              }
+          })
+          request.authPost("educode_sales/follow_ups", data.field, function (res) {
           if (res.success == false) {
             layer.alert(res.msg)
           } else {