educode_sales 0.9.43 → 0.9.45

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;
@@ -102,18 +109,7 @@
 
         var property_list = xmSelect.render({
             el: '#property',
-            data: [
-                // {value: 0, name: '985工程'},
-                // {value: 1, name: '211工程'},
-                {value: 2, name: '本科院校'},
-                {value: 5, name: '军事院校'},
-                {value: 3, name: '高职院校'},
-                {value: 4, name: '中职院校'},
-                {value: 7, name: '中学'},
-                {value: 8, name: '小学'},
-                {value: 6, name: '企业'},
-                {value: 9, name: '其他'},
-            ]
+            data: gon.school_tags
         })
 
         laydate.render({
@@ -125,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: [
                 [
@@ -197,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();
+              }
+            }
         });
 
         //监听表格复选框选择
@@ -360,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') {
+
             }
         });
 
@@ -514,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

@@ -14,21 +14,21 @@ json.data do
     json.id d.id
     json.name d.name
     json.area d.province
-    school_property = d.school_property
-    property = []
-    if school_property.present?
-      # property << '985工程' if school_property.project_985
-      # property << '211工程' if school_property.project_211
-      property << '本科院校' if school_property.regular_college
-      property << '大专院校' if school_property.junior_college
-      property << '中专学校' if school_property.secondary_school
-      property << '军事院校' if school_property.military_school
-      property << '企业' if school_property.enterprise
-      property << '小学' if school_property.ele_school
-      property << '中学' if school_property.mid_school
-      property << '其他' if school_property.other
-    end
-    json.property property.join("、")
+    # school_property = d.school_property
+    # property = []
+    # if school_property.present?
+    #   # property << '985工程' if school_property.project_985
+    #   # property << '211工程' if school_property.project_211
+    #   property << '本科院校' if school_property.regular_college
+    #   property << '大专院校' if school_property.junior_college
+    #   property << '中专学校' if school_property.secondary_school
+    #   property << '军事院校' if school_property.military_school
+    #   property << '企业' if school_property.enterprise
+    #   property << '小学' if school_property.ele_school
+    #   property << '中学' if school_property.mid_school
+    #   property << '其他' if school_property.other
+    # end
+    json.property d.school_tags.where(for_missions: true).pluck(:name).join("、")
     json.department d.departments.size
     json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.school_id = ?", d.id).size
     json.follow follow_ups.size + customer_follows.size
@@ -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.43'
+  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.43
+  version: 0.9.45
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-10 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: []