RubyGems - educode_sales - Versions diffs - 1.10.0 → 1.10.1 - Mend

educode_sales 1.10.0 → 1.10.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

checksums.yaml +4 -4
data/app/controllers/educode_sales/follow_ups_controller.rb +10 -2
data/app/views/educode_sales/businesses/new_follow_record.html.erb +54 -51
data/lib/educode_sales/version.rb +1 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f95a116861234dd0fca5a1714c085e1bec0bddc43a23eb887d52486ac72d16
-  data.tar.gz: 771c88244cbf37b3521d6ca60d9571d10bc22d90ae698ebf885608aeb4560a59
+  metadata.gz: 20755b572d19ee3c58ffca868b9fc6d5e3829024f1c34863ed6707c83009af41
+  data.tar.gz: 4289012ab4ee0794bdf7c0cc49b57ae46305b16f0b724ec135f82d04e9662b91
 SHA512:
-  metadata.gz: 9a81d2f314ed6071cf408581e4725e337fdfcca85873d90945b6fd2b26016437b497c91e34ddfc41deb0602898d150572b7f4a5cf13e4189fb50d9b7414863aa
-  data.tar.gz: 5dfc28b6e674a4241e2c2e717d84fc2b6cf3d3825794d96be7edbb771718cab0841ee055a87b6df43a40b6c97ba1b4d61b280d9184c1e8b4cee44d64c19dfb63
+  metadata.gz: 62d94ce651961ec7a4a41e40b5993bcd0dfb400d2bf53f66ba0b8d25b81015962f5a8e0553935a854cd40779a9eb710a6f842ba85ada1e349248b786e58390cb
+  data.tar.gz: 95517fc542d7c80d8c40513fcb612a4efa422f9697b7168b4151b599419d999b56dfd0dcab077935abb0c6facf2174b0a1497bcae1952d2ed81b29258c57ad38

data/app/controllers/educode_sales/follow_ups_controller.rb CHANGED Viewed

@@ -85,7 +85,12 @@ module EducodeSales
     def create
       load_business
-      follow_up = @business.follow_ups.build(follow_up_params)
+      if @business.last_follow_up
+        follow_up =  @business.last_follow_up.dup
+        follow_up.assign_attributes(follow_up_params)
+      else
+        follow_up = @business.follow_ups.build(follow_up_params)
+      end
       if params[:service_time].present?
         date = params[:service_time].split(" - ")
         follow_up.service_start_time = date[0]
@@ -123,7 +128,8 @@ module EducodeSales
             money.follow_up_id = follow_up.id
             money.save
           end
+          # 合同里签到日期全同步到最新跟进
+          last_follow_up.contract_date_lists.update_all(follow_up_id: follow_up.id)
         end
         @business.update(last_follow_up_id: follow_up.id, clazz_id: follow_up.clazz_id, p_deploy_time: params[:deploy_time])
         # 增加o商机编号
@@ -144,6 +150,8 @@ module EducodeSales
             business.clazz_id = business.follow_ups.last&.clazz_id
           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?
         end
         render_success
       else

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

@@ -46,7 +46,7 @@
                placeholder="请选择日期">
       </div>
     </div>
-    <div class="layui-inline">
+     <div class="layui-inline">
       <label class="layui-form-label">中标时间</label>
       <div class="layui-input-inline">
         <input type="text" class="layui-input" name="bidded_date" autocomplete="off" id="invitation_at_add"
@@ -55,6 +55,7 @@
       </div>
     </div>
     <br>
+    <!--
     <div class="layui-inline">
       <label class="layui-form-label">签单时间</label>
       <div class="layui-input-inline">
@@ -62,14 +63,15 @@
                value="<%= @last_follow_up&.signed_date %>"
                placeholder="请选择日期">
       </div>
-    </div>
+    </div> -->
     <input type="hidden" class="layui-input" name="reception_at" value="<%= @last_follow_up&.reception_at %>">
-    <div class="layui-inline">
+    <input type="hidden" class="layui-input" name="deploy_time" value="<%= @last_follow_up&.deploy_time %>">
+    <!-- <div class="layui-inline">
       <label class="layui-form-label">部署时间</label>
       <div class="layui-input-inline">
         <input type="text" class="layui-input" name="deploy_time" value="<%= @last_follow_up&.deploy_time %>"  id="p_deploy_time" placeholder="请选择日期">
       </div>
-    </div>
+    </div> -->
     <br>
     <div class="layui-inline service_show layui-hide">
       <label class="layui-form-label required">服务期</label>
@@ -78,12 +80,12 @@
       </div>
     </div>
-    <div class="layui-inline deployment_type layui-hide">
+    <!-- <div class="layui-inline deployment_type layui-hide">
       <label class="layui-form-label required">部署类型</label>
       <div class="layui-input-inline">
         <%= select_tag "o_business_deployment", options_for_select(@deployment_type,  @last_follow_up&.o_business_deployment), class: 'required' %>
       </div>
-    </div>
+    </div> -->
     <br class="service_show layui-hide">
     <div class="layui-inline">
@@ -94,8 +96,9 @@
       </div>
       客户采购支出的费用。中标额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。
     </div>
-    <br>
-    <div class="layui-inline">
+    <br>
+    <!--
+   <div class="layui-inline">
       <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
         <input name="actual_amount" type="number" class="layui-input" autocomplete="off" placeholder="本单位的签单金额"
@@ -104,13 +107,15 @@
       客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
     <br>
+    -->
     <div class="layui-inline new_place_select">
       <label class="layui-form-label">渠道</label>
       <div class="layui-input-inline" style="">
         <div id="place" style="width: 190px;"></div>
       </div>
     </div>
-  <br>
+    <br>
+    <!--
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
@@ -119,6 +124,7 @@
       中标额里，渠道拿到的部分。
     </div>
     <br>
+    -->
      <div class="layui-inline">
       <label class="layui-form-label">预算金额(万)</label>
       <div class="layui-input-inline">
@@ -269,49 +275,46 @@
                 })
             }
         })
-        var place_list = xmSelect.render({
-            el: '#place',
-            remoteSearch: true,
-            model: {
-                icon: 'hidden',
-                label: {
-                    type: 'text',
-                    text: {
-                        //左边拼接的字符
-                        left: '',
-                        //右边拼接的字符
-                        right: '',
-                        //中间的分隔符
-                        separator: ', ',
-                    },
-                }
-            },
-            clickClose: true,
-            delay: 1000,
-            paging: true,
-            radio: true,
-            pageRemote: true,
-            filterable: true,
-            remoteMethod: function (val, cb, show, pageIndex) {
-                $.ajax('/missions/sales_place', {
-                    method: 'get',
-                    data: {
-                        q: val,
-                        page: pageIndex
-                    },
-                    dataType: 'json',
-                    success: function (res) {
-                        var data = res.data;
-                        if (res.code == 0) {
-                            cb(res.data, res.count);
-                        } else {
-                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
-                        }
+         var place_list = xmSelect.render({
+             el: '#place',
+             remoteSearch: true,
+             model: {
+                 icon: 'hidden',
+                 label: {
+                     type: 'text',
+                     text: {
+                         left: '',
+                         right: '',
+                         separator: ', ',
+                     },
+                 }
+             },
+             clickClose: true,
+             delay: 1000,
+             paging: true,
+             radio: true,
+             pageRemote: true,
+             filterable: true,
+             remoteMethod: function (val, cb, show, pageIndex) {
+                 $.ajax('/missions/sales_place', {
+                     method: 'get',
+                     data: {
+                         q: val,
+                         page: pageIndex
+                     },
+                     dataType: 'json',
+                     success: function (res) {
+                         var data = res.data;
+                         if (res.code == 0) {
+                             cb(res.data, res.count);
+                         } else {
+                             layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                         }
-                    }
-                })
-            }
-        })
+                     }
+                 })
+             }
+         })
         sales_list.setValue(gon.sales);
         place_list.setValue(gon.place);

data/lib/educode_sales/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.0'
+  VERSION = '1.10.1'
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - anke1460
@@ -742,7 +742,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.