educode_sales 0.9.70 → 0.9.71

data/app/views/educode_sales/plans/edit_year_plan.html.erb

@@ -1,4 +1,31 @@
 
+<div class="layui-form layuimini-form">
+  <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-inline">
+      <label class="layui-form-label">目标类型</label>
+      <div class="layui-input-inline">
+      <%= select_tag "clazz", options_for_select(@clazz), {include_blank: true} %>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">单位</label>
+      <div class="layui-input-inline" style="width: 400px">
+        <input type="text" class="layui-input" autocomplete="off" name="department">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">年度</label>
+      <div class="layui-input-inline" style="width: 150px">
+        <input type="text" class="layui-input" id="year_search_plan_date" autocomplete="off" name="year_search">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <div class="layui-input-inline">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="search">搜索</button>
+      </div>
+    </div>
+  </div>
+</div>
 <div>
   <table class="layui-hide" id="yearTable" lay-filter="yearTable"></table>
 </div>
@@ -26,9 +53,14 @@
       })
     })
 
+    laydate.render({
+      elem: '#year_search_plan_date',
+      type: 'year'
+    });
+
     table.render({
       elem: '#yearTable',
-      url: '/missions/plans/plan_business_infos?year=' + parent.year,
+      url: '/missions/plans/plan_business_infos?year=' + parent.year + "&q[clazz]=" + parent.clazz + "&staff_id=" + parent.staff_id,
       height: 400,
       defaultToolbar: ['filter'],
       initSort: {
@@ -49,6 +81,21 @@
           width: 160,
           title: '商机名称',
         },
+        {
+          field: 'year',
+          width: 100,
+          title: '年度',
+        },
+        {
+          field: 'business_clazz',
+          width: 160,
+          title: '商机类别',
+        },
+        {
+          field: 'property',
+          width: 200,
+          title: '客户类型',
+        },
         {
           field: 'school',
           width: 150,
@@ -102,7 +149,7 @@
         {
           field: 'bidded_amount',
           width: 170,
-          title: '中标额',
+          title: '计划金额',
         },
         {
           field: 'plan_sign_on',
@@ -152,7 +199,7 @@
         {
           field: 'prepayment_amount',
           width: 170,
-          title: '预收款',
+          title: '计划预收款',
         },
         {
           field: 'check_fee_plan_on',
@@ -167,7 +214,7 @@
         {
           field: 'check_fee',
           width: 170,
-          title: '验收款',
+          title: '计划验收款',
         },
         {
           field: 'qa_plan_on',
@@ -182,7 +229,7 @@
         {
           field: 'qa_amount',
           width: 170,
-          title: '质保金',
+          title: '计划质保金',
         },
         {
           field: 'account_receivable',
@@ -203,6 +250,18 @@
       page: true,
     });
 
+    form.on('submit(search)', function (data) {
+      search = data.field
+      table.reload('yearTable', {
+        page: {
+          curr: 1
+        },
+        where: {q: search}
+      }, 'data');
+
+      return false;
+    });
+
     table.on('tool(yearTable)', function (obj) {
       var data = obj.data;
         id = data.id;

data/app/views/educode_sales/plans/new_year.html.erb

@@ -9,7 +9,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">选择商机</label>
       <div class="layui-input-inline" style="width: 400px">
-         <%= select_tag "business_id", options_for_select(@businesses), {"lay-verify": "required", include_blank: true} %>
+        <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true, "lay-search": "" } %>
       </div>
     </div>
     <div class="layui-inline">
@@ -37,13 +37,44 @@
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <a class="layui-btn layui-btn-danger layui-btn-xs data-count-delete" lay-event="delete">删除</a>
 </script>
+
+<script type="text/html" id="plan_bid_on">
+{{# if (['回款目标' ,'签单目标', '商机目标'].includes(d.clazz)) { }}
+  <div style="color: red;text-align: center;">--</div>
+{{# } else { }}
+{{ d.plan_bid_on }}</a>
+{{# } }}
+</script>
+<script type="text/html" id="plan_sign_on">
+{{# if (['回款目标' ,'中标目标', '商机目标'].includes(d.clazz)) { }}
+  <div style="color: red;text-align: center;">--</div>
+{{# } else { }}
+{{ d.plan_sign_on }}</a>
+{{# } }}
+</script>
+<script type="text/html" id="prepayment_plan_on">
+{{# if (['签单目标' ,'中标目标', '商机目标'].includes(d.clazz)) { }}
+  <div style="color: red;text-align: center;">--</div>
+{{# } else { }}
+{{ d.prepayment_plan_on }}</a>
+{{# } }}
+</script>
+<script type="text/html" id="prepayment_amount">
+{{# if (['签单目标' ,'中标目标', '商机目标'].includes(d.clazz)) { }}
+  <div style="color: red;text-align: center;">--</div>
+{{# } else { }}
+{{ d.prepayment_amount }}</a>
+{{# } }}
+</script>
+
 <script>
-  layui.use(['form', 'table', 'laytpl', 'request', 'laydate'], function () {
+  layui.use(['form', 'table', 'laytpl', 'request', 'laydate', 'selectInput'], function () {
     var form = layui.form,
       layer = layui.layer,
       table = layui.table,
       request = layui.request,
       laydate = layui.laydate,
+      selectInput = layui.selectInput,
       $ = layui.$;
       laydate.render({
         elem: '#new_year_field',
@@ -51,6 +82,7 @@
       });
     form.render();
 
+
     var parentIndex = layer.index;
 
     form.on('submit(add_year_plan)', function (data) {
@@ -68,7 +100,9 @@
     });
     form.on('submit(add_y_plan)', function (data) {
       request.authPost("missions/plans/create_sales_plan", {}, function (res) {
-        table.reload('yearPlanTable');
+        <% unless @business %>
+          table.reload('yearPlanTable');
+        <% end %>
         layer.close(parent.yindex);
       })
     })
@@ -96,6 +130,16 @@
           width: 160,
           title: '商机名称',
         },
+        {
+          field: 'business_clazz',
+          width: 160,
+          title: '商机类别',
+        },
+        {
+          field: 'property',
+          width: 200,
+          title: '客户类型',
+        },
         {
           field: 'school',
           width: 150,
@@ -140,21 +184,25 @@
           field: 'plan_bid_on',
           width: 170,
           title: '计划投标时间',
+          templet: "#plan_bid_on"
         },
         {
           field: 'plan_sign_on',
           width: 170,
           title: '计划签单时间',
+          templet: "#plan_sign_on"
         },
         {
           field: 'prepayment_plan_on',
           width: 170,
           title: '计划回款时间',
+          templet: "#prepayment_plan_on"
         },
         {
           field: 'prepayment_amount',
           width: 170,
           title: '计划回款额',
+          templet: "#prepayment_amount"
         },
         {
           title: '操作',

data/app/views/educode_sales/plans/plan_business_infos.json.jbuilder

@@ -35,6 +35,13 @@ json.data do
     json.account_receivable_clazz d.account_receivable_clazz
     json.invoice_amount d.invoice_amount
 
+    json.business_clazz d.business.clazz&.name || ""
+    if d.business&.department&.school
+      json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+    else
+      json.property ''
+    end
+
   end
 end
 

data/app/views/educode_sales/plans/years_plan.json.jbuilder

@@ -2,14 +2,54 @@ json.data do
   json.array! @sale_plans do |d|
     json.id d.id
     json.staff d.staff.user.real_name
+    json.staff_id d.staff_id
     json.clazz EducodeSales::SalePlan::CLAZZ_NAME.invert[d.clazz]
     json.year d.year
+    json.clazz_id d.clazz
     json.target_money d['annual'] || 0
-    json.plan_money  d['budget_amounts']&.round(2) || 0
+    # json.plan_money  d['budget_amounts']&.round(2) || 0
     json.minimum_money d['annual'].present? ?  (d['annual'].to_f * 0.8).round(2) : 0
-    json.finish_money 0
-    json.finish_rate 0
+    
+    # if d.clazz == 1
+    #   # 签单计划的预算额
+    #   json.finish_money d.business_infos.where.not(plan_sign_on: nil).sum(:budget_amount)
+    # elsif d.clazz == 18
+    #   # 中标目标
+    #   json.finish_money d.business_infos.where.not(plan_bid_on: nil).sum(:budget_amount)
+    # elsif d.clazz == 2
+    #   # 回款目标
+    #   json.finish_money d.business_infos.where.not(plan_bid_on: nil).sum(:budget_amount)
+    # elsif d.clazz == 7
+    #   # 商机目标
+    #   json.finish_money d.business_infos.sum(:budget_amount)
+    # end
+    if d.clazz == 1
+      # 签单计划的预算额
+      json.plan_money d['clazz_1'] || 0
+      json.finish_money d['finish_sign']
+      json.finish_rate (d['finish_sign']  * 100 / (d['clazz_1'] || 0).to_f).round(2)
+    elsif d.clazz == 18
+      # 中标目标
+      json.plan_money d['clazz_18'] || 0
+      json.finish_money d['finish_bid']
+      json.finish_rate (d['finish_bid']  * 100 / (d['clazz_18'] || 0).to_f).round(2)
+    elsif d.clazz == 2
+      # 回款目标
+      json.plan_money d['clazz_2'] || 0
+      json.finish_money d['finish_return_money']
+      json.finish_rate (d['finish_return_money']  * 100 / (d['clazz_2'] || 0).to_f).round(2)
+    elsif d.clazz == 7
+      # 商机目标
+      json.plan_money d['clazz_7'] || 0
+      json.finish_money d['clazz_7'] || 0
+      json.finish_rate 100
+    end
+    
     json.updated_at d.updated_at.to_s
+    json.clazz_1 d['clazz_1']
+    json.clazz_2 d['clazz_2']
+    json.clazz_7 d['clazz_7']
+    json.clazz_18 d['clazz_18']
   end
 end
 

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

@@ -196,11 +196,6 @@
                     templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
 
                 },
-                {
-                    field: 'area',
-                    width: 80,
-                    title: '区域',
-                },
                 {
                     field: 'department',
                     width: 130,
@@ -212,6 +207,16 @@
                     width: 160,
                     title: '专业',
                 },
+                {
+                    field: 'area',
+                    width: 80,
+                    title: '区域',
+                },
+                {
+                    field: 'business_count',
+                    width: 120,
+                    title: '单位商机数',
+                },
                 {
                     field: 'professional_title',
                     title: '职称',
@@ -248,6 +253,11 @@
                     totalRow:true,
                     templet: "#follow"
                 },
+                {
+                    field: 'sales_manage',
+                    width: 160,
+                    title: '销售经理',
+                 },
                 {
                   field: 'staff_manage',
                   width: 160,

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

@@ -26,6 +26,13 @@ json.data do
     json.latest_time (d['latest_time'] ? DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d['latest_time'].strftime("%Y-%m-%d")) : DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d.created_at.strftime("%Y-%m-%d"))).to_i
 
     json.staff_manage @staff_manages[d.department&.school&.province]&.join(",")
+    json.sales_manage @sales_manages[d.department&.school&.province]&.join(",")
+
+    if d.department_id
+      json.business_count EducodeSales::Business.where(department_id: d.department_id).size
+    else
+      json.business_count 0
+    end
 
     json.majors d.department&.department_majors&.pluck(:name).present? ? d.department&.department_majors&.pluck(:name).join("，") : ""
 

data/config/routes.rb

@@ -45,6 +45,8 @@ EducodeSales::Engine.routes.draw do
       get :majors
       get :new_major
       get :list
+      get :show_majors
+      get :show_customer_follow
     end
 
     member do
@@ -182,6 +184,7 @@ EducodeSales::Engine.routes.draw do
       get :plan_business_infos
       get :edit_bussiness_info_extra
       post :update_business_info_extra
+      get :staff_businesses
     end
     member do
       delete :delete_business_info

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.70'
+  VERSION = '0.9.71'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.70
+  version: 0.9.71
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 2023-04-23 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
@@ -311,10 +310,13 @@ files:
 - app/views/educode_sales/customers/new_department.html.erb
 - app/views/educode_sales/customers/new_follow_record.html.erb
 - app/views/educode_sales/customers/new_major.html.erb
+- app/views/educode_sales/customers/show_customer_follow.html.erb
+- app/views/educode_sales/customers/show_customer_follow.json.jbuilder
 - app/views/educode_sales/customers/show_department.json.jbuilder
 - app/views/educode_sales/customers/show_follow.html.erb
 - 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/index.json.jbuilder
 - app/views/educode_sales/follow_ups/money_plans.json.jbuilder
 - app/views/educode_sales/follow_ups/teachers.json.jbuilder
@@ -621,7 +623,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -636,8 +638,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []