educode_sales 0.9.25 → 0.9.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7326e12d52dc97f7f251f63b033f3c470591be1100f6f9bd06ab057e9a21bd14
-  data.tar.gz: 80817718f3efdcb1a247095f468123ad1111d996dffe3f858cd6b29aab0f52ad
+  metadata.gz: 23546de4bbb1afb063c383c9284ac5df3851a0b5b80ff1156b4a395d3bacdbdb
+  data.tar.gz: a4e1a21cab776582c8e5659778b81073ee5cd397e7544e8508e7d373a37fa99f
 SHA512:
-  metadata.gz: 4430c0f16dac2deda9e833d7962020fd8727a60d43b3823b631ac7cc5196d40c0bbd66b8170ac114e6cdf5dc197978f3674dfe2d5dad720963baefce8537f76a
-  data.tar.gz: 34fb199238d1d1181e1b07fb8f2e00371e271aa9cc3689af2a916dbeb089f9a2624a0c14140de4cbc550d9faa04a03525db1c9407e9b5d3ae439e8d8152946f9
+  metadata.gz: 952ec86ff8bd23312b8b5e439c1adfebaa3547c59f5bc8f35553699f59ebc2163b64401a971a29207ceb29e3fb586f698a94d07c028fcf3ee7ed2d2fcf8d8aba
+  data.tar.gz: 16b22885432f18349e35abb396db51aad96b55ff882fbda645410e6fb7d1fc2bb59688aadebc5aab1e2ebf02a6b02417f3d55b99ebc2258850d005fb7d7e2046

data/app/controllers/educode_sales/businesses_controller.rb

@@ -34,7 +34,7 @@ module EducodeSales
           end
 
           if params[:bidded_date_year].present? && params[:bidded_date_year] != '全部'
-            gon.bidded_date = Time.new(params[:bidded_date_year]).strftime("%Y-%m-%d") + " - " + Time.new(params[:bidded_date_year]).end_of_year.strftime("%Y-%m-%d")
+            gon.bidded_date = "2015-01-01" + " - " + Time.new(params[:bidded_date_year]).end_of_year.strftime("%Y-%m-%d")
           end
           
           if params[:signed_date_year].present? && params[:signed_date_year] != '全部'

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -45,8 +45,7 @@ module EducodeSales
           end
           if params[:q].present? && params[:q][:area].present?
             p = EducodeSales::Common.find(params[:q][:area]).name
-            @follow_ups = @follow_ups.joins(:business).joins("
-              JOIN departments ON educode_sales_businesses.department_id = departments.id
+            @follow_ups = @follow_ups.joins(business: :department).joins("
               JOIN schools ON departments.school_id = schools.id
             ").where("province = ?", p)
           end
@@ -57,6 +56,8 @@ module EducodeSales
 
           end
 
+          @follow_ups = @follow_ups.includes(:staff, :clazz, :stage, key_person: :teacher, business: [department: :school])
+
           if params[:sort].present? && params[:sort][:field]
             @follow_ups = @follow_ups.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -22,7 +22,7 @@ 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 = 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
 
@@ -57,7 +57,7 @@ module EducodeSales
         # @former_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 <= ? ", year_over_time).sum(:amount).round(2)
         # @receivable_amount = @former_goal_amount - @former_return_amount
 
-        @receivable_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).select("(SUM(educode_sales_follow_ups.actual_amount) - SUM(educode_sales_businesses.return_money)) AS num")
+        @receivable_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).select("(SUM(educode_sales_follow_ups.actual_amount) - SUM(educode_sales_businesses.return_money)) AS num")
         @receivable_amount = @receivable_amount.present? && @receivable_amount[0]['num'] ? @receivable_amount[0]['num'].round(2) : 0
 
         a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).pluck(:id)

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

@@ -142,6 +142,12 @@
                         title: '关键人',
                         templet:'<div><span title="{{d.key_people}}">{{d.key_people}}</span></div>'
                     },
+                    {
+                        field: 'tel',
+                        width: 90,
+                        title: '联系方式',
+                        templet:'<div><span title="{{d.tel}}">{{d.tel}}</span></div>'
+                    },
                     {
                         field: 'staff',
                         width: 90,

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

@@ -1,4 +1,4 @@
-<form class="layui-form layuimini-form " id="custom_data" data-required="true" action="">
+<div class="layui-form layuimini-form " id="custom_data" data-required="true">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
       <label class="layui-form-label required">客户：</label>
@@ -30,7 +30,7 @@
       </div>
     </div>
     <div class="layui-form-item">
-      <label class="layui-form-label">学校性质：</label>
+      <label class="layui-form-label required">学校性质：</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工程" >
@@ -54,7 +54,7 @@
       </button>
     </div>
   </div>
-</form>
+</div>
 
 
 <script>
@@ -339,6 +339,13 @@
         form.on('submit(data-reset-btn)', function (data) {
             data.field.province = $("#province option:selected").text(); //获取选中的项
             data.field.city = $("#city option:selected").text(); //获取选中的项
+            if (data.field.enterprise == undefined && data.field.junior_college == undefined &&
+            data.field.military_school == undefined && data.field.project_211 == undefined && data.field.project_985 == undefined
+            && data.field.regular_college == undefined && data.field.secondary_school == undefined) {
+              layer.alert("请选择学校性质");
+              return false;
+            }
+         
             request.authPut("missions/customers/" + <%= @school.id %>, data.field, function (res) {
                 if (res.success === false) {
                     layer.alert(res.msg)

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

@@ -11,8 +11,9 @@ json.data do
     json.created_at d.created_at.to_s
     json.business d.business.name
     json.business_id d.business.id
-    teacher_ids = d.key_person.pluck(:teacher_id)
-    json.key_people key_people(teacher_ids)
+    # teacher_ids = d.key_person.pluck(:teacher_id)
+    json.tel d.key_person.pluck(:tel).select { |d| d.present?  }.join("、")
+    json.key_people d.key_person.map { |d| d.teacher.name }.join("、")# key_people(teacher_ids)
 
   end
 end

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

@@ -54,9 +54,9 @@
         </div>
         </div>
         <div class="layui-input-inline" style="width: 300px;">
-          <label class="layui-form-label ">联系方式</label>
+          <label class="layui-form-label required">联系方式</label>
           <div class="layui-input-block">
-            <input type="text" class="layui-input" name="tel" autocomplete="off" value=""
+            <input type="text" class="layui-input" name="tel" autocomplete="off" value="" lay-verify="required"
                    id="tel" placeholder="请输入联系方式">
           </div>
         </div>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.25'
+  VERSION = '0.9.26'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.25
+  version: 0.9.26
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-08 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails