educode_sales 0.9.75 → 0.9.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3360ea7a50189fd2b8954d7111e05c3e2592d403072661f4eca95a7f1a0ef3e1
-  data.tar.gz: af8e512e5f7e91c7eb8a211406817f19701311b205ed191982abae08cfc536dd
+  metadata.gz: ec6bd4aff88d498d4b416ae1a654e7e0d391a1438b3dc3358ab9d0c44e843355
+  data.tar.gz: 3b83113b2949c8b7ea4faf3b029a367ecf994b6a42492b67111c5b6bb6539eb6
 SHA512:
-  metadata.gz: df64d18c074d376248f60469c2b0dcac72eafeff9b145420bfc8aa3f9b88e610471e686263a1b26cee7d2096a4094cf533c2af3a0182134c39157aeacb57a60a
-  data.tar.gz: c3dac636495d444ac104ff6b4fdd7f65844645120127e0b1b2ccd4fe1a7a70e287dddb4e8238ef1f7b9a4c080b4aef83d8ff620d292e0c62085d793d619ad23f
+  metadata.gz: 99d66d74810cd737a62330d5b69782fbcf3c26a9e087fb7859c53f37c6eb5187f03f2692afd67f23060be03c3baa397e0928da12202d3d59b55314844fac6dc0
+  data.tar.gz: f997afa839cf458d0bbcdbedf8aa4a564c512499092c4cc9597449d9c8a9b39e3d1825f3a45ac1f777a453b9467da4fbf698b743a86804c06d010de81170cd86

data/app/controllers/educode_sales/contracts_controller.rb

@@ -47,13 +47,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 +164,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 +241,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")
 
       if @current_admin.is_admin?
         @follow_ups = @follow_ups
@@ -283,6 +285,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 +300,96 @@ 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
+         
+        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]}
+        end
+        format.json do
+        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
 
+    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
   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/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">
@@ -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: '信息类型',
                     },
                     {
@@ -288,14 +287,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/_product_list.html.erb

@@ -0,0 +1,358 @@
+<div class="min-height-table" id="product_list">
+  <div style="margin: 10px 10px 10px 10px">
+    <form class="layui-form layui-form-pane" lay-filter="search_form">
+      <div class="layui-form-item">
+        <div class="layui-inline">
+          <label class="layui-form-label">合同名称</label>
+          <div class="layui-input-inline">
+            <input type="text" name="name" class="layui-input" value="">
+          </div>
+        </div>
+        <div class="layui-inline">
+          <label class="layui-form-label">用户单位</label>
+          <div class="layui-input-inline">
+            <input type="text" name="department" value="" class="layui-input">
+          </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">签约单位</label>
+            <div class="layui-input-inline">
+            <input type="text" name="assign_department" value="" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-inline">
+            <label class="layui-form-label">销售经理</label>
+            <div class="layui-input-inline">
+            <%= select_tag "sales_staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true , "lay-search": "" } %>
+            </div>
+        </div>
+        <div class="layui-inline show_item_contract">
+            <label class="layui-form-label">区域</label>
+            <div class="layui-input-inline">
+            <%= select_tag "area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
+            </div>
+        </div>
+        <div class="layui-inline show_item_contract">
+          <label class="layui-form-label">项目阶段</label>
+          <div class="layui-input-inline">
+            <div id="contract_business_step" style="width: 190px;"></div>
+          </div>
+        </div>
+        <div class="layui-inline show_item_contract">
+          <label class="layui-form-label">渠道名称</label>
+          <div class="layui-input-inline">
+            <div id="contract_index_place" style="width: 190px;"></div>
+          </div>
+        </div>
+        <div class="layui-inline show_item_contract">
+          <label class="layui-form-label">中标时间</label>
+          <div class="layui-input-inline">
+            <input type="text" class="layui-input" id="bidded_date" name="bidded_date" placeholder=" - " autocomplete="off">
+          </div>
+        </div>
+        <div class="layui-inline show_item_contract">
+          <label class="layui-form-label">签单时间</label>
+          <div class="layui-input-inline">
+            <input type="text" class="layui-input" id="signed_date" name="signed_date" placeholder=" - " autocomplete="off">
+          </div>
+        </div>
+        <div class="layui-inline">
+          <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
+          </button>
+          <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness_contract">搜索
+          </button>
+        </div>
+      </div>
+    </form>
+  </div>
+  <div id="contact_table_wraper">
+    <table class="layui-hide" id="contact_product_table" lay-filter="contact_product_table"></table>
+  </div>
+</div>
+
+<script type="text/html" id="currentTableBarProduct">
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_product">添加销售目录</a>
+</script>
+
+
+<script>
+  layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown','laytpl', 'xmSelect'], function () {
+      var $ = layui.jquery,
+          form = layui.form,
+          request = layui.request,
+          miniPage = layui.miniPage,
+          dropdown = layui.dropdown,
+          xmSelect = layui.xmSelect,
+          laydate = layui.laydate;
+      var openWH = miniPage.getOpenWidthHeight();
+      laydate.render({
+        elem: '#date',
+        range: true
+      });
+   
+      laydate.render({
+        elem: '#invitation_at',
+        range: true
+      });
+
+      laydate.render({
+        elem: '#bidded_date',
+        range: true,
+        value: gon.bidded_date
+      });
+      laydate.render({
+        elem: '#signed_date',
+        range: true,
+        value: gon.signed_date
+      });
+
+      laydate.render({
+        elem: '#date_at',
+        range: true,
+        value: gon.date_at
+      });
+
+
+      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
+      })
+
+      var index_place_list = xmSelect.render({
+        el: '#contract_index_place',
+        model: {
+          icon: 'hidden',
+          label: {
+              type: 'text',
+              text: {
+                  //左边拼接的字符
+                  left: '',
+                  //右边拼接的字符
+                  right: '',
+                  //中间的分隔符
+                  separator: ', ',
+              },
+          }
+        },
+        remoteSearch: true,
+        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});
+                }
+              }
+            })
+        }
+    })
+    index_place_list.setValue(gon.place)
+
+
+      var data = form.val("search_form");
+      table = layui.table;
+      var cols_table = [
+          [
+              {
+                  field: 'id',
+                  width: 60,
+                  title: '序号', type: 'numbers',
+                  totalRowText: '合计',
+                  fixed: "left"
+              },
+              {
+                  field: 'number',
+                  width: 120,
+                  title: '编号',
+                  fixed: 'left',
+              },
+              {
+                field: 'name',
+                width: 120,
+                title: '合同名称',
+              },
+              {
+                  field: 'area',
+                  width: 100,
+                  title: '地域',
+              },
+              {
+                  field: 'school',
+                  width: 150,
+                  title: '用户单位',
+                  templet: '#school_name',
+              },
+              {
+                  field: 'property',
+                  width: 150,
+                  title: '客户类型',
+              },
+              {
+                  field: 'department',
+                  width: 150,
+                  title: '部门',
+                  templet: '<div><span title="{{d.department}}">{{d.department}}</span></div>',
+              },
+              {
+                field: 'item_clazz',
+                width: 150,
+                title: '销售品目',
+              },
+              {
+                field: 'brand',
+                width: 150,
+                title: '品牌',
+              },
+              {
+                field: 'specification',
+                width: 150,
+                title: '规格',
+              },
+              {
+                field: 'supplier',
+                width: 150,
+                title: '供货商',
+              }
+          ]
+      ]
+
+      var business_table = table.render({
+          elem: '#contact_product_table',
+          url: '/missions/contracts',
+          autoSort: false,
+          where: {q: data},
+          defaultToolbar: ['filter'],
+          title: '合同数据表',
+          totalRow: true,//开启合并行
+          cols: cols_table,
+
+        limit: 20,
+        limits: [10,15,20,30,40,50,60,70,80,90],
+        page: true,
+        skin: 'line',
+    });
+
+
+    var sort = {}, search = data;
+
+    table.on('sort(contact_product_table)', function (obj) {
+      var data = form.val("search_form");
+      sort.field = obj.field;
+      sort.order = obj.type;
+      table.reload('contact_product_table', {
+          url: '/missions/businesses',
+        initSort: obj,
+        where: {
+            sort: sort,
+            q: search
+        }
+      });
+    })
+
+    // 监听搜索操作
+    form.on('submit(search_bussiness_contract)', function (data) {
+      if (search['clazz']) {
+        data.field['clazz'] = search['clazz']
+      }
+      search = data.field
+      table.reload('contact_product_table', {
+        url: '/missions/contracts',
+        page: {
+          curr: 1
+        },
+       where: {q: search, sort: sort}
+      }, 'data');
+  
+      return false;
+    });
+
+    form.on('submit(reset_business_search)', function (data) {
+      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: ''
+      })
+      business_type_list.setValue([])
+      business_step_list.setValue([])
+      index_place_list.setValue([])
+      return false;
+    });
+
+      table.on('tool(contact_product_table)', function (obj) {
+          var data = obj.data;
+          id = data.id
+            if (obj.event === 'add_event') { // 监听添加操作
+            business_id = data.id
+            var content = miniPage.getHrefContent('/missions/contracts/new_follow_up?id=' + data.id);
+            var openWH = miniPage.getOpenWidthHeight();
+            new_follow_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,
+              success: function (layero, index) {
+                form.render('select');
+              }
+            });
+            $(window).on("resize", function () {
+                layer.full(new_follow_index);
+            });
+          } else if (obj.event === 'assign') {
+              var content = miniPage.getHrefContent('/missions/contracts/' + id + '/assign');
+              var openWH = miniPage.getOpenWidthHeight();
+              name = data.name;
+              sindex = layer.open({
+                  title: '指派合同【' + name + "】售后工程师",
+                  type: 1,
+                  shade: 0.2,
+                  maxmin: true,
+                  shadeClose: true,
+                  area: ['600px', '600px'],
+                  content: content
+              });
+              $(window).on("resize", function () {
+                  layer.full(sindex);
+              });
+              return false;
+          } 
+        });
+     
+  
+  });
+</script>
+<style>
+  .layui-table-tool-temp{
+      padding-right: 30px; !important;
+  }
+  .layui-table-fixed .layui-table-body {
+      height: auto!important;
+  }
+  .layui-table-fixed.layui-hide {
+      display: block!important;
+  }
+
+</style>

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/follow_ups.json.jbuilder

@@ -4,17 +4,15 @@ 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.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.html.erb

@@ -3,6 +3,7 @@
     <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">
@@ -11,6 +12,9 @@
         <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>
 
@@ -31,6 +35,8 @@
         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/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 : ''

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

@@ -94,7 +94,7 @@
     <div class="layui-inline">
         <label class="layui-form-label">项目资金来源：</label>
         <div class="layui-input-inline" style="line-height: 38px;">
-          <%= select_tag "o_business_deployment", options_for_select([''] + EducodeSales::FollowUp::funding_sources.keys, @last_follow_up&.funding_source), class: 'required' %>
+          <%= select_tag "funding_source", options_for_select([''] + EducodeSales::FollowUp::funding_sources.keys, @last_follow_up&.funding_source), class: 'required' %>
         </div>
     </div>
     <br>
@@ -120,7 +120,7 @@
         </div>
     </div>
     <div class="layui-inline">
-        <label class="layui-form-label required" style="width:100px;">签约单位：</label>
+        <label class="layui-form-label" style="width:100px;">签约单位：</label>
         <div class="layui-input-inline" style="line-height: 38px;">
          <div id="add_department" style="width: 200px"></div>
         </div>
@@ -330,10 +330,10 @@
         </div>
         <div class="layui-form-mid layui-word-aux">年</div>
     </div>
-    <div class="layui-form-item layui-form-text" style="margin-top:25px;">
+    <div class="layui-form-item layui-form-text required" style="margin-top:25px;">
       <label class="layui-form-label">最新根据记录：</label>
       <div class="layui-input-block">
-        <textarea name="content" placeholder=" " class="layui-textarea"></textarea>
+        <textarea name="content" placeholder=" " class="layui-textarea" lay-verify="required"></textarea>
       </div>
     </div>
     <div class="layui-form-item m-t-20">
@@ -601,9 +601,9 @@
         })
 
 
-        var add_department = selectInput.render({
+        var add_department_select = selectInput.render({
             elem: '#add_department',
-            name: 'signed_department_id', // 渲染的input的name值
+            name: 'signed_departmen', // 渲染的input的name值
             layFilter: 'test', //同layui form参数lay-filter
           //  layVerify: 'required', //同layui form参数lay-verify
             layVerType: 'tips', // 同layui form参数lay-verType
@@ -624,19 +624,9 @@
           });
 
         form.on('submit(add_follow_up)', function (data) {
-            if (data.field.clazz_id == <%= EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>) {
-                if (data.field.service_time.length == 0) {
-                    layer.msg('请选择服务期', {time: 2000, icon: 2, shade: 0.01});
-                    return false;
-                }
-                if (data.field.o_business_deployment === ''){
-                    layer.msg('请选择部署类型', {time: 2000, icon: 2, shade: 0.01});
-                    return false // 退出添加该条记录
-                }
-            }
             $(".submit-btn").addClass("layui-hide");
-      
             data.field.business_id = "<%= @business.id %>";
+            data.field.signed_department_id = add_department_select.getValue(),
             Rails.ajax({
                 url: "/missions/contracts/add_follow_ups",
                 type: 'POST',
@@ -649,7 +639,7 @@
                     if (res.success == false) {
                         layer.alert(res.msg)
                     } else {
-                       
+                        layer.close(new_follow_index);
                     }
                 }
             })

data/app/views/educode_sales/contracts/product_list.js.erb

@@ -0,0 +1 @@
+$("#contract_product_wraper").html("<%= j render 'product_list' %>");

data/config/routes.rb

@@ -28,6 +28,12 @@ EducodeSales::Engine.routes.draw do
       get :list
       get :new_follow_up
       post :add_follow_ups
+      get :product_list
+    end
+    member do
+      post :advise
+      get :assign
+      post :assign_staff
     end
   end
 

data/db/migrate/20230501034307_create_educode_sales_follow_up_trends.rb

@@ -0,0 +1,12 @@
+class CreateEducodeSalesFollowUpTrends < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_follow_up_trends do |t|
+      t.references :follow_up
+      t.integer :clazz
+      t.text :content
+      t.references :staff
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.75'
+  VERSION = '0.9.76'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.75
+  version: 0.9.76
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-01 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
-- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -218,6 +217,7 @@ files:
 - app/models/educode_sales/eco_staff.rb
 - app/models/educode_sales/filter.rb
 - app/models/educode_sales/follow_up.rb
+- app/models/educode_sales/follow_up_trend.rb
 - app/models/educode_sales/idea.rb
 - app/models/educode_sales/idea_follow.rb
 - app/models/educode_sales/idea_history.rb
@@ -307,11 +307,14 @@ files:
 - app/views/educode_sales/commons/show.json.jbuilder
 - app/views/educode_sales/contracts/_follows.html.erb
 - app/views/educode_sales/contracts/_list.html.erb
+- app/views/educode_sales/contracts/_product_list.html.erb
+- app/views/educode_sales/contracts/assign.html.erb
 - app/views/educode_sales/contracts/follow_ups.json.jbuilder
 - app/views/educode_sales/contracts/index.html.erb
 - app/views/educode_sales/contracts/index.json.jbuilder
 - app/views/educode_sales/contracts/list.js.erb
 - app/views/educode_sales/contracts/new_follow_up.html.erb
+- app/views/educode_sales/contracts/product_list.js.erb
 - app/views/educode_sales/customers/edit.html.erb
 - app/views/educode_sales/customers/edit_department.html.erb
 - app/views/educode_sales/customers/edit_follow_record.html.erb
@@ -653,6 +656,7 @@ files:
 - db/migrate/20230430104708_create_idea_follows.rb
 - db/migrate/20230430121335_add_permissions_for_ideas.rb
 - db/migrate/20230430134710_create_educode_sales_assign_staffs.rb
+- db/migrate/20230501034307_create_educode_sales_follow_up_trends.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -661,7 +665,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -677,7 +681,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.9
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []