educode_sales 0.9.75 → 0.9.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3360ea7a50189fd2b8954d7111e05c3e2592d403072661f4eca95a7f1a0ef3e1
-  data.tar.gz: af8e512e5f7e91c7eb8a211406817f19701311b205ed191982abae08cfc536dd
+  metadata.gz: b3c38e0feb88d220e6ec75559d93b49c38d308dd939efbb54f37b1afb106a28f
+  data.tar.gz: d9daee968f4335493daf6ffd1efaab8769cbb0d71c2d2869f84f1d074aea7a3f
 SHA512:
-  metadata.gz: df64d18c074d376248f60469c2b0dcac72eafeff9b145420bfc8aa3f9b88e610471e686263a1b26cee7d2096a4094cf533c2af3a0182134c39157aeacb57a60a
-  data.tar.gz: c3dac636495d444ac104ff6b4fdd7f65844645120127e0b1b2ccd4fe1a7a70e287dddb4e8238ef1f7b9a4c080b4aef83d8ff620d292e0c62085d793d619ad23f
+  metadata.gz: a092214b3fe5caa3b0767a87a9eb936911d98d57b489a4e6da26c0c0b2e3c848bfdce972648fc4cda518fd42d7a1a688fb97eb1cac07c5cab9885fbda3548d87
+  data.tar.gz: 2ef105b4bf305ef64d4c310522bcb451cfa08c3c034eda3db3552c4473d268967994d58979b1359cf2b614b41d95cedac6466d1b7f5419d32132b06ea2d994a2

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 } }
 
@@ -47,13 +46,15 @@ module EducodeSales
             level = @current_admin.role.role_areas.find_by(clazz: '合同管理').level
             case level
             when '自己'
-              @businesses = @businesses.where("educode_sales_businesses.staff_id = ?", @current_admin.id)
+              assign_business_ids = EducodeSales::Business.joins(:assign_staffs).where("educode_sales_assign_staffs.staff_id = ?", @current_admin.id).pluck(:id)
+
+              @businesses = @businesses.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, assign_business_ids)
             when '区域'
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id)
-              business_ids = Business.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
-              @businesses = Business.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids, business_ids)
-              business_ids = @businesses.pluck(:id)
-              @businesses = @businesses.where(business_id: business_ids)
+              business_ids = @businesses.joins(last_follow_up: :assign_follow_ups).where("educode_sales_assign_follow_ups.staff_id = ?", @current_admin.id).pluck(:id)
+              assign_business_ids = EducodeSales::Business.joins(:assign_staffs).where("educode_sales_assign_staffs.staff_id = ?", @current_admin.id).pluck(:id)
+
+              @businesses = @businesses.joins("JOIN departments ON educode_sales_businesses.department_id = departments.id").where("departments.school_id in (?) OR educode_sales_businesses.staff_id = #{@current_admin.id}  OR educode_sales_businesses.id in (?)", school_ids, business_ids + assign_business_ids)
             end
           end
 
@@ -162,7 +163,7 @@ module EducodeSales
 
           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::FollowUp' AND educode_sales_assign_staffs.sourcable_id = educode_sales_businesses.last_follow_up_id").
+            @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
@@ -239,7 +240,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
-      ").where("educode_sales_follow_ups.stage_id in (?)", contract_ids)
+      ").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
@@ -283,6 +284,10 @@ module EducodeSales
 
       end
 
+      if params[:q].present? && params[:q][:info_clazz].present?
+        @follow_ups = @follow_ups.where("educode_sales_follow_up_trends.clazz = ?", params[:q][:info_clazz])
+      end
+
       @follow_ups = @follow_ups.includes(:staff, :clazz, :stage, key_person: :teacher, business: [department: :school])
 
       if params[:sort].present? && params[:sort][:field]
@@ -294,16 +299,150 @@ module EducodeSales
     end
 
     def add_follow_ups
-      p params["1_promise_date"]
-      p params["1_promise_date"].keys
-      params["1_promise_date"].each do |d, v|
-        p '-----22-'
-        p d
-        p v
+      data = []
+      6.times do |i|
+        data[i] = []
+        params["#{i+1}_promise_date"].each do |d, v|
+          data[i] << [v]
+        end
+        params["#{i+1}_num"].each do |d, v|
+          data[i][d.to_i] << v
+        end
+        params["#{i+1}_plan_date"].each do |d, v|
+          data[i][d.to_i] << v
+        end
+        params["#{i+1}_actual_date"].each do |d, v|
+          data[i][d.to_i] << v
+        end
+      end
+      data.each do |d|
+        d.select! { |d| d.delete_if{|f| f == ''}.present? }
+      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
+      if params[:service_time].present?
+        date = params[:service_time].split(" - ")
+        follow_up.service_start_time = date[0]
+        follow_up.service_end_time = date[1]
+        follow_up.service_time_long = (date[1].to_date - date[0].to_date).to_i
+      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|
+          if s.present?
+            s.each do |d|
+             follow_up.contract_date_lists.create!({promise_date: d[0], num: d[1], plan_date: d[2], actual_date: d[3], staff_id: @current_admin.id, clazz: contract_lists[i]})
+            end
+          end
+        end
+        follow_up.follow_up_trends.create(clazz: '跟进信息', content: params[:content], staff_id: @current_admin.id)
+        @business.update(last_follow_up_id: follow_up.id)
+        render_success
+      else
+        render_failure follow_up
+      end
+    end
+
+    def advise
+      followup = FollowUp.find(params[:id])
+      followup.follow_up_trends.create(clazz: '建议信息', content: params[:content], staff_id: @current_admin.id)
+      render_success
+    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 } }
+      render layout: false
+    end
+
+    def product_list
+      respond_to do |format|
+        format.html 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])
+      params[:to_id].split(",").each do |i|
+        @business.assign_staffs.create({staff_id: i})
+      end
       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,6 +19,8 @@ module EducodeSales
     has_many :business_watches, dependent: :destroy
     has_many :business_histories, dependent: :destroy
 
+    has_many :assign_staffs, as: :sourcable # 售后人员
+
     # 关联关注
     has_many :users, :class_name => 'EducodeSales::BusinessRelationShip', foreign_key: 'business_id', :dependent => :destroy
 

data/app/models/educode_sales/contract_date_list.rb

@@ -2,5 +2,7 @@ module EducodeSales
   class ContractDateList < ApplicationRecord
     belongs_to :follow_up
     belongs_to :staff
+
+    enum clazz: ['交货', '验收', '预收款', '交付款', '验收款', '质保金']
   end
 end

data/app/models/educode_sales/follow_up.rb

@@ -15,6 +15,7 @@ module EducodeSales
     include ::Deletable
     belongs_to :business, counter_cache: true # counter_cache(自动计算 business对应follow_up表中对应的个数)
     belongs_to :place, optional: true
+    belongs_to :signed_department, class_name: 'Department', optional: true
     has_many :money_plans
     has_many :key_person
     has_many :teachers, through: :key_person
@@ -23,7 +24,8 @@ module EducodeSales
     belongs_to :stage, class_name: 'Common'
     belongs_to :clazz, class_name: 'Common'
 
-    has_many :assign_staffs, as: :sourcable # 售后人员
+    has_many :follow_up_trends
+    has_many :contract_date_lists
 
 
     default_scope  -> {where(deleted_at: nil)}

data/app/models/educode_sales/follow_up_trend.rb

@@ -0,0 +1,8 @@
+module EducodeSales
+  class FollowUpTrend < ApplicationRecord
+    belongs_to :follow_up
+    belongs_to :staff
+
+    enum clazz: ['跟进信息', '建议信息', '评论信息', '审核信息']
+  end
+end

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

@@ -28,7 +28,7 @@
       <div class="layui-inline">
         <label class="layui-form-label">信息类型</label>
         <div class="layui-input-inline">
-            <%= select_tag "info_clazz", options_for_select(EducodeSales::FollowUp::InfoClazz), { include_blank: true } %>
+            <%= select_tag "info_clazz", options_for_select(EducodeSales::FollowUp::InfoClazz.each_with_index.map { |d, i| [d, i] }), { include_blank: true } %>
         </div>
         </div>
       <div class="layui-inline">
@@ -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 %>
@@ -129,9 +129,8 @@
                     },
                     {
                         field: 'signed_department',
-                        width: 120,
-                        title: '签约单位',
-                        templet:'#signed_department'
+                        width: 160,
+                        title: '签约单位'
                     },
                     {
                         field: 'stage',
@@ -145,8 +144,8 @@
                         title: '销售经理',
                     },
                     {
-                        field: 'infoclazz',
-                        width: 80,
+                        field: 'clazz',
+                        width: 100,
                         title: '信息类型',
                     },
                     {
@@ -202,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;
         });
 
@@ -247,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,
@@ -288,14 +260,14 @@
                 type: 1,
                 area: '400px;',
                 id: 'LAY_layuipro',
-                content: '<div class="layui-form" lay-filter="edit_project" style="padding: 20px;"><textarea autocomplete="off" type="text" name="name" lay-verify="required" class="layui-textarea">' + data.advise + '</textarea></div>' ,
+                content: '<div class="layui-form" lay-filter="edit_project" style="padding: 20px;"><textarea autocomplete="off" type="text" name="name" lay-verify="required" class="layui-textarea"></textarea></div>' ,
                 btn: ['保存', '取消'],
                   btn1: function(index, l) {
                     if (l.find("textarea").val().trim() == '') {
                       layer.msg('内容不能为空')
                       return false;
                     } else {
-                      request.authPut("/missions/follow_ups/" + data.id + "/update_advise", {content: l.find("textarea").val().trim()}, function(res) {
+                      request.authPost("/missions/contracts/" + data.id + "/advise", {content: l.find("textarea").val().trim()}, function(res) {
                         if (res.success == false) {
                           layer.alert(res.msg);
                         } else {

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

@@ -265,6 +265,11 @@
                   templet: '<div><a href="javascript:void(0);" class="layui-table-link" lay-event="show_business"><span title="{{d.name}}">{{d.name}}</span></a></div>',
                   fixed: 'left',
               },
+              {
+                field: 'name',
+                width: 120,
+                title: '合同名称',
+              },
               {
                   field: 'area',
                   width: 100,
@@ -543,7 +548,7 @@
             business_id = data.id
             var content = miniPage.getHrefContent('/missions/contracts/new_follow_up?id=' + data.id);
             var openWH = miniPage.getOpenWidthHeight();
-            sale_plan_index = layer.open({
+            new_follow_index = layer.open({
               title: '添加合同跟进记录',
               type: 1,
               shade: 0.2,
@@ -557,19 +562,19 @@
               }
             });
             $(window).on("resize", function () {
-                layer.full(sale_plan_index);
+                layer.full(new_follow_index);
             });
           } else if (obj.event === 'assign') {
-              var content = miniPage.getHrefContent('/missions/businesses/' + id + '/edit');
+              var content = miniPage.getHrefContent('/missions/contracts/' + id + '/assign');
               var openWH = miniPage.getOpenWidthHeight();
+              name = data.name;
               sindex = layer.open({
-                  title: '编辑',
+                  title: '指派合同【' + name + "】售后工程师",
                   type: 1,
                   shade: 0.2,
                   maxmin: true,
                   shadeClose: true,
-                  area: [openWH[0] + 'px', openWH[1] + 'px'],
-                  offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                  area: ['600px', '600px'],
                   content: content
               });
               $(window).on("resize", function () {

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

@@ -0,0 +1,46 @@
+
+<%= Gon::Base.render_data %>
+<div class="layui-form layuimini-form" style="padding:30px">
+  <div class="layui-form-item">
+    <label class="layui-form-label required">选择售后工程师：</label>
+    <div class="layui-input-block" style="width: 300px">
+      <div id="sales_id"></div>
+    </div>
+  </div>
+  <hr>
+  <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();
+     staff_list_select = xmSelect.render({
+        el: '#sales_id',
+        data: gon.sales_staffs,
+        filterable: true,
+        radio: false,
+      })
+      var parentIndex = layer.index;
+      form.on('submit(saveBtn)', function (data) {
+          layer.confirm('确定指派合同【' + parent.name  +  "】售后工程师?", function (index) {
+            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')
+            })
+        });
+          return false;
+      });
+  });
+</script>

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

@@ -4,17 +4,16 @@ json.data do
     json.clazz d.clazz.name
     json.stage d.stage.name
     json.staff d.staff.user.real_name
-    json.description d.description
-    json.advise d.advise
+    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
+    json.signed_department d.signed_department&.school&.name || ''
     json.created_at d.created_at.to_s
     json.business d.business.name
     json.business_id d.business.id
-    json.rival d.rival || ''
     json.staff_manages d.business.last_follow_up&.assign_follow_ups.present? ? (d.business.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.business.staff&.user&.real_name
-    # teacher_ids = d.key_person.pluck(:teacher_id)
-    json.tel d.key_person.pluck(:tel).select { |d| d.present?  }.join("、")
 
   end
 end

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

@@ -56,7 +56,7 @@ json.data do
     json.source d.source
     json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
 
-    json.assign_staffs d.last_follow_up&.assign_staffs.present? ? (d.last_follow_up.assign_staffs.map{ |d| d.staff.user.real_name}.join("、")) : ''
+    json.assign_staffs d.assign_staffs.map{ |d| d.staff.user.real_name}.join("、")
     json.current_staff_id @current_admin.id
     json.staff_id d.staff_id
     json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''