educode_sales 0.8.9 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d40c49eb6d5bbbaea4b48a8ad0c8c5994bba11888e04ad256406e1fadd833ad2
-  data.tar.gz: f1733a819aadbe481b7a2f8d3233821bf24099612d1828109cd8c004e642be24
+  metadata.gz: 6ec7b94dd1cfa92b3cc2803dae9f3b48ac530c772862959ececa2d575d7f305c
+  data.tar.gz: 766ea79f255bfa56c0f28febb04b8363da6628522a30577e9e57183959bea092
 SHA512:
-  metadata.gz: 63bd36188bf06b9a4ef62edbffe8253d8fcd80ae432a748ea061f12e014b8caf0705b7c6449ebe0a82a347dc47ef79552e455fb8f0d644acaac6867087fe99dd
-  data.tar.gz: 851b51d8cdddd226d9854606a88e9441eb59e378a9e32e9a75faf41d3ccac32addeb9e4a65dfe6ec0d9106ee35067bf5a692ad080b71ae112adaf1841d974fc6
+  metadata.gz: 4133a2b8147539c3e1d92e28a76bc08b1ec05de4c3a9e1f07d95cadab4d65c28af905b558c48254c7fc4a8bd2f70e9cc4714198f5867fe7e2614b946fac092e6
+  data.tar.gz: 2d868ca452990a02abeaa9a3c0e816baf1811eff439ce82a124f89458dce70c3e8ea2a05a682dd6e1fb54c155719593971f58f38cf0c210554cfcce4ded6f564

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -50,6 +50,13 @@ module EducodeSales
               JOIN schools ON departments.school_id = schools.id
             ").where("province = ?", p)
           end
+
+          if params[:q].present? && params[:q][:description].present?
+            @follow_ups = @follow_ups.joins(:business).joins("JOIN educode_sales_businesses ON educode_sales_businesses.id = educode_sales_follow_ups.business_id
+                    ").where("educode_sales_follow_ups.description LIKE ?" ,"%#{params[:q][:description]}%")
+
+          end
+
           if params[:sort].present? && params[:sort][:field]
             @follow_ups = @follow_ups.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else

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

@@ -31,6 +31,12 @@
           <input type="text" class="layui-input" id="follows_date" name="follows_date" autocomplete="off" placeholder=" - ">
         </div>
       </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">最新进展</label>
+        <div class="layui-input-inline">
+          <input type="text" name="description" autocomplete="off" class="layui-input">
+        </div>
+      </div>
 
       <div class="layui-inline">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_follows_search">重置
@@ -195,7 +201,7 @@
                 where: {q: search, sort: sort}
             }, 'data');
             form.val('search_form', {
-                name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area
+                name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area , description: data.field.description
             })
             return false;
         });
@@ -207,6 +213,7 @@
                 follows_date: "",
                 name: "",
                 department: "",
+                description: "",
                 staff_id: ""
             })
             return false;

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

@@ -14,7 +14,7 @@ json.data do
     json.reception_at d.last_follow_up&.reception_at.to_s
     json.bidded_date d.last_follow_up&.bidded_date.to_s
     json.signed_date d.last_follow_up&.signed_date.to_s
-    json.total_amount d.last_follow_up&.total_amount
+    json.total_amount d.last_follow_up&.total_amount.to_f.round(2)
     json.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
     EducodeSales::FollowUp::BUSINESS_DEPLOYMENT[1..-1].each do |m|
       if d.last_follow_up&.o_business_deployment == m[1]
@@ -22,7 +22,7 @@ json.data do
         break
       end
     end
-    json.actual_amount d.last_follow_up&.actual_amount
+    json.actual_amount d.last_follow_up&.actual_amount.to_f.round(2)
     json.return_money d.return_money
     json.wait_return_money d.wait_return_money.to_i.round(2)
     json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '实际回款').present? ? (d.last_follow_up.money_plans.where(clazz: '实际回款').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.8.9'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.1
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-17 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails