educode_sales 1.10.31 → 1.10.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c50f4a81ef08d88a240f765076b16084ce5bba548f47b95b6d39fd925415194e
-  data.tar.gz: 63383b652e3dde1d55bb984050643cb10f9f496d343bd2ee5713de1c5815823f
+  metadata.gz: 22b7976d2189b10d3280296023ca6d52fbb050307cf59d6b83c81547d5fee47e
+  data.tar.gz: 4c81b96887d55e9bc415d2a0f0359884cb196a1dc900d9fc56b837585f6f882b
 SHA512:
-  metadata.gz: 37b0e90d7eb6706824767e754501cd3c41531ef6d5fbf506e0808d5fc7714a61f1b4fe6cf86328ca2dc5f116dc646031d74bf3b58ac52642f0ecc98f37414edc
-  data.tar.gz: 61ff8dba4f84ce8ab9c91d4914edbacd0bfc666245b395e20356c4c493c060baf5cfa2e4fb574c9c19e3a2c8866da471d1bcd06a8eb24dc8ca2535e39acd4cd6
+  metadata.gz: 3697ec424b22d9ed64d8aa5d8e10665c719826651441a597376170287e0b9e54b565ec6ec0d5c545755a6899f5ea9ce5d530ab92daf36a92f843ffbd9d035f47
+  data.tar.gz: c8a57001d38e3ca5f824167565b668228de6e089be99b44bd07b92732a6971fb3aa296b2abd0f945311b01dfa019887faf7a0a1e60b1924a0560d84b7979c329

data/app/controllers/educode_sales/businesses_controller.rb

@@ -293,6 +293,20 @@ module EducodeSales
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
             ").where("educode_sales_follow_ups.invitation_at > ? AND educode_sales_follow_ups.invitation_at < ?", date[0] + '00:00:00', date[1] + '23:59:59')
           end
+        
+          if params[:q].present? && params[:q][:plan_return_date].present?
+            date = params[:q][:plan_return_date].split(" - ")
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.plan_return_date > ? AND educode_sales_follow_ups.plan_return_date < ?", date[0] + '00:00:00', date[1] + '23:59:59')
+          end
+        
+          if params[:q].present? && params[:q][:plan_a_date].present?
+            date = params[:q][:plan_a_date].split(" - ")
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.plan_a_date > ? AND educode_sales_follow_ups.plan_a_date < ?", date[0] + '00:00:00', date[1] + '23:59:59')
+          end
 
           # 根据编号获取商机
           if params[:q].present? && params[:q][:number].present?

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -55,6 +55,10 @@ module EducodeSales
             date = params[:q][:follows_date].split(" - ")
             @follow_ups = @follow_ups.where("educode_sales_follow_ups.created_at > ? AND educode_sales_follow_ups.created_at < ?", date[0], date[1] + '23:59:59')
           end
+          if params[:q].present? && params[:q][:property].present?
+            # 客户类型
+            @follow_ups = @follow_ups.joins(business: [department: [school: :school_tags]]).where("school_tags.id = ?", params[:q][:property])
+          end
           if params[:q].present? && params[:q][:staff_id].present?
             @follow_ups = @follow_ups.where(staff_id: params[:q][:staff_id])
           end

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -57,6 +57,11 @@ module EducodeSales
 
           end
 
+          if params[:q].present? && params[:q][:property].present?
+            # 客户类型
+            @money_plan_records = @money_plan_records.joins(business: [department: [school: :school_tags]]).where("school_tags.id = ?", params[:q][:property])
+          end
+
           if params[:q].present? && params[:q][:staff_manages].present?
             # 销售经理
             @money_plan_records = @money_plan_records.joins(:business).joins("
@@ -161,34 +166,6 @@ module EducodeSales
           businesses << business
           money_plan_record.update(business_id: business.id)
           # business.update(return_money: claim.money_plan.money_plan_claims.sum(:amount))
-
-
-          # # 生成跟进信息
-          # last_follow_up = business.last_follow_up
-          # if last_follow_up.present?
-          #   follow_up = last_follow_up.dup
-
-          #   follow_up.description = "认领了回款记录"
-
-          #   follow_up.staff = @current_admin
-
-          #   last_follow_up.assign_follow_ups.each do |d|
-          #     follow_up.assign_follow_ups.build(staff_id: d.staff_id)
-          #   end
-
-          #   if follow_up.save!
-          #     last_follow_up.key_person.each do |d|
-          #       key_person = d.dup
-          #       key_person.follow_up_id = follow_up.id
-          #       key_person.save
-          #     end
-          #     last_follow_up.money_plans.each do |d|
-          #       d.follow_up_id = follow_up.id
-          #       d.save
-          #     end
-          #     business.update(last_follow_up_id: follow_up.id)
-          #   end
-          # end
         end
       end
       businesses.uniq.each do |d|
@@ -198,6 +175,40 @@ module EducodeSales
         staff_manage_ids = d&.last_follow_up&.assign_follow_ups.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : [d.staff_id]
         common_id = EducodeSales::Common.find_by(clazz: '计划类型', name: '回款计划')&.id
         EducodeSales::SalePlan.where(month: Time.now.beginning_of_month, business: d, staff_id: staff_manage_ids, common_id: common_id).update_all(finish_rate: 100)
+     
+
+        # 生成跟进信息
+        last_follow_up = d.last_follow_up
+        if last_follow_up.present?
+          follow_up = last_follow_up.dup
+          follow_up.description = "认领了回款记录"
+          follow_up.staff = @current_admin
+
+          last_follow_up.assign_follow_ups.each do |d|
+            follow_up.assign_follow_ups.build(staff_id: d.staff_id)
+          end
+
+          if follow_up.save!
+            last_follow_up.key_person.each do |d|
+              key_person = d.dup
+              key_person.follow_up_id = follow_up.id
+              key_person.save
+            end
+
+            last_follow_up.money_plans.each do |d|
+              money = d.dup
+              money.staff = @current_admin
+              money.follow_up_id = follow_up.id
+              money.save
+            end
+
+            # 合同里签到日期全同步到最新跟进
+            last_follow_up.contract_date_lists.update_all(follow_up_id: follow_up.id)
+            
+            follow_up.follow_up_trends.create(clazz: '跟进信息', content: "认领了回款记录", staff_id: @current_admin.id)
+            d.update(last_follow_up_id: follow_up.id)
+          end
+        end
       end
       render_success
     end
@@ -205,7 +216,7 @@ module EducodeSales
     private
 
     def money_plan_record_params
-      params.permit(:amount, :payer_name, :date_at)
+      params.permit(:amount, :payer_name, :date_at, :business_id)
     end
   end
 end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -23,7 +23,9 @@ module EducodeSales
         @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).sum(:total_amount).round(2)
         @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.stage_id IN (?)", s_stage_ids).sum(:actual_amount).round(2)
 
-        @return_amount = Business.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)
+
+        @return_amount = EducodeSales::MoneyPlanRecord.joins(:money_plan_claims).sum(:amount).round(2)
+        # @return_amount = Business.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)
         # # @return_amount = total_return[0]['return_money']&.round(2) || 0
         # @receivable_amount = @goal_amount - @return_amount
 
@@ -50,8 +52,9 @@ module EducodeSales
         s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
         @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids).sum(:total_amount).round(2)
         @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids).sum(:actual_amount).round(2)
-        @return_amount = Business.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_time, year_over_time).sum(:amount).round(2)
+        # @return_amount = Business.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_time, year_over_time).sum(:amount).round(2)
 
+        @return_amount = EducodeSales::MoneyPlanRecord.joins(:money_plan_claims).where("educode_sales_money_plan_records.date_at >= ?  AND educode_sales_money_plan_records.date_at <= ? ", year_time, year_over_time).sum(:amount).round(2)
         # 往年累计已中标合同
         # @former_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.stage_id IN (?)", "#{@year}-12-31", stage_ids).sum(:actual_amount).round(2)
         # # 往年累计已回款

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

@@ -13,6 +13,12 @@
           <input type="text" name="department" class="layui-input">
         </div>
       </div>
+      <div class="layui-inline">
+          <label class="layui-form-label">客户类型</label>
+          <div class="layui-input-inline">
+          <%= select_tag "property", options_for_select(SchoolTag.where(for_missions: true).pluck(:name, :id)), { include_blank: true } %>
+          </div>
+      </div>
       <div class="layui-inline">
         <label class="layui-form-label">销售人员</label>
         <div class="layui-input-inline">
@@ -121,6 +127,11 @@
                         title: '单位',
                         templet:'#school'
                     },
+                    {
+                      field: 'property',
+                      width: 150,
+                      title: '客户类型',
+                    },
                     {
                         field: 'clazz',
                         width: 80,

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

@@ -80,11 +80,12 @@
                 </div>
               </div>
               <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
-                <label class="layui-form-label">计划投标时间</label>
+                <label class="layui-form-label" style="width: 120px;">计划投标时间</label>
                 <div class="layui-input-inline">
                   <input type="text" class="layui-input" id="invitation_at" name="invitation_at" placeholder=" - " autocomplete="off">
                 </div>
               </div>
+            
               <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
                 <label class="layui-form-label">中标时间</label>
                 <div class="layui-input-inline">
@@ -129,6 +130,18 @@
                   <%= select_tag "property", options_for_select(SchoolTag.where(for_missions: true).pluck(:name, :id)), { include_blank: true } %>
                 </div>
               </div>
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
+                <label class="layui-form-label" style="width: 120px;">计划A类时间</label>
+                <div class="layui-input-inline">
+                  <input type="text" class="layui-input" id="plan_a_date" name="plan_a_date" placeholder=" - " autocomplete="off">
+                </div>
+              </div>
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
+                <label class="layui-form-label" style="width: 120px;">计划回款时间</label>
+                <div class="layui-input-inline">
+                  <input type="text" class="layui-input" id="plan_return_date" name="plan_return_date" placeholder=" - " autocomplete="off">
+                </div>
+              </div>
               <div class="layui-inline">
                 <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
                 </button>
@@ -265,7 +278,17 @@
           range: true,
           value: gon.bidded_date
         });
-     
+
+        laydate.render({
+          elem: '#plan_a_date',
+          range: true,
+        });
+        
+        laydate.render({
+          elem: '#plan_return_date',
+          range: true,
+        });
+        
 
         form.on('select(source_id_select)', function(data){
           setSourceWay(data.value);
@@ -535,6 +558,7 @@
                   width: 150,
                   title: '计划A类金额',
                   sort: true,
+                  totalRow: true,
                   hide: gon.filter.plan_a_money
                },
                 {
@@ -549,6 +573,7 @@
                   width: 150,
                   title: '计划投标金额',
                   sort: true,
+                  totalRow: true,
                   hide: gon.filter.invitation_money
                 },
                 {
@@ -563,6 +588,7 @@
                   width: 135,
                   title: '计划回款金额',
                   sort: true,
+                  totalRow: true,
                   hide: gon.filter.plan_return_money
                 },
                 {
@@ -1119,8 +1145,9 @@
         form.on('submit(reset_business_search)', function (data) {
             var field = data.field;
             form.val('search_form', {
-                name: '', department: '', staff_id: '', business_type: '', business_step: '',
-                place_id: '', date: '', area: '', invitation_at: '', business_year: '', number: ''
+                name: '', department: '', staff_id: '', business_type: '', business_step: '', bidded_date: '', source_way: '',
+                place_id: '', date: '', area: '', invitation_at: '', business_year: '', number: '', property: '', level_id: '', source_name: '',
+                invitation_money: '', plan_a_date: '', plan_a_money: '', plan_return_date: '', plan_return_money: ''
             })
             business_type_list.setValue([])
             business_step_list.setValue([])

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

@@ -17,6 +17,11 @@ json.data do
     json.tel d.key_person.pluck(:tel).select { |d| d.present?  }.join("、")
     json.key_people d.key_person.map { |d| d.name }.join("、")# key_people(teacher_ids)
 
+    if d.business.department&.school
+      json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+    else
+      json.property ''
+    end
   end
 end
 

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

@@ -26,6 +26,12 @@
                     <input type="text" name="school" class="layui-input">
                 </div>
             </div>
+            <div class="layui-inline">
+                <label class="layui-form-label">客户类型</label>
+                <div class="layui-input-inline">
+                <%= select_tag "property", options_for_select(SchoolTag.where(for_missions: true).pluck(:name, :id)), { include_blank: true } %>
+                </div>
+            </div>
             <div class="layui-inline">
                 <label class="layui-form-label required">匹配状态</label>
                 <div class="layui-input-inline">
@@ -140,6 +146,11 @@
                         width: 220,
                         title: '对应客户名称',
                     },
+                    {
+                        field: 'property',
+                        width: 150,
+                        title: '客户类型',
+                    },
                     {
                         field: 'state',
                         width: 120,
@@ -205,7 +216,12 @@
                 clazz: "",
                 professional_title: "",
                 school: "",
-                business: ""
+                business: "",
+                property: "",
+                date_at: "",
+                amount: "",
+                payer_name: "",
+                state: ""
             });
             staff_manages_list.setValue([]);
             return false;

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

@@ -3,7 +3,13 @@
       <div class="layui-form-item">
           <label class="layui-form-label" style="width: 80px !important;">合同名称：</label>
           <div class="layui-input-inline" style="line-height: 38px;">
-            <%= @money_plan_record.business&.name %>
+            <% if @money_plan_record.business %>
+              <%= @money_plan_record.business&.name %>
+            <% else %>
+              <div id="business" style="width:600px;"></div>
+            <% end %>
+        
+         
           </div>
       </div>
       <div class="layui-form-item">
@@ -41,13 +47,44 @@
           table = layui.table,
           laydate = layui.laydate,
           request = layui.request,
+          selectInput = layui.selectInput,
           $ = layui.$;
       form.render();
       laydate.render({
           elem: '#date_at',
       });
+
+      if ($("#business").length > 0) {
+        var business_id = "";
+        var business_select = selectInput.render({
+            elem: '#business',
+            name: 'bussiness_name', // 渲染的input的name值
+            layFilter: 'test', //同layui form参数lay-filter
+            layVerType: 'tips', // 同layui form参数lay-verType
+            layReqText: '请填写文本', //同layui form参数lay-ReqText
+            hasSelectIcon: false,
+            placeholder: '请输入合同名称', // 渲染的inputplaceholder值
+            remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
+            remoteMethod: function(value, cb) { // 远程搜索的回调函数
+                if (!value) {
+                    business_id = "";
+                    return cb([]);
+                }
+                request.get('missions/search_contracts?q=' + value, {}, function(res) {
+                    if (res.data.length == 0) {
+                        business_select.emptyValue();
+                        return cb([])
+                    }
+                    return cb(res)
+                })
+            }
+        });
+      }
    
       form.on('submit(saveBtn)', function(data) {
+          if ($("#business").length > 0) {
+            data.field.business_id = business_select.getValue()
+          }
           request.put("missions/money_plan_records/" + parent.id, data.field, function(res) {
               layer.close(parent.sindex)
               parent.table.reload('money_plan_record_table')

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

@@ -21,6 +21,11 @@ json.data do
     else
       json.state '待认领'
     end
+    if d.business&.department&.school
+      json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+    else
+      json.property ''
+    end
   end
 end
 

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

@@ -20,7 +20,7 @@ json.data do
     json.signed_date d.business&.last_follow_up&.signed_date
     json.actual_amount d.business&.last_follow_up&.actual_amount
     json.rate d.business&.last_follow_up&.actual_amount ? (d.amount / d.business.last_follow_up.actual_amount * 100.0).round(2) : ''
-    json.staff_manages d.business&.last_follow_up&.assign_follow_ups.present? ? (d.business.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.business.staff&.user&.real_name
+    json.staff_manages d.business&.last_follow_up&.assign_follow_ups.present? ? (d.business.last_follow_up.assign_follow_ups.map{ |d| d.staff&.user&.real_name}.join("、")) : d.business.staff&.user&.real_name
     if d['claim_num'] > 0
       if d['return_money'].to_f >= d.amount
         json.state '已回款'

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.31'
+  VERSION = '1.10.33'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.31
+  version: 1.10.33
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-11 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ 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
@@ -758,7 +757,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -773,8 +772,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []