educode_sales 1.10.8 → 1.10.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93a3c4bdda6df52bc58177a34c5a39c7330d04d9cbaf4a5d4f4bbe3691d72759
-  data.tar.gz: dd64cb53bd80774ab02cdbd72a94b5684a827c47bd1d5aa51698b1183dbb758e
+  metadata.gz: 8b14ccbfcb9a5061855ca86be07cacb97c60b4775dcfa2a5df9e43ffdef76d7a
+  data.tar.gz: 586ddfdcefed79700eb15c20ccba6b73dbe6ecee3fd12f808d614d843959f536
 SHA512:
-  metadata.gz: 19f7047b112cad5d0f53580aed23fe2fb65955d7418dd28169d7da3c6a5b96c0a30f14485a5b644961deb734b9fb0c59b968c38a5af6920409cdd2143e0de2d7
-  data.tar.gz: 4e3e0da1a8d21ed9d8cdb8cf8a3970dfa5ce554f8f87ad8b8dc30bc19248b63d555bc7ac0b52de91740753ac3ffa93c8b01b6ab9c1b8c415afaa584ca807d20f
+  metadata.gz: fd7f2559d5a6ea7a69482dc0d4cae776e338bcaa99a30b0c303248d5f69abccfbeaf051dc3cbfcfa5b608cf718b7cef989b211f6eef52d4f3b98433b267112fb
+  data.tar.gz: 4c04378292d11f37b2e9c29061470fcec8920c4245bdf7b3c77839e309a20f22b7d6c4ae767a2cf4d4bc37b4d693379464edfbda526b562410a5befb3837a340

data/app/controllers/educode_sales/businesses_controller.rb

@@ -295,6 +295,32 @@ module EducodeSales
             end
           end
 
+          #商机来源
+          if params[:q].present? && params[:q][:source_way].present?
+            if params[:q].present? && params[:q][:source_name].present?
+              if ["会议活动", "渠道代理", "客户"].include?(params[:q][:source_way])
+                if params[:q][:source_way] == '会议活动'
+                  sourcable_id = EducodeSales::Activity.where("name like ?", "%#{params[:q][:source_name]}%").limit(20).pluck(:id)
+                elsif params[:q][:source_way]  == '渠道代理'
+                  sourcable_id = EducodeSales::Place.where("name like ?", "%#{params[:q][:source_name]}%").limit(20).pluck(:id)
+                elsif params[:q][:source_way]  == '客户'
+                  sourcable_id = EducodeSales::Department.where("name like ?", "%#{params[:q][:source_name]}%").limit(20).pluck(:id)
+                end
+
+                if sourcable_id.present?
+                  @businesses = @businesses.where(source_way: params[:q][:source_way], sourcable_id: sourcable_id)
+                else
+                  @businesses = @businesses.none
+                end
+              else
+                @businesses = @businesses.where(source_way: params[:q][:source_way]).where("sourcable_type like ?", "%#{params[:q][:source_name]}%")
+              end
+            else
+              @businesses = @businesses.where(source_way: params[:q][:source_way])
+            end
+          end
+          
+
           # 商机变化
           if params[:q][:clazz_changes].present?
             clazz_changes = EducodeSales::BusinessClazzChange.clazz_changes_value[params[:q][:clazz_changes].to_s]
@@ -406,7 +432,26 @@ module EducodeSales
 
     def create
       department = Department.find(params[:department_id])
-      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id, clazz_id: params[:clazz_id])
+      if params[:sourcable_type].present?
+        if params[:source_way]  == '会议活动'
+          params[:sourcable_type] = 'EducodeSales::Activity'
+        elsif params[:source_way]  == '渠道代理'
+          params[:sourcable_type] = 'EducodeSales::Place'
+        elsif params[:source_way]  == '客户'
+          params[:sourcable_type] = 'EducodeSales::Department'
+        else
+          params[:sourcable_id] = ""
+        end
+      end
+      if ['会议活动', '渠道代理', '客户'].include?(params[:source_way] ) && params[:sourcable_id].blank?
+        params[:sourcable_type] = ""
+      end
+      if params[:sourcable_type].blank?
+        params[:sourcable_id] = ""
+      end
+      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id, clazz_id: params[:clazz_id],
+        sourcable_type: params[:sourcable_type], sourcable_id: params[:sourcable_id], source_way: params[:source_way])
+
       if business.save
         render_success
       else

data/app/controllers/educode_sales/contracts_controller.rb

@@ -344,6 +344,10 @@ module EducodeSales
           if i == 1 && last_follow_up
             # 验收时间
             last_follow_up.reception_at = v
+          elsif i == 0 && last_follow_up
+            # 合同部署时间
+            last_follow_up.deploy_time = v
+            @business.p_deploy_time = v
           end
         end
        
@@ -523,7 +527,7 @@ module EducodeSales
 
     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, :signed_clazz)
+      params.permit(:o_business_deployment, :plan_signed_date, :actual_amount, :bidded_days, :signed_date, :signed_department_id, :service_years, :service_start_time, :service_end_time, :funding_source, :signed_clazz)
     end
 
     def product_up_params

data/app/controllers/educode_sales/customers_controller.rb

@@ -221,11 +221,17 @@ module EducodeSales
             s.major_count,
             s.department_id,
             departments.name AS department_name,
-            (SELECT COUNT(user_extensions.id) FROM user_extensions WHERE user_extensions.department_id = s.department_id AND user_extensions.identity = 0) AS teacher_count,
-            (SELECT COUNT(user_extensions.id) FROM user_extensions WHERE user_extensions.department_id = s.department_id AND user_extensions.identity = 1) AS student_count
+            t.teacher_count,
+            t.student_count
           ").joins("
             JOIN schools ON s.id = schools.id
             LEFT JOIN departments ON s.department_id = departments.id
+            LEFT JOIN (
+              SELECT COUNT(IF(user_extensions.identity = 0, user_extensions.id, 0)) AS teacher_count,
+                     COUNT(IF(user_extensions.identity = 1, user_extensions.id, 1)) AS student_count, user_extensions.department_id
+               FROM user_extensions
+               GROUP BY user_extensions.department_id
+            ) AS t ON  t.department_id = s.department_id
           ")
 
           # part_a_ids = CustomerFollow.all.pluck(:school_id)
@@ -271,6 +277,8 @@ module EducodeSales
             @customers = @customers.where(id: school_ids)
           end
 
+          @count = School.joins("LEFT JOIN departments ON schools.id = departments.school_id").count
+
           if params[:page].present?
             @customers = @customers.order(id: :desc).page(params[:page]).per(params[:limit])
           else

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -33,13 +33,17 @@ module EducodeSales
               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.where("educode_sales_businesses.staff_id = ? OR educode_sales_businesses.id in (?)", @current_admin.id, business_ids)
               business_ids = @businesses.pluck(:id)
-              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids)
+
+              # 指定查看人
+              follow_up_ids = EducodeSales::WatchFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids).or(FollowUp.where(id: follow_up_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)
-              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids)
+              follow_up_ids = EducodeSales::WatchFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+              @follow_ups = FollowUp.where(business_id: business_ids + area_business_ids).or(FollowUp.where(id: follow_up_ids))
             else
               @follow_ups = FollowUp.all
             end
@@ -308,7 +312,7 @@ module EducodeSales
     end
 
     def update_tags
-      followup = FollowUp.find(params[:id])
+      follow_up = FollowUp.find(params[:id])
       tags = []
       tags_name = []
       params[:tags].split(",").uniq.each do |d|
@@ -317,15 +321,34 @@ module EducodeSales
         end
         tags_name << tag.name
         tag.save unless tag.persisted?
-        t = FollowUpTag.find_or_initialize_by(tag_id: tag.id, follow_up_id: followup.id)
+        t = FollowUpTag.find_or_initialize_by(tag_id: tag.id, follow_up_id: follow_up.id)
         t.staff = @current_admin
         tags << t
       end
-      followup.follow_up_tags = tags
-      followup.save
+      follow_up.follow_up_tags = tags
+      follow_up.save
       render json: {success: true, tags: tags_name}
     end
 
+    def add_assign
+      follow_up = FollowUp.find(params[:id])
+      staff_ids = follow_up.watch_follow_ups.pluck(:staff_id)
+
+      common = Common.find_by(clazz: 'staff_type', name: '销售')
+      gon.assign_watch= Staff.joins(:user).where.not(job_type: common.id).where.not(role_id: 11).map { |d| {name: d.user.real_name, value: d.id, selected: staff_ids.include?(d.id)} }
+      render layout: false
+    end
+
+    def update_assign
+      follow_up = FollowUp.find(params[:id])
+      staffs = []
+      params[:staff_ids].split(",").each do |staff_id|
+        staffs << WatchFollowUp.find_or_initialize_by(staff_id: staff_id, follow_up_id: follow_up.id)
+      end
+      follow_up.watch_follow_ups = staffs
+      follow_up.save
+      render json: {success: true, tags: staffs.map { |d| d.staff.user.real_name }}
+    end
 
     private
 

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -6,8 +6,12 @@ module EducodeSales
     def index
       respond_to do |format|
         format.html do
+       
         end
         format.js do
+          gon.edit_record = can?(:update_record, EducodeSales::MoneyPlan)
+          gon.edit_record_self = can?(:update_record_self, EducodeSales::MoneyPlan)
+          gon.staff_id = @current_admin.id
         end
         format.json do
           @money_plan_records = MoneyPlanRecord.left_joins(:money_plan_claims).group("educode_sales_money_plan_records.id").select("educode_sales_money_plan_records.*, COUNT(educode_sales_money_plan_claims.id) AS claim_num")
@@ -132,6 +136,36 @@ module EducodeSales
         if business
           money_plan_record.update(business_id: business.id)
           business.update(return_money: claim.money_plan.money_plan_claims.sum(:amount))
+
+
+          # # 生成跟进信息
+          # last_follow_up = business.last_follow_up
+          # if last_follow_up.present?
+          #   follow_up = last_follow_up.dup
+      
+          #   follow_up.description = "认领了回款记录"
+           
+          #   follow_up.staff = @current_admin
+      
+          #   last_follow_up.assign_follow_ups.each do |d|
+          #     follow_up.assign_follow_ups.build(staff_id: d.staff_id)
+          #   end
+      
+          #   if follow_up.save!
+          #     last_follow_up.key_person.each do |d|
+          #       key_person = d.dup
+          #       key_person.follow_up_id = follow_up.id
+          #       key_person.save
+          #     end
+          #     last_follow_up.money_plans.each do |d|
+          #       d.follow_up_id = follow_up.id
+          #       d.save
+          #     end
+          #     business.update(last_follow_up_id: follow_up.id)
+          #   end
+          # end
+
+
         end
       end
       render_success

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -7,6 +7,7 @@ module EducodeSales
       authorize! :read, MoneyPlan
       respond_to do |format|
         format.html do
+         
         end
         format.json do
           last_follow_up_ids = Business.all.pluck(:last_follow_up_id)
@@ -48,6 +49,9 @@ module EducodeSales
         format.html do
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
+          gon.edit_money_plan = can?(:update, EducodeSales::MoneyPlan)
+          gon.edit_money_plan_self = can?(:update_self, EducodeSales::MoneyPlan)
+          gon.staff_id = @current_admin.id
         end
   
       end
@@ -67,6 +71,10 @@ module EducodeSales
       @money_plan = MoneyPlan.find(params[:id])
       gon.business_id = @money_plan.business_id
       gon.business = [{value: @money_plan.business_id.to_s, name: @money_plan.business&.name}]
+
+      gon.edit_money_plan = can?(:update, EducodeSales::MoneyPlan)
+      gon.edit_money_plan_self = can?(:update_self, EducodeSales::MoneyPlan)
+      gon.staff_id = @current_admin.id
       render layout: false
     end
 

data/app/models/educode_sales/follow_up.rb

@@ -23,6 +23,8 @@ module EducodeSales
     has_many :teachers, through: :key_person
     has_many :assign_follow_ups
     has_many :follow_up_tags, dependent: :destroy
+
+    has_many :watch_follow_ups, dependent: :destroy
     belongs_to :staff
     belongs_to :stage, class_name: 'Common'
     belongs_to :clazz, class_name: 'Common'

data/app/views/educode_sales/assessments/_attendances.html.erb

@@ -34,8 +34,12 @@
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">签到列表</span>
-    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import_attendances"><i class="layui-icon layui-icon-add-circle-fine"></i> 批量导入签到数据</button>
-    <button class="layui-btn layui-btn-normal layui-btn-sm layui-btn-danger data-delete-btn pull-right" lay-event="batch_delete"><i class="layui-icon layui-icon-delete"></i> 批量删除签到数据</button>
+    <% if can?(:import_attendances,  EducodeSales::AssessmentsSetting) %>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import_attendances"><i class="layui-icon layui-icon-add-circle-fine"></i> 批量导入签到数据</button>
+    <% end %>
+    <% if can?(:batch_delete,  EducodeSales::AssessmentsSetting) %>
+      <button class="layui-btn layui-btn-normal layui-btn-sm layui-btn-danger data-delete-btn pull-right" lay-event="batch_delete"><i class="layui-icon layui-icon-delete"></i> 批量删除签到数据</button>
+    <% end %>
   </div>
 </script>
 
@@ -44,8 +48,12 @@
 </div>
 
 <script type="text/html" id="currentTableBar">
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
-  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% if can?(:edit_attendance,  EducodeSales::AssessmentsSetting) %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% end %>
+  <% if can?(:delete_attendance,  EducodeSales::AssessmentsSetting) %>
+    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
 </script>
 
 <script>

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

@@ -6,7 +6,9 @@
     <% if can?(:show, EducodeSales::AssessmentsSetting) %>
       <li data="assessments" > 考核指标设置</li>
     <%end %>
-    <li class="">签到记录</li>
+    <% if can?(:show_attendances,  EducodeSales::AssessmentsSetting) %>
+      <li class="">签到记录</li>
+    <% end %>
   </ul>
   <!--<div class="layuimini-main min-height-table"></div>-->
   <div class="layui-tab-content">

data/app/views/educode_sales/businesses/edit.html.erb

@@ -68,34 +68,38 @@
       $ = layui.$;
     selectInput = layui.selectInput;
 
-    var levels_select = xmSelect.render({
-      el: '#levels',
-      name: 'level_ids',
-      data: gon.levels,
-      on: function(data) {
-        var is_secret = false;
-        data.arr.forEach(function(i) {
-          if (i.name == '战略型' || i.name == '保密型') {
-            is_secret = true;
+    if ($("#levels").length > 0) {
+      var levels_select = xmSelect.render({
+        el: '#levels',
+        name: 'level_ids',
+        data: gon.levels,
+        on: function(data) {
+          var is_secret = false;
+          data.arr.forEach(function(i) {
+            if (i.name == '战略型' || i.name == '保密型') {
+              is_secret = true;
+            }
+          })
+          if (is_secret) {
+            $("#watch_ids_wraper").removeClass('layui-hide')
+          } else {
+            $("#watch_ids_wraper").addClass('layui-hide')
           }
-        })
-        if (is_secret) {
-          $("#watch_ids_wraper").removeClass('layui-hide')
-        } else {
-          $("#watch_ids_wraper").addClass('layui-hide')
         }
+      })
+    }
+    if ($("#watch_ids").length > 0) {
+      var watch_id_select = xmSelect.render({
+        el: '#watch_ids',
+        name: 'watch_ids',
+        data: gon.watche_ids,
+        filterable: true,
+      })
+      if (gon.is_secret) {
+        $("#watch_ids_wraper").removeClass("layui-hide")
       }
-    })
-
-    var watch_id_select = xmSelect.render({
-      el: '#watch_ids',
-      name: 'watch_ids',
-      data: gon.watche_ids,
-      filterable: true,
-    })
-    if (gon.is_secret) {
-      $("#watch_ids_wraper").removeClass("layui-hide")
     }
+  
     var source_way = gon.source_way;
     form.on('select(source_id)', function(data){
       source_way = data.value;
@@ -162,20 +166,22 @@
         
       }
     });
-
-    var merge_business_select = xmSelect.render({
-      el: '#merge_business', 
-      filterable: true,
-      name: 'merge_business_ids',
-      remoteSearch: true,
-      remoteMethod: function(val, cb, show){
-        request.get('missions/businesses/search?id=' + parent.id + "&q=" + val, {},
-         function(res) {
-          cb(res.data)
-        })
-      },
-      data: []
-    })
+    if ($("#merge_business").length > 0) {
+      var merge_business_select = xmSelect.render({
+        el: '#merge_business', 
+        filterable: true,
+        name: 'merge_business_ids',
+        remoteSearch: true,
+        remoteMethod: function(val, cb, show){
+          request.get('missions/businesses/search?id=' + parent.id + "&q=" + val, {},
+          function(res) {
+            cb(res.data)
+          })
+        },
+        data: []
+      })
+    }
+   
 
 
       var sourcable_id = gon.sourcable_id;

data/app/views/educode_sales/businesses/get_export_data.json.jbuilder

@@ -32,6 +32,15 @@ json.data do
     json.divide_money d.divide_amount
     json.budget_amount d.budget_amount
     json.area d.department&.school&.province
+
+    json.keys_person_count d.last_follow_up.present? ? EducodeSales::KeyPerson.where("follow_up_id = #{d.last_follow_up.id}").count : 0
+    json.rival d.last_follow_up&.rival || ''
+
+    if ["会议活动", "渠道代理", "客户"].include?(d.source_way)
+      json.source "#{d.source_way} #{d.sourcable&.name}"
+    else
+      json.source "#{d.source_way} #{d.sourcable_type}"
+    end
     # school_property = d.department&.school&.school_property
     # property = []
 

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

@@ -91,35 +91,13 @@
                   <input type="text" class="layui-input" id="bidded_date" name="bidded_date" placeholder=" - " autocomplete="off">
                 </div>
               </div>
-              <div class="layui-inline show_item" 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="signed_date" name="signed_date" placeholder=" - " autocomplete="off">
-                </div>
-              </div>
-              <div class="layui-inline show_item" 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_at" name="date_at" placeholder=" - " autocomplete="off">
-                </div>
-              </div>
               <div class="layui-inline show_item" 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" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
-                <label class="layui-form-label">部署类型</label>
-                <div class="layui-input-inline">
-                  <select name="o_business_deployment">
-                    <option value=""></option>
-                    <option value="1">公有云</option>
-                    <option value="2">私有云</option>
-                    <option value="3">混合云</option>
-                  </select>
-                </div>
-              </div>
+              
               <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
                 <label class="layui-form-label">商机等级</label>
                 <div class="layui-input-inline">
@@ -130,6 +108,15 @@
                   </select>
                 </div>
               </div>
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
+                <label class="layui-form-label">商机来源</label>
+                <div class="layui-inline">
+                  <%= select_tag "source_way", options_for_select(EducodeSales::Business.source_ways.keys), { include_blank: true, "lay-filter": 'source_id_select' } %>
+                </div>
+                <div class="layui-inline" style="line-height: 38px;display:none;" id="source_input_wraper">
+                  <input type="text" class="layui-input" name="source_name" placeholder="" autocomplete="off" id="source_name_input">
+                </div>
+              </div>
               <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
                 <label class="layui-form-label">销售经理</label>
                 <div class="layui-input-inline">
@@ -277,19 +264,46 @@
           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
+        form.on('select(source_id_select)', function(data){
+          setSourceWay(data.value);
+          $("#source_name_input")[0].value = "";
         });
 
-
+ 
+      function setSourceWay(value) {
+        if (value == '400电话' || value == '商务邮箱') {
+          $("#source_input_wraper").hide()
+        } else {
+          $("#source_input_wraper").show()
+          var text = "";
+          switch (value) {
+            case '会议活动':
+              text = "请选择活动运营";
+              break;
+            case '公司资源':
+              text = "请填写公司领导、部门其他同事姓名";
+              break;
+            case '渠道代理':
+              text = "请选择渠道";
+              break;
+            case '合作伙伴':
+              text = "请填写合作伙伴公司名称";
+              break;
+            case '招标信息':
+              text = "请填写招标信息";
+              break;
+            case '客户':
+              text = "请选择客户";
+              break;
+            case '朋友':
+              text = "请填写姓名";
+              break;
+          }
+          $("#source_name_input")[0].placeholder = text;
+        }
+      }
 
         // $('#businesses_table_wraper .layui-table-body').on('scroll', function(e) {
         //   var leftPx = $(e.target).scrollLeft(); //获取表格body，滚动条距离左边的长度
@@ -478,7 +492,7 @@
                 },
                 {
                     field: 'source',
-                    width: 90,
+                    width: 150,
                     title: '商机来源',
                     hide: gon.filter.source
                 },
@@ -773,8 +787,6 @@
                 select: data.select,
                 staff_id: data.staff_id,
                 staff_manages: data.staff_manages,
-                signed_date: data.signed_date,
-                date_at: data.date_at,
                 bidded_date: data.bidded_date,
                 business_year: data.business_year,
                 year: data.year,

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

@@ -63,7 +63,12 @@ json.data do
     json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '实际回款').present? ? (d.last_follow_up.money_plans.where(clazz: '实际回款').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
     json.place d.last_follow_up&.place&.name
     json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff&.user&.real_name : d.staff&.user&.real_name
-    json.source d.source
+    if ["会议活动", "渠道代理", "客户"].include?(d.source_way)
+      json.source "#{d.source_way} #{d.sourcable&.name}"
+    else
+      json.source "#{d.source_way} #{d.sourcable_type}"
+    end
+   
     json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
     json.current_staff_id @current_admin.id
     json.staff_id d.staff_id

data/app/views/educode_sales/businesses/new.html.erb

@@ -14,13 +14,20 @@
        <a href="/missions/customers" style=" color: #0000FF">添加单位/部门</a>
      </div>
      <br>
-      <div class="layui-inline" style="padding-top: 20px">
+      <!-- <div class="layui-inline" style="padding-top: 20px">
         <label class="layui-form-label ">商机来源</label>
         <input  type="text" name="source" autocomplete="off" class="layui-input" style="width: 300px;" placeholder="请输入商机来源">
-      </div>
+      </div> -->
       <div class="layui-inline" style="padding-top: 20px">
-        <p style="padding-left: 40px">请填写提供本商机的人名（如‘张明’）；如果为非头歌用户，请增加单位信息（如‘张明，华为公司’）</p>
+        <label class="layui-form-label required">商机来源</label>
+        <div class="layui-inline">
+        <%= select_tag "source_way", options_for_select(EducodeSales::Business.source_ways.keys), { include_blank: true, "lay-filter": 'source_id', "lay-verify": "required" } %>
+        </div>
+        <div class="layui-inline" style="line-height: 38px;" id="source_wraper">
+          <div id="customer_id" style="width: 360px"></div>
+        </div>
       </div>
+ 
       <br>
       <div class="layui-inline" style="padding-top: 20px">
         <label class="layui-form-label required">项目类型</label>
@@ -70,6 +77,85 @@
       }
     });
 
+    var source_way = "";
+    form.on('select(source_id)', function(data){
+      source_way = data.value;
+      setSourceWay(data.value);
+      $("#" + customer_select._input)[0].value = "";
+    });
+
+ 
+    function setSourceWay(value) {
+      if (value == '400电话' || value == '商务邮箱') {
+        $("#source_wraper").hide()
+      } else {
+        $("#source_wraper").show()
+        var text = "";
+        switch (value) {
+          case '会议活动':
+            text = "请选择活动运营";
+            break;
+          case '公司资源':
+            text = "请填写公司领导、部门其他同事姓名";
+            break;
+          case '渠道代理':
+            text = "请选择渠道";
+            break;
+          case '合作伙伴':
+            text = "请填写合作伙伴公司名称";
+            break;
+          case '招标信息':
+            text = "请填写招标信息";
+            break;
+          case '客户':
+            text = "请选择客户";
+            break;
+          case '朋友':
+            text = "请填写姓名";
+            break;
+        }
+        $("#" + customer_select._input)[0].placeholder = text;
+      }
+    }
+
+    var sourcable_id = "";
+    var customer_select = selectInput.render({
+        elem: '#customer_id',
+        name: 'sourcable_type', // 渲染的input的name值
+        layFilter: 'test', //同layui form参数lay-filter
+      //  layVerify: 'required', //同layui form参数lay-verify
+        layVerType: 'tips', // 同layui form参数lay-verType
+        layReqText: '请填写文本', //同layui form参数lay-ReqText
+        hasSelectIcon: false,
+        placeholder: '请输入商机来源', // 渲染的inputplaceholder值
+        remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
+        remoteMethod: function (value, cb) { // 远程搜索的回调函数
+          if (!value) {
+          sourcable_id = "";
+            return cb([]);
+          }
+          if (['会议活动', '渠道代理', '客户'].includes(source_way)) {
+          var type = "";
+          if (source_way == '客户') {
+            type = 'customer';
+          } else if (source_way == '渠道代理') {
+            type = 'place';
+          } else if (source_way == '会议活动') {
+            type = 'active';
+          }
+          request.get('missions/search_customer?q=' + value + "&type=" + type, {}, function (res) {
+            if (res.data.length == 0) {
+              customer_select.emptyValue();
+              return cb([])
+            }
+            return cb(res)
+          })
+        }
+        }
+      });
+
+
+
     // 当前弹出层，防止ID被覆盖
     var parentIndex = layer.index;
 
@@ -83,6 +169,9 @@
         name: data.field.name,
         source: data.field.source,
         clazz_id: data.field.clazz_id,
+        source_way: data.field.source_way,
+        sourcable_type: data.field.sourcable_type,
+        sourcable_id: customer_select.getValue() || sourcable_id,
 
       }, function (res) {
         if (res.success == false) {

data/app/views/educode_sales/businesses/time_line.html.erb

@@ -34,6 +34,16 @@
         </span>
         <!-- <span class="layui-badge layui-bg-green"></span> -->
         <button type="button" class="layui-btn layui-btn-xs layui-btn-primary add-tag" data-id="<%= f.id %>"><i class="layui-icon layui-icon-addition"></i>标签设置</button>
+
+        <br/>
+        <br/>
+        <span id="assign_<%= f.id %>">
+        <% f.watch_follow_ups.each do |d| %>
+          <span class="layui-badge layui-bg-green"><%= d.staff&.name %></span>
+        <% end %>
+        </span>
+        <!-- <span class="layui-badge layui-bg-green"></span> -->
+        <button type="button" class="layui-btn layui-btn-xs layui-btn-primary assign-staff" data-id="<%= f.id %>"><i class="layui-icon layui-icon-addition"></i>指定人查看</button>
       </p>
     </div>
   </li>
@@ -150,6 +160,28 @@
       });
     })
 
+    $(".assign-staff").on("click", function(e) {
+      var data = e.currentTarget.dataset;
+      follow_up_id = data.id
+      var content = miniPage.getHrefContent('/missions/follow_ups/' + follow_up_id + '/add_assign');
+      var openWH = miniPage.getOpenWidthHeight();
+      tindex = layer.open({
+        title: '指定人查看',
+        type: 1,
+        shade: 0.2,
+        maxmin: true,
+        shadeClose: true,
+        area: ['700px','600px'],
+       // offset: [openWH[2] + 'px', openWH[3] + 'px'],
+        content: content
+      });
+      $(window).on("resize", function () {
+          layer.full(sindex);
+      });
+    })
+
+  
+
     
 
     });

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

@@ -97,6 +97,13 @@
           <%= select_tag "funding_source", options_for_select([''] + EducodeSales::FollowUp::funding_sources.keys, @last_follow_up&.funding_source), class: 'required' %>
         </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">合同额(万)</label>
+      <div class="layui-input-inline">
+        <input name="actual_amount" type="number" class="layui-input" autocomplete="off" placeholder="本单位的签单金额"
+               value="<%= @last_follow_up&.actual_amount.to_f.round(6) %>">
+      </div>
+    </div>
     <br>
     <h2 style="padding-left:20px;margin-top: 25px;">签单</h2>
     <hr>

data/app/views/educode_sales/customers/list.json.jbuilder

@@ -48,12 +48,12 @@ json.data do
     json.department d['department_name'] || ''
     json.major_count d['major_count']
     json.department_id d['department_id'] || ''
-    json.teacher_counts d['teacher_count']
-    json.student_counts d['student_count']
+    json.teacher_counts d['teacher_count'] || 0
+    json.student_counts d['student_count'] || 0
   end
 end
 
 json.code 0
 if params[:page].present?
-  json.count @customers.total_count
+  json.count @count
 end

data/app/views/educode_sales/follow_ups/add_assign.html.erb

@@ -0,0 +1,42 @@
+<%= Gon::Base.render_data %>
+    <div class="layui-form layuimini-form">
+        <div class="layui-form-item" style="padding: 25px">
+            <div id="assign_staff"></div>
+            <div class="layui-form-item text-center" style="margin-top: 60px;">
+                <button class="layui-btn layui-btn-normal" lay-submit lay-filter="btn">提交</button>
+            </div>
+        </div>
+    </div>
+    <script>
+        layui.use(['form', 'request', 'xmSelect'], function() {
+            var form = layui.form,
+                request = layui.request,
+                xmSelect = layui.xmSelect,
+                $ = layui.$;
+
+            var place_list = xmSelect.render({
+                el: '#assign_staff',
+                name: "staff_ids",
+                tips: '请选择人员',
+                clickClose: true,
+                paging: true,
+                filterable: true,
+                data: gon.assign_watch,
+            })
+
+            form.on("submit(btn)", function(form) {
+                request.post('missions/follow_ups/' + parent.follow_up_id + '/update_assign',
+                    form.field,
+                    function(res) {
+                        if (res.success) {
+                            $("#assign_" + parent.follow_up_id).html("");
+                            res.tags.forEach(function(tag) {
+                                $("#assign_" + parent.follow_up_id).append(' <span class="layui-badge layui-bg-green">' + tag + '</span')
+                            })
+                        }
+                        layer.close(tindex);
+                    })
+            })
+
+        })
+    </script>

data/app/views/educode_sales/money_plan_records/_index.html.erb

@@ -1,3 +1,4 @@
+<%= Gon::Base.render_data %>
 <div style="margin: 10px 10px 10px 10px" id="money_plan_record">
     <form class="layui-form layui-form-pane" lay-filter="submit_form_record">
         <div class="layui-form-item">
@@ -52,13 +53,13 @@
 </script>
 
 <script type="text/html" id="currentTableBarmoney_record">
-    <% if can? :update_record, EducodeSales::MoneyPlan %>
+    {{# if (gon.edit_record || d.staff_id == gon.staff_id && gon.edit_record_self) {}}
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
-    <% end %>
+    {{# }}}
     <% if can? :delete_update_record, EducodeSales::MoneyPlan %>
     <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="delete">删除</a>
     <% end %>
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="confirm">认领回款</a>
+    <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="confirm">认领回款</a>
 </script>
 
 <script>

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

@@ -10,6 +10,7 @@ json.data do
     json.school d.business&.school&.name
     json.school_id d.business&.school_id
     json.staff d.staff.user.real_name
+    json.staff_id d.staff_id
     json.number d.business&.number
     json.payer_name d.payer_name
     if d['claim_num'] > 0

data/app/views/educode_sales/money_plans/_index.html.erb

@@ -1,3 +1,4 @@
+<%= Gon::Base.render_data %>
 <div style="margin: 10px 10px 10px 10px" id="money_plan_list">
     <form class="layui-form layui-form-pane" lay-filter="search_plans">
         <div class="layui-form-item">
@@ -23,7 +24,9 @@
     </form>
 </div>
 <script type="text/html" id="toolbar_money_plan">
+  <% if can? :create, EducodeSales::MoneyPlan %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" style="margin-left: 20px;" lay-event="addMoney">添加回款计划</button>
+    <% end %>
 </script>
 
 <table class="layui-hide" id="money_plan_table" lay-filter="money_plan_table"></table>
@@ -32,9 +35,13 @@
     <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
 </script>
 <script type="text/html" id="currentTableBarmoney_plan">
+    {{# if (gon.edit_money_plan || d.staff_id == gon.staff_id && gon.edit_money_plan_self) {}}
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    {{# }}}
+    <% if can? :delete, EducodeSales::MoneyPlan %>
     <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="delete">删除</a>
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="apply">开票申请</a>
+    <% end %>
+    <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="apply">开票申请</a>
     <!-- <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">催款提醒</a> -->
 
 </script>

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

@@ -11,6 +11,7 @@ json.data do
     json.school d.business.school.name
     json.school_id d.business.school_id
     json.staff d.staff.user.real_name
+    json.staff_id d.staff_id
     json.number d.business.number
     json.category d.category || ''
     json.payment_clause d.payment_clause

data/config/routes.rb

@@ -157,6 +157,8 @@ EducodeSales::Engine.routes.draw do
       get :upload_file
       get :add_tag
       post :update_tags
+      get :add_assign
+      post :update_assign
     end
   end
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.8'
+  VERSION = '1.10.10'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.8
+  version: 1.10.10
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-15 00:00:00.000000000 Z
+date: 2023-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -364,6 +364,7 @@ files:
 - app/views/educode_sales/customers/show_follow.json.jbuilder
 - app/views/educode_sales/customers/show_follow_record.html.erb
 - app/views/educode_sales/customers/show_majors.html.erb
+- app/views/educode_sales/follow_ups/add_assign.html.erb
 - app/views/educode_sales/follow_ups/add_tag.html.erb
 - app/views/educode_sales/follow_ups/file.html.erb
 - app/views/educode_sales/follow_ups/index.json.jbuilder
@@ -758,7 +759,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.