educode_sales 0.9.44 → 0.9.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3b8eeaf96172e79bdd5ecd470826d1b1509e27aa51650992fea9573124c03a8
-  data.tar.gz: 448e73b86222666fa76163427cacf66d25dcb3afff0186dac870da2096f701ec
+  metadata.gz: 490547dd6002957fc97b49d5944e48b43476036a6f9090689c457ebdf0ad2167
+  data.tar.gz: e82a58a5dfdc42d2ad607f6c702a643ed3a91227a42771fdada0034b823340e9
 SHA512:
-  metadata.gz: d33d493129ce919f40d3ba640312a2b32b8965e269f013c9fac9cd8972576fd5cae0ce6c3099c691ff5b993263f36f61ab2f2f5298c6051c51df74c4c4d6c5dd
-  data.tar.gz: ab38c5526bec3b5eae9b4109b705298f8a5b8a2d932845bf70fc1b45b0d29ef9395b3d6865b840703bda9184b754ebc6411efee484d78160ea3b74dda998977b
+  metadata.gz: 42827e0c0a5c605af5bd4ecd2dd4dd82faed892a6697d3c8c684c6d4dd4a3c96e9c67e94e7fe20eedd68c6545dad6ab5a8e66b02f39a3f2048fa8afa0b994f0c
+  data.tar.gz: 25005c073e6b4f7bf406d6950907a3fe2a95fb68a14d45ade420a663a31d29795292e168614e61501f48c08e53d8b888ba72adac3fffb05bd299b0121d7a7237

data/app/controllers/educode_sales/customers_controller.rb

@@ -128,7 +128,11 @@ module EducodeSales
             @customers = @customers.where(id: school_ids)
           end
 
-          @customers = @customers.order(id: :desc).page(params[:page]).per(params[:limit])
+          if params[:page].present?
+            @customers = @customers.order(id: :desc).page(params[:page]).per(params[:limit])
+          else
+            @customers = @customers.order(id: :desc)
+          end
         end
       end
     end
@@ -213,6 +217,36 @@ module EducodeSales
       render layout: false
     end
 
+    def batch_update_school_tags
+      xlsx = Roo::Spreadsheet.open(params[:file])
+      ods = xlsx.sheet(0)
+      rows = ods.last_row - 1
+      i = 0
+      school_tag_hash = SchoolTag.where(for_missions: true).pluck(:name, :id).to_h
+      rows.times do |r|  #行数
+        i += 1
+        next unless ods.row(r+1)[0]
+        school = School.find_by(name: ods.row(r+1)[0].to_s.strip)
+        school_list = EducodeSales::CustomerAdd::SCHOOL_LIST.invert
+        if school
+          property_names = ods.row(r+1)[2].to_s.strip
+          tags = []
+          if property_names
+            property_names.gsub("、", " ").gsub(",", " ").split(" ").each do |tag|
+              if school_tag_hash[tag]
+                tags << SchoolTagMiddle.find_or_initialize_by(school_id: school.id, school_tag_id: school_tag_hash[tag])
+              end
+            end
+          end
+          school.school_tag_middles = tags
+        end
+      end
+
+      SchoolTagMiddle.where(school_id: nil).delete_all
+      
+      render json: { succcess: true}
+    end
+
     def update
       @school = School.find(params[:id])
       ActiveRecord::Base.transaction do
@@ -236,20 +270,11 @@ module EducodeSales
         #保存学校标签
 
         keys = %w[regular_college junior_college secondary_school military_school other mid_school ele_school enterprise]
-        names = {
-          "regular_college" => "本科院校",
-          "junior_college" => "高职院校",
-          "secondary_school" => "中职院校",
-          "military_school" => "军事院校",
-          "other" => "其他",
-          "mid_school" => "中学",
-          "ele_school" => "小学",
-          "enterprise" => "企业"
-        }
+        names = EducodeSales::CustomerAdd::SCHOOL_LIST
         property.attributes.each do |key, value|
           next unless key.in?(keys)
           next unless value.to_s == "true"
-          school_tag = SchoolTag.find_by_name(names[key])
+          school_tag = SchoolTag.find_by(name: names[key], for_missions: true)
           if school_tag.present?
             SchoolTagMiddle.create(school_id: @school.id, school_tag_id: school_tag.id)
           end

data/app/models/educode_sales/customer_add.rb

@@ -1,4 +1,15 @@
 module EducodeSales
   class CustomerAdd < ApplicationRecord
+
+    SCHOOL_LIST = {
+      "regular_college" => "本科院校",
+      "junior_college" => "高职院校",
+      "secondary_school" => "中职院校",
+      "military_school" => "军事院校",
+      "other" => "其他",
+      "mid_school" => "中学",
+      "ele_school" => "小学",
+      "enterprise" => "企业"
+    }
   end
 end

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

@@ -45,6 +45,12 @@
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">客户列表</span>
+    <% if can? :export, EducodeSales::Customer %>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="export">导出</button>
+    <% end %>
+    <% if can? :modify_school_tag, EducodeSales::Customer %>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" id="modify_customer">批量修改客户类型</button>
+    <% end %>
     <% if can? :create, EducodeSales::Customer %>
       <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加客户</button>
     <% end %>
@@ -83,10 +89,11 @@
 
 
 <script>
-    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
+    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'upload'], function () {
         var $ = layui.jquery,
             form = layui.form,
             request = layui.request,
+            upload = layui.upload,
             dropdown = layui.dropdown,
             miniPage = layui.miniPage,
             laydate = layui.laydate;
@@ -114,12 +121,13 @@
         });
 
         table = layui.table;
-        table.render({
+        var customer_table = table.render({
             elem: '#customers_table',
             url: '/missions/customers',
             where: {q: form.val('search_teachers')},
             toolbar: '#toolbarDemo',
             // totalRow:true,
+            title: '客户列表',
             defaultToolbar: ['filter'],
             cols: [
                 [
@@ -186,6 +194,11 @@
             limit: 20,
             limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
             page: true,
+            done: function() {
+              if ($('#modify_customer').length > 0) {
+                uploadCustomer();
+              }
+            }
         });
 
         //监听表格复选框选择
@@ -349,6 +362,22 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
+            } else if (obj.event == 'export') {
+              layer.load(0, {});
+              var data = form.val("search_teachers");
+              var property = [];
+              property_list.getValue().forEach(function (d) {
+                  property.push(d.value);
+              })
+              data.property = property.toString();
+              request.authGet("/missions/customers?=" + $.param({q:data}), {
+              }, function (res) {
+                  data = res.data
+                  table.exportFile(customer_table.config.id, data, 'xls');
+                  layer.closeAll('loading');
+              })
+            } else if (obj.event == 'modify_customer') {
+
             }
         });
 
@@ -503,11 +532,53 @@
             }
         });
 
+        function uploadCustomer() {
+          upload.render({
+            elem: '#modify_customer'
+            ,url: '/missions/customers/batch_update_school_tags'
+            ,accept: 'file' //普通文件
+            ,acceptMime: 'application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,application/vnd.ms-excel'
+            ,headers: {
+              'X-CSRF-Token': $('meta[name=csrf-token]').attr('content')
+            }
+            ,before: function(obj){ 
+              layer.load(); 
+            }
+            ,done: function(res){
+                layer.msg('导入成功');
+                table.reload('customers_table');
+                layer.closeAll('loading'); //关闭loading
+            }
+            ,error: function(index, upload){
+                table.reload('file');
+                layer.closeAll('loading'); //关闭loading
+                layer.alert('导入失败，请检查文件格式')
+                layer.close(parent.import_index)
+            }
+         });
+        }
+        if ($('#modify_customer').length > 0) {
+          var uploadTip;
+          $(document).on('mouseenter', '#modify_customer', function() {
+            uploadTip = layer.tips("<p style='color:#000;'>" +  "导入Excel文件可批量修改客户性质。表格格式：客户名称 区域 性质。格式按导出的客户列表格式导入" + "</p>",
+              this,
+              {
+                tips:[1,'#f2f2f2'],
+                time:0,
+                area: 'auto',
+                maxWidth:500
+              });
+          })
+
+        $(document).on('mouseleave', '#modify_customer', function() {
+          layer.close(uploadTip);
+        })
+      }
+
     });
 </script>
 <style>
     .layui-table-tool-temp {
-        padding-right: 30px;
-    !important;
+      padding-right: 30px; !important;
     }
 </style>

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

@@ -37,4 +37,6 @@ json.data do
 end
 
 json.code 0
-json.count @customers.total_count
+if params[:page].present?
+  json.count @customers.total_count
+end

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

@@ -13,7 +13,7 @@
       <div class="layui-input-block">
         <%= select_tag "role_id",
                        options_for_select(EducodeSales::Role.pluck(:name, :id),
-                                          @staff.role_id), { 'lay-filter': 'role_id' } %>
+                                          @staff.role_id), { 'lay-filter': 'role_id', include_blank: true } %>
       </div>
     </div>
     <div class="layui-form-item">
@@ -21,7 +21,7 @@
       <div class="layui-input-block">
         <%= select_tag "job_type",
                        options_for_select(@staff_types,
-                                          @staff.job_type), { 'lay-filter': 'job_type' } %>
+                                          @staff.job_type), { 'lay-filter': 'job_type', include_blank: true } %>
       </div>
     </div>
     <div class="layui-form-item">

data/config/routes.rb

@@ -37,6 +37,7 @@ EducodeSales::Engine.routes.draw do
       get :new_department
       get :edit_department
       get :give
+      post :batch_update_school_tags
     end
 
     member do

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -49,6 +49,9 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       EducodeSales::Permission.create(name: '编辑跟进记录', subject: 'Customer', action: 'update_follow', clazz: 'customer')
       EducodeSales::Permission.create(name: '删除跟进记录', subject: 'Customer', action: 'destroy_follow', clazz: 'customer')
 
+      EducodeSales::Permission.create(name: '导出', subject: 'Customer', action: 'export', clazz: 'customer')
+      EducodeSales::Permission.create(name: '批量导入修改客户类型', subject: 'Customer', action: 'modify_school_tag', clazz: 'customer')
+
 
       EducodeSales::Permission.create(name: '查看数据', subject: 'SaleTrend', action: 'trends', clazz: 'market')
       EducodeSales::Permission.create(name: '编辑目标', subject: 'SaleTrend', action: 'sale_trends', clazz: 'market')

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.44'
+  VERSION = '0.9.45'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.44
+  version: 0.9.45
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-11 00:00:00.000000000 Z
+date: 2023-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ files:
 - 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
@@ -502,7 +501,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -517,8 +516,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []