educode_sales 0.6.0 → 0.6.4

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

@@ -19,12 +19,12 @@
           <%= 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">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
@@ -40,7 +40,7 @@
   <div class="layui-btn-container">
     <span class="table-label">客户列表</span>
     <% if can? :create, EducodeSales::Customer %>
-<!--      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加客户</button>-->
+      <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>
@@ -59,14 +59,14 @@
 <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>
 </script>
 <script type="text/html" id="name">
-  <a href="javascript:void(0);" lay-event="name" class="layui-table-link">{{ 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>
@@ -87,12 +87,12 @@
 
         var laydate = layui.laydate;
 
-        function hn(){
-            $("#search_bt").trigger("click");
-        }
-        $(document).ready(function(){
-            window.onload=hn;
-        });
+        // function hn(){
+        //     $("#search_bt").trigger("click");
+        // }
+        // $(document).ready(function(){
+        //     window.onload=hn;
+        // });
 
         laydate.render({
             elem: '#date',
@@ -106,17 +106,17 @@
         table.render({
             elem: '#customers_table',
             url: '/missions/customers',
-            // where: {q: form.val('search_form')},
+            where: {q: form.val('search_teachers')},
             toolbar: '#toolbarDemo',
             // totalRow:true,
             defaultToolbar: ['filter'],
             cols: [
                 [
-                    {type:'checkbox'},
+                    {type: 'checkbox'},
                     {
                         field: 'id',
                         width: 60,
-                        title:'序号',type: 'numbers',
+                        title: '序号', type: 'numbers',
 
                     },
                     {
@@ -337,7 +337,7 @@
             var data = obj.data;
             id = data.id
             if (obj.event === 'edit') { // 监听添加操作
-                var content = miniPage.getHrefContent('/missions/customers' + data.id + '/edit');
+                var content = miniPage.getHrefContent('/missions/customers/' + data.id + '/edit');
                 var openWH = miniPage.getOpenWidthHeight();
                 sale_plan_index = layer.open({
                     title: '编辑客户',

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|
-    department_ids = d.departments.ids
-    business_ids = EducodeSales::Business.where(department_id: department_ids).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
@@ -15,7 +15,7 @@ json.data do
     json.name d.name
     json.area d.province
     json.department d.departments.size
-    json.business business_ids.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
     json.staff EducodeSales::CustomerExtension.find_by(school_id: d.id)&.customer_staff&.user&.real_name
   end