educode_sales 1.10.12 → 1.10.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 527f28a2fd7c3c37f33e50c8e548738f4a1cc0f3c9abdea333a0923556931111
-  data.tar.gz: 0bd0f7f605e9824cf213efd5cc7545da1a6bf6c27497de5379c4245b94825e9a
+  metadata.gz: b595ce61a977409f8c8fbc7147c1fa6712d50f9a3ee9196c3a558311866ae2ab
+  data.tar.gz: 3f942636105c5cd52c67f2d52f3da562fa7789f1377f66e0c0bf50a2484db1af
 SHA512:
-  metadata.gz: d6d96d56c3dce18d9af2130eb82a3027aa9df79835053064eebbf0e8a7d6403da499433f241f2890c036a5b76a4aefb1f0724cc1bfb3deaf74245838f2784665
-  data.tar.gz: 0d1e0bb773080e9fd5b8ebed30623fc449b4b59bb57c04d76b0f7bef5d4382dfd4d88fe4b4a508f9dee739e5ffef92dcaf55ee1ca0fbeb74e046848b877406dd
+  metadata.gz: fb5eb5e79b46a3b1286233ff1b283dad90e6c7f666c90e155fa1485f7ae44beeb031395d7199c109ac68cf04160bd674dcf913b6f37cce2ed345c5091b65ff27
+  data.tar.gz: 0aac91efda64a27e6b994255cb271d925f2bb70540ed72cfa14d7d5c20403f8056748e70d09658b3505da0c181d54dcd7011b0404e3d87f08ca5fb745d01933b

data/app/controllers/educode_sales/contracts_controller.rb

@@ -234,6 +234,7 @@ module EducodeSales
       @last_follow_up = @business.last_follow_up
       @deployment_type = EducodeSales::FollowUp::BUSINESS_DEPLOYMENT
       @signed_clazz = EducodeSales::FollowUp.signed_clazzs.keys
+      @stages =  Common.where(clazz: 'business_step', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).order("position").pluck(:name, :id)
       
       signed_department = @last_follow_up.signed_department
       if signed_department
@@ -327,6 +328,7 @@ module EducodeSales
     def add_follow_ups
       @business = Business.find(params[:business_id])
       last_follow_up = @business.last_follow_up
+      
       data = []
       6.times do |i|
         data[i] = []
@@ -527,7 +529,7 @@ module EducodeSales
 
     private
     def follow_up_params
-      params.permit(:o_business_deployment, :plan_signed_date, :actual_amount, :bidded_days, :signed_date, :signed_department_id, :service_years, :service_start_time, :service_end_time, :funding_source, :signed_clazz)
+      params.permit(:o_business_deployment, :plan_signed_date, :actual_amount, :bidded_days, :signed_date, :signed_department_id, :service_years, :service_start_time, :service_end_time, :funding_source, :signed_clazz, :stage_id)
     end
 
     def product_up_params

data/app/controllers/educode_sales/home_controller.rb

@@ -122,7 +122,7 @@ module EducodeSales
       # @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)
+        @data = @data.where.not(business_id: nil).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
     end
 

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -11,7 +11,7 @@ module EducodeSales
         end
         format.json do
           last_follow_up_ids = Business.all.pluck(:last_follow_up_id)
-          @money_plans = MoneyPlan.where(follow_up_id: last_follow_up_ids).joins(:business).left_joins(:money_plan_claims).group("educode_sales_money_plans.id").select("educode_sales_money_plans.*, COUNT(educode_sales_money_plan_claims.id) AS claim_num")
+          @money_plans = MoneyPlan.where(follow_up_id: last_follow_up_ids).joins(:business).left_joins(:money_plan_claims).group("educode_sales_money_plans.id").select("educode_sales_money_plans.*, SUM(educode_sales_money_plan_claims.amount) AS return_money, COUNT(educode_sales_money_plan_claims.id) AS claim_num")
           if @current_admin.is_admin?
           else
             level = @current_admin.role.role_areas.find_by(clazz: '回款管理').level

data/app/models/educode_sales/follow_up.rb

@@ -12,7 +12,7 @@ module EducodeSales
 
     enum signed_clazz: ['直签', '代签', '总集', '渠道']
 
-    enum funding_source: ['贷款资金', '财政资金', '自由资金']
+    enum funding_source: ['贷款资金', '财政资金', '自有资金']
 
     include ::Deletable
     belongs_to :business, counter_cache: true # counter_cache(自动计算 business对应follow_up表中对应的个数)

data/app/views/educode_sales/contracts/new_follow_up.html.erb

@@ -32,7 +32,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">项目阶段：</label>
       <div class="layui-input-inline" style="line-height: 38px;">
-        <%= @last_follow_up&.stage&.name%>
+        <%= select_tag "stage_id", options_for_select(@stages, @last_follow_up&.stage_id), { 'lay-filter': 'stage_id', class: 'required' } %>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -102,6 +102,14 @@
                     width: 120,
                     sort: true,
                     title: '金额',
+                }, {
+                    field: 'return_money',
+                    width: 120,
+                    title: '已回款',
+                }, {
+                    field: 'residue_money',
+                    width: 120,
+                    title: '未回款',
                 }, {
                     field: 'rate',
                     width: 100,

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

@@ -22,13 +22,20 @@ json.data do
     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
     if d['claim_num'] > 0
-      json.state '已回款'
+      if d['return_money'].to_f >= d.amount
+        json.state '已回款'
+      else
+        json.state '部分回款'
+      end
     elsif d['claim_num'] == 0 && d.date_at > Time.now
       json.state '正常'
     else
       json.state '已逾期'
     end
     json.claim_num d['claim_num']
+
+    json.return_money d['return_money'] || 0
+    json.residue_money (d.amount - d['return_money'].to_f) > 0 ? d.amount - d['return_money'].to_f : 0
     if d['claim_num'] > 0
       json.accounts_state ''
     else

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.12'
+  VERSION = '1.10.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.12
+  version: 1.10.14
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-19 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails