educode_sales 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88c76bb62d36b9922c99d80e365218b4dbde3bfe9632773d71ba40bdda28ef2f
-  data.tar.gz: 4ba6723ac69f19bb92c57a876b1e7c7299fc15bf1d213eede7ce215e12a932bc
+  metadata.gz: 97a73ea8470e60cc322017425b3af50411105d237ae981f490aef1df1cd2816f
+  data.tar.gz: 3711b02d39d60076344835b00d1ff44fc152d30a0671eee314096cb817f720f0
 SHA512:
-  metadata.gz: 608ee9cf6238d241410cb879004c9d18d5ee4e2fa346f285a6f81e3391b3438b905997dbc03c5b37c83c1c9dbd5f2cda1c7f11c3c831c3f986ceda2b443fe925
-  data.tar.gz: 0f5c04324244916fe4a6fd75625076b8ae56bf6398f04676d168b41af251dd66b0db586f53881bbb68ddfaebef7d0ef95d0b47f790b64ed34729c57b5533d856
+  metadata.gz: 30dda9e9c18079954c459b90f623735b7c286d8a8c0fb6c42ab32464289bdd8133f87d39d938d8d20979b5eb944b65362910d1edf675f32e82c62cefc3ebfdf5
+  data.tar.gz: 73f820c375a6035995ddcbae380fd39fd07d7db4b2d53e27637c3e6c955371b1a7fe4d4e4ed7649544090501ad2c2aefba4ce02dd6adb9a0778d7313429ba354

data/app/controllers/educode_sales/businesses_controller.rb

@@ -191,6 +191,7 @@ module EducodeSales
             last_follow.reception_at,
             last_follow.bidded_date,
             last_follow.signed_date,
+            last_follow.created_at as latest_time,
             last_follow.actual_amount,
             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
@@ -201,7 +202,7 @@ module EducodeSales
 
     def create
       department = Department.find(params[:department_id])
-      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source])
+      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)
       if business.save
         render_success
       else
@@ -223,7 +224,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, source: params[:source])
+      if business.update(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)
         render_success
       else
         render_failure business

data/app/controllers/educode_sales/customers_controller.rb

@@ -2,8 +2,6 @@ require_dependency "educode_sales/application_controller"
 
 module EducodeSales
   class CustomersController < ApplicationController
-    # before_action :find_school, only: [:edit, :update]
-    # before_action :must_admin!, only: [:destroy]
 
     def new_department
       render layout: false
@@ -43,7 +41,7 @@ module EducodeSales
         end
         format.json do
           if @current_admin.is_admin?
-            @customers = School
+            @customers = School.all
           else
             level = @current_admin.role.role_areas.find_by(clazz: '客户管理').level
             case level
@@ -56,7 +54,7 @@ module EducodeSales
               school_ids = a_school_ids + b_school_ids
               @customers = School.where(id: school_ids)
             else
-              @customers = School
+              @customers = School.all
             end
           end
 
@@ -71,21 +69,29 @@ module EducodeSales
             @customers = @customers.where(id: school_ids)
           end
 
-          # if params[:q].present? && params[:q][:date].present?
-          #   department_ids =
-          #   business_ids = EducodeSales::Business.where(department_id: department_ids).ids
-          #   follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
-          #   customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
-          #   a_last_follow_time = follow_ups.last&.created_at&.to_s(:date)
-          #   b_last_follow_time = customer_follows.last&.created_at&.to_s(:date)
-          #   if a_last_follow_time.present? && b_last_follow_time.present?
-          #     json.last_follow_time a_last_follow_time < b_last_follow_time ? b_last_follow_time : a_last_follow_time
-          #   else
-          #     json.last_follow_time a_last_follow_time || b_last_follow_time
-          #   end
-          #   date = params[:q][:date].split(" - ")
-          #   @customers = @customers.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1])
-          # end
+          if params[:q].present? && params[:q][:date].present?
+            ids = EducodeSales::CustomerFollow.all.pluck(:school_id)
+            @customers = @customers.where(id: ids)
+            school_ids =[]
+            date = params[:q][:date].split(" - ")
+            @customers.each do |d|
+              business_ids = EducodeSales::Business.where(school_id: d.id).ids
+              follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
+              customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
+              next if follow_ups.blank? && customer_follows.blank?
+              a_last_follow_time = follow_ups.last&.created_at&.to_s
+              b_last_follow_time = customer_follows.last&.created_at&.to_s
+              if a_last_follow_time.present? && b_last_follow_time.present?
+                last_follow_time = ((a_last_follow_time < b_last_follow_time) ? b_last_follow_time : a_last_follow_time)
+              else
+                last_follow_time = (a_last_follow_time || b_last_follow_time)
+              end
+              if last_follow_time.present? && last_follow_time > date[0] && last_follow_time < date[1]
+                school_ids << d.id
+              end
+            end
+            @customers = @customers.where(id: school_ids)
+          end
 
           @customers = @customers.order(id: :desc).page(params[:page]).per(params[:limit])
         end
@@ -109,11 +115,6 @@ module EducodeSales
         format.json do
           @follow_ups = EducodeSales::CustomerFollow.where(school_id: params[:id])
           @latest = @follow_ups.order(created_at: :desc).first
-          # if params[:field]
-          #   @follow_ups = @follow_ups.order("#{params[:field]} #{params[:order]}")
-          # else
-          #   @follow_ups = @follow_ups.order("created_at desc")
-          # end
           @follow_ups = @follow_ups.order("created_at desc")
           @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
         end
@@ -122,11 +123,6 @@ module EducodeSales
 
     def show_department
       @departments = School.find(params[:id]).departments
-      # if params[:field]
-      #   @follow_ups = @follow_ups.order("#{params[:field]} #{params[:order]}")
-      # else
-      #   @follow_ups = @follow_ups.order("created_at desc")
-      # end
       @departments = @departments.order("created_at desc")
       @departments = @departments.page(params[:page]).per(params[:limit])
     end
@@ -154,40 +150,54 @@ module EducodeSales
     end
 
     def create
-      @school = School.find(params[:id])
       ActiveRecord::Base.transaction do
-        property = SchoolProperty.find_or_create_by!(school_property_params)
+        property = SchoolProperty.find_or_create_by!(project_985: params[:project_985].present? ? 1 : 0,
+                                                     project_211: params[:project_211].present? ? 1 : 0,
+                                                     regular_college: params[:regular_college].present? ? 1 : 0,
+                                                     junior_college: params[:junior_college].present? ? 1 : 0,
+                                                     secondary_school: params[:secondary_school].present? ? 1 : 0,
+                                                     military_school: params[:military_school].present? ? 1 : 0,
+                                                     enterprise: params[:enterprise].present? ? 1 : 0)
         @school = School.new
         @school.attributes = school_params
         @school.school_property = property
         @school.save!
       end
+      render_success
     end
 
     def edit
       @school = School.find(params[:id])
+      @school_property = @school.school_property
       render layout: false
     end
 
     def update
       @school = School.find(params[:id])
       ActiveRecord::Base.transaction do
-        property = SchoolProperty.find_or_create_by!(school_property_params)
+        property = SchoolProperty.find_or_create_by!(project_985: params[:project_985].present? ? 1 : 0,
+                                                     project_211: params[:project_211].present? ? 1 : 0,
+                                                     regular_college: params[:regular_college].present? ? 1 : 0,
+                                                     junior_college: params[:junior_college].present? ? 1 : 0,
+                                                     secondary_school: params[:secondary_school].present? ? 1 : 0,
+                                                     military_school: params[:military_school].present? ? 1 : 0,
+                                                     enterprise: params[:enterprise].present? ? 1 : 0)
         @school.attributes = school_params
         @school.school_property = property
         @school.save!
       end
+      render_success
     end
 
     private
 
 
     def school_property_params
-      params.require(:school).permit(:project_985, :project_211, :regular_college, :junior_college, :secondary_school, :military_school, :enterprise)
+      params.permit(:project_985, :project_211, :regular_college, :junior_college, :secondary_school, :military_school, :enterprise)
     end
 
     def school_params
-      params.require(:school).permit(:name, :province, :city, :address)
+      params.permit(:name, :province, :city, :address)
     end
 
   end

data/app/controllers/educode_sales/places_controller.rb

@@ -8,7 +8,11 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @places = Place.page(params[:page]).per(params[:limit])
+          @places = EducodeSales::Place.all
+          if params[:q].present? && params[:q][:name].present?
+            @places = @places.where("name like ?", "%#{params[:q][:name]}%")
+          end
+          @places = @places.page(params[:page]).per(params[:limit])
           @x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
           @stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
         end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -13,7 +13,7 @@ module EducodeSales
       x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
       o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
       @sale_trend = SaleTrend.find_or_create_by(year: @year)
-      @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:total_amount).round(2)
+      @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).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.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).sum(:total_amount).round(2)
       @actual_goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).sum(:actual_amount).round(2)
@@ -72,6 +72,21 @@ module EducodeSales
         end
       end
 
+      #商机区域分布图表
+      provinces = EducodeSales::Common.where(clazz: 'area').pluck(:name)
+      @business_data =  {
+        labels: provinces,
+        datasets:[
+          {
+            label: "商机总额",
+            data: provinces.map{|province| Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ?", x).sum(:total_amount).round(2)},
+            backgroundColor: colors[0],
+            borderColor: colors[0],
+            borderWidth: 1
+          }
+        ]
+      }
+
 
       # 已中标图表
       goal_default_dates = ("#{Time.now.year}-01".."#{Time.now.year}-#{Time.now.month}").to_a

data/app/controllers/educode_sales/teachers_controller.rb

@@ -113,10 +113,21 @@ module EducodeSales
             @teachers = @teachers.where("educode_sales_teachers.created_at > ? AND educode_sales_teachers.created_at < ?", date[0], date[1])
           end
 
-          @teachers = @teachers.order("educode_sales_teachers.created_at desc").page(params[:page]).per(params[:limit])
+          @teachers = @teachers.select("
+            educode_sales_teachers.*,
+            users.created_on,
+            users.last_login_on").joins("
+            LEFT JOIN users ON educode_sales_teachers.user_id = users.id
+          ")
+          if params[:sort].present? && params[:sort][:field]
+            @teachers = @teachers.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @teachers = @teachers.order("educode_sales_teachers.created_at desc")
+          end
+          @teachers = @teachers.page(params[:page]).per(params[:limit])
+        end
 
         end
-      end
     end
 
     def import

data/app/models/educode_sales/permission.rb

@@ -1,7 +1,7 @@
 module EducodeSales
   class Permission < ApplicationRecord
     enum clazz: {
-      '市场态势': 'market',
+      '销售态势': 'market',
       '销售分工': 'sale_job',
       '商机管理': 'business',
       '渠道管理': 'place',

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

@@ -55,6 +55,9 @@
 <script type="text/html" id="business">
   <a href="javascript:void(0);" lay-event="business" class="layui-table-link">{{ d.business }}</a>
 </script>
+<script type="text/html" id="school">
+  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
+</script>
 
 
 <script>
@@ -130,7 +133,7 @@
                         field: 'school',
                         width: 120,
                         title: '单位',
-                        templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
+                        templet:'#school'
                     },
                     {
                         field: 'staff',

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

@@ -18,6 +18,7 @@
                 <label class="layui-form-label">商机名称</label>
                 <div class="layui-input-inline">
                   <input type="text" name="name" autocomplete="off" class="layui-input" value="<%=params[:name] %>">
+                  <input type="text" style="display: none" name="place_id" autocomplete="off" class="layui-input" value="<%=params[:place_id] %>">
                 </div>
               </div>
               <div class="layui-inline">
@@ -107,6 +108,9 @@
 <script type="text/html" id="show_follow">
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>
+<script type="text/html" id="school_name">
+  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
+</script>
 
 
 <script>
@@ -203,7 +207,7 @@
                 field: 'school',
                 width: 150,
                 title: '单位',
-                  templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
+                  templet:'#school_name'
               },
               {
                 field: 'department',
@@ -235,6 +239,22 @@
                 width: 90,
                 title: '阶段'
               },
+                {
+                    field: 'source',
+                    width: 90,
+                    title: '商机来源'
+                },
+                {
+                    field: 'last_follow_person',
+                    width: 100,
+                    title: '最新跟进人'
+                },
+                {
+                    field: 'latest_time',
+                    width: 200,
+                    title: '最新跟进时间',
+                    sort: true
+                },
               {
                 field: 'invitation_at',
                 width: 105,
@@ -285,21 +305,6 @@
                 width: 160,
                 title: '渠道',
               },
-              {
-                field: 'source',
-                width: 90,
-                title: '商机来源'
-              },
-              {
-                field: 'last_follow_person',
-                width: 100,
-                title: '最新跟进人'
-              },
-              {
-                field: 'latest_time',
-                width: 200,
-                title: '最新跟进时间'
-              },
               {
                 title: '操作',
                 minWidth: 170,
@@ -390,6 +395,7 @@
         });
       }
       function time_line(id,name) {
+          business_id = id
         var content = miniPage.getHrefContent('/missions/businesses/time_line?business_id=' + id);
         var openWH = miniPage.getOpenWidthHeight();
         sindex = layer.open({

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

@@ -5,6 +5,7 @@ json.data do
     json.name d.name
     json.department d.department.name
     json.school d.department.school.name
+    json.school_id d.department.school.id
     json.follow_ups_count d.follow_ups_count
     follow_ups_count += d.follow_ups_count
     json.follow_up_id d.last_follow_up_id

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

@@ -12,7 +12,7 @@
     <span class="table-label pull-right" style="padding-right: 20px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
   </div>
 </script>
-<div class="edit-table tool">
+<div class=" tool">
   <div class="z-index">
     <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
   </div>

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

@@ -43,7 +43,7 @@
     function demo(){
         layer.closeAll()
         business_id = parent.business_id
-        var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + parent.business_id);
+        var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + business_id);
         var openWH = miniPage.getOpenWidthHeight();
         sindex = layer.open({
             title: '商机列表/'+ parent.business_name +'的跟进记录',

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

@@ -1,14 +1,58 @@
-<%#= Gon::Base.render_data %>
-<form class="layui-form " action="">
+<form class="layui-form layuimini-form " action="">
   <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-inline">
+      <label class="layui-form-label required">学校：</label>
+      <div class="layui-input-block">
+        <input type="text" name="name" required  lay-verify="required" value="<%=@school.name %>" placeholder="请输入学校" autocomplete="off"
+               class="layui-input" id="inputFocus">
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label required">省：</label>
+      <div class="layui-input-block">
+        <input type="text" name="province"   lay-verify="required"  value="<%=@school.province %>" autocomplete="off"
+               class="layui-input" placeholder="请输入地址" >
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label ">市：</label>
+      <div class="layui-input-block">
+        <input type="text" name="city"   value="<%=@school.city %>" autocomplete="off"
+               class="layui-input" placeholder="请输入地址" >
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label ">地址：</label>
+      <div class="layui-input-block">
+        <input type="text" name="address"   value="<%=@school.address %>" autocomplete="off"
+               class="layui-input" placeholder="请输入地址" >
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <label class="layui-form-label">学校性质：</label>
+      <div class="layui-input-block">
+        <input type="checkbox" name="project_985" lay-skin="primary" value="1" <%= 'checked' if @school_property&.project_985 %> title="985工程">
+        <input type="checkbox" name="project_211" lay-skin="primary" value="1" <%= 'checked' if @school_property&.project_211 %> title="211工程" >
+        <input type="checkbox" name="regular_college" lay-skin="primary" value="1" <%= 'checked' if @school_property&.regular_college %> title="本科院校">
+      </div>
+    </div>
     <div class="layui-form-item">
-      <label class="layui-form-label required">负责区域</label>
       <div class="layui-input-block">
-        <div id="area_edit" class="demo-transfer"></div>
+        <input type="checkbox" name="junior_college" lay-skin="primary" value="1" <%= 'checked' if @school_property&.junior_college %> title="大专院校">
+        <input type="checkbox" name="secondary_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.secondary_school %> title="中专院校" >
+        <input type="checkbox" name="military_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.military_school %> title="军事院校">
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <div class="layui-input-block">
+        <input type="checkbox" name="enterprise" lay-skin="primary" value="1" <%= 'checked' if @school_property&.enterprise %> title="企业">
       </div>
     </div>
     <div class="layui-inline" style="padding-left: 30px">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="submits">提交
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
       </button>
     </div>
   </div>
@@ -35,23 +79,13 @@
 
 
         //监听提交
-        form.on('submit(submits)', function (data) {
-
-            var area_ids = []
-            layui.each(transfer.getData('area_list'), function (i, v) {
-                area_ids.push(v.value)
-            })
-            if (area_ids.length == 0) {
-                layer.alert("请选择负责区域");
-                return false;
-            }
-            data.field['area_ids'] = area_ids;
-            request.authPut("missions/places/" + data.field.id, data.field, function (res) {
-                if (res.success == false) {
+        form.on('submit(data-reset-btn)', function (data) {
+            request.authPut("missions/customers/" + <%= @school.id %>, data.field, function (res) {
+                if (res.success === false) {
                     layer.alert(res.msg)
                 } else {
-                    layer.closeAll();
-                    table.reload('place')
+                    layer.closeAll(); //关闭所有层
+                    table.reload('customers_table')
                 }
             })
             return false;

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

@@ -40,7 +40,7 @@
   <div class="layui-btn-container">
     <span class="table-label">客户列表</span>
     <% if can? :create, EducodeSales::Customer %>
-<!--      <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="add">添加客户</button>
     <% end %>
     <% if can? :give, EducodeSales::Customer %>
   <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="give">分配/移交</button>
@@ -59,14 +59,14 @@
 <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_follow">添加跟进记录</a>
   <% end %>
   <% if can? :update, EducodeSales::Customer %>
-<!--<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>-->
+<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <% end %>
 </script>
 <script type="text/html" id="business">
   <a href="/missions/businesses?school={{d.name}}"  class="layui-table-link">{{ d.business }}</a>
 </script>
 <script type="text/html" id="name">
-  <a href="javascript:void(0);" lay-event="name" class="layui-table-link">{{ d.name }}</a>
+  <a href="<%= base_url%>/colleges/{{d.id}}/statistics" class="layui-table-link" target="_blank">{{ d.name }}</a>
 </script>
 <script type="text/html" id="department">
   <a href="javascript:void(0);" lay-event="department" class="layui-table-link">{{ d.department }}</a>
@@ -87,12 +87,12 @@
 
         var laydate = layui.laydate;
 
-        function hn(){
-            $("#search_bt").trigger("click");
-        }
-        $(document).ready(function(){
-            window.onload=hn;
-        });
+        // function hn(){
+        //     $("#search_bt").trigger("click");
+        // }
+        // $(document).ready(function(){
+        //     window.onload=hn;
+        // });
 
         laydate.render({
             elem: '#date',
@@ -106,7 +106,7 @@
         table.render({
             elem: '#customers_table',
             url: '/missions/customers',
-            // where: {q: form.val('search_form')},
+            where: {q: form.val('search_teachers')},
             toolbar: '#toolbarDemo',
             // totalRow:true,
             defaultToolbar: ['filter'],
@@ -338,7 +338,7 @@
             var data = obj.data;
             id = data.id
             if (obj.event === 'edit') { // 监听添加操作
-                var content = miniPage.getHrefContent('/missions/customers' + data.id + '/edit');
+                var content = miniPage.getHrefContent('/missions/customers/' + data.id + '/edit');
                 var openWH = miniPage.getOpenWidthHeight();
                 sale_plan_index = layer.open({
                     title: '编辑客户',

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

@@ -1,7 +1,6 @@
 json.data do
   json.array! @customers do |d|
-    department_ids = d.departments.ids
-    business_ids = EducodeSales::Business.where(department_id: department_ids).ids
+    business_ids = EducodeSales::Business.where(school_id:  d.id).ids
     follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
     customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
     a_last_follow_time = follow_ups.last&.created_at&.to_s

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

@@ -1,17 +1,33 @@
-<form class="layui-form " action="">
+<form class="layui-form  layuimini-form" action="">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
       <label class="layui-form-label required">学校：</label>
       <div class="layui-input-block">
-        <input type="text" name="name" required lay-verify="required" placeholder="请输入学校" autocomplete="off"
+        <input type="text" name="name"  lay-verify="required"  placeholder="请输入学校" autocomplete="off"
                class="layui-input" id="inputFocus">
       </div>
     </div>
     <br>
     <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="address" required lay-verify="required" autocomplete="off"
+        <input type="text" name="province" lay-verify="required"   autocomplete="off"
+               class="layui-input" placeholder="请输入省" >
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label ">市：</label>
+      <div class="layui-input-block">
+        <input type="text" name="city"   autocomplete="off"
+               class="layui-input" placeholder="请输入市" >
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label ">地址：</label>
+      <div class="layui-input-block">
+        <input type="text" name="address"   autocomplete="off"
                class="layui-input" placeholder="请输入地址" >
       </div>
     </div>
@@ -66,23 +82,14 @@
         //监听提交
         form.on('submit(data-reset-btn)', function (data) {
             console.log(data.field);
-            // var area_ids = []
-            // layui.each(transfer.getData('area_list'), function (i, v) {
-            //     area_ids.push(v.value)
-            // })
-            // if (area_ids.length === 0) {
-            //     layer.alert("请选择负责区域");
-            //     return false;
-            // }
-            // data.field['area_ids'] = area_ids;
-            // request.authPost("missions/places", data.field, function (res) {
-            //     if (res.success === false) {
-            //         layer.alert(res.msg)
-            //     } else {
-            //         layer.closeAll(); //关闭所有层
-            //         table.reload('place')
-            //     }
-            // })
+            request.authPost("missions/customers", data.field, function (res) {
+                if (res.success === false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.closeAll(); //关闭所有层
+                    parent.table.reload('customers_table')
+                }
+            })
             return false;
         });
     });

data/app/views/educode_sales/customers/show_follow_record.html.erb

@@ -1,10 +1,10 @@
 <h1 class="text-center" style="padding: 25px"><%=@school.name %></h1>
 <form class="layui-form form-value" action="">
   <div class="layui-form-item" style="padding: 25px">
-    <div class="layui-inline">
+    <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">跟进内容：</label>
-      <div class="layui-input-inline">
-        <span><%= @follow_up.content%></span>
+      <div class="layui-input-block" style="padding-right: 20px;">
+        <pre><%= @follow_up.content %></pre>
       </div>
     </div>
     <br>

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

@@ -7,6 +7,7 @@ json.data do
     json.description d.description
     json.advise d.advise
     json.school d.business.department.school.name
+    json.school_id d.business.department.school.id
     json.created_at d.created_at.to_s
     json.business d.business.name
     json.business_id d.business.id

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

@@ -1,3 +1,22 @@
+<div style="margin: 10px 10px 10px 10px">
+  <form class="layui-form layui-form-pane" lay-filter="search_teachers">
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">渠道名称</label>
+        <div class="layui-input-inline">
+          <input type="text" name="name" autocomplete="off" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
+        </button>
+        <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜 索
+        </button>
+      </div>
+    </div>
+  </form>
+</div>
+
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">渠道列表</span>
@@ -35,6 +54,51 @@
             request = layui.request,
             miniPage = layui.miniPage;
 
+
+
+        var sort = {}, search = {};
+        table.on('sort(place)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('place', {
+                initSort: obj,
+                where: {
+                    sort: sort,
+                    q: search
+                }
+            });
+        })
+
+        // 监听搜索操作
+        form.on('submit(search_teachers)', function (data) {
+            search = data.field
+            table.reload('place', {
+                page: {
+                    curr: 1
+                },
+                where: {q: search, sort: sort}
+            }, 'data');
+            return false;
+        });
+
+        form.on('submit(reset_business_search)', function (data) {
+            var field = data.field;
+            form.val('search_teachers', {
+                area: "",
+                date: "",
+                attitude: "",
+                name: "",
+                professional_title: "",
+                regist_at: "",
+                staff_id: "",
+                status: "",
+                school: "",
+                assist: "",
+                teacher_source: ""
+            });
+            return false;
+        });
+
         table.render({
             elem: '#place',
             url: '/missions/places',

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

@@ -7,7 +7,7 @@
     <div class="layui-tab-item layui-show">
       <form class="layui-form line" action="">
         <% id = 0 %>
-        <% EducodeSales::Permission.all.group_by{ |d| d.clazz}.each do |k, d| %>
+        <% EducodeSales::Permission.all.order(position: :asc).group_by{ |d| d.clazz}.each do |k, d| %>
          <div class="layui-form-item">
            <label class="layui-form-label"><%= k %></label>
            <div class="layui-input-block">

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -272,6 +272,19 @@
 
   </div>
 </div>
+<br>
+<br>
+<div class="layui-tab layui-tab-card " id="销售额分析" lay-filter="test1">
+  <ul class="layui-tab-title">
+    <li class="layui-this">商机区域分布</li>
+  </ul>
+  <div class="layui-tab-content" style="padding-right: 50px">
+    <div class="layui-tab-item layui-show" style="padding-left: 20px">
+      <canvas id="myChart3" width="960" height="200"></canvas>
+    </div>
+
+  </div>
+</div>
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/chart.js@2.9.1/dist/Chart.min.css">
 <script src="https://cdn.jsdelivr.net/npm/chart.js@2.9.1/dist/Chart.min.js"></script>
   <script>
@@ -498,5 +511,12 @@
             data: <%=raw @goal_count_data.to_json %>,
             options: opt
         });
+
+        var ctx = document.getElementById('myChart3');
+        var myChart3 = new Chart(ctx, {
+            type: 'bar',
+            data: <%=raw @business_data.to_json %>,
+            options: opt
+        });
     })
   </script>

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

@@ -49,6 +49,10 @@
     <a href="/missions/customers?staff_id={{d.id}}">{{d.school_count}}</a>
   </div>
 </script>
+<script type="text/html" id="bussinessBar">
+  <div class="layui-btn-container">
+  </div>
+</script>
 <script>
   layui.use('table', function () {
       var form = layui.form,
@@ -63,7 +67,9 @@
     table.render({
       elem: '#table',
       url: '/missions/sales?year=<%= @year %>',
-      cellMinWidth: 80,
+        defaultToolbar: ['filter'],
+        cellMinWidth: 80,
+        toolbar: '#bussinessBar',
         totalRow:true,
       cols: [
         [{
@@ -161,14 +167,14 @@
             field: 'follow_school_rate',
             title: '学校覆盖率',
                 sort:true,
-            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            totalRow:true,
             width: 120
           },
             {
             field: 'follow_department_rate',
             title: '学院覆盖率',
                 sort:true,
-            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            totalRow:true,
             width: 120
           },
         ]

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

@@ -5,6 +5,8 @@ businesses_d_count = 0
 businesses_e_count = 0
 businesses_o_count = 0
 school_counts = 0
+follow_school_rates = 0
+follow_department_rates = 0
 area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @staffs do |d|
@@ -38,11 +40,13 @@ json.data do
       json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
       json.return_money @businesses.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", @x).where.not("educode_sales_money_plans.clazz!= ?", 1).sum(:amount).round(2)
       json.school_count school_count
-      follow_school_count = EducodeSales::CustomerFollow.where(staff_id: d.id).pluck(:school_id).uniq.size
+      follow_school_count = (EducodeSales::CustomerFollow.where(staff_id: d.id).pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.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).size + EducodeSales::FollowUp.where(staff_id: d.id).size
-      json.follow_school_rate follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0
-      json.follow_department_rate follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0
+      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)
+      json.follow_department_rate follow_department_rate.to_s + '%'
     else
       business_a = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
       business_b = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).where("educode_sales_follow_ups.year = ?", @year).count
@@ -54,11 +58,13 @@ json.data do
       json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", "#{@year}-01-01", "#{@year}-12-31").sum(:total_amount).round(2)
       json.return_money @businesses.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", @x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").sum(:amount).round(2)
       json.school_count school_count
-      follow_school_count = EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").pluck(:school_id).uniq.size || 0
+      follow_school_count = (EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").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_rate follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0
-      json.follow_department_rate follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0
+      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)
+      json.follow_department_rate follow_department_rate.to_s + '%'
     end
 
     json.business_a business_a
@@ -81,6 +87,8 @@ json.data do
     businesses_e_count += business_e
     businesses_o_count += business_o
     school_counts += school_count
+    follow_school_rates += follow_school_rate
+    follow_department_rates += follow_department_rate
   end
 end
 
@@ -92,6 +100,8 @@ json.totalRow do
   json.business_e businesses_e_count.to_s
   json.business_o businesses_o_count.to_s
   json.school_count school_counts.to_s
+  json.follow_school_rate (follow_school_rates.to_f / @staffs.size).to_s + '%'
+  json.follow_department_rate (follow_department_rates.to_f / @staffs.size).to_s + '%'
 end
 json.code 0
 json.count @staffs.total_count

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

@@ -88,16 +88,6 @@
 <table class="layui-hide" id="teachers_table" style="min-height: 300px;" lay-filter="teachers_table"></table>
 </div>
 <script type="text/html" id="currentTableBar">
-  <%# if can? :create, EducodeSales::OperationPlan %>
-<!--  <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>-->
-  <%# end %>
-  <%# if can? :update, EducodeSales::Teacher %>
-<!--  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>-->
-  <%# end %>
-  <%# if can? :destroy, EducodeSales::Teacher %>
-<!--  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>-->
-   <%# end %>
   <% if can? :create, EducodeSales::TeacherFollow %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
   <% end %>
@@ -243,19 +233,22 @@
                     templet: "#event"
                 },
                 {
-                    field: 'regist_at',
+                    field: 'created_on',
                     width: 120,
                     title: '注册时间',
+                    sort: true,
                 },
                 {
                     field: 'last_login_on',
                     width: 120,
                     title: '最近登录',
+                    sort: true,
                 },
                 {
                     field: 'created_at',
                     width: 120,
                     title: '添加时间',
+                    sort: true,
                 },
                 {
                     field: 'wechat',

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

@@ -18,7 +18,7 @@ json.data do
     json.courses_count d.courses_count
     json.actives d.actives
     json.students d.students_count
-    json.regist_at d.user.present? ? d.user.created_on.to_s(:date) : ''
+    json.created_on d.user.present? ? d.user.created_on.to_s(:date) : ''
     json.last_login_on (d.user.present? && d.user.last_login_on.present?) ? d.user.last_login_on.to_s(:date) : ''
     json.teacher_used d.teacher_used
     json.wechat d.wechat

data/db/migrate/20211220102720_add_position_to_commons.rb

@@ -0,0 +1,12 @@
+class AddPositionToCommons < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_permissions, :position, :integer
+    EducodeSales::Permission.all.each_with_index do |d,index|
+      if d.clazz == '销售态势' || d.clazz == '销售分工' || d.clazz == '商机管理' || d.clazz == '客户管理'
+        d.update(position: index)
+      else
+        d.update(position: index * 10)
+      end
+    end
+  end
+end

data/db/migrate/20211221075146_add_school_id_to_educode_sales_businesses.rb

@@ -0,0 +1,8 @@
+class AddSchoolIdToEducodeSalesBusinesses < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_businesses, :school_id, :integer
+    EducodeSales::Business.all.each do |business|
+      business.update(school_id: business.department.school.id)
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-17 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -405,6 +405,8 @@ files:
 - db/migrate/20211206054756_add_year_to_follow_ups.rb
 - db/migrate/20211214100803_create_customer_extensions.rb
 - 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
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb