educode_sales 0.9.44 → 0.9.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3b8eeaf96172e79bdd5ecd470826d1b1509e27aa51650992fea9573124c03a8
-  data.tar.gz: 448e73b86222666fa76163427cacf66d25dcb3afff0186dac870da2096f701ec
+  metadata.gz: 7444b7d61d8ff5a5677b765e4d0580a49a3b425de52ffec51e0f4bce62b5d125
+  data.tar.gz: 2752a018874ad957014ceff871ee1ef7cb77d8ea0300c0da9a1112344c579d51
 SHA512:
-  metadata.gz: d33d493129ce919f40d3ba640312a2b32b8965e269f013c9fac9cd8972576fd5cae0ce6c3099c691ff5b993263f36f61ab2f2f5298c6051c51df74c4c4d6c5dd
-  data.tar.gz: ab38c5526bec3b5eae9b4109b705298f8a5b8a2d932845bf70fc1b45b0d29ef9395b3d6865b840703bda9184b754ebc6411efee484d78160ea3b74dda998977b
+  metadata.gz: 5a4e87f3e97aa8604d7656e36e044943129e6ee19414bc5a2ba2d6d5d1f8150797d9a0cd0e254693f74535cde2d1f9aa9eb27027cdb2f6dfae548c3bd1276435
+  data.tar.gz: 05c6ce1070251dd40fb903ef901517228ebaddaa7690d84ac94f141768e6c065c0c31b7785d0eea71dc9aacba98ff548fb699b6a595a5877056c9b2a308c84d4

data/app/controllers/educode_sales/customers_controller.rb

@@ -33,6 +33,25 @@ module EducodeSales
       render_success
     end
 
+    def majors
+      department = Department.find(params[:id])
+      @majors = department.department_majors
+    end
+
+    def major
+      department = Department.find(params[:id])
+      major = department.department_majors.new(name: params[:name])
+      if major.save
+        render_success
+      else
+        render_failure major
+      end
+    end
+
+    def new_major
+      render layout: false
+    end
+
     def index
       authorize! :read, Customer
       respond_to do |format|
@@ -128,11 +147,35 @@ 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
 
+    def update_major
+      department = Department.find(params[:id])
+      major = department.department_majors.find(params[:major_id])
+      if major.update(name: params[:name])
+        render_success
+      else
+        render_failure major
+      end
+    end
+
+    def delete_major
+      department = Department.find(params[:id])
+      major = department.department_majors.find(params[:major_id])
+      if major.destroy
+        render_success
+      else
+        render_failure major
+      end
+    end
+
     def give
       common = Common.find_by(clazz: 'staff_type', name: '销售')
       @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
@@ -213,6 +256,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 +309,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/edit_department.html.erb

@@ -16,7 +16,24 @@
       </div>
     </div>
   </form>
+  <div>
+    <table class="layui-hide" id="major_table" lay-filter="major_table"></table>
+  </div>
 </div>
+<script type="text/html" id="add_major">
+  <div class="layui-btn-container">
+    <span class="table-label">专业列表</span>
+    <% if can? :create_department, EducodeSales::Customer %>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加专业</button>
+    <% end %>
+  </div>
+</script>
+<script type="text/html" id="tab_major">
+  <% if can? :update_department, EducodeSales::Customer %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    <a class="layui-btn layui-btn-normal layui-btn-xs layui-btn-danger data-count-delete" lay-event="del">删除</a>
+ <% end %>
+</script>
 
 <script>
 
@@ -50,5 +67,106 @@
             })
             return false;
         });
+
+        table.render({
+          elem: '#major_table',
+          url: '/missions/customers/majors?id=' + parent.department_id ,
+          toolbar: '#add_major',
+          defaultToolbar: [],
+          cols: [
+            [
+              {
+                field: 'id',
+                width: 100,
+                title:'序号',type: 'numbers',
+              },
+              {
+                field: 'name',
+                title: '专业',
+              },
+              {
+                title: '操作',
+                width: 190,
+                toolbar: '#tab_major',
+                align: "center",
+                fixed: 'right'
+              }
+            ]
+          ],
+      });
+
+      table.on('toolbar(major_table)', function (obj) {
+        if (obj.event === 'add') {
+          department_id = parent.department_id;
+            var content = miniPage.getHrefContent('/missions/customers/new_major?id=' + parent.department_id);
+            var openWH = miniPage.getOpenWidthHeight();
+            new_major_index = 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) {
+                form.render('select');
+              }
+            });
+            $(window).on("resize", function () {
+              layer.full(index);
+            });
+        }
     });
+    table.on('tool(major_table)', function (obj) {
+      if (obj.event == 'edit') { 
+        var index = layer.open({
+          title: '修改专业名称',
+          closeBtn: 0,
+          type: 1,
+          area: '400px;',
+          id: 'LAY_layuipro',
+          content: '<div class="layui-form" lay-filter="edit_data" style="padding: 20px;"><input autocomplete="off" type="text" name="name" lay-verify="required" class="layui-input" value="' + obj.data.name +'"/></div>' ,
+          btn: ['保存', '取消'],
+            btn1: function(index, l) {
+              if (l.find("input").val().trim() == '') {
+                layer.msg('名称不能为空')
+                return false;
+              } else {
+                  request.authPut("missions/customers/" + parent.department_id + "/update_major", {name: l.find("input").val().trim(), major_id: obj.data.id}, function(res) {
+                  if (res.success == false) {
+                    layer.alert(res.msg);
+                  } else {
+                    table.reload('major_table');
+                    parent.table.reload('sale_plan_follow_table');
+                    layer.close(index);
+                  }
+                })
+              }
+              
+              return false
+            },
+            btn2: function(index, l) {
+              layer.close(index)
+            }
+        });
+      } else if (obj.event == 'del') {
+        var index = layer.open({
+          content: '确定删除该专业 ' + obj.data.name + ' 吗',
+          yes: function(index, layero){
+            request.authDelete("missions/customers/" + parent.department_id  + "/delete_major?major_id=" + obj.data.id, {}, function(res) {
+              if (res.success == false) {
+                layer.alert(res.msg)
+              } else {
+                table.reload('major_table');
+                parent.table.reload('sale_plan_follow_table');
+                layer.close(index);
+              }
+            })
+          }
+        });  
+      }
+    })
+     
+  });
 </script>

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/customers/majors.json.jbuilder

@@ -0,0 +1,10 @@
+json.data do
+  i = 0
+  json.array! @majors do |d|
+    json.num i + 1
+    json.id d.id
+    json.name d.name
+  end
+end
+json.code 0
+json.count @majors.size

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

@@ -0,0 +1,40 @@
+<div class="layuimini-main">
+  <form class="layui-form  layuimini-form">
+    <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-form-item" style="padding: 25px">
+      <div class="layui-inline">
+        <label class="layui-form-label required">专业名称</label>
+        <div class="layui-input-block" style="width: 300px;">
+          <input type="text" name="name" required lay-verify="required" autocomplete="off" placeholder="请输入" class="layui-input" >
+        </div>
+      </div>
+      </div>
+      <div class="layui-form-item" style="padding-left: 130px">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_major_btn">提交</button>
+      </div>
+    </div>
+  </form>
+</div>
+
+<script>
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
+      var form = layui.form,
+        request = layui.request,
+        $ = layui.$;
+
+      form.on('submit(add_major_btn)', function (data) {
+        data.field.school_id = parent.school_id
+        request.authPost("missions/customers/"+ parent.department_id +"/major", data.field, function (res) {
+            if (res.success === false) {
+                layer.alert(res.msg)
+            } else {
+              layer.close(parent.new_department_index); //关闭所有层
+              parent.table.reload('major_table');
+              parent.table.reload('sale_plan_follow_table');
+              layer.close(parent.new_major_index);
+            }
+        })
+        return false;
+      });
+    });
+</script>

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

@@ -4,6 +4,7 @@ json.data do
     # json.created_at d.created_at.to_s
     # json.staff d.staff.user.real_name
     json.department d.name
+    json.department_major d.department_majors.pluck(:name).join("、")
     # json.content d.content
     # json.is_latest d.id == @latest.id
   end

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

@@ -51,6 +51,11 @@
                         {
                             field: 'department',
                             title: '学院/部门',
+                            width: 200,
+                        },
+                        {
+                          field: 'department_major',
+                          title: '专业',
                         },
                         {
                             title: '操作',
@@ -131,7 +136,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'edit') {
-                department_id = obj.data.id
+                department_id = obj.data.id;
                 content = miniPage.getHrefContent('/missions/customers/edit_department?id='+ obj.data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 edit_index1 = layer.open({

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,9 @@ EducodeSales::Engine.routes.draw do
       get :new_department
       get :edit_department
       get :give
+      post :batch_update_school_tags
+      get :majors
+      get :new_major
     end
 
     member do
@@ -44,6 +47,9 @@ EducodeSales::Engine.routes.draw do
       put :update_follow_up
       post :create_department
       put :update_department
+      post :major
+      put :update_major
+      delete :delete_major
     end
   end
 

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/db/migrate/20230215141612_add_mobile_to_teachers.rb

@@ -0,0 +1,5 @@
+class AddMobileToTeachers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_teachers, :mobile, :string
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.44'
+  VERSION = '0.9.46'
 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.46
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-11 00:00:00.000000000 Z
+date: 2023-02-17 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
@@ -275,9 +274,11 @@ files:
 - app/views/educode_sales/customers/give.html.erb
 - app/views/educode_sales/customers/index.html.erb
 - app/views/educode_sales/customers/index.json.jbuilder
+- app/views/educode_sales/customers/majors.json.jbuilder
 - app/views/educode_sales/customers/new.html.erb
 - app/views/educode_sales/customers/new_department.html.erb
 - app/views/educode_sales/customers/new_follow_record.html.erb
+- app/views/educode_sales/customers/new_major.html.erb
 - app/views/educode_sales/customers/show_department.json.jbuilder
 - app/views/educode_sales/customers/show_follow.html.erb
 - app/views/educode_sales/customers/show_follow.json.jbuilder
@@ -494,6 +495,7 @@ files:
 - db/migrate/20230117144025_create_educode_sales_business_clazz_changes.rb
 - db/migrate/20230206080303_create_educode_sales_staff_school_tags.rb
 - db/migrate/20230209102302_create_educode_sales_staff_permissions.rb
+- db/migrate/20230215141612_add_mobile_to_teachers.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -502,7 +504,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -517,8 +519,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: []