educode_sales 1.10.16 → 1.10.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0004adcd1b18ad1bf429a0e64bcdecaf5fa88876b356bc283ef278e15bf77d57
-  data.tar.gz: 7c42448634f80e5b43a8f1cdb04e43e0f73df68cf3d5c333eb9938beaff7efad
+  metadata.gz: 3c05c264ac50b0d590a758bb92ea0d39e26d5aa4326f9d891041e5501999f0d5
+  data.tar.gz: b1d43f1098d9118dbb43978c5d10410b16ee42f40d9e7ed94a0cb13b327ea425
 SHA512:
-  metadata.gz: d6beecd42616de97a1f3c29060b1e1589609f8eb5ab109302c805ee3ab00a1036fa8d96557ecffb64961944247999e3c19d6232659fcfb874477571000a6f8ad
-  data.tar.gz: 9443b63c1a0e1e592d77f3a398ba91c77e6ef7d1738e606d613d87ea3fd63e550599d2bdcca638f6849bc69127c6bd34403913ad8d007a9d6256fbd058ef3cbd
+  metadata.gz: 24483315990fdb826a90520dabe2cc0e7ba99180209624db38a7f902b3b76ba4743e268b066fca02191f9d2d4d06ba353c5074df0ec273981317f37f11bd19e4
+  data.tar.gz: f549e8982818f99050fcbe876dc974a29aba6c1e8d1c1a6caeb772e100b49090aa2a20a4d19ead7d6001647840911ef941686e5a5d79bdbe320b15fe2f1232d7

data/app/controllers/educode_sales/teachers_controller.rb

@@ -26,6 +26,7 @@ module EducodeSales
     def index
       respond_to do |format|
         format.html do
+          @areas = EducodeSales::Common.where(clazz: 'area').map{|d| {name: d.name, value: d.id}}
           common = Common.find_by(clazz: 'staff_type', name: '运营')
           role = EducodeSales::Role.find_by(name: '生态经理')
           if role
@@ -149,11 +150,11 @@ module EducodeSales
             @teachers = @teachers.joins(:department).where("departments.id in (?)", departments_ids)
           end
           if params[:q].present? && params[:q][:area].present?
-            p = EducodeSales::Common.find(params[:q][:area]).name
+            p = EducodeSales::Common.where("id in (?)", params[:q][:area]).pluck(:name).uniq
             @teachers = @teachers.joins("
               JOIN departments ON educode_sales_teachers.department_id = departments.id
               JOIN schools ON departments.school_id = schools.id
-            ").where("province = ?", p)
+            ").where("province in (?)", p)
           end
           if params[:activity_id].present?
             if params[:school_id].present?

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

@@ -8,9 +8,9 @@ json.data do
     json.clazz d.clazz
     json.business d.business.name
     json.business_id d.business.id
-    json.school d.business.school.name
+    json.school d.business.school&.name
     json.school_id d.business.school_id
-    json.staff d.staff.user.real_name
+    json.staff d.staff&.user&.real_name
     json.staff_id d.staff_id
     json.number d.business.number
     json.category d.category || ''

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

@@ -65,7 +65,7 @@
       <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">区域</label>
         <div class="layui-input-inline">
-          <%= select_tag "area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
+          <div id="area_01"></div>
         </div>
       </div>
       <div class="layui-inline show_item" style="display:none;">
@@ -153,8 +153,7 @@
           form = layui.form,
           request = layui.request,
           dropdown = layui.dropdown,
-          miniPage = layui.miniPage,
-          laydate = layui.laydate;
+          miniPage = layui.miniPage;
 
         var laydate = layui.laydate;
 
@@ -167,6 +166,13 @@
             range: true
         });
 
+        //区域选择
+        var area_select = xmSelect.render({
+            el: '#area_01',
+            name: 'area',
+            data: <%=raw @areas.to_json %>,
+        });
+
         cols_table = [[
             {
                 field: 'id',
@@ -390,7 +396,7 @@
                 align: "center",
                 fixed: 'right'
             }
-        ]]
+        ]];
 
         table = layui.table;
         table.render({
@@ -514,7 +520,12 @@
 
         // 监听搜索操作
         form.on('submit(search_teachers)', function (data) {
-            search = data.field
+            var area_value = [];
+            area_select.getValue().forEach(function (d) {
+                area_value.push(d.value)
+            });
+            data.field.area = area_value;
+            search = data.field;
             table.reload('teachers_table', {
                 page: {
                     curr: 1
@@ -527,7 +538,6 @@
         form.on('submit(reset_business_search)', function (data) {
             var field = data.field;
             form.val('search_teachers', {
-                area: "",
                 date: "",
                 attitude: "",
                 name: "",
@@ -537,7 +547,8 @@
                 school: "",
                 assist: "",
                 teacher_source: ""
-            })
+            });
+            area_select.setValue([]);
             return false;
         });
         form.on('submit(show_hide)', function (data) {

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.16'
+  VERSION = '1.10.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.16
+  version: 1.10.18
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-25 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails