RubyGems - educode_sales - Versions diffs - 0.9.78 → 0.9.80 - Mend

educode_sales 0.9.78 → 0.9.80

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 (6) hide show

checksums.yaml +4 -4
data/app/controllers/educode_sales/contracts_controller.rb +14 -5
data/app/views/educode_sales/contracts/_list.html.erb +1 -40
data/app/views/educode_sales/contracts/new_follow_up.html.erb +15 -14
data/lib/educode_sales/version.rb +1 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b22a3361ca68bbfaa0704aa28aeecb7f2906973b836971183936c3c13910fbe
-  data.tar.gz: 35b7435979cecacdc00bae4b28bf3112e8e6cb5a1b36cd2a8035e91fc817d36b
+  metadata.gz: 395f66b5ef943bc9225deabd8c08878c41fc4c557107f1728c97e4db077950d0
+  data.tar.gz: c359c0122a4889fb641d8a7ced439aec7e2110db21edae0944cb33fc82b95fb3
 SHA512:
-  metadata.gz: 18719f022f0e3d7d1d91f4f111ecd8b234b450e5244874bf21fce753220e2a7c8e0bb02341c88ac8e6d2f9a5dd4f6540d72c41b1db9f0b1a76025654b8c006d0
-  data.tar.gz: 5a6d3f438a743d0004351c9d2361c60b2b79da3d468a4776954fc577f263bcd784022bca5c3ba2cddb094dfba9a66be609ef7614469ba5b6b66461183f8decbe
+  metadata.gz: 62eb2a7d7487db2adf78a544af31aae449c76026f5d29fd366a56b6ad96a25c47d3adcc3c30a1a9cc7ec0b9a53a9cca82ee5f9241ee5555d575c8bab1ac2b183
+  data.tar.gz: 9fe50dbd0b57e981e65976cef26a2ed96f69b09aa07df4c6ce15e6e97bf02caf23e960eb922266b32d32cde40cfdaa60795702cbdf2db8b96f1e337825a16087

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

@@ -233,6 +233,15 @@ module EducodeSales
       @business = Business.find(params[:id])
       @last_follow_up = @business.last_follow_up
       @deployment_type = EducodeSales::FollowUp::BUSINESS_DEPLOYMENT
+      signed_department = @last_follow_up.signed_department
+      if signed_department
+        gon.department = {value: signed_department.id, name: "#{signed_department&.school&.name}-#{signed_department&.name}"}
+        gon.value = signed_department.id
+      else
+        gon.department = {}
+        gon.value = ''
+      end
       render layout: false
     end
@@ -322,9 +331,11 @@ module EducodeSales
       end
       @business = Business.find(params[:business_id])
-      follow_up = @business.follow_ups.build(follow_up_params)
-      follow_up.stage = @business.last_follow_up.stage
-      follow_up.clazz = @business.last_follow_up.clazz
+      last_follow_up = @business.last_follow_up
+      follow_up = last_follow_up.dup
+      follow_up.assign_attributes(follow_up_params)
+      follow_up.description = params[:content]
       if params[:service_time].present?
         date = params[:service_time].split(" - ")
         follow_up.service_start_time = date[0]
@@ -333,8 +344,6 @@ module EducodeSales
       end
       follow_up.staff = @current_admin
-      last_follow_up = @business.last_follow_up
       if follow_up.save!
         contract_lists = EducodeSales::ContractDateList.clazzs.invert
         data.each_with_index do |s, i|

data/app/views/educode_sales/contracts/_list.html.erb CHANGED Viewed

@@ -21,22 +21,6 @@
             <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true , "lay-search": "" } %>
           </div>
         </div>
-        <div class="layui-inline">
-          <label class="layui-form-label">商机变化</label>
-          <div class="layui-input-inline">
-            <select name="clazz_changes">
-              <option value=""></option>
-              <option value="1">商机降级</option>
-              <option value="2">商机晋级</option>
-              <option value="3">商机降级 A-X</option>
-              <option value="4">商机降级 AB-X</option>
-              <option value="5">商机降级 ABC-X</option>
-              <option value="6">商机晋级 B-A</option>
-              <option value="7">商机晋级 BC-A</option>
-              <option value="8">商机晋级 BCD-A</option>
-            </select>
-          </div>
-        </div>
         <div class="layui-inline">
             <label class="layui-form-label">销售经理</label>
             <div class="layui-input-inline">
@@ -49,12 +33,6 @@
             <%= select_tag "after_sales_staff_id", options_for_select(@after_sales_staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true , "lay-search": "" } %>
             </div>
         </div>
-        <div class="layui-inline show_item_contract" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
-          <label class="layui-form-label">项目类型</label>
-          <div class="layui-input-inline">
-            <div id="contract_business_type" style="width: 190px;"></div>
-          </div>
-        </div>
         <div class="layui-inline show_item_contract" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
           <label class="layui-form-label">项目阶段</label>
           <div class="layui-input-inline">
@@ -79,12 +57,7 @@
             <%= select_tag "business_year", options_for_select((2015..Time.now.year).to_a.reverse, params[:business_year]), { include_blank: true } %>
           </div>
         </div>
-        <div class="layui-inline show_item_contract" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
-          <label class="layui-form-label">招标时间</label>
-          <div class="layui-input-inline">
-            <input type="text" class="layui-input" id="invitation_at" name="invitation_at" placeholder=" - " autocomplete="off">
-          </div>
-        </div>
         <div class="layui-inline show_item_contract" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
           <label class="layui-form-label">中标时间</label>
           <div class="layui-input-inline">
@@ -103,12 +76,6 @@
             <input type="text" class="layui-input" id="date_at" name="date_at" placeholder=" - " autocomplete="off">
           </div>
         </div>
-        <div class="layui-inline show_item_contract" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
-          <label class="layui-form-label">创建时间</label>
-          <div class="layui-input-inline">
-            <input type="text" class="layui-input" id="date" name="date" placeholder=" - " autocomplete="off">
-          </div>
-        </div>
         <div class="layui-inline show_item_contract" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
           <label class="layui-form-label">部署类型</label>
           <div class="layui-input-inline">
@@ -185,12 +152,6 @@
       });
-      var business_type_list = xmSelect.render({
-        el: '#contract_business_type',
-        data: gon.business_type
-      })
       var business_step_list = xmSelect.render({
         el: '#contract_business_step',
         data: gon.business_step

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

@@ -103,20 +103,20 @@
     <div class="layui-inline">
         <label class="layui-form-label">计划签单时间：</label>
         <div class="layui-input-inline" style="line-height: 38px;">
-        <input type="text" class="layui-input date" name="plan_signed_date" autocomplete="off">
+        <input type="text" class="layui-input date" name="plan_signed_date" autocomplete="off" value="<%= @last_follow_up&.plan_signed_date %>">
         </div>
     </div>
     <div class="layui-inline">
         <label class="layui-form-label" style="width:100px;">中标后：</label>
         <div class="layui-input-inline" style="line-height: 38px;width:60px;">
-          <input type="text" class="layui-input" name="bidded_days" autocomplete="off">
+          <input type="text" class="layui-input" name="bidded_days" autocomplete="off" value="<%= @last_follow_up&.bidded_days %>">
         </div>
         <div class="layui-form-mid layui-word-aux">天</div>
     </div>
     <div class="layui-inline">
         <label class="layui-form-label" style="width:100px;">实际签单时间：</label>
         <div class="layui-input-inline" style="line-height: 38px;">
-        <input type="text" class="layui-input date" name="signed_date" autocomplete="off">
+        <input type="text" class="layui-input date" name="signed_date" autocomplete="off" value="<%= @last_follow_up&.signed_date %>">
         </div>
     </div>
     <div class="layui-inline">
@@ -316,22 +316,22 @@
     <div class="layui-inline">
         <label class="layui-form-label">约定服务期：</label>
         <div class="layui-input-inline" style="line-height: 38px;">
-          <input type="text" class="layui-input date" name="service_start_time" autocomplete="off">
+          <input type="text" class="layui-input date" name="service_start_time" autocomplete="off" value="<%= @last_follow_up&.service_start_time %>">
         </div>
         <div class="layui-input-inline" style="line-height: 38px;text-align:center;width:30px;">-</div>
         <div class="layui-input-inline" style="line-height: 38px;">
-         <input type="text" class="layui-input date" name="service_end_time" autocomplete="off">
+         <input type="text" class="layui-input date" name="service_end_time" autocomplete="off" value="<%= @last_follow_up&.service_end_time %>">
         </div>
     </div>
      <div class="layui-inline">
         <label class="layui-form-label" style="width:100px;">验收后：</label>
         <div class="layui-input-inline" style="line-height: 38px;width:60px;">
-          <input type="text" class="layui-input" name="service_years" autocomplete="off">
+          <input type="text" class="layui-input" name="service_years" autocomplete="off" value="<%= @last_follow_up&.service_years %>">
         </div>
         <div class="layui-form-mid layui-word-aux">年</div>
     </div>
-    <div class="layui-form-item layui-form-text required" style="margin-top:25px;">
-      <label class="layui-form-label">最新根据记录：</label>
+    <div class="layui-form-item layui-form-text" style="margin-top:25px;">
+      <label class="layui-form-label required">最新跟进记录：</label>
       <div class="layui-input-block">
         <textarea name="content" placeholder=" " class="layui-textarea" lay-verify="required"></textarea>
       </div>
@@ -600,21 +600,22 @@
             });
         })
-        var add_department_select = selectInput.render({
+         var signed_department_id = gon.value;
+         var add_department_select = selectInput.render({
             elem: '#add_department',
-            name: 'signed_departmen', // 渲染的input的name值
+            name: 'signed_department', // 渲染的input的name值
             layFilter: 'test', //同layui form参数lay-filter
           //  layVerify: 'required', //同layui form参数lay-verify
             layVerType: 'tips', // 同layui form参数lay-verType
             layReqText: '请填写文本', //同layui form参数lay-ReqText
-            initValue: '', // 渲染初始化默认值
+            initValue: gon.value, // 渲染初始化默认值
             hasSelectIcon: false,
             placeholder: '请输入头歌平台上单位部门', // 渲染的inputplaceholder值
-            data: [],
+            data: [gon.department],
             remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
             remoteMethod: function (value, cb) { // 远程搜索的回调函数
               if (!value) {
+                signed_department_id = "";
                 return cb([]);
               }
               request.get('missions/search?type=department&q=' + value, {}, function (res) {
@@ -626,7 +627,7 @@
         form.on('submit(add_follow_up)', function (data) {
             $(".submit-btn").addClass("layui-hide");
             data.field.business_id = "<%= @business.id %>";
-            data.field.signed_department_id = add_department_select.getValue(),
+            data.field.signed_department_id = add_department_select.getValue() || signed_department_id;
             Rails.ajax({
                 url: "/missions/contracts/add_follow_ups",
                 type: 'POST',

data/lib/educode_sales/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.78'
+  VERSION = '0.9.80'
 end

metadata CHANGED Viewed

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