educode_sales 0.8.7 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa6e3ad4c5385f2be6eaea6affcdcde6284c8bc04986877ca5880c2a26eff5c0
-  data.tar.gz: 19ec51101d14bd95976a5c2211f66209fc6ef27f2894f84d9c21c5d1a4fbb5b2
+  metadata.gz: f53f1760e66e10622abeeb7b8487804a5905e70b6adaec22df103fccd5e91bde
+  data.tar.gz: 5ba593e92ec3ec068cf850fcb4f5ff2ab61c47a0b3c93104649b0e38f96cc9b5
 SHA512:
-  metadata.gz: 4091a85e044edea498641d586ea567b878af526f524e1ac32c947d02274379ebb3301ea7b9cd4fd02950b39ca7897a5d392079098ec74e96e59553d37e61bddb
-  data.tar.gz: 59d6fa56fafcab5ab09d228f65b443ec70658e72d9bfaba56b7df38492ac46e80404dc95198e874d4a89c3d65dbbb86d96e573abb7c91da450ee08843647d9cf
+  metadata.gz: 3ae71fcb67e0946049f0cbe4f3b99dc1cbc6109042726beebfa78d1b59e7b4b00d3f84d261d1f9c3d8dfcd29d4a7b9d489827225d6d45e4c1678a85d80f702cd
+  data.tar.gz: a43d02fa863b87ae1df795af04f71080dda11153cc54c8cfeedcc43e10c2d5ab7104f598de8bdb1eb5983646ee6a6176be872b95ecc6f87973c54b602c1b7c94

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,11 +14,17 @@ 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
-    json.actual_amount d.last_follow_up&.actual_amount
+    EducodeSales::FollowUp::BUSINESS_DEPLOYMENT[1..-1].each do |m|
+      if d.last_follow_up&.o_business_deployment == m[1]
+        json.o_business_deployment m[0]
+        break
+      end
+    end
+    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.wait_return_money d.wait_return_money.to_f.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 : ''
     json.place d.last_follow_up&.place&.name
     json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
@@ -27,5 +33,6 @@ json.data do
     json.current_staff_id @current_admin.id
     json.staff_id d.staff_id
     json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
+    json.year d.last_follow_up&.year.to_s
   end
 end

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

@@ -25,8 +25,8 @@ json.data do
       end
     end
     json.year d.last_follow_up&.year.to_s
-    json.total_amount d.last_follow_up&.total_amount
-    json.actual_amount d.last_follow_up&.actual_amount
+    json.total_amount d.last_follow_up&.total_amount.to_f.round(2)
+    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_f.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/app/views/educode_sales/businesses/new_follow_record.html.erb

@@ -87,7 +87,7 @@
       <label class="layui-form-label">总额(万)</label>
       <div class="layui-input-inline">
         <input name="total_amount" type="number" class="layui-input" autocomplete="off"
-               value="<%= @last_follow_up&.total_amount %>">
+               value="<%= @last_follow_up&.total_amount.to_f.round(2) %>">
       </div>
       客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。
     </div>
@@ -96,7 +96,7 @@
       <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
         <input name="actual_amount" type="number" class="layui-input" autocomplete="off" placeholder="本单位的签单金额"
-               value="<%= @last_follow_up&.actual_amount %>">
+               value="<%= @last_follow_up&.actual_amount.to_f.round(2) %>">
       </div>
       客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
@@ -111,7 +111,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
-        <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount%>">
+        <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount.to_f.round(2) %>">
       </div>
       总额里，渠道拿到的部分。
     </div>

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

@@ -17,9 +17,9 @@ json.data do
         end
       end
     end
-    json.total_amount d.total_amount
-    json.actual_amount d.actual_amount
-    json.divide_amount d.divide_amount ? d.divide_amount : ""
+    json.total_amount d.total_amount.to_f.round(2)
+    json.actual_amount d.actual_amount.to_f.round(2)
+    json.divide_amount (d.divide_amount ? d.divide_amount : "").to_f.round(2)
     json.staff d.staff.user.real_name
     json.place d.place&.name
     json.money_plans_count d.money_plans_count

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

@@ -75,13 +75,13 @@
     <div class="layui-inline">
       <label class="layui-form-label">总额：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.total_amount %>万
+        <%= @follow_up.total_amount.to_f.round(2) %>万
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">合同额：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.actual_amount %>万
+        <%= @follow_up.actual_amount.to_f.round(2) %>万
       </div>
     </div>
     <br>
@@ -94,7 +94,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.divide_amount %>万
+        <%= @follow_up.divide_amount.to_f.round(2) %>万
       </div>
     </div>
     <div class="layui-form-item">

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.8.7'
+  VERSION = '0.9.2'
 end

metadata

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