educode_sales 0.9.76 → 0.9.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec6bd4aff88d498d4b416ae1a654e7e0d391a1438b3dc3358ab9d0c44e843355
-  data.tar.gz: 3b83113b2949c8b7ea4faf3b029a367ecf994b6a42492b67111c5b6bb6539eb6
+  metadata.gz: 7b22a3361ca68bbfaa0704aa28aeecb7f2906973b836971183936c3c13910fbe
+  data.tar.gz: 35b7435979cecacdc00bae4b28bf3112e8e6cb5a1b36cd2a8035e91fc817d36b
 SHA512:
-  metadata.gz: 99d66d74810cd737a62330d5b69782fbcf3c26a9e087fb7859c53f37c6eb5187f03f2692afd67f23060be03c3baa397e0928da12202d3d59b55314844fac6dc0
-  data.tar.gz: f997afa839cf458d0bbcdbedf8aa4a564c512499092c4cc9597449d9c8a9b39e3d1825f3a45ac1f777a453b9467da4fbf698b743a86804c06d010de81170cd86
+  metadata.gz: 18719f022f0e3d7d1d91f4f111ecd8b234b450e5244874bf21fce753220e2a7c8e0bb02341c88ac8e6d2f9a5dd4f6540d72c41b1db9f0b1a76025654b8c006d0
+  data.tar.gz: 5a6d3f438a743d0004351c9d2361c60b2b79da3d468a4776954fc577f263bcd784022bca5c3ba2cddb094dfba9a66be609ef7614469ba5b6b66461183f8decbe

data/app/controllers/educode_sales/contracts_controller.rb

@@ -9,7 +9,6 @@ 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]}
-          gon.staffs = staffs.map { |d| {name: d.user.real_name, value: d.id } }
           gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
           gon.staffs = staffs.map { |d| {name: d.user.real_name, value: d.id } }
 
@@ -18,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
@@ -99,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
@@ -159,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
 
           # 商机变化
@@ -226,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
@@ -241,7 +242,7 @@ module EducodeSales
       contract_ids = Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
       @follow_ups = FollowUp.joins("
         JOIN educode_sales_businesses ON educode_sales_follow_ups.business_id = educode_sales_businesses.id
-      ").joins(:follow_up_trends).where("educode_sales_follow_ups.stage_id in (?)", contract_ids).select("educode_sales_follow_ups.*, educode_sales_follow_up_trends.clazz, educode_sales_follow_up_trends.content")
+      ").joins(:follow_up_trends).where("educode_sales_follow_ups.stage_id in (?)", contract_ids).select("educode_sales_follow_ups.*, educode_sales_follow_up_trends.clazz, educode_sales_follow_up_trends.content, educode_sales_follow_up_trends.id AS trend_id")
 
       if @current_admin.is_admin?
         @follow_ups = @follow_ups
@@ -333,7 +334,7 @@ module EducodeSales
       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|
@@ -358,38 +359,97 @@ 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
 
     def product_list
       respond_to do |format|
         format.html do
-         
-        end
-        format.js do
           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]}
+          gon.staffs = staffs.map { |d| {name: d.user.real_name, value: d.id } }
+          gon.business_step = Common.where(clazz: 'business_step', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).order("position").map do |d|
+            {value: d.id, name: d.name, selected: false}
+          end
         end
         format.json do
+          @product_catalogs = ProductCatalog
+          @product_catalogs = @product_catalogs.where("name like ?", "%#{params[:q][:name]}%") if params[:q] && params[:q][:name].present?
+          @product_catalogs = @product_catalogs.where(item_clazz: params[:q][:item_clazz]) if params[:q] && params[:q][:item_clazz].present?
+          @product_catalogs = @product_catalogs.page(params[:page]).per(params[:limit])
         end
       end
     end
 
     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
 
+    def new_product
+      render layout: false
+    end
+
+    def product_catalog
+      product_catalog = ProductCatalog.new(product_up_params)
+      if product_catalog.save
+        render_success
+      else
+        render_failure product_catalog
+      end
+    end
+
+    def update_product_catalog
+      product_catalog = ProductCatalog.find(params[:id])
+      if product_catalog.update(product_up_params)
+        render_success
+      else
+        render_failure product_catalog
+      end
+    end
+
+    def edit_product
+      @product_catalog = ProductCatalog.find(params[:id])
+      render layout: false
+    end
+
+    def show_follow_record
+      @follow_up = FollowUp.find(params[:follow_up_id])
+      @business = Business.find(@follow_up.business_id)
+      @show_follow_recored_deployment = EducodeSales::FollowUp::BUSINESS_DEPLOYMENT.to_h.invert[@follow_up.o_business_deployment]
+
+      @trend = FollowUpTrend.find(params[:trend_id])
+
+      id = @follow_up.id
+      @follow_ups = @business.follow_ups
+      ids = @follow_ups.ids
+      size = ids.size
+      ids = ids.reverse
+      index = ids.index(id)
+      @next_id = (index != size - 1 && size > 1) ? ids[index + 1] : 0
+      @pre_id = (index != 0 && size > 1) ? ids[index - 1] : 0
+      render layout: false
+    end
+
     private
     def follow_up_params
       params.permit(:o_business_deployment, :plan_signed_date, :bidded_days, :signed_date, :signed_department_id, :service_years, :service_start_time, :service_end_time, :funding_source)
     end
+
+    def product_up_params
+      params.permit(:name, :item_clazz, :brand, :specification, :unit, :param, :source_method, :supplier)
+    end
   end
 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/models/educode_sales/product_catalog.rb

@@ -0,0 +1,7 @@
+module EducodeSales
+  class ProductCatalog < ApplicationRecord
+
+    enum item_clazz: %w(平台 课程 硬件 技术服务 培训服务 咨询服务 云服务 装修服务 其他)
+    enum source_method: %w(自研 在研 待研 外购)
+  end
+end

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

@@ -63,7 +63,7 @@
   </div>
 </script>
 <script type="text/html" id="currentTableBar_follows">
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">详情</a>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show_detail">详情</a>
     <% if can?(:advise, EducodeSales::Business) %>
       <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="add_advise">团队建议</a>
     <% end %>
@@ -201,15 +201,6 @@
                 },
                 where: {q: search, sort: sort}
             }, 'data');
-            // table.reload('businesses_table', {
-            //     page: {
-            //         curr: 1
-            //     },
-            //     where: {q: search, sort: sort}
-            // }, 'data');
-            // form.val('search_form', {
-            //     name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area , description: data.field.description
-            // })
             return false;
         });
 
@@ -246,29 +237,11 @@
         table.on('tool(contract_follows_table)', function (obj) {
             var data = obj.data;
             id = data.id
-            if (obj.event === 'add_event') { // 监听添加操作
-                var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + data.id);
+            if (obj.event === 'show_detail') { // 监听添加操作
+                var content = miniPage.getHrefContent('/missions/contracts/show_follow_record?follow_up_id=' + data.id + "&trend_id=" + data.trend_id);
                 var openWH = miniPage.getOpenWidthHeight();
                 show_index = layer.open({
-                    title: '查看商机跟进记录',
-                    type: 1,
-                    shade: 0.2,
-                    maxmin: true,
-                    shadeClose: true,
-                    area: [openWH[0] + 'px', openWH[1] + 'px'],
-                    offset: [openWH[2] + 'px', openWH[3] + 'px'],
-                    content: content
-                });
-                $(window).on("resize", function () {
-                    layer.full(index);
-                });
-            }  else if (obj.event === 'business') {
-                business_id = data.business_id
-                business_name = data.business
-                content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
-                openWH = miniPage.getOpenWidthHeight();
-                index = layer.open({
-                    title: '商机列表/' + data.business + '的跟进记录',
+                    title: '查看合同动态',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,

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

@@ -46,7 +46,7 @@
         <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;' %>">
@@ -161,7 +161,7 @@
         elem: '#date',
         range: true
       });
-   
+
       laydate.render({
         elem: '#invitation_at',
         range: true
@@ -525,7 +525,7 @@
         },
        where: {q: search, sort: sort}
       }, 'data');
-  
+
       return false;
     });
 
@@ -533,7 +533,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 +581,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/edit_product.html.erb

@@ -0,0 +1,85 @@
+<%= Gon::Base.render_data %>
+<div class="layui-form layuimini-form" style="padding:30px">
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">产品名称：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="name" value="<%= @product_catalog.name %>" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">销售品目：</label>
+            <div class="layui-input-inline">
+                <%= select_tag "item_clazz", options_for_select(EducodeSales::ProductCatalog.item_clazzs.keys, @product_catalog.item_clazz), { 'lay-filter': 'item_clazz', 'lay-verify': "required",  include_blank: true,  "lay-search": "" } %>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">品牌：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="brand" value="<%= @product_catalog.brand %>" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">规格型号：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="specification" value="<%= @product_catalog.specification %>" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">单位：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="unit" value="<%= @product_catalog.unit %>" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">参数：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="param" value="<%= @product_catalog.param %>" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">来源方式：</label>
+            <div class="layui-input-inline">
+                <%= select_tag "source_method", options_for_select(EducodeSales::ProductCatalog.source_methods.keys, @product_catalog.source_method), { 'lay-filter': 'source_method', 'lay-verify': "required",  include_blank: true,  "lay-search": "" } %>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">供应商：</label>
+            <div class="layui-input-inline">
+                 <input type="text" name="supplier" value="<%= @product_catalog.supplier %>" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+        </div>
+    </div>
+</div>
+
+<script>
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput'], function() {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            $ = layui.$;
+        form.render();
+
+        form.on('submit(saveBtn)', function(data) {
+            request.put("missions/contracts/"+ parent.id + "/update_product_catalog", data.field, function(res) {
+                layer.close(parent.edit_production_index)
+                parent.table.reload('contact_product_table')
+            })
+            return false;
+        });
+    });
+</script>

data/app/views/educode_sales/contracts/follow_ups.json.jbuilder

@@ -5,6 +5,7 @@ json.data do
     json.stage d.stage.name
     json.staff d.staff.user.real_name
     json.clazz EducodeSales::FollowUpTrend.clazzs.invert[d['clazz']]
+    json.trend_id d['trend_id']
     json.description d['content']
     json.school d.business.department&.school&.name
     json.school_id d.business.department&.school&.id

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

@@ -3,7 +3,6 @@
     <ul class="layui-tab-title">
         <li class="layui-this follows_li">跟进动态</li>
         <li class="contracts_list_li">合同列表</li>
-        <li class="contracts_product_li">产品目录</li>
     </ul>
     <div class="layui-tab-content">
         <div class="layui-tab-item follows_div layui-show">
@@ -12,9 +11,6 @@
         <div class="layui-tab-item contracts_list_div">
           <div id="contract_list_wraper"></div>
         </div>
-        <div class="layui-tab-item contracts_product_div">
-          <div id="contract_product_wraper"></div>
-        </div>
     </div>
 </div>
 
@@ -35,8 +31,6 @@
         element.on('tab(contract_tab)', function(data) {
           if (data.index == 1 && $("#contract_list").length == 0) {
             loadPage('/missions/contracts/list')
-          } else if (data.index == 2 && $("#product_list").length == 0) {
-            loadPage('/missions/contracts/product_list')
           }
         });
 

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

@@ -0,0 +1,85 @@
+<%= Gon::Base.render_data %>
+<div class="layui-form layuimini-form" style="padding:30px">
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">产品名称：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="name" value="" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">销售品目：</label>
+            <div class="layui-input-inline">
+                <%= select_tag "item_clazz", options_for_select(EducodeSales::ProductCatalog.item_clazzs.keys), { 'lay-filter': 'item_clazz', 'lay-verify': "required",  include_blank: true,  "lay-search": "" } %>
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">品牌：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="brand" value="" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">规格型号：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="specification" value="" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">单位：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="unit" value="" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">参数：</label>
+            <div class="layui-input-inline">
+                <input type="text" name="param" value="" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-inline">
+            <label class="layui-form-label required">来源方式：</label>
+            <div class="layui-input-inline">
+                <%= select_tag "source_method", options_for_select(EducodeSales::ProductCatalog.source_methods.keys), { 'lay-filter': 'source_method', 'lay-verify': "required",  include_blank: true,  "lay-search": "" } %>
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label required">供应商：</label>
+            <div class="layui-input-inline">
+                 <input type="text" name="supplier" value="" class="layui-input" lay-verify="required">
+            </div>
+        </div>
+    </div>
+    <div class="layui-form-item">
+        <div class="layui-input-block">
+            <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+        </div>
+    </div>
+</div>
+
+<script>
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput'], function() {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            $ = layui.$;
+        form.render();
+
+        form.on('submit(saveBtn)', function(data) {
+            request.post("missions/contracts/product_catalog", data.field, function(res) {
+                layer.close(parent.add_product_index)
+                parent.table.reload('contact_product_table')
+            })
+            return false;
+        });
+    });
+</script>