educode_sales 0.9.42 → 0.9.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d635995859ce768ee96b28509c5094efbc03e8d98ca1b6fe59e52bc4696ef41e
-  data.tar.gz: 8010219ab35845df3329179cf6e8f2e56e224b5d60781a2ff4b80999efcc0c1c
+  metadata.gz: 392c1371a9b0cb569b25de476461924555a2d8b077a2864f1bc33145ae65bc61
+  data.tar.gz: 250898b5906ea9b92a41eb4bef8b9ecba8e254bcd574d37d4cdc8cdd11f25811
 SHA512:
-  metadata.gz: 3939a32d342b6ce49488569f52a67902fad404502dfae2262a1f4b37a3275ec63728e36a1d03feebba2cbf20590de4ceac237a09d5b053dc10510e5506eb20f5
-  data.tar.gz: 37ba20f22853d9cd00c82c5a1f472157fa37fbfe8cfac77cb868b707142ab6d36b8e93f1ecb4f9cd6dec9f478ed9b406cfb06a68115812b6e7dd0a3e67d40391
+  metadata.gz: b66b2ee6d89ef9f63bd035843df5c6724bb34108320dbd9c2af6d3706ccc91e5a3af9940bd22eca06779e2f6ecebeb9e816beea8fb78c967cfb620666e45df9d
+  data.tar.gz: 2d0f88851293f938355a04ed9c8c90dceaf126dd8df3b4cd8a18c675dbd158203132dbd9e3f504c2803c25c4bb3fc57c0086372871bd3b193fc4f3ddc55cba08

data/app/controllers/educode_sales/customers_controller.rb

@@ -91,6 +91,12 @@ module EducodeSales
                 school_property_ids += SchoolProperty.where(military_school: true).ids
               when 6
                 school_property_ids += SchoolProperty.where(enterprise: true).ids
+              when 7
+                school_property_ids += SchoolProperty.where(mid_school: true).ids
+              when 8
+                school_property_ids += SchoolProperty.where(ele_school: true).ids
+              when 9
+                school_property_ids += SchoolProperty.where(other: true).ids
               else
               end
             end

data/app/controllers/educode_sales/staffs_controller.rb

@@ -54,7 +54,8 @@ module EducodeSales
       # gon.schools = School.all.first(100).map { |d| { value: d.id, title: d.name } } #.unshift({value: -1, title: '全国'})
       @staff_types = Common.where(clazz: 'staff_type').pluck(:name, :id)
       tag_ids = @staff.staff_school_tags.pluck(:school_tag_id)
-      gon.school_properties = SchoolTag.where(for_missions: true).map { |d| { value: d.id, name: d.name, selected: tag_ids.include?(d.id) } }
+      names = %w[本科院校 军事院校 高职院校 中职院校 中学 小学 企业 其他]
+      gon.school_properties = SchoolTag.where(for_missions: true).sort_by { |tag| names.index(tag.name) }.map { |d| { value: d.id, name: d.name, selected: tag_ids.include?(d.id) } }
       render layout: false
     end
 
@@ -113,7 +114,7 @@ module EducodeSales
       end
       staff.staff_permissions.delete_all
       permissions.each do |permission|
-        staff.staff_permissions.create(staff_id:staff.id, permission_id:permission.id)
+        staff.staff_permissions.create(staff_id: staff.id, permission_id: permission.id)
       end
       staff.staff_school_tags = tags
       params[:current_admin] = @current_admin.id

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

@@ -16,15 +16,15 @@
       <div class="layui-inline">
         <label class="layui-form-label">负责人</label>
         <div class="layui-input-inline">
-          <%= select_tag "staff_id", options_for_select(@staffs,params[:staff_id]), { include_blank: true } %>
+          <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { include_blank: true } %>
         </div>
       </div>
-<!--      <div class="layui-inline">-->
-<!--        <label class="layui-form-label">最后跟进</label>-->
-<!--        <div class="layui-input-inline">-->
-<!--          <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">-->
-<!--        </div>-->
-<!--      </div>-->
+      <!--      <div class="layui-inline">-->
+      <!--        <label class="layui-form-label">最后跟进</label>-->
+      <!--        <div class="layui-input-inline">-->
+      <!--          <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">-->
+      <!--        </div>-->
+      <!--      </div>-->
       <div class="layui-inline">
         <label class="layui-form-label">性质</label>
         <div class="layui-input-inline">
@@ -34,7 +34,8 @@
       <div class="layui-inline">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
         </button>
-        <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜 索
+        <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜
+          索
         </button>
       </div>
     </div>
@@ -48,7 +49,7 @@
       <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加客户</button>
     <% end %>
     <% if can? :give, EducodeSales::Customer %>
-  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="give">分配/移交</button>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="give">分配/移交</button>
     <% end %>
     </button>
   </div>
@@ -61,17 +62,17 @@
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_department">添加部门</a>
   <% end %>
   <% if can? :create_follow, EducodeSales::Customer %>
-<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_follow">添加跟进记录</a>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_follow">添加跟进记录</a>
   <% end %>
   <% if can? :update, 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 data-count-edit" lay-event="edit">编辑</a>
   <% end %>
 </script>
 <script type="text/html" id="business">
-  <a href="/missions/businesses?school={{d.name}}"  class="layui-table-link">{{ d.business }}</a>
+  <a href="/missions/businesses?school={{d.name}}" class="layui-table-link">{{ d.business }}</a>
 </script>
 <script type="text/html" id="name">
-  <a href="<%= base_url%>/colleges/{{d.id}}/statistics" class="layui-table-link" target="_blank">{{ d.name }}</a>
+  <a href="<%= base_url %>/colleges/{{d.id}}/statistics" class="layui-table-link" target="_blank">{{ d.name }}</a>
 </script>
 <script type="text/html" id="department">
   <a href="javascript:void(0);" lay-event="department" class="layui-table-link">{{ d.department }}</a>
@@ -102,13 +103,16 @@
         var property_list = xmSelect.render({
             el: '#property',
             data: [
-                {value: 0, name: '985工程'},
-                {value: 1, name: '211工程'},
+                // {value: 0, name: '985工程'},
+                // {value: 1, name: '211工程'},
                 {value: 2, name: '本科院校'},
-                {value: 3, name: '大专院校'},
-                {value: 4, name: '中专学校'},
                 {value: 5, name: '军事院校'},
-                {value: 6, name: '企业'}
+                {value: 3, name: '高职院校'},
+                {value: 4, name: '中职院校'},
+                {value: 7, name: '中学'},
+                {value: 8, name: '小学'},
+                {value: 6, name: '企业'},
+                {value: 9, name: '其他'},
             ]
         })
 
@@ -191,7 +195,7 @@
             ],
 
             limit: 20,
-            limits: [10,15,20,30,40,50,60,70,80,90],
+            limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
             page: true,
         });
 
@@ -200,7 +204,6 @@
         });
 
 
-
         function edit(id) {
             var content = miniPage.getHrefContent('/missions/teachers/' + id + '/edit');
             var openWH = miniPage.getOpenWidthHeight();
@@ -262,7 +265,7 @@
         // 监听搜索操作
         form.on('submit(search_teachers)', function (data) {
             var property = [];
-            property_list.getValue().forEach(function(d) {
+            property_list.getValue().forEach(function (d) {
                 property.push(d.value);
             })
             data.field.property = property.toString();
@@ -314,15 +317,15 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
-            }else if (obj.event === 'give') {  //
+            } else if (obj.event === 'give') {  //
                 var school_ids = []
                 var checkStatus = table.checkStatus('customers_table')
-                    ,data = checkStatus.data;
-                for (var i=0,len=data.length; i<len; i++){
+                    , data = checkStatus.data;
+                for (var i = 0, len = data.length; i < len; i++) {
                     school_ids.push(data[i].id)
                 }
                 ids = school_ids
-                if(ids.length == 0){
+                if (ids.length == 0) {
                     layer.msg('请选择客户')
                     return
                 }
@@ -361,7 +364,6 @@
         });
 
 
-
         table.on('tool(customers_table)', function (obj) {
             var data = obj.data;
             id = data.id
@@ -427,7 +429,7 @@
 
             } else if (obj.event === 'courses') {
                 teacher_id = data.id
-                content = miniPage.getHrefContent('/missions/teachers/add_courses?id='+data.id);
+                content = miniPage.getHrefContent('/missions/teachers/add_courses?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '课程方向',
@@ -487,7 +489,7 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
-            }  else if (obj.event === 'follow' || obj.event === 'name' ||obj.event === 'department' ) {
+            } else if (obj.event === 'follow' || obj.event === 'name' || obj.event === 'department') {
                 id = data.id
                 time = data.last_follow_time || ''
                 content = miniPage.getHrefContent('/missions/customers/show_follow?id=' + data.id);
@@ -515,7 +517,8 @@
     });
 </script>
 <style>
-    .layui-table-tool-temp{
-        padding-right: 30px; !important;
+    .layui-table-tool-temp {
+        padding-right: 30px;
+    !important;
     }
 </style>

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

@@ -1,7 +1,7 @@
 x = EducodeSales::Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
 json.data do
   json.array! @customers do |d|
-    business_ids = EducodeSales::Business.where(school_id:  d.id).ids
+    business_ids = EducodeSales::Business.where(school_id: d.id).ids
     follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
     customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
     a_last_follow_time = follow_ups.last&.created_at&.to_s
@@ -17,13 +17,16 @@ json.data do
     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 << '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("、")
     json.department d.departments.size

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.42'
+  VERSION = '0.9.43'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.42
+  version: 0.9.43
 platform: ruby
 authors:
 - anke1460