educode_sales 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6dbbb6a86049648541dc1d2fb1ec36eec9e24562bd17693725b1e3b498be3c0
-  data.tar.gz: 7d4dffa34c61c38e66664d685244f4485d1cf7021c7115fb52903155efd3aac8
+  metadata.gz: 41b7c2e662fd724e27b8a995fe3f8fe5733384fe5454ffff038a22fe7526b6ad
+  data.tar.gz: '09abc1d2d95817c2fc4e1dbc73beb1a31beb24239e2401b25c41125bf7864130'
 SHA512:
-  metadata.gz: dc84606ad701fb65520d5be1d79f59c83bad909b93fb3d6b4b61b7bc22e037c7b58a94bd9f13f9d8f9bfc6a37d891a168e04c23453fb5590fb4e479878025ed2
-  data.tar.gz: fefca5856e9a3c84876b2dcff7fd9c7415ca1d935f141a367b4dcc3c6b549965febef90454afcfe6462b93fd716a38b21b1899947fe0292353c5dc9f7dfaaaf3
+  metadata.gz: 7305c066cefb80249560e179eee5f84caedde9e223cb45311ebca66462251be8280cfb5c577da14d3c946ed485fadcca6342160e571203f0d25ccb987fca0f7b
+  data.tar.gz: 3896cf2a1252a590053116ceac804abbc6cdae787b8f055a4258cfc388b8832aea623d561e5fe3ae4ce76e22347aa606f3e0f40e138c4747d535b5d75e2070c3

data/app/controllers/educode_sales/staffs_controller.rb

@@ -9,6 +9,25 @@ module EducodeSales
         end
         format.json do
           @staffs = Staff.where(is_admin: false, deleted_at: nil).page(params[:page]).per(params[:limit])
+          if params[:q].present? && params[:q][:name].present?
+            @staffs = @staffs.joins(:user).where('CONCAT(lastname, firstname) LIKE :name', name: "%#{params[:q][:name]}%")
+          end
+          if params[:q].present? && params[:q][:role].present?
+            @staffs = @staffs.where(role: params[:q][:role])
+          end
+          if params[:q].present? && params[:q][:staff_id].present?
+            @staffs = @staffs.where(staff_id: params[:q][:staff_id])
+          end
+          if params[:q].present? && params[:q][:staff_type].present?
+            @staffs = @staffs.where(job_type: params[:q][:staff_type])
+          end
+          if params[:q].present? && params[:q][:banned].present?
+            if params[:q][:banned] == "0"
+              @staffs = @staffs.where("educode_sales_staffs.expired_at is null or educode_sales_staffs.expired_at > ?", Time.now)
+            else
+              @staffs = @staffs.where("educode_sales_staffs.expired_at is null or educode_sales_staffs.expired_at < ?", Time.now)
+            end
+          end
         end
       end
     end

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

@@ -1,4 +1,4 @@
-follow_ups_count = 0
+follow_count = 0
 json.data do
   json.array! @businesses do |d|
     json.id d.id
@@ -6,8 +6,9 @@ json.data do
     json.department d.department.name
     json.school d.department.school.name
     json.school_id d.department.school.id
-    json.follow_ups_count d.follow_ups.where(deleted_at: nil).size
-    follow_ups_count += d.follow_ups_count
+    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
@@ -37,7 +38,6 @@ json.data1 do
     json.school d.department.school.name
     json.school_id d.department.school.id
     json.follow_ups_count d.follow_ups.where(deleted_at: nil).size
-    follow_ups_count += d.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
@@ -61,7 +61,7 @@ json.data1 do
 end
 
 json.totalRow do
-  json.follow_ups_count follow_ups_count.to_s
+  json.follow_ups_count follow_count.to_i.to_s
 end
 json.code 0
 json.count @businesses.total_count

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

@@ -4,9 +4,43 @@
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加人员</button>
   </div>
 </script>
-
+<div class="layuimini-main  min-height-table" id="week_table_wraper">
+  <div class="layui-form layui-form-pane" lay-filter="week_plan_form_filter">
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">用户名</label>
+        <div class="layui-input-inline large-select">
+          <input type="text" class="layui-input" id="name" autocomplete="off" name="name">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">角色</label>
+        <div class="layui-input-inline">
+          <%= select_tag "role", options_for_select(EducodeSales::Role.all.pluck(:name, :id)), {'lay-filter': 'role', include_blank: true} %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">人员类型</label>
+        <div class="layui-input-inline large-select">
+          <%= select_tag "staff_type", options_for_select(EducodeSales::Common.where(clazz: 'staff_type').pluck(:name, :id)), {'lay-filter': 'staff_type', include_blank: true} %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">状态</label>
+        <div class="layui-input-inline large-select">
+          <%= select_tag "banned", options_for_select([["启用",0],["禁用",1]]), {'lay-filter': 'banned', include_blank: true} %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <button type="reset" lay-submit class="layui-btn layui-btn-primary" lay-filter="week_plan_reset">重置
+        </button>
+        <button type="submit" lay-submit class="layui-btn layui-btn-primary" lay-filter="week_plan_search">检索
+        </button>
+      </div>
+    </div>
+  </div>
 <table class="layui-hide" id="staff_filter" lay-filter="staff_filter"></table>
-
+</div>
 <script type="text/html" id="staff_bar">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <a class="layui-btn layui-btn-xs layui-btn-warm data-count-delete" lay-event="disable">禁用</a>
@@ -97,6 +131,38 @@
         });
       }
     });
+      var sort = {}, search = {};
+      // table.on('sort(weekPlanTable)', function(obj) {
+      //     sort.field = obj.field;
+      //     sort.order = obj.type;
+      //     table.reload('weekPlanTable', {
+      //         initSort: obj,
+      //         where: {
+      //             sort: sort,
+      //             q: search
+      //         }
+      //     });
+      // })
+
+      // 监听搜索操作
+      form.on('submit(week_plan_search)', function (data) {
+          search = data.field
+          table.reload('staff_filter', {
+              page: {
+                  curr: 1
+              },
+              where: {q: search, sort : sort}
+          }, 'data');
+
+          return false;
+      });
+
+      form.on('submit(week_plan_reset)', function(data){
+          var field = data.field;
+          form.val('week_plan_form_filter', {name: '', role: '', staff_type: '', banned: ''})
+          return false;
+      });
+
     table.on('tool(staff_filter)', function (obj) {
       var data = obj.data;
       staff_id = data.id;

data/db/migrate/20220121060006_create_educode_sales_business_export_records.rb

@@ -0,0 +1,10 @@
+class CreateEducodeSalesBusinessExportRecords < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_business_export_records do |t|
+      t.string :name
+      t.references :staff
+
+      t.timestamps
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.6.7'
+  VERSION = '0.6.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -414,6 +414,7 @@ files:
 - db/migrate/20211215025029_create_educode_sales_customer_follows.rb
 - db/migrate/20211220102720_add_position_to_commons.rb
 - db/migrate/20211221075146_add_school_id_to_educode_sales_businesses.rb
+- db/migrate/20220121060006_create_educode_sales_business_export_records.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb