educode_sales 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3990eb5d7556c5bab5819c03981769a0385a28d52a8357ca8116cc1083ab6d0
-  data.tar.gz: 073e8a50229f8a39a2966fdfad84bd177efceb1101e82c6553dbc3fc905542b2
+  metadata.gz: ef5373cd46335d53f4f5062b2ac750c01fa8797ddf1626c4373c6997e5e1fa9f
+  data.tar.gz: f27164e66b64b22b5b0c889ffb3c5c2c6567559f490a00e4af8a32f4298841dd
 SHA512:
-  metadata.gz: 7fefe63cc01a8977e73b6f4f758aee060afe88f6c9706effda0e61ec0ab4cf38a21fa5a825e2ccf7420940a17d3712c91ac2e9a9a5268040d897dae24df55197
-  data.tar.gz: 03a089117cb9d969c68e38fb91904983dd978c459a33e8d0a03264355852e3716044fd85e280f5f9d62d54445332e516f4a0d0f324178305d8d988dd8ca3365a
+  metadata.gz: a9d42047fdaeba4c49096c40dd92b9d33ed77f84ef7a65410f34bab1a0408be55c7db38caa5e30aab0456d1b93af4db2a0c79c953dfdfd9f39579f26e5a1cef2
+  data.tar.gz: 2850fa03b263d9a06f0d2af5c9649b9ccd30719a58e5a0f0dac41bb2b495c2745e2ed1b8711ecabdac249166c75dadec3d26b7219800398ee7ff219c6fa167c7

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -18,13 +18,13 @@ 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 = @follow_ups.where(business_id: business_ids)
+              @follow_ups = FollowUp.where(business_id: business_ids)
             when '区域'
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(: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 = @follow_ups.where(business_id: business_ids)
+              @follow_ups = FollowUp.where(business_id: business_ids)
             else
               @follow_ups = FollowUp.all
             end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -45,18 +45,19 @@ module EducodeSales
             when '自己'
               @teachers = Teacher.where(is_key: false)
               @teachers = @teachers.where(staff_id: @current_admin.id)
+              teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.all.pluck(:Teacher_id) + EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id) + @teachers.ids
+              @teachers = Teacher.where(id: teacher_ids)
             when '区域'
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
               @teachers = Teacher.joins("JOIN departments ON educode_sales_teachers.department_id = departments.id").where(is_key: false).where("departments.school_id in (?) OR educode_sales_teachers.staff_id = #{@current_admin.id}", school_ids)
+              teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.all.pluck(:Teacher_id) + EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id) + @teachers.ids
+              @teachers = Teacher.where(id: teacher_ids)
             else
               @teachers = Teacher.where(is_key: false)
             end
           end
 
-          public_teacher_ids = EducodeSales::Teacher.where(staff_id: 0).pluck(:id) - EducodeSales::TeacherAssignFollow.all.pluck(:Teacher_id)
-          teacher_ids = @teachers.ids
-          teacher_ids = teacher_ids + public_teacher_ids + EducodeSales::TeacherAssignFollow.where(staff_id: @current_admin.id).pluck(:teacher_id)
-          @teachers = @teachers.where(id: teacher_ids)
+
 
           if params[:q].present? && params[:q][:assist].present?
             staff_id = params[:q][:assist].to_i
@@ -74,9 +75,9 @@ module EducodeSales
           end
           if params[:q].present? && params[:q][:status].present?
             if params[:q][:status] == "1"
-              @teachers = @teachers.where("educode_sales_teachers.regist_at is not null AND educode_sales_teachers.user_id is not null")
+              @teachers = @teachers.where("educode_sales_teachers.user_id is not null")
             else
-              @teachers = @teachers.where("educode_sales_teachers.regist_at is null OR educode_sales_teachers.user_id is null")
+              @teachers = @teachers.where("educode_sales_teachers.user_id is null")
             end
           end
           if params[:q].present? && params[:q][:attitude].present?

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

@@ -77,7 +77,7 @@
       </div>
     </div>
     <br>
-    <div class="layui-inline">
+    <div class="layui-inline place_select">
       <label class="layui-form-label">渠道</label>
       <div class="layui-input-inline" style="z-index: 101">
         <div id="edit_place" style="width: 190px;"></div>
@@ -234,6 +234,7 @@
           parent.layer.close(parent.layer.getFrameIndex(window.name))
           parent.table.reload('sale_plan_follow_table')
           parent.table.reload('businesses_table')
+          parent.table.reload('teachers_table')
         }
       })
 
@@ -242,4 +243,9 @@
     });
 
   });
-</script>
+</script>
+<style>
+    .place_select xm-select > .xm-body{
+        width: 300px; !important;
+    }
+</style>

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

@@ -38,7 +38,7 @@
                   <%= select_tag "business_type", options_for_select(EducodeSales::Common.where(clazz: 'business_type').pluck(:name, :id), params[:clazz_id]), { 'lay-filter': 'clazz_id', include_blank: true } %>
                 </div>
               </div>
-              <div class="layui-inline m-t-10">
+              <div class="layui-inline">
                 <label class="layui-form-label">项目阶段</label>
                 <div class="layui-input-inline">
                   <%= select_tag "business_step", options_for_select(EducodeSales::Common.where(clazz: 'business_step').pluck(:name, :id)), { include_blank: true } %>

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

@@ -83,7 +83,7 @@
       </div>
     </div>
     <br>
-    <div class="layui-inline">
+    <div class="layui-inline new_place_select">
       <label class="layui-form-label">渠道</label>
       <div class="layui-input-inline" style="z-index: 101">
         <div id="place" style="width: 190px;"></div>
@@ -246,6 +246,7 @@
             parent.layer.close(parent.layer.getFrameIndex(window.name))
             parent.table.reload('sale_plan_follow_table')
             parent.table.reload('businesses_table')
+            parent.table.reload('teachers_table')
           }
         })
 
@@ -254,4 +255,9 @@
       });
 
   });
-</script>
+</script>
+<style>
+    .new_place_select xm-select > .xm-body{
+        width: 300px; !important;
+    }
+</style>

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

@@ -248,6 +248,7 @@
                   layer.close(index);
                     table.reload("businesses_table");
                     table.reload("sale_plan_follow_table");
+                    table.reload('teachers_table')
                 })
               });
           } else if (obj.event === 'show') { // 监听添加操作
@@ -342,27 +343,26 @@
               [
                 {
                   field: 'id',
-                  width: 80,
+                  width: 60,
                   title:'序号',type: 'numbers',
                 },
                 {
                   field: 'staff',
-                  width: 140,
+                  width: 100,
                   title: '姓名'
                 },
                 {
                   field: 'month',
-                  width: 120,
+                  width: 100,
                   title: '月份',
                 },
                 {
                   field: 'weekly',
-                  width: 120,
+                  width: 100,
                   title: '周次'
                 },
                 {
                   field: 'content',
-                  width: 300,
                   title: '计划内容'
                 },
                 {

data/app/views/educode_sales/sales/operations.html.erb

@@ -59,7 +59,7 @@
                     templet: "#xschool",
                     totalRow:true,
                     sort: true,
-                    width: 120
+                    width: 170
                 },
                 ]
             ],

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

@@ -98,7 +98,7 @@
   <%# if can? :destroy, EducodeSales::Teacher %>
 <!--  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>-->
    <%# end %>
-  <% if can? :add_follow, EducodeSales::Teacher %>
+  <% if can? :create, EducodeSales::TeacherFollow %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
   <% end %>
   <% if @more %>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2021-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails