educode_sales 0.9.77 → 0.9.79

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3c38e0feb88d220e6ec75559d93b49c38d308dd939efbb54f37b1afb106a28f
-  data.tar.gz: d9daee968f4335493daf6ffd1efaab8769cbb0d71c2d2869f84f1d074aea7a3f
+  metadata.gz: e35598f2024ca7c1f138093b0fcd9dce947d35d35ebb6a96f4b943c808c52c85
+  data.tar.gz: a7e7602b92b9050a05fba0e97904ba1689fe0becb716ce81a9593db50c7668f9
 SHA512:
-  metadata.gz: a092214b3fe5caa3b0767a87a9eb936911d98d57b489a4e6da26c0c0b2e3c848bfdce972648fc4cda518fd42d7a1a688fb97eb1cac07c5cab9885fbda3548d87
-  data.tar.gz: 2ef105b4bf305ef64d4c310522bcb451cfa08c3c034eda3db3552c4473d268967994d58979b1359cf2b614b41d95cedac6466d1b7f5419d32132b06ea2d994a2
+  metadata.gz: b765e6ce6015e1253d0352cda77169bc34c1b43d60fd6eac60975099a15d9459eee2fae17f1f81adbd52cb50f99c6ef40b619426e1b9c5b7df769da6c6b87ba0
+  data.tar.gz: e4df5cae9dfe1a18e38ad5a8fade16aa9e73d710d31515c8ec8faa24253a07a4d9aaba78c76ce2732d297577caa0aaab58d3d350736834cec467dfe4d426be49

data/app/controllers/educode_sales/contracts_controller.rb

@@ -17,18 +17,18 @@ module EducodeSales
             # 项目类型
             bussiness_type = EducodeSales::Business.include_types(params[:type]) || []
           end
-    
+
           business_step = []
           if params[:step]
             # 项目阶段
             business_step = EducodeSales::Business.include_steps(params[:step]) || []
           end
-    
-    
+
+
           gon.business_type = Common.where(clazz: 'business_type').map do |d|
             {value: d.id, name: d.name, selected: bussiness_type.include?(d.extras)}
           end
-    
+
           gon.business_step = Common.where(clazz: 'business_step', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).order("position").map do |d|
             {value: d.id, name: d.name, selected: business_step.include?(d.name)}
           end
@@ -98,7 +98,7 @@ module EducodeSales
           if params[:q].present? && params[:q][:business_type].present?
             @businesses = @businesses.where("educode_sales_businesses.clazz_id in (?)", params[:q][:business_type].split(",").map(&:to_i))
           end
-       
+
           if params[:q].present? && params[:q][:business_step].present?
             @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
@@ -158,14 +158,14 @@ module EducodeSales
             # 销售经理
             @businesses = @businesses.joins("LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = educode_sales_businesses.last_follow_up_id").
                                       where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", params[:q][:sales_staff_id], params[:q][:sales_staff_id])
-              
+
           end
 
           if params[:q].present? && params[:q][:after_sales_staff_id].present?
             #  售后工程师
             @businesses = @businesses.joins("LEFT JOIN educode_sales_assign_staffs ON educode_sales_assign_staffs.sourcable_type = 'EducodeSales::Business' AND educode_sales_assign_staffs.sourcable_id = educode_sales_businesses.id").
                                       where("educode_sales_assign_staffs.staff_id = ?", params[:q][:after_sales_staff_id])
-              
+
           end
 
           # 商机变化
@@ -225,6 +225,8 @@ module EducodeSales
       common = Common.find_by(clazz: 'staff_type', name: '销售')
       staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11)
       @staffs = staffs.map { |d| [d.user.real_name, d.id]}
+      role = Role.find_by(name: '售后工程师')
+      @after_sales_staffs = Staff.joins(:user).where(role_id: role.id).map { |d| [d.user.real_name, d.id]}
     end
 
     def new_follow_up
@@ -320,9 +322,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]
@@ -331,8 +335,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|
@@ -357,9 +359,11 @@ module EducodeSales
     end
 
     def assign
-      common = Common.find_by(clazz: 'staff_type', name: '销售')
-      staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11)
-      gon.sales_staffs = staffs.map { |d| {name: d.user.real_name, value: d.id } }
+      role = Role.find_by( name: '售后工程师')
+      staffs = Staff.joins(:user).where(role_id: role.id)
+      business = Business.find(params[:id])
+      selected_staff_ids = business.assign_staffs.pluck(:staff_id)
+      gon.sales_staffs = staffs.map { |d| {name: d.user.real_name, value: d.id, selected: selected_staff_ids.include?(d.id) } }
       render layout: false
     end
 
@@ -385,9 +389,12 @@ module EducodeSales
 
     def assign_staff
       @business = Business.find(params[:id])
+      assign_staffs = []
       params[:to_id].split(",").each do |i|
-        @business.assign_staffs.create({staff_id: i})
+        assign_staffs << AssignStaff.find_or_initialize_by(sourcable_id: @business.id, staff_id: i, sourcable_type: "EducodeSales::Business")
       end
+      @business.assign_staffs = assign_staffs
+      @business.save
       render_success
     end
 

data/app/models/educode_sales/business.rb

@@ -19,7 +19,7 @@ module EducodeSales
     has_many :business_watches, dependent: :destroy
     has_many :business_histories, dependent: :destroy
 
-    has_many :assign_staffs, as: :sourcable # 售后人员
+    has_many :assign_staffs, as: :sourcable, dependent: :destroy # 售后人员
 
     # 关联关注
     has_many :users, :class_name => 'EducodeSales::BusinessRelationShip', foreign_key: 'business_id', :dependent => :destroy

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

@@ -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">
@@ -46,15 +30,9 @@
         <div class="layui-inline">
             <label class="layui-form-label">售后工程师</label>
             <div class="layui-input-inline">
-            <%= select_tag "after_sales_staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true , "lay-search": "" } %>
+            <%= 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">
@@ -161,7 +128,7 @@
         elem: '#date',
         range: true
       });
-   
+
       laydate.render({
         elem: '#invitation_at',
         range: true
@@ -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
@@ -525,7 +486,7 @@
         },
        where: {q: search, sort: sort}
       }, 'data');
-  
+
       return false;
     });
 
@@ -533,7 +494,7 @@
       var field = data.field;
       form.val('search_form', {
           name: '', department: '', staff_id: '', business_type: '', business_step: '',
-          place_id: '', date: '', area: '', invitation_at: '', business_year: '', number: ''
+          place_id: '', date: '', area: '', invitation_at: '', business_year: '', number: '', o_business_deployment: '',after_sales_staff_id: ''
       })
       business_type_list.setValue([])
       business_step_list.setValue([])
@@ -581,10 +542,10 @@
                   layer.full(sindex);
               });
               return false;
-          } 
+          }
         });
-     
-  
+
+
   });
 </script>
 <style>

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

@@ -37,7 +37,7 @@
             request.post('missions/contracts/' + parent.id +"/assign_staff", {to_id: staff_list_select.getValue('valueStr')}, function (res) {
                 layer.close(index);
                 layer.close(parentIndex)
-              //  parent.table.reload('contact_table')
+               parent.table.reload('contact_table')
             })
         });
           return false;

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

@@ -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>

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

@@ -2,60 +2,60 @@
 <form class="layui-form form-value">
   <div class="layui-form-item" style="padding: 10px 25px 0;">
     <div class="layui-inline">
-      <label class="layui-form-label">单位：</label>
+      <label class="layui-form-label" style="width: 160px;">单位：</label>
       <div class="layui-input-inline">
         <%= @follow_up.business.department&.school&.name %>
       </div>
     </div>
     <%if @follow_up.business.number.present?%>
       <div class="layui-inline">
-        <label class="layui-form-label">编号：</label>
+        <label class="layui-form-label" style="width: 160px;">编号：</label>
         <div class="layui-input-inline">
           <%= @follow_up.business.number %>
         </div>
       </div>
     <%end %>
     <div class="layui-inline">
-      <label class="layui-form-label">部门：</label>
+      <label class="layui-form-label" style="width: 160px;">部门：</label>
       <div class="layui-input-inline">
         <%= @follow_up.business.department&.name %>
       </div>
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label">项目类型：</label>
+      <label class="layui-form-label" style="width: 160px;">项目类型：</label>
       <div class="layui-input-inline">
         <%= @follow_up.clazz.name %>
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">项目阶段：</label>
+      <label class="layui-form-label" style="width: 160px;">项目阶段：</label>
       <div class="layui-input-inline">
          <%= @follow_up.stage.name %>
       </div>
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label">招标时间：</label>
+      <label class="layui-form-label" style="width: 160px;">招标时间：</label>
       <div class="layui-input-inline">
         <%= @follow_up.invitation_at.to_s %>
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">中标时间：</label>
+      <label class="layui-form-label" style="width: 160px;">中标时间：</label>
       <div class="layui-input-inline">
         <%= @follow_up.bidded_date.to_s %>
       </div>
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label">签单时间：</label>
+      <label class="layui-form-label" style="width: 160px;">签单时间：</label>
       <div class="layui-input-inline">
         <%= @follow_up.signed_date.to_s %>
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">验收时间：</label>
+      <label class="layui-form-label" style="width: 160px;">验收时间：</label>
       <div class="layui-input-inline">
         <%= @follow_up.reception_at.to_s %>
       </div>
@@ -64,7 +64,7 @@
     <br>
     <%if @follow_up.clazz_id == EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.id %>
       <div class="layui-inline">
-        <label class="layui-form-label">服务期：</label>
+        <label class="layui-form-label" style="width: 160px;">服务期：</label>
         <div class="layui-input-inline">
           <%= @follow_up.service_start_time.to_s + "-" + @follow_up.service_end_time.to_s %>
         </div>
@@ -72,7 +72,7 @@
     <%end %>
     <%if @follow_up.clazz_id == EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.id %>
       <div class="layui-inline">
-        <label class="layui-form-label">部署类型：</label>
+        <label class="layui-form-label" style="width: 160px;">部署类型：</label>
         <div class="layui-input-inline">
           <%=@show_follow_recored_deployment%>
         </div>
@@ -81,46 +81,46 @@
     <br>
 
     <div class="layui-inline">
-      <label class="layui-form-label">中标额：</label>
+      <label class="layui-form-label" style="width: 160px;">中标额：</label>
       <div class="layui-input-inline">
         <%= @follow_up.total_amount.to_f.round(6) %>万
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">合同额：</label>
+      <label class="layui-form-label" style="width: 160px;">合同额：</label>
       <div class="layui-input-inline">
         <%= @follow_up.actual_amount.to_f.round(6) %>万
       </div>
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label">渠道：</label>
+      <label class="layui-form-label" style="width: 160px;">渠道：</label>
       <div class="layui-input-inline">
         <%= @follow_up.place&.name %>
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">渠道分成：</label>
+      <label class="layui-form-label" style="width: 160px;">渠道分成：</label>
       <div class="layui-input-inline">
         <%= @follow_up.divide_amount.to_f.round(6) %>万
       </div>
     </div>
     <br/>
     <div class="layui-inline">
-      <label class="layui-form-label">预算金额：</label>
+      <label class="layui-form-label" style="width: 160px;">预算金额：</label>
       <div class="layui-input-inline">
         <%= @follow_up.budget_amount.to_f.round(6) %>万
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">分成比例：</label>
+      <label class="layui-form-label" style="width: 160px;">分成比例：</label>
       <div class="layui-input-inline">
         <%= @follow_up.divide_rate.to_f.round(2) %>%
       </div>
     </div>
     <div class="layui-form-item">
       <div class="layui-inline">
-        <label class="layui-form-label">所属年度：</label>
+        <label class="layui-form-label" style="width: 160px;">所属年度：</label>
         <div class="layui-input-inline">
           <%= @follow_up&.year %>年
         </div>
@@ -128,13 +128,13 @@
     </div>
      <div class="layui-form-item">
       <div class="layui-inline">
-        <label class="layui-form-label">项目资金来源：</label>
+        <label class="layui-form-label" style="width: 160px;">项目资金来源：</label>
         <div class="layui-input-inline">
           <%= @follow_up&.funding_source %>
         </div>
       </div>
       <div class="layui-inline">
-        <label class="layui-form-label">签约单位：</label>
+        <label class="layui-form-label" style="width: 160px;">签约单位：</label>
         <div class="layui-input-inline" style="width: 300px">
             <%= @follow_up.signed_department&.school&.name || '' %>
         </div>
@@ -142,24 +142,24 @@
     </div>
     <div class="layui-form-item">
       <label class="layui-form-label" style="width: 150px;">售后工程师：</label>
-      <div class="layui-input-inline">
+      <div class="layui-input-inline" style="width: 350px;">
         <%= @business.assign_staffs.map{|d| d.staff.user.full_name}.join("、") %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label"><%= @trend.clazz %>：</label>
+      <label class="layui-form-label" style="width: 160px;"><%= @trend.clazz %>：</label>
       <div class="layui-input-block" style="padding-right: 20px;">
         <pre><%= @trend.content %></pre>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">时间：</label>
+      <label class="layui-form-label" style="width: 160px;">时间：</label>
       <div class="layui-input-block" style="padding-right: 20px;">
         <pre><%= @follow_up.created_at.to_s %></pre>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">跟进人：</label>
+      <label class="layui-form-label" style="width: 160px;">跟进人：</label>
       <div class="layui-input-block" style="padding-right: 20px;">
         <pre><%= @follow_up.staff.user.real_name %></pre>
       </div>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.77'
+  VERSION = '0.9.79'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.77
+  version: 0.9.79
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -685,7 +685,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.0.0
 signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.