educode_sales 1.10.20 → 1.10.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8908d0c995259936abab94c6b0a235b53d28665b95436e06da08dca21fed73e
-  data.tar.gz: 669ac2995a1f97f84b428d96be113636aba86bb59d5a39f43f3d2fdf409169b1
+  metadata.gz: c2b8c0d76ccb06751726aeef62b4b04f234424db8b848d62f086b530b1213d25
+  data.tar.gz: 88f36d9731d556cdfedd495e0ad198e90baeecf454352fc8faf17d9dd373c3a9
 SHA512:
-  metadata.gz: 42d35a31b42ffb22685ecbb1269680c64e7a14edc2a43fa5f3e2599282343e6c2f561a7ee3ffca26b7cdafe8ecebb1106353dd6027d5452a0328935acd2deddd
-  data.tar.gz: fbb54ac9f06b76958722487a110529bfb323ed56f537f9a8946f9f4682fc22972b89722171b927fd0b749146d94fcde82b1e0caae4adae819f5968ff4b9b29e8
+  metadata.gz: 99412e792e86479290e2d09a62aced8ae6bc6cd32d448450d9e0b4898d5df54358e683a70b94038eb37474ba663b6d1cbe9e4b24a8440dcef2e6ca17a3d19e06
+  data.tar.gz: cb3ba8ffa9e9cf91ade0cf3a74fe5e5fc13767d05a1dfa12180fb699abbb70cbc380469b55b11b0900a7c0930afd2ba395148f532c23f3fcba70f7794fca7913

data/app/controllers/educode_sales/assessments_controller.rb

@@ -8,6 +8,7 @@ module EducodeSales
     def index
         respond_to do |format|
           format.html do
+            gon.assement_list = EducodeSales::AssessmentsSetting::CLAZZ.map { |d, i| {value: d, name: i } }
             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]}  # [[], [], ............]
             # 导出
@@ -53,6 +54,10 @@ module EducodeSales
     end
 
     def finished
+      @year = params[:q].present? && params[:q][:assessment_year].present? ? params[:q][:assessment_year] : Time.now.year
+      EducodeSales::AssessmentsSetting.update_stats(@year, params[:assessment_id])
+
+
       if @current_admin.is_admin?
         @assessments = AssessmentsSetting.all
       else
@@ -67,6 +72,7 @@ module EducodeSales
           @assessments = AssessmentsSetting.all
         end
       end
+      
 
       if params[:assessment_year].present?
         @assessments = @assessments.where(assessment_year: Time.new(params[:assessment_year])..Time.new(params[:assessment_year]).end_of_year)

data/app/controllers/educode_sales/ideas_controller.rb

@@ -3,7 +3,35 @@ require_dependency "educode_sales/application_controller"
 module EducodeSales
   class IdeasController < ApplicationController
 
-    before_action :find_idea, only: [:edit, :destroy, :detail, :history, :update]
+    before_action :find_idea, only: [:edit, :destroy, :detail, :history, :update, :assign, :assign_staff, :assign_sale_staff, :update_sale_staff]
+
+    def assign
+      selected_staff_ids = @idea.assist_staff_ids.map(&:to_i)
+      staffs = Staff.where.not(role_id: 11).includes(:user)
+      gon.ideas_staffs = staffs.map { |d| { name: d.user.real_name, value: d.id, selected: selected_staff_ids.include?(d.id) } }
+      render layout: false
+    end
+
+    # 指派协作人  assist_staff_ids协作人
+    def assign_staff
+      @idea.assist_staff_ids = params[:to_id].to_s.split(",")
+      @idea.save
+      render_success
+    end
+
+    def assign_sale_staff
+      selected_staff_ids = Array(@idea.staff_id)
+      staffs = Staff.where.not(role_id: 11).includes(:user)
+      gon.sales_staffs = staffs.map { |d| { name: d.user.real_name, value: d.id, selected: selected_staff_ids.include?(d.id) } }
+      render layout: false
+    end
+
+    # 指派方案经理 staff_id
+    def update_sale_staff
+      @idea.staff_id = params[:to_id]
+      @idea.save
+      render_success
+    end
 
     def index
       respond_to do |format|
@@ -24,16 +52,14 @@ module EducodeSales
             level = @current_admin.role.role_areas.find_by(clazz: '方案管理').try(:level)
             case level
             when '自己'
-              # 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)
-              idea_ids = Idea.all.pluck(:other_staff_ids).flatten.uniq
+              idea_ids = Idea.all.select { |d| Array(d.other_staff_ids).include?(@current_admin.id) || d.sale_staff_id == @current_admin.id || Array(d.assist_staff_ids).include?(@current_admin.id) || d.staff_id == @current_admin.id }.map { |d| d.id }
               @ideas = Idea.where("educode_sales_ideas.creator_id = ? OR educode_sales_ideas.id in (?)", @current_admin.id, idea_ids)
             when '区域'
               # 查看区域商机，需要排除掉其它人员手上的监管学校
               other_staff_school_id = EducodeSales::StaffSchool.where.not(staff_id: @current_admin.id).where("school_id IN (SELECT school_id FROM educode_sales_staff_schools WHERE staff_id = #{@current_admin.id}) IS NOT TRUE").distinct.pluck :school_id
 
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id) + StaffSchool.where(staff_id: @current_admin.id).pluck(:school_id) - other_staff_school_id
-              idea_ids = Idea.all.pluck(:other_staff_ids).flatten.uniq
+              idea_ids = Idea.all.select { |d| Array(d.other_staff_ids).include?(@current_admin.id) || d.sale_staff_id == @current_admin.id || Array(d.assist_staff_ids).include?(@current_admin.id) || d.staff_id == @current_admin.id }.map { |d| d.id }
               @ideas = @ideas.joins(department: :school).where("schools.id in (?) OR educode_sales_ideas.creator_id = ? OR educode_sales_ideas.id in (?)", school_ids, @current_admin.id, idea_ids)
             else
               @ideas = @ideas
@@ -116,8 +142,8 @@ module EducodeSales
         idea.department_id = idea.business&.department_id
       end
       idea.attachment_ids = attachment_ids
-      idea.assist_staff_ids = assist_staff_ids
-      idea.other_staff_ids = other_staff_ids
+      # idea.assist_staff_ids = assist_staff_ids
+      # idea.other_staff_ids = other_staff_ids
       idea.save
       render_success
     end
@@ -134,11 +160,11 @@ module EducodeSales
       @idea.assign_attributes(idea_params)
       # @idea.school_id = Department.find_by_id(@idea.department_id)&.school_id
       assist_staff_ids = Array(params[:assist_staff_ids].to_s.split(","))
-      @idea.assist_staff_ids = assist_staff_ids
+      # @idea.assist_staff_ids = assist_staff_ids
       attachment_ids = Array(params[:attachment_ids].to_s.split(","))
       @idea.attachment_ids = attachment_ids
       other_staff_ids = Array(params[:other_staff_ids].to_s.split(","))
-      @idea.other_staff_ids = other_staff_ids
+      # @idea.other_staff_ids = other_staff_ids
       if @idea.business_id.present?
         @idea.school_id = @idea.business&.department&.school_id
         @idea.department_id = @idea.business&.department_id
@@ -267,7 +293,7 @@ module EducodeSales
       params.permit(:name, :level, :staff_id,
                     :status, :types, :model, :hardware, :project,
                     :money, :end_time, :content, :department_id, :school_id,
-                    :manager_name, :manager_phone, :school_name, :department_name, :sale_staff_id, :attachment_id, :idea_type, :business_id)
+                    :manager_name, :manager_phone, :school_name, :department_name, :attachment_id, :idea_type, :business_id)
     end
 
     def find_idea

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -90,9 +90,20 @@ module EducodeSales
     def create
       business = Business.find(params[:business_id])
       data = []
+      week = Time.now.strftime('%W').to_i
+      current_week = ""
+      staff_manage_ids = business&.last_follow_up&.assign_follow_ups.present? ? business.last_follow_up.assign_follow_ups.pluck(:staff_id) : [business.staff_id]
       (params[:num].to_i+1).times do |i|
+        _week = params["date_at[#{i}]"].to_date.strftime('%W').to_i
+        current_week = _week if _week == week
         business.money_plans.create(category: params["category[#{i}]"], amount: params["amount[#{i}]"], payment_clause: params["payment_clause[#{i}]"], date_at: params["date_at[#{i}]"], follow_up_id: business.last_follow_up_id, staff_id: @current_admin.id )
       end
+      if current_week.present?
+        staff_manage_ids.each do |staff_id|
+          EducodeSales::SalePlan.create(month: Time.now.beginning_of_month, weekly: week, content: "提醒：请补充回款计划内容！", business: business, staff_id: staff_id, finish_rate: '0' )
+          EducodeSales::SalePlan.create(month: Time.now.beginning_of_month, content: "提醒：请补充回款计划内容！", business: business, staff_id: staff_id, finish_rate: '0' )
+        end
+      end
       render_success
     end
 

data/app/models/educode_sales/assessments_setting.rb

@@ -41,7 +41,82 @@ module EducodeSales
 
 
 
+    def self.update_assessment_value(assessment_id, year, data)
+      assessments = EducodeSales::AssessmentsSetting.where(assessment: assessment_id).where("assessment_year >= ? and assessment_year <= ?", "#{year}-01-01 00:00:00".to_date, "#{year}-12-31 23:59:00".to_date)
+      assessments.each do |ass|
+       if data[ass.staff_id].present?
+        data_count = []
+        data[ass.staff_id].each do |d|
+          data_count[d['month']-1] = d['value']
+        end
+
+        data_count[12] = data_count[0].to_f  + data_count[1].to_f  + data_count[2].to_f
+        data_count[13] = data_count[3].to_f  + data_count[4].to_f  + data_count[5].to_f
+        data_count[14] = data_count[6].to_f  + data_count[7].to_f  + data_count[8].to_f
+        data_count[15] = data_count[9].to_f  + data_count[10].to_f  + data_count[11].to_f
+        data_count[16] = data_count[12].to_f + data_count[13].to_f + data_count[14].to_f + data_count[15].to_f
+        ass.update(annual_progress: data_count[16],
+          first_quarter_progress: data_count[12],
+          second_quarter_progress: data_count[13],
+          third_quarter_progress: data_count[14], 
+          fourth_quarter_progress: data_count[15],
+          january_progress: data_count[0],
+          february_progress: data_count[1],
+          march_progress: data_count[2], 
+          april_progress: data_count[3], 
+          may_progress: data_count[4],
+          june_progress: data_count[5],
+          july_progress: data_count[6],
+          august_progress: data_count[7],
+          september_progress: data_count[8],
+          october_progress: data_count[9],
+          november_progress: data_count[10],
+          december_progress: data_count[11])
+       end
+      end
+    end
+
+    def self.update_stats(year, assessment_id)
+      Rails.cache.fetch("stats_by_assessment_#{year}", :expires_in => 1.days) do
+        self.stats_by_return_money(year)
+        self.stats_by_business(year)
+        self.stats_by_contracts(year)
+        true
+      end
+    end
+
+    def self.stats_by_business(year)
+       # 商机目标完成情况
+        ids = EducodeSales::Common.where(extras: %w[a_class b_class c_class d_class e_class]).pluck(:id)
+        data = EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id in (?) ",ids)
+                                            .where("educode_sales_follow_ups.created_at >= ? and educode_sales_follow_ups.created_at <= ?", "#{year}-01-01 00:00:00".to_date, "#{year}-12-31 23:59:59".to_date)
+                                            .group("educode_sales_follow_ups.staff_id, MONTH(educode_sales_follow_ups.created_at)").select("SUM(budget_amount) AS value, educode_sales_follow_ups.staff_id, MONTH(educode_sales_follow_ups.created_at) AS month")
+                                            .group_by{|d| d.staff_id }
+        self.update_assessment_value(7, year, data)
+    end
+
+
+    def self.stats_by_contracts(year)
+      # 中标目标
+        contract_ids = EducodeSales::Common.where(clazz: '商机阶段', name: ['已中标', '已签单', '已验收', '回款中', '服务中', '已结束']).pluck(:id)
+        data = EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.stage_id in (?) ", contract_ids)
+        .where("educode_sales_follow_ups.created_at >= ? and educode_sales_follow_ups.created_at <= ?", "#{year}-01-01 00:00:00".to_date, "#{year}-12-31 23:59:59".to_date)
+        .group("educode_sales_follow_ups.staff_id, MONTH(educode_sales_follow_ups.created_at)").select("SUM(actual_amount) AS value, educode_sales_follow_ups.staff_id, MONTH(educode_sales_follow_ups.created_at) AS month")
+        .group_by{|d| d.staff_id }
+        self.update_assessment_value(18, year, data)
+    end
+
+    def self.stats_by_return_money(year)
+      # 回款目标完成
+        data = EducodeSales::MoneyPlanClaim.joins(:money_plan)
+                                    .where("educode_sales_money_plans.created_at >= ? and educode_sales_money_plans.created_at <= ?", "#{year}-01-01 00:00:00".to_date, "#{year}-12-31 23:59:59".to_date)
+                                    .group("educode_sales_money_plans.staff_id, MONTH(educode_sales_money_plans.created_at)").select("SUM(educode_sales_money_plan_claims.amount) AS value, educode_sales_money_plans.staff_id, MONTH(educode_sales_money_plans.created_at) AS month")
+                                    .group_by{|d| d.staff_id }
+        self.update_assessment_value(2, year, data)
+    end
 
   end
+
+
 end
 

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

@@ -10,9 +10,7 @@
       <div class="layui-inline">
         <label class="layui-form-label">考核指标</label>
         <div class="layui-input-inline">
-          <select class="layui-select" name="assessment_id" >
-            <%= options_for_select EducodeSales::AssessmentsSetting::CLAZZ.invert.to_a, 7 %>
-          </select>
+          <div id="assement_id"></div>
         </div>
       </div>
       <div class="layui-inline">
@@ -44,7 +42,7 @@
 </script>
 
 <script>
-  layui.use(['form', 'table', 'miniPage', 'element', 'rate', 'laydate', 'request'], function () {
+  layui.use(['form', 'table', 'miniPage', 'element', 'rate', 'laydate', 'request', 'xmSelect'], function () {
 
     var $ = layui.jquery,
       form = layui.form,
@@ -52,7 +50,8 @@
       request = layui.request,
       table = layui.table,
       rate = layui.rate,
-      miniPage = layui.miniPage;
+      xmSelect = layui.xmSelect,
+      miniPage = layui.miniPage,
       dropdown = layui.dropdown;
 
 
@@ -62,6 +61,11 @@
     });
 
 
+    var assement_list = xmSelect.render({
+      el: '#assement_id',
+      data: gon.assement_list
+  })
+
 
     var progress_table = table.render({
       elem: '#finished_table'
@@ -119,7 +123,9 @@
     loadFinishTable(form.val('assessment_progress_form'))
 
     form.on('submit(progress_search_btn)', function (data) {
-      loadFinishTable(data.field)
+      var search = data.field;
+      search.assessment_id = assement_list.getValue('valueStr').split(",");
+      loadFinishTable(search);
       return false;
     })
 

data/app/views/educode_sales/assessments/finished.json.jbuilder

@@ -32,7 +32,6 @@ json.data do
     json.rate_2  completion_rate(assessment.second_quarter, assessment.second_quarter_progress)
     json.rate_3   completion_rate(assessment.third_quarter, assessment.third_quarter_progress)
     json.rate_4   completion_rate(assessment.fourth_quarter,assessment.fourth_quarter_progress)
-
     #  得分_score
     if assessment.assessment == 1
       # json.assessment '签单金额'

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

@@ -1,3 +1,4 @@
+<%= Gon::Base.render_data %>
 <div class="layui-tab" lay-filter="sale_tab" >
   <ul class="layui-tab-title">
     <% if can?(:show_result, EducodeSales::AssessmentsSetting) %>

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

@@ -5,13 +5,13 @@
     <div class="layui-inline">
       <label class="layui-form-label">单位</label>
       <div class="layui-input-inline" style="line-height: 38px;">
-        <%= @business.department.school.name %>
+        <%= @business.department&.school&.name %>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">部门</label>
       <div class="layui-input-inline" style="line-height: 38px;">
-        <%= @business.department.name %>
+        <%= @business.department&.name %>
       </div>
     </div>
     <br>

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

@@ -102,6 +102,8 @@
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_recycle_s">恢复</a>
   <% end %>
   {{# }else{}}
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="assign">指派协作人</a>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="assign_sale_staff">指派方案经理</a>
   <% if can? :add_follow, EducodeSales::Idea %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-add_follow" lay-event="add_follows">添加跟进</a>
   <% end %>
@@ -256,7 +258,7 @@
                 },
                 {
                     title: '操作',
-                    minWidth: 500,
+                    minWidth: 700,
                     toolbar: '#currentTableBar',
                     align: "center",
                     fixed: 'right'
@@ -453,6 +455,40 @@
                 $(window).on("resize", function () {
                     layer.full(followup_index);
                 });
+            } else if (obj.event === 'assign') { //协作人
+                var content = miniPage.getHrefContent('/missions/ideas/' + id + '/assign');
+                var openWH = miniPage.getOpenWidthHeight();
+                var name = data.name;
+                sindex = layer.open({
+                    title: '指派协作人',
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: ['600px', '300px'],
+                    content: content
+                });
+                $(window).on("resize", function () {
+                    layer.full(sindex);
+                });
+                return false;
+            } else if (obj.event === 'assign_sale_staff') { //指派方案经理
+                var content = miniPage.getHrefContent('/missions/ideas/' + id + '/assign_sale_staff');
+                var openWH = miniPage.getOpenWidthHeight();
+                var name = data.name;
+                sindex = layer.open({
+                    title: "指派方案经理",
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: ['600px', '300px'],
+                    content: content
+                });
+                $(window).on("resize", function () {
+                    layer.full(sindex);
+                });
+                return false;
             } else if (obj.event === 'idea_recycle') {
                 layer.confirm('确定删除' + data.name, function (index) {
                     request.delete('missions/ideas/' + id, {}, function (res) {

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

@@ -0,0 +1,45 @@
+<%= 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_staff_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_staff_id',
+            data: gon.ideas_staffs,
+            filterable: true,
+            radio: false,
+        })
+        var parentIndex = layer.index;
+        form.on('submit(saveBtn)', function (data) {
+            layer.confirm('确定指派协作人?', function (index) {
+                request.post('missions/ideas/' + parent.id + "/assign_staff", {to_id: staff_list_select.getValue('valueStr')}, function (res) {
+                    layer.close(index);
+                    layer.close(parentIndex)
+                    parent.table.reload('ideas_table')
+                })
+            });
+            return false;
+        });
+    });
+</script>

data/app/views/educode_sales/ideas/assign_sale_staff.html.erb

@@ -0,0 +1,45 @@
+<%= 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: true,
+        })
+        var parentIndex = layer.index;
+        form.on('submit(saveBtn)', function (data) {
+            layer.confirm('确定指派方案经理?', function (index) {
+                request.post('missions/ideas/' + parent.id + "/update_sale_staff", {to_id: staff_list_select.getValue('valueStr')}, function (res) {
+                    layer.close(index);
+                    layer.close(parentIndex)
+                    parent.table.reload('ideas_table')
+                })
+            });
+            return false;
+        });
+    });
+</script>

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

@@ -41,20 +41,20 @@
           </div>
         </div>
         <div class="layui-col-md6">
-          <labeL class="layui-form-label">协作人:</labeL>
+          <labeL class="layui-form-label required">项目名称:</labeL>
           <div class="layui-input-block">
-            <div id="assist_staff_ids"></div>
+            <div id="business_id" style="width: 600px;"></div>
           </div>
         </div>
-      </div>
-      <div class="layui-row" style="padding-top: 15px">
-        <div class="layui-col-md6">
-          <labeL class="layui-form-label required">项目名称:</labeL>
+        <div class="layui-col-md6" style="display: none">
+          <labeL class="layui-form-label">协作人:</labeL>
           <div class="layui-input-block">
-            <div id="business_id" style="width: 600px;"></div>
+            <div id="assist_staff_ids"></div>
           </div>
         </div>
-        <div class="layui-col-md6">
+      </div>
+      <div class="layui-row" style="padding-top: 15px;display: none">
+        <div class="layui-col-md6" style="display: none">
           <labeL class="layui-form-label">方案经理:</labeL>
           <div class="layui-input-block">
             <div id="new_staff_id"></div>
@@ -96,7 +96,7 @@
             <%= select_tag "idea_type", options_for_select(EducodeSales::Idea.idea_types.keys, @idea&.idea_type), { 'lay-filter': 'idea_type', include_blank: false } %>
           </div>
         </div>
-        <div class="layui-col-md6">
+        <div class="layui-col-md6" style="display: none">
           <labeL class="layui-form-label">指派人:</labeL>
           <div class="layui-input-block">
             <div id="other_staff_ids"></div>

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

@@ -41,20 +41,20 @@
           </div>
         </div>
         <div class="layui-col-md6">
-          <labeL class="layui-form-label">协作人:</labeL>
+          <labeL class="layui-form-label required">项目名称:</labeL>
           <div class="layui-input-block">
-            <div id="assist_staff_ids"></div>
+            <div id="business_id" style="width: 600px;"></div>
           </div>
         </div>
-      </div>
-      <div class="layui-row" style="padding-top: 15px">
-        <div class="layui-col-md6">
-          <labeL class="layui-form-label required">项目名称:</labeL>
+        <div class="layui-col-md6" style="display: none">
+          <labeL class="layui-form-label">协作人:</labeL>
           <div class="layui-input-block">
-            <div id="business_id" style="width: 600px;"></div>
+            <div id="assist_staff_ids"></div>
           </div>
         </div>
-        <div class="layui-col-md6">
+      </div>
+      <div class="layui-row" style="padding-top: 15px;display: none">
+        <div class="layui-col-md6" style="display: none">
           <labeL class="layui-form-label">方案经理:</labeL>
           <div class="layui-input-block">
             <div id="new_staff_id"></div>
@@ -96,7 +96,7 @@
             <%= select_tag "idea_type", options_for_select(EducodeSales::Idea.idea_types.keys, @idea&.idea_type), { 'lay-filter': 'idea_type', include_blank: false } %>
           </div>
         </div>
-        <div class="layui-col-md6">
+        <div class="layui-col-md6" style="display: none">
           <labeL class="layui-form-label">指派人:</labeL>
           <div class="layui-input-block">
             <div id="other_staff_ids"></div>

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

@@ -94,12 +94,14 @@
             url: '/missions/money_plan_records',
             toolbar: '#toolbar_money_plan_record',
             defaultToolbar: ['filter'],
+            totalRow:true,
             cols: [
                 [{
                         field: 'id',
                         width: 80,
                         title: '序号',
                         type: 'numbers',
+                        totalRowText:'合计'
                     },
                     {
                         field: 'payer_name',
@@ -109,7 +111,8 @@
                     {
                         field: 'amount',
                         width: 150,
-                        title: '回款金额'
+                        title: '回款金额',
+                        totalRow:true
                     },
                     {
                         field: 'date_at',

data/config/routes.rb

@@ -383,6 +383,10 @@ EducodeSales::Engine.routes.draw do
       get :upload_file
     end
     member do
+      get :assign
+      post :assign_staff
+      get :assign_sale_staff
+      post :update_sale_staff
       get :show_schools
       post :follow_up
       put :update_advise

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.20'
+  VERSION = '1.10.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.20
+  version: 1.10.22
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2023-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -418,6 +418,8 @@ files:
 - app/views/educode_sales/ideas/add_courses.html.erb
 - app/views/educode_sales/ideas/add_event.html.erb
 - app/views/educode_sales/ideas/add_keys.html.erb
+- app/views/educode_sales/ideas/assign.html.erb
+- app/views/educode_sales/ideas/assign_sale_staff.html.erb
 - app/views/educode_sales/ideas/course_list.json.jbuilder
 - app/views/educode_sales/ideas/course_subject.json.jbuilder
 - app/views/educode_sales/ideas/daily_paper.html.erb