educode_sales 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb7ba8647915177726d6f9f525ea700b0e7ca469bf8ff7460d27a8d3e5204c28
-  data.tar.gz: d56bb7b39f7f44dc59b2d733ae60af4d3aee9135f8ee60e0721a5723bf20fc7a
+  metadata.gz: 82398cf1df1cb40215b1632031edfd6b6ffa4dfed2ff1c8f86c624fa938c917c
+  data.tar.gz: b11d133013cc1dfe416f77b26255709fb24b33061568380abf625012b13b4ee0
 SHA512:
-  metadata.gz: 7b2d57743dbf47151f106931393b6e4e9671a8bba6b8393e3769954ddb8a82cb914c85ee926c16595ec546f2e7826a569590d6d9589d12d67d0858a77c2effc6
-  data.tar.gz: 96d8209f672ee5118f30da45bb672db2139f9890148c0bfff46873df59329d8aa5b1c9e1763e7c063048e994f03399706fd8e850a8502e8cd8d08bcae3e44dc0
+  metadata.gz: ee3920c928e0d06ba4785d0a5ab091b9833d94c42eb881e879c378d36d71f6c75985299b225c198b9abf0f2d5d9a6e133a5afeb7147c87e6523bcde609f07f30
+  data.tar.gz: 14a4f1e5e7f23f94279b9023656d170fed8cf6b3d1a6a034b71cca658bc4d0ab13c27f8d82b589a747f02fca5f53fda1a224c7fb76d1a7f25db4552b2a9ac53d

data/app/controllers/educode_sales/businesses_controller.rb

@@ -35,6 +35,7 @@ module EducodeSales
           @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 = []
+          gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
           if can?(:create, EducodeSales::SalePlan)
             gon.menus << { title: '添加周计划', event: 'week' }
             gon.menus << { title: '添加月计划', event: 'month' }

data/app/controllers/educode_sales/customer_extensions_controller.rb

@@ -0,0 +1,17 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class CustomerExtensionsController < ApplicationController
+
+    def create
+      params[:school_ids].each do |d|
+        if EducodeSales::CustomerExtension.find_by(school_id: d).present?
+          EducodeSales::CustomerExtension.find_by(school_id: d).update(customer_staff_id: params[:staff_id])
+        else
+          EducodeSales::CustomerExtension.create(customer_staff_id: params[:staff_id], school_id: d)
+        end
+      end
+        render_success
+      end
+    end
+  end

data/app/controllers/educode_sales/customer_follows_controller.rb

@@ -0,0 +1,41 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class CustomerFollowsController < ApplicationController
+    def create
+      follow_up = EducodeSales::CustomerFollow.new(follow_up_params)
+      follow_up.staff = @current_admin
+      if follow_up.save
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    def destroy
+      follow_up = CustomerFollow.find(params[:id])
+      if follow_up.destroy
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    def update
+      follow_up = CustomerFollow.find(params[:id])
+      follow_up.assign_attributes(follow_up_params)
+      if follow_up.save
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    private
+
+    def follow_up_params
+      params.permit(:school_id, :department_id, :content)
+    end
+
+  end
+end

data/app/controllers/educode_sales/customers_controller.rb

@@ -0,0 +1,194 @@
+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
+    end
+    def create_department
+        department_name = params[:department_name].to_s.strip
+        school = School.find(params[:school_id])
+
+        return render_failure('部门名称重复') if school.departments.exists?(name: department_name)
+
+        ActiveRecord::Base.transaction do
+          department = school.departments.create!(name: department_name, is_auth: 1)
+          ApplyAddDepartment.create!(school_id: school.id, status: 1, name: department.name,
+                                     department_id: department.id, user_id: current_user.id)
+        end
+
+        render_success
+    end
+
+    def edit_department
+      @department = Department.find(params[:id])
+      render layout: false
+    end
+    def update_department
+      department = Department.find(params[:id])
+      department.update(name: params[:department_name])
+      render_success
+    end
+
+
+    def index
+      authorize! :read, Customer
+      respond_to do |format|
+        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]}
+        end
+        format.json do
+          if @current_admin.is_admin?
+            @customers = School
+          else
+            level = @current_admin.role.role_areas.find_by(clazz: '客户管理').level
+            case level
+            when '自己'
+              school_ids = CustomerExtension.where(customer_staff_id:  @current_admin.id).pluck(:school_id)
+              @customers = School.where(id: school_ids)
+            when '区域'
+              a_school_ids = School.where(province: @current_admin.areas.pluck(:name)).ids
+              b_school_ids = CustomerExtension.where(customer_staff_id:  @current_admin.id).pluck(:school_id)
+              school_ids = a_school_ids + b_school_ids
+              @customers = School.where(id: school_ids)
+            else
+              @customers = School
+            end
+          end
+
+          if params[:q].present? && params[:q][:name].present?
+            @customers = @customers.where("schools.name like ?", "%#{params[:q][:name]}%")
+          end
+          if params[:q].present? && params[:q][:area].present?
+            @customers = @customers.where("schools.province = ?", "#{params[:q][:area]}")
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            school_ids = EducodeSales::CustomerExtension.where(customer_staff_id: params[:q][:staff_id]).pluck(:school_id)
+            @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
+
+          @customers = @customers.order(id: :desc).page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    def give
+      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]}
+      render layout: false
+    end
+
+    def show_follow
+      respond_to do |format|
+        format.html do
+          @school_name = School.find(params[:id]).name
+          @area = School.find(params[:id]).province
+          @staff = EducodeSales::CustomerExtension.find_by(school_id: params[:id])&.customer_staff&.user&.real_name
+          render layout: false
+        end
+        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
+      end
+    end
+
+    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
+
+
+    def new_follow_record
+      @school = School.find(params[:id])
+      render layout: false
+    end
+
+    def show_follow_record
+      @follow_up = EducodeSales::CustomerFollow.find(params[:id])
+      @school = School.find(@follow_up.school_id)
+      render layout: false
+    end
+
+    def edit_follow_record
+      @follow_up = EducodeSales::CustomerFollow.find(params[:id])
+      @school = School.find(@follow_up.school_id)
+      render layout: false
+    end
+
+    def new
+      render layout: false
+    end
+
+    def create
+      @school = School.find(params[:id])
+      ActiveRecord::Base.transaction do
+        property = SchoolProperty.find_or_create_by!(school_property_params)
+        @school = School.new
+        @school.attributes = school_params
+        @school.school_property = property
+        @school.save!
+      end
+    end
+
+    def edit
+      @school = School.find(params[:id])
+      render layout: false
+    end
+
+    def update
+      @school = School.find(params[:id])
+      ActiveRecord::Base.transaction do
+        property = SchoolProperty.find_or_create_by!(school_property_params)
+        @school.attributes = school_params
+        @school.school_property = property
+        @school.save!
+      end
+    end
+
+    private
+
+
+    def school_property_params
+      params.require(:school).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)
+    end
+
+  end
+end

data/app/controllers/educode_sales/roles_controller.rb

@@ -16,7 +16,7 @@ module EducodeSales
 
     def create
       role = Role.new(name: params[:name])
-      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }])
+      role.role_areas.build([{ clazz: 'Business' }, { clazz: 'SalePlan' }, { clazz: 'Teacher' }, { clazz: 'Operation' }, {clazz:'Customer'}])
       if role.save
         render_success
       else
@@ -78,6 +78,9 @@ module EducodeSales
       role.role_areas.find_by(clazz: 'Operation').update(level: params[:operation])
       role.role_areas.find_by(clazz: 'SalePlan').update(level: params[:sale_plan])
       role.role_areas.find_by(clazz: 'Teacher').update(level: params[:teacher])
+      r = role.role_areas.find_or_initialize_by(clazz: 'Customer')
+      r.level = params[:customer]
+      r.save
       render_success
     end
 

data/app/models/educode_sales/customer.rb

@@ -0,0 +1,4 @@
+module EducodeSales
+  class Customer < ApplicationRecord
+  end
+end

data/app/models/educode_sales/customer_extension.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class CustomerExtension < ApplicationRecord
+    belongs_to :customer_staff, class_name: 'Staff', optional: true
+    belongs_to :school
+
+  end
+end

data/app/models/educode_sales/customer_follow.rb

@@ -0,0 +1,5 @@
+module EducodeSales
+  class CustomerFollow < ApplicationRecord
+    belongs_to :staff
+  end
+end

data/app/models/educode_sales/permission.rb

@@ -10,7 +10,8 @@ module EducodeSales
       '运营分工': 'operation_job',
       '教师运营': 'teacher',
       '活动运营': 'activity',
-      '运营计划': 'operation_plan'
+      '运营计划': 'operation_plan',
+      '客户管理': 'customer'
     }
   end
 end

data/app/models/educode_sales/role_area.rb

@@ -8,6 +8,7 @@ module EducodeSales
       '销售计划': 'SalePlan',
       '教师运营': 'Teacher',
       '运营计划': 'Operation',
+      '客户管理': 'Customer',
     }
   end
 end

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

@@ -98,7 +98,7 @@
                     },
                     {
                         field: 'advise',
-                        width: 170,
+                        width: 120,
                         title: '团队建议',
                         templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
                     },
@@ -122,14 +122,15 @@
                     },
                     {
                         field: 'business',
-                        width: 150,
+                        width: 120,
                         title: '所属商机',
                         templet:'#business'
                     },
                     {
                         field: 'school',
-                        width: 150,
+                        width: 120,
                         title: '单位',
+                        templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
                     },
                     {
                         field: 'staff',
@@ -138,9 +139,11 @@
                     },
                     {
                         field: 'created_at',
-                        width: 170,
+                        width: 120,
                         title: '跟进时间',
                         sort: true,
+                        templet:'<div><span title="{{d.created_at}}">{{d.created_at}}</span></div>'
+
                     },
                     {
                         title: '操作',

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

@@ -91,9 +91,9 @@
     </div>
     <div class="layui-form-item">
       <div class="layui-inline">
-        <label class="layui-form-label">所属年度</label>
+        <label class="layui-form-label required">所属年度</label>
         <div class="layui-input-inline">
-          <input type="text" class="layui-input" name="year" autocomplete="off" id="edit_year"
+          <input type="text" class="layui-input" name="year"  lay-verify="required" autocomplete="off" id="edit_year"
                  value="<%= @follow_up&.year%>"
                  placeholder="请选择年度">      </div>
       </div>

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

@@ -23,7 +23,7 @@
               <div class="layui-inline">
                 <label class="layui-form-label">单位</label>
                 <div class="layui-input-inline">
-                  <input type="text" name="department" autocomplete="off" class="layui-input">
+                  <input type="text" name="department" autocomplete="off" value="<%=params[:school] %>" class="layui-input">
                 </div>
               </div>
               <div class="layui-inline">
@@ -123,7 +123,7 @@
         range: true
       });
 
-         var is_show = <%=params[:name].present? || params[:clazz_id].present? %>
+         var is_show = <%=params[:name].present? || params[:clazz_id].present? || params[:place_id].present? || params[:school].present? %>
       if(is_show){
           $('.follows_li').removeClass('layui-this');
           $('.follows_div').removeClass('layui-show');
@@ -174,6 +174,7 @@
                 })
             }
         })
+            index_place_list.setValue(gon.place)
 
 
       table = layui.table;

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

@@ -10,6 +10,9 @@
       <label class="layui-form-label required">单位部门</label>
       <div class="layui-input-block" id="add_department" style="width: 300px;"></div>
     </div>
+     <div class="layui-inline" >
+       <a href="/missions/customers" style=" color: #0000FF">添加单位/部门</a>
+     </div>
      <br>
       <div class="layui-inline" style="padding-top: 20px">
         <label class="layui-form-label ">商机来源</label>

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

@@ -97,9 +97,9 @@
     </div>
     <div class="layui-form-item">
     <div class="layui-inline">
-      <label class="layui-form-label">所属年度</label>
+      <label class="layui-form-label required">所属年度</label>
       <div class="layui-input-inline">
-        <input type="text" class="layui-input" name="year" autocomplete="off" id="year"
+        <input type="text" class="layui-input" name="year" autocomplete="off"  lay-verify="required" id="year"
                value="<%= @last_follow_up&.year%>"
                placeholder="请选择年度">      </div>
     </div>

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

@@ -117,6 +117,11 @@
                     title: '回款计划',
                     templet: '#edit_plan'
                 },
+                {
+                    field: 'description',
+                    width: 120,
+                    title: '最新进展',
+                },
               {
                 field: 'invitation_at',
                 width: 110,
@@ -160,7 +165,7 @@
 
               {
                 field: 'place',
-                width: 200,
+                width: 400,
                 title: '渠道',
               },
               {

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

@@ -18,6 +18,7 @@ json.data do
     json.money d.money_plans.where(clazz: 1).sum(:amount).round(2)
     json.is_latest d.id == @latest&.id
     json.flag d.created_at.present? ? (Time.now - d.created_at).to_f/3600 < 24 : false
+    json.description d.description
   end
 end
 

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

@@ -0,0 +1,60 @@
+<%#= Gon::Base.render_data %>
+<form class="layui-form " action="">
+  <div class="layui-form-item" style="padding: 25px">
+    <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>
+      </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>
+    </div>
+  </div>
+</form>
+
+
+<script>
+
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            transfer = layui.transfer,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            $ = layui.$;
+
+        form.render();
+
+        // 当前弹出层，防止ID被覆盖
+        var parentIndex = layer.index;
+
+
+
+
+        //监听提交
+        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) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.closeAll();
+                    table.reload('place')
+                }
+            })
+            return false;
+        });
+    });
+</script>

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

@@ -0,0 +1,52 @@
+<div class="layuimini-main">
+  <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="department_name" required lay-verify="required" autocomplete="off" placeholder="请输入"
+                 class="layui-input" id="inputFocus" value="<%=@department.name %>">
+        </div>
+      </div>
+      <div class="layui-inline" style="padding-left: 30px">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-edit">提交
+        </button>
+      </div>
+    </div>
+  </form>
+</div>
+
+<script>
+
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            transfer = layui.transfer,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            laydate = layui.laydate,
+            $ = layui.$;
+
+
+
+        form.render();
+
+        // 当前弹出层，防止ID被覆盖
+        var parentIndex = layer.index;
+
+
+        //监听提交
+        form.on('submit(data-edit)', function (data) {
+            request.authPut("missions/customers/"+ parent.department_id +"/update_department", data.field, function (res) {
+                if (res.success === false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.edit_index1);
+                    table.reload('sale_plan_follow_table')
+                }
+            })
+            return false;
+        });
+    });
+</script>

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

@@ -0,0 +1,50 @@
+<h1 class="text-center" style="padding: 25px"><%=@school.name %></h1>
+<form class="layui-form " action="">
+  <div class="layui-form-item layui-form-text">
+    <label class="layui-form-label">跟进内容</label>
+    <div class="layui-input-block">
+      <textarea name="content" placeholder="请输入跟进内容" class="layui-textarea" ><%=@follow_up.content %></textarea>
+    </div>
+  </div>
+  <div class="layui-inline">
+    <label class="layui-form-label">跟进部门</label>
+    <div class="layui-input-inline">
+      <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id),@follow_up.department_id)%>
+    </div>
+  </div>
+  <div class="layui-inline" style="padding-left: 50px">
+    <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit_follow_up">提交
+    </button>
+  </div>
+</form>
+<script>
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            laydate = layui.laydate,
+            $ = layui.$;
+
+
+        form.render();
+
+        form.on('submit(edit_follow_up)', function (data) {
+            request.authPut("missions/customer_follows/<%= @follow_up.id%>", data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.editFollowIndex);
+                    parent.layer.close(parent.layer.getFrameIndex(window.name))
+                    parent.table.reload('customers_table')
+                    parent.table.reload('unfinish_table')
+                }
+            })
+
+
+            return false;
+        });
+
+    });
+</script>