educode_sales 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef71df95ea9c88505726ebebc6ac92e8c6b801a561119b609858b9ab75be5294
-  data.tar.gz: 36fc9cc01c16282483406e3756aebfcc6b6284d30777e75bbfcb9d9b8ea9a707
+  metadata.gz: 06ac69aca1c84150d19b35dd21ed944d1bad8140bc09acb1c07ecfa76af6a955
+  data.tar.gz: ccd9ef3f0774e1a45627f1e05ccac063f5e20ce35606ea4615706eaaa045be98
 SHA512:
-  metadata.gz: e1fa0c0044b71f1b3c0405236489df57d2c26e3a7d8e27f90f65e8617a604c1bb4a95180ef4926c35c930021f02724b94b348ec5e8e2222411e136a9409c81ae
-  data.tar.gz: a94080334e4e9e20a0a17db31f13fb41df5423e43ea3864953bc1b08b4b1e38e9497fd38a01542263e769886d6f6eb9c355614d4182940d3e360281d5b0066c2
+  metadata.gz: 00b7d6f4308a10d6f7cbd7e901415c4548f3f12119b72d032f91f82fd0c6d24fd273141f0728439eacde51b1851d1f15ffc1b26ed9584c089d2491d10fe8ce13
+  data.tar.gz: b896a8e71a2703ec4d177dc3c24c1853ec853fb9cd04560c26d3422121de6a2daa9254e6345fee19fe772dbd0c43c268c1cb6b40d03bf0d129d15a84abdb7d7c

data/app/controllers/educode_sales/contracts_controller.rb

@@ -348,9 +348,9 @@ module EducodeSales
         end
        
       end
-      data.each do |d|
-        d.select! { |d| d.delete_if{|f| f == ''}.present? }
-      end
+      # data.each do |d|
+      #   d.select! { |d| d.delete_if{|f| f == ''}.present? }
+      # end
 
       follow_up = last_follow_up.dup
      

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -108,6 +108,10 @@ module EducodeSales
         claim.amount = params["amount[#{i}]"]
         claim.staff =  @current_admin
         claim.save
+        business = claim.money_plan.business
+        if business
+          business.update(return_money: claim.money_plan.money_plan_claims.sum(:amount))
+        end
       end
       
       render_success

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -57,6 +57,22 @@ module EducodeSales
       render layout: false
     end
 
+    def edit
+      @money_plan = MoneyPlan.find(params[:id])
+      gon.business_id = @money_plan.business_id
+      gon.business = [{value: @money_plan.business_id.to_s, name: @money_plan.business&.name}]
+      render layout: false
+    end
+
+    def update
+      @money_plan = MoneyPlan.find(params[:id])
+      if @money_plan.update(money_plan_params)
+        render_success
+      else
+        render_failure @money_plan
+      end
+    end
+
     def create
       business = Business.find(params[:business_id])
       data = []
@@ -66,5 +82,10 @@ module EducodeSales
       render_success
     end
 
+    private
+    def money_plan_params
+      params.permit(:category, :amount, :payment_clause, :date_at)
+    end
+
   end
 end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -166,7 +166,8 @@ module EducodeSales
           if params[:q].present? && params[:q][:staff_manage].present?
             staff = Staff.find(params[:q][:staff_manage])
             school_ids = School.where(province: staff.areas.pluck(:name)).pluck(:id)
-            teacher_ids = EducodeSales::Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where("departments.school_id in (?)", school_ids).pluck(:id)
+            assign_teacher_ids = EducodeSales::AssignStaff.where("educode_sales_assign_staffs.sourcable_type = 'EducodeSales::Teacher' and educode_sales_assign_staffs.staff_id = ?", params[:q][:staff_manage]).pluck(:sourcable_id)
+            teacher_ids = EducodeSales::Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where("departments.school_id in (?)", school_ids).pluck(:id) + assign_teacher_ids
             @teachers = @teachers.where(id: teacher_ids)
           end
 
@@ -426,6 +427,28 @@ module EducodeSales
       render layout: false
     end
 
+    #获取该教师所指派生态经理
+    def assign
+      role = Role.find_by( name: '生态经理')
+      staffs = Staff.joins(:user).where(role_id: role.id)
+      teacher = Teacher.find(params[:id])
+      selected_staff_ids = teacher.assign_staffs.pluck(:staff_id)
+      gon.staff_manages = staffs.map { |d| {name: d.user.real_name, value: d.id, selected: selected_staff_ids.include?(d.id)} }
+      render layout: false
+    end
+
+    #指派生态经理
+    def assign_staff
+      @teacher = EducodeSales::Teacher.find(params[:id])
+      assign_staffs = []
+      params[:to_id].split(",").each do |i|
+        assign_staffs << AssignStaff.find_or_initialize_by(sourcable_id: @teacher.id, staff_id: i, sourcable_type: "EducodeSales::Teacher")
+      end
+      @teacher.assign_staffs = assign_staffs
+      @teacher.save
+      render_success
+    end
+
     private
     def teacher_params
       params.permit(:name, :professional_title, :job, :source_id, :wechat, :mobile, :realname)

data/app/models/educode_sales/staff.rb

@@ -31,6 +31,7 @@ module EducodeSales
 
     has_many :market_areas, dependent: :destroy
     has_many :areas, through: :market_areas
+    has_many :assign_staffs, :class_name => 'EducodeSales::AssignStaff', dependent: :destroy
     validates :user_id, uniqueness: { message: '已存在' }
 
     # attr_writer :month

data/app/models/educode_sales/teacher.rb

@@ -1,5 +1,6 @@
 module EducodeSales
   class Teacher < ApplicationRecord
+    has_many :assign_staffs, as: :sourcable, dependent: :destroy #生态经理
     has_many :activity_teachers, dependent: :destroy
     has_many :activities, through: :activity_teachers
     has_many :teacher_follows, dependent: :destroy

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

@@ -23,7 +23,7 @@ json.data do
     json.staff d.staff.user.real_name
     json.place d.place&.name
     json.money_plans_count d.money_plans_count
-    json.money d.money_plans.where(clazz: 1).sum(:amount).round(2)
+    json.money d.money_plans.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

data/app/views/educode_sales/money_plans/_index.html.erb

@@ -32,6 +32,7 @@
     <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
 </script>
 <script type="text/html" id="currentTableBarmoney_plan">
+    <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="apply">开票申请</a>
     <!-- <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">催款提醒</a> -->
 
@@ -125,7 +126,7 @@
                     field: 'busireceipt_state',
                     width: 120,
                     title: '开票状态',
-                },  {
+                }, {
                     field: 'created_at',
                     width: 170,
                     title: '添加计划时间',
@@ -228,6 +229,22 @@
                 $(window).on("resize", function() {
                     layer.full(sindex);
                 });
+            } else if (obj.event === 'edit') {
+                var content = miniPage.getHrefContent('/missions/money_plans/' + data.id + '/edit')
+                var openWH = miniPage.getOpenWidthHeight();
+                sindex = layer.open({
+                    title: '编辑回款计划',
+                    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
+                });
+                $(window).on("resize", function() {
+                    layer.full(sindex);
+                });
             }
         });
 

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

@@ -0,0 +1,80 @@
+<%= Gon::Base.render_data %>
+<div style="padding:10px">
+    <div class="layui-form layuimini-form" lay-filter="searchform">
+      <div class="layui-form-item">
+        <label class="layui-form-label required" style="width: 80px !important;">合同名称：</label>
+        <div class="layui-input-inline">
+          <%= hidden_field_tag :id, @money_plan.id %>
+          <div id="business" style="line-height:38px;">
+          <%=  @money_plan.business.name %>
+          </div>
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">回款类别：</label>
+            <div class="layui-input-inline">
+                <%= select_tag "category", options_for_select(EducodeSales::MoneyPlan.categories.keys, @money_plan.category), { 'lay-filter': 'category', 'lay-verify': "required",  include_blank: true,  "lay-search": "" } %>
+            </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label required" style="width:50px;">金额：</label>
+          <div class="layui-input-inline">
+          <input type="text" name="amount" value="<%= @money_plan.amount %>" class="layui-input" lay-verify="required">
+          </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label required" style="width: 110px;">计划回款时间：</label>
+          <div class="layui-input-inline">
+            <input type="text" name="date_at" value="<%= @money_plan.date_at.to_s(:date) %>" class="layui-input" lay-verify="required" id="date_at">
+          </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label">付款条件：</label>
+          <div class="layui-input-inline">
+          <input type="text" name="payment_clause" value="<%= @money_plan.payment_clause %>" class="layui-input">
+          </div>
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <div class="layui-input-block">
+          <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">保存</button>
+        </div>
+      </div>
+    </div>
+</div>
+
+  <script>
+
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'laydate', 'selectInput'], function() {
+      var form = layui.form,
+        layer = layui.layer,
+        table = layui.table,
+        laydate = layui.laydate,
+        laytpl = layui.laytpl,
+        request = layui.request,
+        selectInput = layui.selectInput,
+        $ = layui.$;
+      form.render();
+
+      laydate.render({
+        elem: '#date_at',
+      });
+
+
+      var business_id =  gon.business_id;
+
+      form.on('submit(saveBtn)', function(data) {
+        data.field.business_id = business_id;
+        if (data.field.business_id == '') {
+          layer.msg('请选择合同')
+          return false;
+        }
+        request.put("missions/money_plans/" + data.field.id, data.field, function(res) {
+          layer.close(parent.sindex)
+           parent.table.reload('money_plan_table')
+        })
+        return false;
+      });
+    });
+  </script>

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

@@ -122,6 +122,7 @@
   <% if can? :create, EducodeSales::TeacherFollow %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
   <% end %>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="assign">指派生态经理</a>
   <% if @more %>
     <a class="layui-btn-xs data-count-edit more-btn" data-name={{d.name}} data-id={{d.id}}>更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
   <% end %>
@@ -396,11 +397,206 @@
             url: '/missions/teachers',
             where: {q: form.val('search_form')},
             toolbar: '#toolbarDemo',
-            totalRow: true,
+            totalRow:true,
             defaultToolbar: ['filter'],
-            cols: cols_table,
+            cols: [
+              [
+                {
+                    field: 'id',
+                    width: 60,
+                    title:'序号',type: 'numbers',
+                    totalRowText:'合计',
+                    fixed: 'left'
+
+                },
+                {
+                    field: 'name',
+                    width: 100,
+                    title: '姓名',
+                    fixed: 'left',
+                    templet: "#name"
+                },
+                {
+                    field: 'realname',
+                    width: 100,
+                    title: '真实姓名',
+                },
+                {
+                    field: 'school',
+                    width: 160,
+                    title: '单位',
+                    templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
+
+                },
+                {
+                    field: 'department',
+                    width: 130,
+                    title: '部门',
+                    templet:'<div><span title="{{d.department}}">{{d.department}}</span></div>'
+                },
+                {
+                    field: 'majors',
+                    width: 160,
+                    title: '专业',
+                },
+                {
+                    field: 'area',
+                    width: 80,
+                    title: '区域',
+                },
+                {
+                    field: 'business_count',
+                    width: 120,
+                    title: '单位商机数',
+                },
+                {
+                    field: 'professional_title',
+                    title: '职称',
+                    width: 80,
+                    templet: '#show_follow'
+                },
+                {
+                    field: 'job',
+                    width: 80,
+                    title: '职务',
+                    templet: '#show_keys'
+
+                },
+                {
+                  field: 'source',
+                  width: 90,
+                  title: '来源',
+                },
+                {
+                    field: 'attitude',
+                    width: 60,
+                    title: '态度',
+                },
+                {
+                    field: 'course_subjects_count',
+                    width: 90,
+                    title: '课程方向',
+                    templet: "#courses"
+                },
+                {
+                    field: 'teacher_follows_count',
+                    width: 90,
+                    title: '跟进情况',
+                    totalRow:true,
+                    templet: "#follow"
+                },
+                {
+                    field: 'sales_manage',
+                    width: 160,
+                    title: '销售经理',
+                 },
+                {
+                  field: 'staff_manage',
+                  width: 160,
+                  title: '生态经理',
+                },
+                {
+                    field: 'follow_person',
+                    width: 120,
+                    title: '最新跟进人',
+                },
+                {
+                    field: 'followup_at',
+                    width: 180,
+                    title: '最新跟进时间',
+                },
+                {
+                    field: 'latest_time',
+                    width: 120,
+                    title: '无跟进天数',
+                    sort: true,
+                },
+                {
+                    field: 'teacher_used',
+                    width: 120,
+                    title: '学院渗透率',
+                },
+                {
+                    field: 'students',
+                    width: 60,
+                    totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+                    title: '学生',
+                },
+                {
+                    field: 'courses_count',
+                    width: 60,
+                    title: '课堂',
+                    totalRow:true,
+                    templet: "#class"
+                },
+                {
+                    field: 'activities_count',
+                    width: 100,
+                    title: '参与活动',
+                    templet: "#event"
+                },
+                {
+                    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: 'experience',
+                    width: 120,
+                    title: '经验值',
+                    sort: true,
+                },
+                {
+                    field: 'grade',
+                    width: 120,
+                    title: '金币',
+                    sort: true,
+                },
+                {
+                    field: 'mobile',
+                    width: 120,
+                    title: '联系电话',
+                },
+                {
+                    field: 'wechat',
+                    width: 120,
+                    title: '微信号',
+                },
+                {
+                    field: 'teacher_assist',
+                    width: 120,
+                    title: '教研助理',
+                },
+                {
+                    field: 'is_contact',
+                    width: 120,
+                    title: '是否联系上'
+                },
+                {
+                    title: '操作',
+                    minWidth: 270,
+                    toolbar: '#currentTableBar',
+                    align: "center",
+                    fixed: 'right'
+                }
+              ]
+            ],
+
             limit: 20,
-            limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
+          limits: [10,15,20,30,40,50,60,70,80,90],
             page: true,
             done: function (res) {
                 drowpdwonRender()
@@ -408,7 +604,7 @@
         });
         var dropmenu = gon.menus;
 
-        drowpdwonRender = function () {
+        drowpdwonRender = function() {
             dropdown.render({
                 elem: '.more-btn',
                 data: dropmenu,
@@ -780,6 +976,23 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
+            }else if(obj.event === 'assign'){ //指派生态经理
+                var content = miniPage.getHrefContent('/missions/teachers/' + id + '/assign');
+                var openWH = miniPage.getOpenWidthHeight();
+                var name = data.name;
+                sindex = layer.open({
+                    title: '指派教师【' + name + "】生态经理",
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: ['600px', '300px'],
+                    content: content
+                });
+                $(window).on("resize", function () {
+                    layer.full(sindex);
+                });
+                return false;
             }
         });
 

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

@@ -0,0 +1,43 @@
+<%= Gon::Base.render_data %>
+<div class="layui-form layuimini-form" style="padding:30px">
+  <div class="layui-form-item">
+    <label class="layui-form-label required">选择生态经理：</label>
+    <div class="layui-input-block" style="width: 300px">
+      <div id="staff_manage_id"></div>
+    </div>
+  </div>
+  <hr>
+  <div class="layui-form-item">
+    <div class="layui-input-block">
+      <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+    </div>
+  </div>
+</div>
+
+<script>
+    layui.use(['form', 'table', 'upload', 'request', 'selectInput'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            request = layui.request,
+            $ = layui.$;
+
+        form.render();
+        staff_list_select = xmSelect.render({
+            el: '#staff_manage_id',
+            data: gon.staff_manages,
+            filterable: true,
+            radio: false,
+        });
+        var parentIndex = layer.index;
+        form.on('submit(saveBtn)', function () {
+            layer.confirm('确定指派生态经理?', function (index) {
+                request.post('missions/teachers/' + parent.id +"/assign_staff", {to_id: staff_list_select.getValue('valueStr')}, function () {
+                    layer.close(index);
+                    layer.close(parentIndex);
+                    parent.table.reload('teachers_table')
+                })
+            });
+            return false;
+        });
+    });
+</script>

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

@@ -25,7 +25,11 @@ json.data do
     json.followup_at d.follow_up&.created_at&.to_s
     json.latest_time (d['latest_time'] ? DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d['latest_time'].strftime("%Y-%m-%d")) : DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d.created_at.strftime("%Y-%m-%d"))).to_i
 
-    json.staff_manage @staff_manages[d.department&.school&.province]&.join(",")
+    assign_staff_manages = []
+    d.assign_staffs.each do |assign|
+      assign_staff_manages << assign.staff&.user&.real_name
+    end
+    json.staff_manage @staff_manages[d.department&.school&.province].present? ? (@staff_manages[d.department&.school&.province] + assign_staff_manages).uniq.join(",") : assign_staff_manages
     json.sales_manage @sales_manages[d.department&.school&.province]&.join(",")
 
     if d.department_id

data/app/views/layouts/educode_sales/application.html.erb

@@ -2,6 +2,7 @@
 <html>
 
 <head>
+  <title>头歌营销系统</title>
     <%= csrf_meta_tags %>
         <%= csp_meta_tag %>
             <%= Gon::Base.render_data %>
@@ -16,6 +17,8 @@
         <div class="layui-header">
             <a href="/missions">
                 <div class="layui-bg-black layuimini-logo layui-logo" id="head_a">
+                  <%= image_tag "educode_sales/logo.png", class: 'header-logo' %>
+                  <span class="app-title">营销系统</span>
                 </div>
             </a>
 

data/config/routes.rb

@@ -332,6 +332,8 @@ EducodeSales::Engine.routes.draw do
       get :unfinish_plans
       get :course_subject
       put :update_follow_up
+      get :assign
+      post :assign_staff
     end
   end
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -448,6 +448,7 @@ files:
 - app/views/educode_sales/money_plan_records/index.json.jbuilder
 - app/views/educode_sales/money_plans/_index.html.erb
 - app/views/educode_sales/money_plans/add.html.erb
+- app/views/educode_sales/money_plans/edit.html.erb
 - app/views/educode_sales/money_plans/index.json.jbuilder
 - app/views/educode_sales/money_plans/list.html.erb
 - app/views/educode_sales/operation_plans/_monthPlan.html.erb
@@ -592,6 +593,7 @@ files:
 - app/views/educode_sales/teachers/add_courses.html.erb
 - app/views/educode_sales/teachers/add_event.html.erb
 - app/views/educode_sales/teachers/add_keys.html.erb
+- app/views/educode_sales/teachers/assign.html.erb
 - app/views/educode_sales/teachers/course_list.json.jbuilder
 - app/views/educode_sales/teachers/course_subject.json.jbuilder
 - app/views/educode_sales/teachers/daily_paper.html.erb