educode_sales 0.3.8 → 0.3.9

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

@@ -1,7 +1,12 @@
 <script type="text/html" id="newWeeklyToolbar">
   <div class="layui-btn-container">
+    {{#  if(parent.from_edit_monthly){ }}
+    <span class="table-label">本月计划列表</span>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add_month"> 添加计划</button>
+    {{# } else { }}
     <span class="table-label">本周计划列表</span>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
+    {{#  } }}
   </div>
 </script>
 <form class="layui-form layui-form-pane">
@@ -168,6 +173,27 @@
         $(window).on("resize", function () {
           layer.full(sindex);
         });
+      }else if (obj.event === 'add_month') { // 监听添加操作
+          from_weekly = true;
+          var content = miniPage.getHrefContent('/missions/plans/new_month');
+          var openWH = miniPage.getOpenWidthHeight();
+          sindex = layer.open({
+              title: '添加计划',
+              type: 1,
+              shade: 0.2,
+              maxmin: true,
+              shadeClose: true,
+              area: [openWH[0] + 'px', openWH[1] + 'px'],
+              offset: [openWH[2] + 'px', openWH[3] + 'px'],
+              content: content,
+              success: function (layero, index) {
+                  // 重新渲染弹层中的下拉选择框select
+                  form.render('select');
+              }
+          });
+          $(window).on("resize", function () {
+              layer.full(sindex);
+          });
       }
     });
     table.on('tool(newWeeklyTable)', function (obj) {

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

@@ -60,6 +60,7 @@
         ]
       ],
       limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
       page: true
     });
   });

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

@@ -6,8 +6,8 @@ json.data do
     json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
     json.business_a d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @a_clazz&.id).count
     json.business_b d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @b_clazz&.id).count
-    json.goal d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.stage_id in (?)", @step_ids).sum(:total_amount).round(2)
-    json.return_money  d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").sum("educode_sales_businesses.return_money")
+    json.goal d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
+    json.return_money  d.businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ?", @x).sum("educode_sales_businesses.return_money").round(2)
     json.a_clazz_id @a_clazz&.id
     json.b_clazz_id @b_clazz&.id
   end

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

@@ -62,6 +62,7 @@
                 ]
             ],
             limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
             page: true
         });
 

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

@@ -177,7 +177,6 @@
             }
           })
           $("#" + el).blur(function () {
-            console.log(this.value)
             if (this.value == '') {
               layer.msg("不能为空")
             } else {
@@ -185,13 +184,11 @@
               data[el] = this.value;
               var self = this;
               data['year'] = year;
-              console.log(data, $("#years").value, year)
               request.post( '/missions/sales/sale_trends',
                 data,
                 function(res) {
                   $("#" + el + "_field").addClass("layui-hide");
                   $("#" + el + "_value").removeClass("layui-hide");
-                  console.log(self.value)
                   $("#" + el + "_value")[0].innerText = self.value + "万";
                 }
               )
@@ -200,7 +197,6 @@
         }
 
         form.on('select(year)', function(data){
-          console.log(data, )
           year = data.value
           window.location.href = "/missions/sales/trends?year=" + data.value
         })

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

@@ -73,6 +73,7 @@
         ]
       ],
       limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
       page: true,
       skin: 'line'
     });

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

@@ -48,7 +48,6 @@
 
         //监听提交
         form.on('submit(add_course)', function (data) {
-            console.log(data.field)
             request.authPost('missions/teachers/'+parent.teacher_id +'/create_course', data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)

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

@@ -0,0 +1,40 @@
+<div style="padding-left: 50px">
+        <button type="button" class="layui-btn" id="test3"><i class="layui-icon"></i>选择文件</button>
+</div>
+<script>
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            upload = layui.upload,
+            request = layui.request,
+            $ = layui.$;
+        selectInput = layui.selectInput;
+
+        form.render();
+
+        //指定允许上传的文件类型
+        upload.render({
+            elem: '#test3'
+            ,url: '/missions/import_teachers' //此处配置你自己的上传接口即可
+            ,accept: 'file', //普通文件
+                headers: {
+                    'X-CSRF-Token': $('meta[name=csrf-token]').attr('content')
+                }
+            ,before: function(obj){ //obj参数包含的信息，跟 choose回调完全一致，可参见上文。
+                layer.load(); //上传loading
+            }
+            ,done: function(res){
+                layer.msg('导入成功');
+                table.reload('teachers_table');
+                table.reload('activities_table');
+                layer.close(parent.import_index)
+                layer.closeAll('loading'); //关闭loading
+            }
+            ,error: function(index, upload){
+                layer.closeAll('loading'); //关闭loading
+            }
+        });
+    });
+</script>

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

@@ -65,8 +65,9 @@
   <div class="layui-btn-container">
     <span class="table-label">教师列表</span>
     <% if can? :create, EducodeSales::Teacher %>
-    <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-normal layui-btn-sm data-add-btn pull-right" lay-event="import">导入数据</button>
+      <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-normal layui-btn-sm data-add-btn pull-right" lay-event="search_new"> 搜索添加 -->
     </button>
   </div>
@@ -235,6 +236,7 @@
             ],
 
             limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
             page: true,
             done: function (res) {
                 drowpdwonRender()
@@ -347,7 +349,6 @@
         // 监听搜索操作
         form.on('submit(search_teachers)', function (data) {
             search = data.field
-            console.log(search);
             table.reload('teachers_table', {
                 page: {
                     curr: 1
@@ -391,6 +392,22 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
+            }else if (obj.event === 'import') {  //
+                var content = miniPage.getHrefContent('/missions/teachers/import');
+                var openWH = miniPage.getOpenWidthHeight();
+                import_index = layer.open({
+                    title: '导入数据',
+                    type: 1,
+                    shade: 0.2,
+                    shadeClose: true,
+                    area: ['200px', '100px'],
+                    offset: 'auto',
+                    closeBtn: 0,
+                    content: content,
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
             } else if (obj.event === 'search_new') { // 搜索添加
                 content = miniPage.getHrefContent('/missions/teachers/search_new');
                 openWH = miniPage.getOpenWidthHeight();

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

@@ -81,7 +81,6 @@
                 return cb([]);
               }
               request.get('missions/search_edu_teacher?q=' + value, {}, function (res) {
-                  console.log(res);
                   return cb(res)
               })
             }

data/config/routes.rb

@@ -9,6 +9,7 @@ EducodeSales::Engine.routes.draw do
   get :search_edu_teacher,to: "home#search_edu_teacher"
   get :search, to: "home#search"
   get :no_permission, to: "home#no_permission"
+  get :sales_staff, to: "home#sales_staff"
 
   resources :sessions do
   end
@@ -110,8 +111,12 @@ EducodeSales::Engine.routes.draw do
     end
   end
 
+
+  resources :import_teachers
+
   resources :teachers do
     collection do
+      get :import
       get :add_keys
       get :search_new
       get :add_courses

data/db/migrate/20211013060712_create_educode_sales_assign_follow_ups.rb

@@ -0,0 +1,10 @@
+class CreateEducodeSalesAssignFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_assign_follow_ups do |t|
+      t.references :staff
+      t.references :follow_up
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.3.8'
+  VERSION = '0.3.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-10 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,6 +96,7 @@ files:
 - app/assets/javascripts/educode_sales/extent/miniPage.js
 - app/assets/javascripts/educode_sales/extent/request.js
 - app/assets/javascripts/educode_sales/extent/select_input.js
+- app/assets/javascripts/educode_sales/extent/xm-select.js
 - app/assets/javascripts/educode_sales/layui.js
 - app/assets/stylesheets/educode_sales/app.css
 - app/assets/stylesheets/educode_sales/application.css
@@ -120,6 +121,7 @@ files:
 - app/controllers/educode_sales/commons_controller.rb
 - app/controllers/educode_sales/follow_ups_controller.rb
 - app/controllers/educode_sales/home_controller.rb
+- app/controllers/educode_sales/import_teachers_controller.rb
 - app/controllers/educode_sales/key_person_controller.rb
 - app/controllers/educode_sales/operation_plans_controller.rb
 - app/controllers/educode_sales/operation_reports_controller.rb
@@ -146,6 +148,7 @@ files:
 - app/models/educode_sales/activity.rb
 - app/models/educode_sales/activity_teacher.rb
 - app/models/educode_sales/application_record.rb
+- app/models/educode_sales/assign_follow_up.rb
 - app/models/educode_sales/business.rb
 - app/models/educode_sales/common.rb
 - app/models/educode_sales/course_subject.rb
@@ -194,6 +197,7 @@ files:
 - app/views/educode_sales/follow_ups/teachers.json.jbuilder
 - app/views/educode_sales/home/index.html.erb
 - app/views/educode_sales/home/no_permission.html.erb
+- app/views/educode_sales/home/sales_staff.json.jbuilder
 - app/views/educode_sales/home/search.json.jbuilder
 - app/views/educode_sales/home/search_edu_teacher.json.jbuilder
 - app/views/educode_sales/home/search_teacher.json.jbuilder
@@ -285,6 +289,7 @@ files:
 - app/views/educode_sales/teachers/course_subject.json.jbuilder
 - app/views/educode_sales/teachers/edit.html.erb
 - app/views/educode_sales/teachers/edit_follow_record.html.erb
+- app/views/educode_sales/teachers/import.html.erb
 - app/views/educode_sales/teachers/index.html.erb
 - app/views/educode_sales/teachers/index.json.jbuilder
 - app/views/educode_sales/teachers/new.html.erb
@@ -327,6 +332,7 @@ files:
 - db/migrate/20210915061738_add_students_count_teacher_follow_ups.rb
 - db/migrate/20211009031109_add_tel_key_peoples.rb
 - db/migrate/20211009063423_add_source_businesses.rb
+- db/migrate/20211013060712_create_educode_sales_assign_follow_ups.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb