educode_sales 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 685592848049f4a9fbcb75c52c46eb4a1ad1ee9cf14725b44a7c79ad0e0714d1
-  data.tar.gz: 8b3ac5946bdb350f6bb92b79f7ab9a5ba91678e24c24ae70b06766709f84fb3d
+  metadata.gz: c5ec520db3019e20ddbbd8615880ee3060fdd6d6e5f859130dfb0b0845be8f6d
+  data.tar.gz: 7f678fb5d8c6b9dd77dc8c002b49f1e7228d8ce30b3eddb77fb2e7717b93d1d4
 SHA512:
-  metadata.gz: 14cdf1d7faa137de66574701ff7e13e76820bfed31e92960118a1407358c69134c07e51f251532e38de575064d667ab9f2c54d9299a6f59f51a150ffd1b73d83
-  data.tar.gz: 15b1c39abb61f478992198b04698af35cc90e1a6077b697c83d107e1d47c448fbc571436681b630e147aee10fbcb73607e0f7aae5567359e2ceeab4188959f98
+  metadata.gz: 7ffcbfc616f3ab9241834c9642dfc13e8d18a1ea7c5bc16edcb46398503f80456e2fee80a09da8fec8377a748f0f60a56e4fdf53640470a1e7521a160642a7b7
+  data.tar.gz: 3dd3605a2b1f4cd3469201c87dc7237bb76c01ea6da7cb968e81fd5702b57ab847c919a176a792cb3b7c47547bcc1dad06711cc38dda351935f7096d87001fc1

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -21,7 +21,7 @@ module EducodeSales
               @sale_plans = OperationPlan.where(staff_id: @current_admin.id)
             when '区域'
               staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_plans = OperationPlan.where("staff_id in (?)", staff_ids)
+              @sale_plans = OperationPlan.where("staff_id in (?) OR educode_sales_operation_plans.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_plans = OperationPlan
             end
@@ -44,7 +44,7 @@ module EducodeSales
           if params[:sort].present? && params[:sort][:field]
             @sale_plans = @sale_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @sale_plans = @sale_plans.order("updated_at desc")
+            @sale_plans = @sale_plans.order("created_at desc")
           end
           @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])
         end

data/app/controllers/educode_sales/operation_reports_controller.rb

@@ -18,7 +18,7 @@ module EducodeSales
               @sale_reports = OperationReport.where(staff_id: @current_admin.id)
             when '区域'
               staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_reports = OperationReport.where("staff_id in (?)", staff_ids)
+              @sale_reports = OperationReport.where("staff_id in (?) OR educode_sales_operation_reports.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_reports = OperationReport
             end
@@ -40,7 +40,7 @@ module EducodeSales
           if params[:sort].present? && params[:sort][:field]
             @sale_reports = @sale_reports.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @sale_reports = @sale_reports.order("updated_at desc")
+            @sale_reports = @sale_reports.order("created_at desc")
           end
           @sale_reports = @sale_reports.page(params[:page]).per(params[:limit])
         end
@@ -126,6 +126,6 @@ module EducodeSales
       params.permit(:level1_opinion, :level2_opinion, :level3_opinion, :level1_score, :level2_score, :level3_score)
     end
 
-    
+
   end
 end

data/app/controllers/educode_sales/plans_controller.rb

@@ -22,7 +22,7 @@ module EducodeSales
               @sale_plans = SalePlan.where(staff_id: @current_admin.id)
             when '区域'
               staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_plans = SalePlan.where("staff_id in (?)", staff_ids)
+              @sale_plans = SalePlan.where("staff_id in (?) OR educode_sales_sale_plans.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_plans = SalePlan
             end
@@ -44,7 +44,7 @@ module EducodeSales
           if params[:sort].present? && params[:sort][:field]
             @sale_plans = @sale_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @sale_plans = @sale_plans.order("updated_at desc")
+            @sale_plans = @sale_plans.order("created_at desc")
           end
 
           @sale_plans = @sale_plans.page(params[:page]).per(params[:limit])

data/app/controllers/educode_sales/sale_reports_controller.rb

@@ -9,7 +9,7 @@ module EducodeSales
       else
         sale_report = @current_admin.sale_reports.build(month: Date.today.beginning_of_month, weekly: Time.now.strftime('%W').to_i)
       end
-      
+
       sale_report.finish_rate = params[:finish_rate]
       sale_report.client = params[:client]
       sale_report.content = params[:content]
@@ -51,7 +51,7 @@ module EducodeSales
               @sale_reports = SaleReport.where(staff_id: @current_admin.id)
             when '区域'
               staff_ids = Staff.joins(user: [user_extension: [department: :school]]).where("schools.province in (?)", @current_admin.areas.pluck(:name)).pluck(:id)
-              @sale_reports = SaleReport.where("staff_id in (?)", staff_ids)
+              @sale_reports = SaleReport.where("staff_id in (?) OR educode_sales_sale_reports.staff_id = ?", staff_ids, @current_admin.id)
             else
               @sale_reports = SaleReport
             end
@@ -73,7 +73,7 @@ module EducodeSales
           if params[:sort].present? && params[:sort][:field]
             @sale_reports = @sale_reports.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @sale_reports = @sale_reports.order("updated_at desc")
+            @sale_reports = @sale_reports.order("created_at desc")
           end
           @sale_reports = @sale_reports.page(params[:page]).per(params[:limit])
         end

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

@@ -1 +1 @@
-<div style="text-align:center;"><%= image_tag "educode_sales/indexlogo.png", width: "900" %></div>
+<div style="text-align:center;"><%= image_tag "educode_sales/indexLogo.png", width: "900" %></div>

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

@@ -93,7 +93,7 @@
               },
               {
                 field: 'business_name',
-                width: 280,
+                width: 180,
                 title: '商机名称',
               },
               {

data/app/views/educode_sales/sale_reports/show.html.erb

@@ -119,43 +119,42 @@
         },
         {
           field: 'staff',
-          width: 120,
+          width: 80,
           title: '姓名'
         },
         {
             field: 'business_name',
-            width: 270,
+            width: 150,
             title: '商机名称',
         },
         {
             field: 'school',
-            width: 200,
+            width: 120,
             title: '单位'
         },
         {
             field: 'department',
-            width: 190,
+            width: 170,
             title: '部门'
         },
         {
           field: 'weekly',
-          width: 100,
+          width: 80,
           title: '周次',
         },
         {
           field: 'follow_ups_count',
-          width: 100,
+          width: 80,
           title: '跟进',
           templet: '#show_follow'
         },
         {
           field: 'finish_rate',
-          width: 100,
+          width: 80,
           title: '完成率',
         },
         {
           field: 'content',
-          width: 300,
           title: '计划内容',
         },
         {

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

@@ -11,14 +11,10 @@
 <script type="text/html" id="currentTableBar">
 </script>
 <script type="text/html" id="school">
-  <div class="layui-text">
     <a href="javascript:void(0);" lay-event="school" class="layui-table-link">{{d.schools}}</a>
-  </div>
 </script>
 <script type="text/html" id="xschool">
-  <div class="layui-text">
     <a href="javascript:void(0);" lay-event="xschool" class="layui-table-link">{{d.departments}}</a>
-  </div>
 </script>
 <script>
     layui.use(['form', 'table', 'miniPage', 'element'], function () {

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

@@ -145,83 +145,83 @@
               [
                 {
                     field: 'id',
-                    width: 120,
+                    width: 60,
                     title:'序号',type: 'numbers',
                     totalRowText:'合计',
                 },
                 {
                     field: 'name',
-                    width: 120,
+                    width: 80,
                     title: '姓名',
                     templet: "#name"
                 },
                 {
                     field: 'school',
-                    width: 250,
+                    width: 160,
                     title: '单位',
                 },
                 {
                     field: 'department',
-                    width: 250,
+                    width: 130,
                     title: '部门'
                 },
                 {
                     field: 'professional_title',
                     title: '职称',
-                    width: 120,
+                    width: 80,
                     templet: '#show_follow'
                 },
                 {
                     field: 'job',
-                    width: 120,
+                    width: 80,
                     title: '职务',
                     templet: '#show_keys'
 
                 },
                 {
                   field: 'source',
-                  width: 120,
+                  width: 90,
                   title: '来源',
                 },
                 {
                     field: 'attitude',
-                    width: 120,
+                    width: 60,
                     title: '态度',
                 },
                 {
                     field: 'course_subjects_count',
-                    width: 120,
+                    width: 90,
                     title: '课程方向',
                     templet: "#courses"
                 },
                 {
                     field: 'teacher_follows_count',
-                    width: 120,
+                    width: 90,
                     title: '跟进情况',
                     totalRow:true,
                     templet: "#follow"
                 },
                 {
                     field: 'teacher_used',
-                    width: 120,
+                    width: 100,
                     title: '学院渗透率',
                 },
                 {
                     field: 'students',
-                    width: 120,
+                    width: 60,
                     totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                     title: '学生',
                 },
                 {
                     field: 'courses_count',
-                    width: 120,
+                    width: 60,
                     title: '课堂',
                     totalRow:true,
                     templet: "#class"
                 },
                 {
                     field: 'activities_count',
-                    width: 120,
+                    width: 100,
                     title: '参与活动',
                     templet: "#event"
                 },

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

@@ -45,7 +45,7 @@
   <div class="layui-side layui-bg-black">
     <div class="layui-side-scroll ">
       <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
-      <ul class="layui-nav layui-nav-tree"
+      <ul class="layui-nav layui-nav-tree ul"
           lay-filter="test">
         <li class="layui-nav-item layui-nav-itemed menu-li" >
           <a class="" href="javascript:;"><b><%= image_tag "educode_sales/1.销售活动.png",size:"15"%><i style="padding-right: 25px"></i>销售活动</b></a>
@@ -252,4 +252,9 @@
 
 
 
-</script>
+</script>
+<style>
+    .layuimini-mini .ul .layui-nav-child{
+        display: none;!important;
+    }
+</style>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -103,7 +103,7 @@ files:
 - app/assets/images/educode_sales/icon-ext.png
 - 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