educode_sales 0.7.7 → 0.8.1

data/app/views/educode_sales/businesses/following_businesses.jbuilder

@@ -0,0 +1,44 @@
+follow_up_ids = EducodeSales::AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+follow_count = 0
+json.data do
+  json.array! @businesses do |d|
+    json.id d.id
+    json.name d.name
+    json.department d.department.name
+    json.school d.department.school.name
+    json.school_id d.department.school.id
+    follow_ups_count = d.follow_ups.where(deleted_at: nil).size
+    json.follow_ups_count follow_ups_count
+    follow_count += follow_ups_count
+    json.follow_up_id d.last_follow_up_id
+    json.clazz d.last_follow_up&.clazz&.name || ""
+    json.stage d.last_follow_up&.stage&.name
+    json.invitation_at d.last_follow_up&.invitation_at.to_s
+    json.reception_at d.last_follow_up&.reception_at.to_s
+    json.bidded_date d.last_follow_up&.bidded_date.to_s
+    json.signed_date d.last_follow_up&.signed_date.to_s
+    json.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
+    json.year d.last_follow_up&.year.to_s
+    json.total_amount d.last_follow_up&.total_amount
+    json.actual_amount d.last_follow_up&.actual_amount
+    json.return_money d.return_money
+    json.wait_return_money d.wait_return_money.to_f.round(2)
+    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 : EducodeSales::Staff.find(d.staff_id).user.real_name
+    json.source d.source
+    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
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
+    json.self_flag (d.staff_id == @current_admin.id) || (d.last_follow_up_id.in? follow_up_ids)
+    json.followed  d.users.where(user_id:@current_admin.user.id).first ? 1 : 0
+    end
+end
+
+json.totalRow do
+  json.follow_ups_count follow_count.to_i.to_s
+end
+json.code 0
+json.count @businesses.size
+json.msg 'succcess'

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

@@ -100,6 +100,7 @@
     <% if can? :create, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加商机</button>
     <% end %>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="followes"> 我的关注</button>
     <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="mine"> 我的商机</button>
     <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right" lay-event="all"> 全部商机</button>
   </div>
@@ -138,9 +139,14 @@
     {{# }}}
   <% end %>
   <% if @more %>
-    <a class="layui-btn-xs data-count-edit more-btn" data-name={{d.name}} data-id={{d.id}}>更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
+    {{# if(d.followed==0){}}
+    <a class="layui-btn-xs data-count-edit more-btn more-btn1" data-name={{d.name}} data-id={{d.id}}>更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
+    {{# }else{}}
+    <a class="layui-btn-xs data-count-edit more-btn more-btn2" data-name={{d.name}} data-id={{d.id}}>更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
+    {{# }}}
   <% end %>
 </script>
+
 <script type="text/html" id="show_keys">
   <a href="javascript:void(0);" lay-event="show_keys" class="layui-table-link">{{ d.teachers_count }}</a>
 </script>
@@ -151,10 +157,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="follows">
+  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">kkkkk</a>
+</script>
 
 
 <script>
-    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown'], function () {
+    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown','laytpl'], function () {
         var $ = layui.jquery,
             form = layui.form,
             request = layui.request,
@@ -252,8 +261,8 @@
             elem: '#businesses_table',
             url: '/missions/businesses',
             where: {q: data},
-            defaultToolbar: ['filter'],
             toolbar: '#bussinessBar',
+            defaultToolbar: ['filter'],
             title: '商机数据表',
             totalRow: true,//开启合并行
             cols: [
@@ -270,19 +279,22 @@
                         width: 170,
                         title: '商机名称',
                         templet: '<div><span title="{{d.name}}">{{d.name}}</span></div>',
-                        fixed: 'left'
+                        fixed: 'left',
+                        hide: gon.business_filter.name
                     },
                     {
                         field: 'school',
                         width: 150,
                         title: '单位',
-                        templet: '#school_name'
+                        templet: '#school_name',
+                        hide: gon.business_filter.school
                     },
                     {
                         field: 'department',
                         width: 150,
                         title: '部门',
-                        templet: '<div><span title="{{d.department}}">{{d.department}}</span></div>'
+                        templet: '<div><span title="{{d.department}}">{{d.department}}</span></div>',
+                        hide: gon.business_filter.department
                     },
                     {
                         field: 'follow_ups_count',
@@ -290,6 +302,7 @@
                         width: 60,
                         templet: '#show_follow',
                         totalRow: true,
+                        hide: gon.business_filter.name
                     },
                     // {
                     //   field: 'teachers_count',
@@ -301,109 +314,142 @@
                         field: 'clazz',
                         width: 80,
                         title: '类型',
-                        templet: '<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>'
+                        templet: '<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>',
+                        hide: gon.business_filter.name
               },
               {
                 field: 'stage',
                 width: 90,
-                title: '阶段'
+                title: '阶段',
+                  hide: gon.business_filter.name
               },
                 {
                     field: 'source',
                     width: 90,
-                    title: '商机来源'
+                    title: '商机来源',
+                    hide: gon.business_filter.source
                 },
                 {
                     field: 'last_follow_person',
                     width: 100,
-                    title: '最新跟进人'
+                    title: '最新跟进人',
+                    hide: gon.business_filter.last_follow_person
                 },
                 {
                     field: 'latest_time',
                     width: 200,
                     title: '最新跟进时间',
-                    sort: true
+                    sort: true,
+                    hide: gon.business_filter.latest_time
                 },
               {
                 field: 'invitation_at',
                 width: 105,
                 title: '招标时间',
-                sort: true
+                sort: true,
+                  hide: gon.business_filter.invitation_at
               },
               {
                 field: 'bidded_date',
                 width: 105,
                 title: '中标时间',
-                  sort: true
+                  sort: true,
+                  hide: gon.business_filter.bidded_date
               },
               {
                 field: 'signed_date',
                   width: 105,
                   title: '签单时间',
-                  sort: true
+                  sort: true,
+                  hide: gon.business_filter.signed_date
               },
                     {
                         field: 'reception_at',
                         width: 105,
                         title: '验收时间',
-                        sort: true
+                        sort: true,
+                        hide: gon.business_filter.reception_at
                     },
                     {
                         field: 'service_end_time',
                         width: 200,
                         title: '服务期',
-                        sort: true
+                        sort: true,
+                        hide: gon.business_filter.service_end_time
                     },
                     {
                         field: 'total_amount',
                         width: 100,
                         title: '总额',
                         totalRow: true,
-                        sort: true
+                        sort: true,
+                        hide: gon.business_filter.total_amount
                     },
                     {
                         field: 'actual_amount',
                         width: 100,
                 title: '合同额',
                   totalRow: true,
-                sort: true
+                sort: true,
+                        hide: gon.business_filter.actual_amount
               },
               {
                 field: 'return_money',
                 width: 100,
                 title: '回款',
                 sort: true,
-                  totalRow: true
+                  totalRow: true,
+                  hide: gon.business_filter.return_money
               },
               {
                 field: 'wait_return_money',
                 width: 100,
                 title: '待回款',
                 sort: true,
-                  totalRow: true
+                  totalRow: true,
+                  hide: gon.business_filter.wait_return_money
               },
               {
                 field: 'return_money_days',
                 width: 150,
                 title: '首次回款周期(天)',
+                  hide: gon.business_filter.return_money_days
               },
               {
                 field: 'place',
                 width: 160,
                 title: '渠道',
+                  hide: gon.business_filter.place
               },
               {
                 field: 'year',
                 width: 105,
                 title: '所属年度',
-                  sort: true
+                  sort: true,
+                  hide: gon.business_filter.year
               },
+              {
+                  field: 'followed',
+                  templet:function(d){
+                      if (d.followed==1){
+
+                          return  '<i class="layui-icon" style="color: goldenrod">&#xe658;</i> '
+                      }
+
+                      else return ''
+                  },
+                 width: 105,
+                 title: '关注',
+                  align: "center",
+                  hide: gon.business_filter.followed
+
+               },
               {
                 title: '操作',
                 minWidth: 220,
                 toolbar: '#currentTableBar',
                 align: "center",
-                fixed: 'right'
+                fixed: 'right',
               }
             ]
           ],
@@ -422,15 +468,18 @@
       });
 
       var dropmenu = gon.menus;
+      var dropmenu2=JSON.parse(JSON.stringify(dropmenu));
       var export_dropmenu = gon.export_menus;
+      dropmenu2[dropmenu2.findIndex(function (elem){return elem.title.includes("关注")})].title="取消关注";
 
       drowpdwonRender = function() {
         dropdown.render({
-          elem: '.more-btn',
-          data: dropmenu,
+          elem: '.more-btn1',
+          data: dropmenu,//dropmenu,
           click: function(data, othis){
             var elem = $(this.elem);
             id = elem.data('id');
+
             switch (data.event) {
             case 'week':
               week(id);
@@ -450,9 +499,44 @@
             case 'delete':
               deleteBusiness(id, elem.data('name'));
               break;
+            case 'following':
+               following(id);
+                break;
             }
           }
         });
+          dropdown.render({
+              elem: '.more-btn2',
+              data: dropmenu2,//dropmenu,
+              click: function(data, othis){
+                  var elem = $(this.elem);
+                  id = elem.data('id');
+
+                  switch (data.event) {
+                      case 'week':
+                          week(id);
+                          break;
+                      case 'month':
+                          month(id);
+                          break;
+                      case 'edit':
+                          edit(id);
+                          break;
+                      case 'file':
+                          file(id, elem.data('name'));
+                          break;
+                      case 'time_line':
+                          time_line(id, elem.data('name'));
+                          break;
+                      case 'delete':
+                          deleteBusiness(id, elem.data('name'));
+                          break;
+                      case 'following':
+                          following(id);
+                          break;
+                  }
+              }
+          });
       }
 
         export_drowpdwonRender = function() {
@@ -585,6 +669,41 @@
           layer.full(sindex);
         });
       }
+        function following(id) {
+            $.ajax({
+                type: "get",
+                dataType: "json",
+                url: '/missions/businesses/followed',
+                data: {business_id:id},
+                success: function (data) {
+                   layer.open({
+                       title:'关注',
+                       content:data.msg,
+                       btn: ['确认', '取消'],
+                       yes:function (){
+                           $.ajax({
+                               type: "post",
+                               dataType: "json",
+                               url: '/missions/businesses/following',
+                               data: {business_id:id},
+                               success: function (da) {
+
+                                   layer.msg(da.msg,{icon: da.code==200? 1:2})
+                                   table.reload("businesses_table")
+
+                               },
+                               error:function (da){
+                                   alert('请求错误')
+                               }
+                           });
+                       }
+                   })
+                },
+                error:function (data){
+                    alert('请求错误')
+                }
+            });
+        }
 
       function edit(id) {
         var content = miniPage.getHrefContent('/missions/businesses/' + id + '/edit');
@@ -662,7 +781,7 @@
           layer.confirm('确定删除' + name, function (index) {
           request.delete('missions/businesses/' + id, {}, function (res) {
             layer.close(index);
-            table.reload("businesses_table")
+            table.reload("businesses_table",{url: '/missions/businesses'})
           })
         });
       }
@@ -674,6 +793,7 @@
         sort.field = obj.field;
         sort.order = obj.type;
         table.reload('businesses_table', {
+            url: '/missions/businesses',
           initSort: obj,
           where: {
               sort: sort,
@@ -698,12 +818,14 @@
             search = data.field
             console.log(search);
             table.reload('businesses_table', {
+                url: '/missions/businesses',
             page: {
                 curr: 1
             },
             where: {q: search, sort: sort}
           }, 'data');
             table.reload('teachers_table', {
+                url: '/missions/businesses',
                 page: {
                     curr: 1
                 },
@@ -734,6 +856,17 @@
         });
 
         table.on('toolbar(businesses_table)', function (obj) {
+            switch (obj.event) {
+                case 'LAYTABLE_COLS':
+                    layui.form.on('checkbox(LAY_TABLE_TOOL_COLS)', function(obj) {
+                        var value = obj.elem.checked
+                        var name = obj.elem.attributes[1].value
+                        console.log(obj.elem.attributes.name);
+                        request.get('missions/filter?type=businesses_list&name='+name+'&hidden='+value,{},function (res){})
+                    });
+            }
+
+
             if (obj.event === 'add') { // 监听添加操作
                 var content = miniPage.getHrefContent('/missions/businesses/new');
                 var openWH = miniPage.getOpenWidthHeight();
@@ -753,6 +886,21 @@
             } else if (obj.event === 'all') {
                 search = {"all":"1"}
                 table.reload('businesses_table', {
+                    url: '/missions/businesses',
+                    page: {
+                        curr: 1
+                    },
+                    where: {q: search, sort: sort}
+                }, 'data');
+                form.val('search_form', {
+                    name: '', department: '', staff_id: '', business_type: '', business_step: '',
+                    place_id: '', date: '', area: ''
+                })
+                return false;
+            } else if (obj.event === 'followes') {
+                search = {"all":"1"}
+                table.reload('businesses_table', {
+                    url: '/missions/businesses/following_businesses',
                     page: {
                         curr: 1
                     },
@@ -767,6 +915,7 @@
             else if (obj.event === 'mine') {
                 search = {"mine":"1"}
                 table.reload('businesses_table', {
+                    url: '/missions/businesses',
                     page: {
                         curr: 1
                     },
@@ -829,7 +978,7 @@
                 layer.confirm('确定删除' + data.name, function (index) {
                     request.delete('missions/businesses/' + data.id, {}, function (res) {
                         layer.close(index);
-                        table.reload("businesses_table")
+                        table.reload("businesses_table",{url: '/missions/businesses',})
                     })
                 });
             }else if (obj.event === 'add_follow') { // 监听添加操作
@@ -929,7 +1078,6 @@
                 });
             }
         });
-
     });
 </script>
 <style>

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

@@ -32,6 +32,7 @@ json.data do
     json.staff_id d.staff_id
     json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
     json.self_flag (d.staff_id == @current_admin.id) || (d.last_follow_up_id.in? follow_up_ids)
+    json.followed  d.users.where(user_id:@current_admin.user.id).first ? 1 : 0
     end
 end
 

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

@@ -71,7 +71,7 @@
     <div class="layui-inline service_show layui-hide">
       <label class="layui-form-label required">服务期</label>
       <div class="layui-input-inline">
-        <input type="text" class="layui-input required" id="service_time" name="service_time" placeholder=" - " autocomplete="off" value=<%= (@last_follow_up&.service_start_time.present? && @last_follow_up&.service_end_time.present?) ? (@last_follow_up.service_start_time.to_s + "-" + @last_follow_up.service_end_time.to_s) : '' %>>
+        <input type="text" class="layui-input required" id="service_time" name="service_time" placeholder=" - " autocomplete="off" value="<%= (@last_follow_up&.service_start_time.present? && @last_follow_up&.service_end_time.present?) ? (@last_follow_up.service_start_time.to_s + " - " + @last_follow_up.service_end_time.to_s) : '' %>">
       </div>
     </div>
     <br class="service_show layui-hide">

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

@@ -38,7 +38,7 @@
   layui.use(['form', 'table', 'laytpl', 'request', 'laydate'], function () {
     var form = layui.form,
       layer = layui.layer,
-      laydate = layui.laydate
+      laydate = layui.laydate,
       table = layui.table,
       request = layui.request,
       $ = layui.$;

data/app/views/layouts/educode_sales/application.html.erb

@@ -31,7 +31,7 @@
       </li>
     </ul>
     <ul class="layui-nav layui-layout-right">
-      <li class="layui-nav-item layui-hide layui-show-md-inline-block" id="logout">
+      <li class="layui-nav-item  layui-show-md-inline-block" id="logout">
         <a href="javascript:;">
           <%= image_tag "/images/#{url_to_avatar(@current_admin.user)}", class: 'layui-nav-img' %>
           <%= @current_admin.user.real_name %>
@@ -81,7 +81,7 @@
               <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/6.销售计划.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售计划</a></dd>
             <% end %>
             <% if can?(:show, EducodeSales::AssessmentsSetting) || can?(:show_result, EducodeSales::AssessmentsSetting) %>
-<!--              <dd><a href="/missions/assessments" class="<%#= current?('layui-this', assessments_path) %>"><i  style="padding-right: 35px"></i><%#= image_tag "educode_sales/assessment.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>绩效考核</a></dd>-->
+              <dd><a href="/missions/assessments" class="<%= current?('layui-this', assessments_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/assessment.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>绩效考核</a></dd>
             <% end %>
             <% if can? :sales, EducodeSales::Staff %>
               <dd><a href="/missions/sales" class="<%= current?('layui-this', sales_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/3.销售分工.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售分工</a>

data/config/routes.rb

@@ -13,6 +13,7 @@ EducodeSales::Engine.routes.draw do
   get :sales_staff, to: "home#sales_staff"
   get :sales_place, to: "home#sales_place"
   get :staff_schools, to: "home#staff_schools"
+  get :filter, to: "application#filter"
 
 
   resources :sessions do
@@ -85,6 +86,7 @@ EducodeSales::Engine.routes.draw do
 
   resources :businesses do
     collection do
+      post :following
       get :export_records
       post :get_export_data
       get :add_export_records
@@ -98,6 +100,8 @@ EducodeSales::Engine.routes.draw do
       get :file
       get :time_line
       get :upload_file
+      get :following_businesses
+      get :followed
     end
 
     member do

data/db/migrate/20220419103842_add_column_timestamps_to_assessments_settings.rb

@@ -0,0 +1,9 @@
+class AddColumnTimestampsToAssessmentsSettings < ActiveRecord::Migration[5.2]
+  def change
+    add_timestamps :educode_sales_assessments_settings
+  end
+  # def change_table
+  #   add_timestamps(:assessments_settings)
+  # end
+end
+

data/db/migrate/20220420071909_create_educode_sales_business_relation_ships.rb

@@ -0,0 +1,10 @@
+class CreateEducodeSalesBusinessRelationShips < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_business_relation_ships do |t|
+      t.integer :user_id
+      t.integer :business_id
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20220507020149_create_filter.rb

@@ -0,0 +1,10 @@
+class CreateFilter < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_filters do |t|
+      t.string :filter_type
+      t.references :staff
+      t.string :filter_data
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20220507091959_change_educode_sales_filter_column_length.rb

@@ -0,0 +1,5 @@
+class ChangeEducodeSalesFilterColumnLength < ActiveRecord::Migration[5.2]
+  def change
+    change_column :educode_sales_filters, :filter_data, :text
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.7.7'
+  VERSION = '0.8.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.8.1
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-21 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -186,12 +186,14 @@ files:
 - app/models/educode_sales/assign_follow_up.rb
 - app/models/educode_sales/business.rb
 - app/models/educode_sales/business_export_record.rb
+- app/models/educode_sales/business_relation_ship.rb
 - app/models/educode_sales/common.rb
 - app/models/educode_sales/course_subject.rb
 - app/models/educode_sales/customer.rb
 - app/models/educode_sales/customer_add.rb
 - app/models/educode_sales/customer_extension.rb
 - app/models/educode_sales/customer_follow.rb
+- app/models/educode_sales/filter.rb
 - app/models/educode_sales/follow_up.rb
 - app/models/educode_sales/key_person.rb
 - app/models/educode_sales/market_area.rb
@@ -235,6 +237,7 @@ files:
 - app/views/educode_sales/businesses/export_records.html.erb
 - app/views/educode_sales/businesses/export_records.json.jbuilder
 - app/views/educode_sales/businesses/file.html.erb
+- app/views/educode_sales/businesses/following_businesses.jbuilder
 - app/views/educode_sales/businesses/get_export_data.json.jbuilder
 - app/views/educode_sales/businesses/index.html.erb
 - app/views/educode_sales/businesses/index.json.jbuilder
@@ -449,6 +452,10 @@ files:
 - db/migrate/20220411021641_add_new_column_assessments_settings.rb
 - db/migrate/20220413090940_add_september_progress_to_assessment_settings.rb
 - db/migrate/20220418033025_add_staff_id_to_sets.rb
+- db/migrate/20220419103842_add_column_timestamps_to_assessments_settings.rb
+- db/migrate/20220420071909_create_educode_sales_business_relation_ships.rb
+- db/migrate/20220507020149_create_filter.rb
+- db/migrate/20220507091959_change_educode_sales_filter_column_length.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb