educode_sales 1.10.15 → 1.10.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3224c4eb4169cfa99fd5b8b0c6d0531d8a69d42cecd06f00ff450a848f4d104e
-  data.tar.gz: 56756302eb3bf1ca2d9712a963caefcefb8b7b251cd9d414941bc0010249a965
+  metadata.gz: 39c60c3cd7dfc7b0d4539a9bffb2f470b3bd8f715cd59e18bb29e2769d17a9f5
+  data.tar.gz: 8351e4270d28ab90775ad91f9b797aa63dd4c305379340ee714f4da25d27f8a6
 SHA512:
-  metadata.gz: 33e019ff9aed04f7ccb78b9d9b3eb2aef244afe9c5843ec466ae94cda58d6940cabcf8978e0931a0a0b7d883fb31bf67e4a3ca9a8c1dcaae1c9b0c53ed7feb2a
-  data.tar.gz: 02a3bf3a1196f51b0d6bf844bf11ad8d27be92649f6cbc1c090dca91be88ce321614c1bed9c665d518c711c24d9991615bca8c34a8f74066e30bdc875e888909
+  metadata.gz: eee717a68d577cce55b28e68d3e9ad59a30ace071f2cbc5c5e88345b765de9fa71aea9c761978146f7376ae666f6bf5f25fabf07d2be96fc7b598ce0ab0af7ea
+  data.tar.gz: f6a598583aa6bcbb120728c2b35771368bc17cf16decdd289e8df4b5ebe0ca55bee5fbba504b3a6b0d1b2829b37816f6d26b06ed33ef860754b0058b90bedc3e

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/plans/new_month.html.erb

@@ -9,7 +9,14 @@
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
       <div class="layui-input-inline" style="width: 500px">
-         <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
+         <% if @business %>
+         <div style="line-height: 38px;">
+          <%= "#{@business.name} (#{@business.department&.school&.name} #{@business.department&.name})" %>
+          <%= hidden_field_tag "business_id", @business.id %>
+         </div>
+         <% else %>
+           <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
+         <% end %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

data/app/views/educode_sales/plans/new_week.html.erb

@@ -15,7 +15,15 @@
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
       <div class="layui-input-inline" style="width: 500px">
-        <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
+        <% if @business %>
+        <div style="line-height: 38px;">
+         <%= "#{@business.name} (#{@business.department&.school&.name} #{@business.department&.name})" %>
+         <%= hidden_field_tag "business_id", @business.id %>
+        </div>
+        <% else %>
+          <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
+        <% end %>
+       
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

data/app/views/educode_sales/plans/new_year.html.erb

@@ -9,7 +9,14 @@
     <div class="layui-inline">
       <label class="layui-form-label required">选择商机</label>
       <div class="layui-input-inline" style="width: 400px">
-        <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true, "lay-search": "" } %>
+        <% if @business %>
+        <div style="line-height: 38px;">
+         <%= "#{@business.name} (#{@business.department&.school&.name} #{@business.department&.name})" %>
+         <%= hidden_field_tag "business_id", @business.id %>
+        </div>
+        <% else %>
+          <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
+        <% end %>
       </div>
     </div>
     <div class="layui-inline">

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.15'
+  VERSION = '1.10.17'
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.15
+  version: 1.10.17
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2023-06-25 00:00:00.000000000 Z
@@ -105,6 +105,7 @@ 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
@@ -744,7 +745,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -759,8 +760,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []