educode_sales 1.10.13 → 1.10.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f2900e20d8d02f6f0fbaa6a05a857523a48ddbc6bf5109490b3a03c867dbc0
-  data.tar.gz: 7315b80cdbb66086120ca83a0e3727c3c7b75ec926c842001f7516379423a560
+  metadata.gz: b595ce61a977409f8c8fbc7147c1fa6712d50f9a3ee9196c3a558311866ae2ab
+  data.tar.gz: 3f942636105c5cd52c67f2d52f3da562fa7789f1377f66e0c0bf50a2484db1af
 SHA512:
-  metadata.gz: 3f3cb902472a53c44add57b45c082f7f42ba04e18e07d84f8a903a04f3395fc24ed759bd90d315ebb2e73055399f61648bcf23620232badc46f131ac4782cafa
-  data.tar.gz: 91b19a1cbfa4770b4e78e9347a47ed0b14412b00d3c1f66663b560b714133ba6aa5faedf16e38cb3e520562041185081f90c35b8cc5751bfeb8595d3384633d0
+  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/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/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.13'
+  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.13
+  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