educode_sales 1.10.0 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f95a116861234dd0fca5a1714c085e1bec0bddc43a23eb887d52486ac72d16
-  data.tar.gz: 771c88244cbf37b3521d6ca60d9571d10bc22d90ae698ebf885608aeb4560a59
+  metadata.gz: 8319a1ab978e05583c3bf97bba97c61d872dbb3165d8e7f62888dc43747732fa
+  data.tar.gz: 12b16d2e7c5c4d8c0c0e6051625308c1dc50693d5dfc26452cf2336ca796736f
 SHA512:
-  metadata.gz: 9a81d2f314ed6071cf408581e4725e337fdfcca85873d90945b6fd2b26016437b497c91e34ddfc41deb0602898d150572b7f4a5cf13e4189fb50d9b7414863aa
-  data.tar.gz: 5dfc28b6e674a4241e2c2e717d84fc2b6cf3d3825794d96be7edbb771718cab0841ee055a87b6df43a40b6c97ba1b4d61b280d9184c1e8b4cee44d64c19dfb63
+  metadata.gz: 3a134e29aa9a9f3543be3edc4e63ee1e9d5f87f4879905a7b166a2cafb6e85ace9b14d2aa736a3e3e0d0797723da19050a590abd6fff4eec7cd56aa012dc983f
+  data.tar.gz: baf71ec0ec85d306725c0c75f6445b89c7f8953dabc7914a569cecb963fd183d95eafe92540023739d82c07c32819406a40ff8265c602340ea5239d1587c8ccf

data/app/controllers/educode_sales/customers_controller.rb

@@ -195,8 +195,6 @@ module EducodeSales
               LEFT JOIN educode_sales_businesses AS d ON d.department_id = departments.id AND d.deleted_at is NULL
               GROUP BY schools.id, departments.id
             ) AS de ON m.id = de.id AND m.department_id = de.department_id
-
-
           ) AS s")
           if @current_admin.is_admin?
             # @customers = School.all
@@ -230,10 +228,10 @@ module EducodeSales
             LEFT JOIN departments ON s.department_id = departments.id
           ")
 
-          part_a_ids = CustomerFollow.all.pluck(:school_id)
-          part_b_ids = Business.pluck(:school_id)
-          ids = part_a_ids + part_b_ids + CustomerAdd.all.pluck(:school_id)
-          @customers = @customers.where(id: ids.uniq)
+          # part_a_ids = CustomerFollow.all.pluck(:school_id)
+          # part_b_ids = Business.pluck(:school_id)
+          # ids = part_a_ids + part_b_ids + CustomerAdd.all.pluck(:school_id)
+          # @customers = @customers.where(id: ids.uniq)
           if params[:q].present? && params[:q][:name].present?
             @customers = @customers.where("schools.name like ?", "%#{params[:q][:name]}%")
           end
@@ -246,7 +244,7 @@ module EducodeSales
           end
           if params[:q].present? && params[:q][:property].present?
             property = params[:q][:property].split(",").map(&:to_i)
-            @customers = @customers.joins(:school_tags).where("school_tags.id in (?)", property).distinct
+            @customers = @customers.joins("JOIN school_tag_middles ON school_tag_middles.school_id = s.id INNER JOIN school_tags ON school_tags.id = school_tag_middles.school_tag_id").where("school_tags.id in (?)", property).distinct
           end
 
           if params[:q].present? && params[:q][:date].present?

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -85,7 +85,12 @@ module EducodeSales
 
     def create
       load_business
-      follow_up = @business.follow_ups.build(follow_up_params)
+      if @business.last_follow_up
+        follow_up =  @business.last_follow_up.dup
+        follow_up.assign_attributes(follow_up_params)
+      else
+        follow_up = @business.follow_ups.build(follow_up_params)
+      end
       if params[:service_time].present?
         date = params[:service_time].split(" - ")
         follow_up.service_start_time = date[0]
@@ -123,7 +128,8 @@ module EducodeSales
             money.follow_up_id = follow_up.id
             money.save
           end
-
+          # 合同里签到日期全同步到最新跟进
+          last_follow_up.contract_date_lists.update_all(follow_up_id: follow_up.id)
         end
         @business.update(last_follow_up_id: follow_up.id, clazz_id: follow_up.clazz_id, p_deploy_time: params[:deploy_time])
         # 增加o商机编号
@@ -144,6 +150,8 @@ module EducodeSales
             business.clazz_id = business.follow_ups.last&.clazz_id
           end
           business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '实际回款', follow_up_id: business.follow_ups.last&.id).sum(:amount))
+          # 合同里签到日期全同步到最新跟进
+          follow_up.contract_date_lists.update_all(follow_up: business.follow_ups.last) if business.follow_ups.last.present?
         end
         render_success
       else

data/app/controllers/educode_sales/home_controller.rb

@@ -119,7 +119,8 @@ module EducodeSales
     end
 
     def search_money_plans
-      @data = MoneyPlan.joins(business: :school)
+      # @data = MoneyPlan.joins(business: [:school, :last_follow_up])
+      @data = MoneyPlan.joins("JOIN educode_sales_businesses ON educode_sales_businesses.last_follow_up_id = educode_sales_money_plans.follow_up_id JOIN schools ON schools.id = educode_sales_businesses.school_id")
       if params[:q].present?
         @data = @data.where("educode_sales_businesses.name like :q OR educode_sales_businesses.number like :q OR schools.name like :q ", q: "%#{params[:q]}%").limit(20)
       end

data/app/models/educode_sales/idea.rb

@@ -23,7 +23,7 @@ module EducodeSales
     enum status: %w[未完成 已完成]
     enum types: %w[低定制 非定制 高定制 全定制]
     enum model: %w[本地版 线上版 混合版]
-    enum idea_type: %w[售前 售后]
+    enum idea_type: %w[建设方案 申报论证 市场调研 课程建设 报价清单 交流汇报 招标参数 资质申报 产品手册 宣传海报 课题论文 投标支持 其他类]
 
     serialize :assist_staff_ids,Array
     serialize :attachment_ids, Array

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

@@ -46,7 +46,7 @@
                placeholder="请选择日期">
       </div>
     </div>
-    <div class="layui-inline">
+     <div class="layui-inline">
       <label class="layui-form-label">中标时间</label>
       <div class="layui-input-inline">
         <input type="text" class="layui-input" name="bidded_date" autocomplete="off" id="invitation_at_add"
@@ -55,6 +55,7 @@
       </div>
     </div>
     <br>
+    <!-- 
     <div class="layui-inline">
       <label class="layui-form-label">签单时间</label>
       <div class="layui-input-inline">
@@ -62,14 +63,15 @@
                value="<%= @last_follow_up&.signed_date %>"
                placeholder="请选择日期">
       </div>
-    </div>
+    </div> -->
     <input type="hidden" class="layui-input" name="reception_at" value="<%= @last_follow_up&.reception_at %>">
-    <div class="layui-inline">
+    <input type="hidden" class="layui-input" name="deploy_time" value="<%= @last_follow_up&.deploy_time %>">
+    <!-- <div class="layui-inline">
       <label class="layui-form-label">部署时间</label>
       <div class="layui-input-inline">
         <input type="text" class="layui-input" name="deploy_time" value="<%= @last_follow_up&.deploy_time %>"  id="p_deploy_time" placeholder="请选择日期">
       </div>
-    </div>
+    </div> -->
     <br>
     <div class="layui-inline service_show layui-hide">
       <label class="layui-form-label required">服务期</label>
@@ -78,12 +80,12 @@
       </div>
     </div>
 
-    <div class="layui-inline deployment_type layui-hide">
+    <!-- <div class="layui-inline deployment_type layui-hide">
       <label class="layui-form-label required">部署类型</label>
       <div class="layui-input-inline">
         <%= select_tag "o_business_deployment", options_for_select(@deployment_type,  @last_follow_up&.o_business_deployment), class: 'required' %>
       </div>
-    </div>
+    </div> -->
 
     <br class="service_show layui-hide">
     <div class="layui-inline">
@@ -94,8 +96,9 @@
       </div>
       客户采购支出的费用。中标额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。
     </div>
-    <br>
-    <div class="layui-inline">
+    <br> 
+    <!-- 
+   <div class="layui-inline">
       <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
         <input name="actual_amount" type="number" class="layui-input" autocomplete="off" placeholder="本单位的签单金额"
@@ -104,13 +107,15 @@
       客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
     <br>
+    -->
     <div class="layui-inline new_place_select">
       <label class="layui-form-label">渠道</label>
       <div class="layui-input-inline" style="">
         <div id="place" style="width: 190px;"></div>
       </div>
     </div>
-  <br>
+    <br> 
+    <!-- 
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
@@ -119,6 +124,7 @@
       中标额里，渠道拿到的部分。
     </div>
     <br>
+    -->
      <div class="layui-inline">
       <label class="layui-form-label">预算金额(万)</label>
       <div class="layui-input-inline">
@@ -269,49 +275,46 @@
                 })
             }
         })
-        var place_list = xmSelect.render({
-            el: '#place',
-            remoteSearch: true,
-            model: {
-                icon: 'hidden',
-                label: {
-                    type: 'text',
-                    text: {
-                        //左边拼接的字符
-                        left: '',
-                        //右边拼接的字符
-                        right: '',
-                        //中间的分隔符
-                        separator: ', ',
-                    },
-                }
-            },
-            clickClose: true,
-            delay: 1000,
-            paging: true,
-            radio: true,
-            pageRemote: true,
-            filterable: true,
-            remoteMethod: function (val, cb, show, pageIndex) {
-                $.ajax('/missions/sales_place', {
-                    method: 'get',
-                    data: {
-                        q: val,
-                        page: pageIndex
-                    },
-                    dataType: 'json',
-                    success: function (res) {
-                        var data = res.data;
-                        if (res.code == 0) {
-                            cb(res.data, res.count);
-                        } else {
-                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
-                        }
+         var place_list = xmSelect.render({
+             el: '#place',
+             remoteSearch: true,
+             model: {
+                 icon: 'hidden',
+                 label: {
+                     type: 'text',
+                     text: {
+                         left: '',
+                         right: '',
+                         separator: ', ',
+                     },
+                 }
+             },
+             clickClose: true,
+             delay: 1000,
+             paging: true,
+             radio: true,
+             pageRemote: true,
+             filterable: true,
+             remoteMethod: function (val, cb, show, pageIndex) {
+                 $.ajax('/missions/sales_place', {
+                     method: 'get',
+                     data: {
+                         q: val,
+                         page: pageIndex
+                     },
+                     dataType: 'json',
+                     success: function (res) {
+                         var data = res.data;
+                         if (res.code == 0) {
+                             cb(res.data, res.count);
+                         } else {
+                             layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                         }
 
-                    }
-                })
-            }
-        })
+                     }
+                 })
+             }
+         })
 
         sales_list.setValue(gon.sales);
         place_list.setValue(gon.place);

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

@@ -399,202 +399,7 @@
             toolbar: '#toolbarDemo',
             totalRow:true,
             defaultToolbar: ['filter'],
-            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'
-                }
-              ]
-            ],
-
+            cols: cols_table,
             limit: 20,
           limits: [10,15,20,30,40,50,60,70,80,90],
             page: true,

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.0'
+  VERSION = '1.10.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.2
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-09 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
+- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -727,7 +728,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -742,8 +743,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []