educode_sales 1.10.29 → 1.10.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b133a8fca27810c1c165bdab01c812af7c4ee76a0f80b02be3fcc064a353e4f9
-  data.tar.gz: 3631d821e73722d263dc9f724f09b19abd7dc0a9559a114f41f5bf204a334cb2
+  metadata.gz: 2b8cf3a691cad00390dd20d6bdf65d8e8370d421e7cfc13b955d0ca48bdd60a0
+  data.tar.gz: 1a9b038833e3c4352f719c92bbf17e457fc9e636af8ae7257fed0e501316146e
 SHA512:
-  metadata.gz: b3f72cb4af3f4f343fefc8438d08bc041d3f3526e639a0714196fbd63c91b9a322e03d2fc2548632b97aeed7cd6a7425a2bc5c9e798563b10be870124e504539
-  data.tar.gz: 40fbf3c2c51e50c8eaac57940279e8ec16708b1bfddc6d3673aed16033aa07aaadfaa8f69a28f9f527987afe515e77f565272298ac1f915deeb883535d27a048
+  metadata.gz: 70957af70e5376cf26fa3bb8e85c23eb648b28266e7f714a5c889c7f3f42cc9658e3d0fdb4ac1e8dca1edc7a4888b2ee0bd03997a6f33fe0944d677ea05fa502
+  data.tar.gz: 608d5517bb583e5a927e8f85e6f85d9b896e084b444d31edda31ce0ff960433bc74e4dd8f5b955979bf9f61343e6edd8691a2a7f566fd060163a05fa60df72af

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -189,7 +189,7 @@ module EducodeSales
           end
           business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '实际回款', follow_up_id: business.follow_ups.last&.id).sum(:amount))
           # 合同里签到日期全同步到最新跟进
-          follow_up.contract_date_lists.update_all(follow_up: business.follow_ups.last) if business.follow_ups.last.present?
+          follow_up.contract_date_lists.update_all(follow_up_id: business.follow_ups.last.id) if business.follow_ups.last.present?
         end
         render_success
       else

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

@@ -34,6 +34,21 @@
       </div>
     </div>
     <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划A类时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="plan_a_date" autocomplete="off" id="plan_a_date"
+              value="<%= @follow_up&.plan_a_date %>"
+              placeholder="请选择日期">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划A类金额(万)</label>
+      <div class="layui-input-inline">
+        <input name="plan_a_money" class="layui-input" value="<%= @follow_up&.plan_a_money.to_f.round(6) %>">
+      </div>
+    </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label">计划投标时间</label>
       <div class="layui-input-inline">
@@ -41,6 +56,28 @@
           id="invitation_at_edit" placeholder="请选择日期">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划投标金额(万)</label>
+      <div class="layui-input-inline">
+        <input name="invitation_money" class="layui-input" value="<%= @follow_up&.invitation_money.to_f.round(6) %>">
+      </div>
+    </div>
+    </br>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划回款时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="plan_return_date" autocomplete="off" id="plan_return_date"
+              value="<%= @follow_up&.plan_return_date %>"
+              placeholder="请选择日期">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划回款金额(万)</label>
+      <div class="layui-input-inline">
+        <input name="plan_return_money" class="layui-input" value="<%= @follow_up&.plan_return_money.to_f.round(6) %>">
+      </div>
+    </div>
+    </br>
     <div class="layui-inline">
       <label class="layui-form-label">中标时间</label>
       <div class="layui-input-inline">
@@ -237,6 +274,14 @@
             type: 'year'
         })
 
+        laydate.render({
+            elem: '#plan_a_date'
+        })
+
+        laydate.render({
+            elem: '#plan_return_date'
+        })
+
         laydate.render({
             elem: '#reception_at_edit'
         });
@@ -354,4 +399,7 @@
         width: 300px;
     !important;
     }
+    .layui-form-label {
+      width: 120px;
+    }
 </style>

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

@@ -82,9 +82,6 @@
         <input name="plan_return_money" class="layui-input" value="<%= @last_follow_up&.plan_return_money.to_f.round(6) %>">
       </div>
     </div>
- 
-  
-    <br>
     <!-- 
     <div class="layui-inline">
       <label class="layui-form-label">签单时间</label>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.29'
+  VERSION = '1.10.30'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.29
+  version: 1.10.30
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
-- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -758,7 +757,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -774,7 +773,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.9
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []