educode_sales 0.5.1 → 0.5.2

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

@@ -1,15 +1,25 @@
+area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @staffs do |d|
     json.id d.id
     json.name d.user.real_name
     json.role d.role&.name
-    json.area d.areas.present? ? d.areas.pluck(:name).join("、") : ''
     json.job_type EducodeSales::Common.job_type_name[d.job_type]
     json.month d.month
     json.enabled_at d.enabled_at ? d.enabled_at.to_s(:date) : ''
     json.expired_at d.enabled_at ? "#{d.enabled_at.to_s(:date)}-#{d.expired_at.to_s(:date)}" : ''
+    if d.areas.present?
+      if d.areas.ids.sort.to_s == area_ids
+        json.area '全国'
+      else
+        json.area  d.areas.pluck(:name).join("、")
+      end
+    else
+      json.area  ''
+    end
   end
 end
 
+
 json.code 0
 json.count @staffs.total_count

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

@@ -144,7 +144,7 @@
       $(document).on('click','#new_teacher1',function(){
           var content = miniPage.getHrefContent('/missions/teachers/new');
           var openWH = miniPage.getOpenWidthHeight();
-          sindex = layer.open({
+          teacher_uni_index = layer.open({
               id:"a",
               title: '添加老师',
               type: 1,

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

@@ -588,4 +588,9 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 30px; !important;
+    }
+</style>

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

@@ -156,6 +156,7 @@
               table.reload('teachers_table');
               layer.close(parent.index)
               layer.close(parent.sindex)
+              layer.close(parent.teacher_uni_index)
             }
           })
           return false;

data/config/routes.rb

@@ -203,6 +203,9 @@ EducodeSales::Engine.routes.draw do
   end
 
   resources :roles do
+    collection do
+      get :rename
+    end
     member do
       put :view
       put :update_role

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -297,6 +297,7 @@ files:
 - app/views/educode_sales/roles/index.html.erb
 - app/views/educode_sales/roles/index.json.jbuilder
 - app/views/educode_sales/roles/new.html.erb
+- app/views/educode_sales/roles/rename.html.erb
 - app/views/educode_sales/sale_reports/audit.html.erb
 - app/views/educode_sales/sale_reports/edit.html.erb
 - app/views/educode_sales/sale_reports/index.json.jbuilder
@@ -304,6 +305,7 @@ files:
 - app/views/educode_sales/sale_reports/show.html.erb
 - app/views/educode_sales/sale_trends/operations.html.erb
 - app/views/educode_sales/sale_trends/trends.html.erb
+- app/views/educode_sales/sale_trends/trends.json.jbuilder
 - app/views/educode_sales/sales/index.html.erb
 - app/views/educode_sales/sales/index.json.jbuilder
 - app/views/educode_sales/sales/operations.html.erb