educode_sales 0.1.5 → 0.2.1

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

@@ -115,7 +115,7 @@
               {
                 field: 'id',
                 width: 60,
-                title: '序号',
+                title:'序号',type: 'numbers',
               },
               {
                 field: 'name',
@@ -138,15 +138,15 @@
                 width: 60,
                 templet: '#show_follow'
               },
-              {
-                field: 'teachers_count',
-                width: 100,
-                title: '关键人',
-                templet: '#show_keys'
-              },
+              // {
+              //   field: 'teachers_count',
+              //   width: 100,
+              //   title: '关键人',
+              //   templet: '#show_keys'
+              // },
               {
                 field: 'clazz',
-                width: 80,
+                width: 60,
                 title: '类型'
               },
               {
@@ -156,13 +156,13 @@
               },
               {
                 field: 'invitation_at',
-                width: 120,
+                width: 105,
                 title: '招标时间',
                 sort: true
               },
               {
                 field: 'reception_at',
-                width: 120,
+                width: 105,
                 title: '验收时间',
                 sort: true
               },
@@ -183,6 +183,11 @@
                 width: 110,
                 title: '渠道'
               },
+              {
+                field: 'last_follow_person',
+                width: 120,
+                title: '跟进人'
+              },
               {
                 title: '操作',
                 minWidth: 300,
@@ -192,6 +197,7 @@
               }
             ]
           ],
+          limit: 20,
           page: true,
           skin: 'line'
       });
@@ -317,6 +323,7 @@
                 });
 
             } else if (obj.event === 'show_keys') {
+                business_id = obj.data.id
                 follow_up_id = obj.data.follow_up_id;
                 content = miniPage.getHrefContent('/educode_sales/businesses/show_keys');
                 openWH = miniPage.getOpenWidthHeight();
@@ -338,6 +345,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'show_follow') {
+                business_id = obj.data.id
                 content = miniPage.getHrefContent('/educode_sales/businesses/show_follow?id=' + id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({

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

@@ -6,7 +6,8 @@ json.data do
     json.school d.department.school.name
     json.follow_ups_count d.follow_ups_count
     json.follow_up_id d.last_follow_up_id
-    json.teachers_count d.follow_ups.sum(:key_people_count)
+    # json.teachers_count d.follow_ups.sum(:key_people_count)
+    # json.teachers_count EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).present? ? EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).key_people_count : 0
     json.clazz d.last_follow_up&.clazz&.name
     json.stage d.last_follow_up&.stage&.name
     json.invitation_at d.last_follow_up&.invitation_at.to_s
@@ -14,6 +15,7 @@ json.data do
     json.total_amount d.last_follow_up&.total_amount
     json.return_money d.return_money
     json.place d.last_follow_up&.place&.name
+    json.last_follow_person d.last_follow_up_id.present? ? EducodeSales::Staff.find(EducodeSales::Business.find_by(last_follow_up_id: d.last_follow_up_id).staff_id).user.real_name : ''
   end
 end
 json.code 0

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

@@ -1,7 +1,7 @@
 <div class="layui-form layuimini-form">
    <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
-      <label class="layui-form-label required">名称</label>
+      <label class="layui-form-label required">商机名称</label>
       <div class="layui-input-block">
         <input type="text" name="name" autocomplete="off" lay-verify="required" class="layui-input" style="width: 300px;">
       </div>

data/app/views/educode_sales/businesses/new_follow_record.html.erb

@@ -124,8 +124,18 @@
       form.render();
     
       form.on('submit(add_follow_up)', function (data) {
-        data.field.business_id = "<%= @business.id %>";
-        request.authPost("educode_sales/follow_ups", data.field, function (res) {
+          console.log(data);
+          data.field.business_id = "<%= @business.id %>";
+          console.log(data.field.business_id);
+          request.authPut("educode_sales/businesses/" + data.field.business_id +"/updateMoney/", {
+              return_money: 0
+          }, function (res) {
+              if (res.success == false) {
+                  layer.alert(res.msg)
+              } else {
+              }
+          })
+          request.authPost("educode_sales/follow_ups", data.field, function (res) {
           if (res.success == false) {
             layer.alert(res.msg)
           } else {

data/app/views/educode_sales/businesses/show_follow.html.erb

@@ -7,19 +7,21 @@
   </div>
 </script>
 <div class="edit-table">
-<table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table" style="min-height: 300px;"></table>
+<table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
 <table class="layui-hide" id="unfinish_table" lay-filter="unfinish_table" style="min-height: 300px;"></table>
 </div>
 <script type="text/html" id="currentTableBar_follow">
   <% if can? :follow, EducodeSales::Business %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
   <% end %>
+  {{#  if(d.is_latest){ }}
   <% if can? :update_follow, EducodeSales::Business %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <% end %>
   <% if can? :destroy_follow, EducodeSales::Business %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
   <% end %>
+  {{#  } }}
 </script>
 
 <!--关键人-->
@@ -34,7 +36,7 @@
 <!--未完成计划列表-->
 <script type="text/html" id="unfinish_table_tabar">
   <div class="layui-btn-container">
-    <span class="table-label">未完成计划列表</span>
+    <span class="table-label">跟进计划列表</span>
   </div>
 </script>
 
@@ -68,7 +70,7 @@
               {
                 field: 'id',
                 width: 80,
-                title: '序号'
+                title:'序号',type: 'numbers',
               },
               {
                 field: 'created_at',
@@ -78,12 +80,12 @@
               },
               {
                 field: 'clazz',
-                width: 80,
+                width: 60,
                 title: '类型',
               },
               {
                 field: 'stage',
-                width: 120,
+                width: 100,
                 title: '阶段',
               },
               {
@@ -94,12 +96,12 @@
               },
               {
                 field: 'invitation_at',
-                width: 120,
+                width: 110,
                 title: '招标时间',
               },
               {
                 field: 'reception_at',
-                width: 120,
+                width: 110,
                 title: '验收时间',
               },
               {
@@ -147,8 +149,8 @@
               }
             ]
           ],
-          limits: [10, 15, 20, 25, 50, 100],
-          limit: 15,
+          height: 400,
+          limit: 20,
           page: true,
           skin: 'line'
       });
@@ -165,7 +167,9 @@
 
       table.on('toolbar(sale_plan_follow_table)', function (obj) {
         if (obj.event === 'add') { // 监听添加操作
-          var content = miniPage.getHrefContent('/educode_sales/businesses/new_follow_record?id=' + parent.id);
+            console.log(parent.business_id);
+            business_id = parent.business_id
+            var content = miniPage.getHrefContent('/educode_sales/businesses/new_follow_record?id=' + parent.id);
           var openWH = miniPage.getOpenWidthHeight();
           sale_plan_index = layer.open({
             title: '添加',
@@ -190,10 +194,13 @@
           var data = obj.data;
           follow_up_id = obj.data.id;
           if (obj.event === 'delete') {
-              layer.confirm('确定删除序号为' + data.id + "的跟进记录", function (index) {
+              console.log(data);
+              layer.confirm('确定删除ID为' + data.id + "的跟进记录", function (index) {
                 request.authDelete("educode_sales/follow_ups/" + data.id, {}, function() {
                   obj.del();
                   layer.close(index);
+                    table.reload("businesses_table");
+                    table.reload("sale_plan_follow_table");
                 })
               });
           } else if (obj.event === 'show') { // 监听添加操作
@@ -234,6 +241,7 @@
           } else if (obj.event === 'add_keys') { // 监听添加操作
               content = miniPage.getHrefContent('/educode_sales/teachers/add_keys?follow_up_id=' + obj.data.id);
               openWH = miniPage.getOpenWidthHeight();
+              is_latest = obj.data.is_latest
               keyindex = layer.open({
                   title: '关键人',
                   type: 1,
@@ -254,6 +262,7 @@
           } else if (obj.event === 'edit_plan') {
               content = miniPage.getHrefContent('/educode_sales/businesses/edit_plan');
               openWH = miniPage.getOpenWidthHeight();
+              is_latest = obj.data.is_latest
               plan_index = layer.open({
                   title: '回款计划',
                   type: 1,
@@ -285,7 +294,7 @@
                 {
                   field: 'id',
                   width: 80,
-                  title: '序号'
+                  title:'序号',type: 'numbers',
                 },
                 {
                   field: 'staff',
@@ -325,8 +334,8 @@
                 }
               ]
             ],
-            limits: [10, 15, 20, 25, 50, 100],
-            limit: 15,
+             
+
             page: true,
             skin: 'line'
         });
@@ -394,10 +403,6 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
-            } else if (obj.event === 'delete') { // 监听删除操作
-                var checkStatus = table.checkStatus('currentTableId'),
-                    data = checkStatus.data;
-                layer.alert(JSON.stringify(data));
             }
         });
 
@@ -405,7 +410,7 @@
           var data = obj.data;
           plan_id = data.id;
           if (obj.event === 'delete') {
-            layer.confirm('确定删除序号为' + data.id + "的计划", function (index) {
+            layer.confirm('确定删除ID为' + data.id + "的计划", function (index) {
               request.authDelete("educode_sales/plans/" + data.id, {}, function() {
                 obj.del();
                 layer.close(index);

data/app/views/educode_sales/businesses/show_follow.json.jbuilder

@@ -14,6 +14,7 @@ json.data do
     json.place d.place&.name
     json.money_plans_count d.money_plans_count
     json.money d.money_plans.where(clazz: 1).sum(:amount)
+    json.is_latest d.id == @latest&.id
   end
 end
 

data/app/views/educode_sales/businesses/show_keys.html.erb

@@ -11,7 +11,7 @@
           {
             field: 'id',
             width: 80,
-            title: '序号'
+            title:'序号',type: 'numbers',
           },
           {
             field: 'name',

data/app/views/educode_sales/commons/edit.html.erb

@@ -73,7 +73,7 @@
         [{
           field: 'id',
           width: 80,
-          title: 'ID',
+          title:'序号',type: 'numbers',
           sort: true
         }, {
           field: 'name',

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

@@ -29,7 +29,7 @@
           {
             field: 'i',
             width: 80,
-            title: 'ID',
+            title:'序号',type: 'numbers',
             sort: true
           },
           {
@@ -49,8 +49,7 @@
           }
         ]
       ],
-      limits: [10, 15, 20, 25, 50, 100],
-      limit: 15,
+      limit: 20,
       page: true,
       skin: 'line'
     });

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

@@ -1 +1 @@
-<h4>欢迎使用头歌营销支撑系统</h4>
+<div style="text-align:center;"><%= image_tag "educode_sales/indexlogo.png", width: "900" %></div>

data/app/views/educode_sales/home/search_teacher.json.jbuilder

@@ -3,9 +3,9 @@ json.data do
     if d.is_a? EducodeSales::Teacher
       json.value "t-#{d.id}"
       if d.department.present?
-        json.name "#{d.name}--(#{d.department&.school&.name}--#{d.department&.name}) (来源教师列表)"
+        json.name "#{d.name}--(#{d.department&.school&.name}--#{d.department&.name}) (来源运营教师列表)"
       else
-        json.name "#{d.name}--(来源教师列表)"
+        json.name "#{d.name}--(来源运营教师列表)"
       end
       json.extras [d.professional_title, d.job]
 

data/app/views/educode_sales/home/statistics.html.erb

@@ -65,4 +65,5 @@
       </div>
     </div>
   </div>
+</div>
 </div>

data/app/views/educode_sales/operation_plans/_monthPlan.html.erb

@@ -83,7 +83,7 @@
                     {
                         field: 'id',
                         width: 80,
-                        title: '序号'
+                        title:'序号',type: 'numbers',
                     },
                     {
                         field: 'staff',
@@ -136,8 +136,7 @@
                     }
                 ]
             ],
-            limits: [10, 15, 20, 25, 50, 100],
-            limit: 15,
+            limit: 20,
             page: true,
             skin: 'line'
         });

data/app/views/educode_sales/operation_plans/_monthly.html.erb

@@ -84,7 +84,7 @@
                     {
                         field: 'id',
                         width: 80,
-                        title: '序号'
+                        title:'序号',type: 'numbers',
                     },
                     {
                         field: 'staff',
@@ -164,6 +164,7 @@
                     });
                 })
             },
+            limit: 20,
             page: true
         });
 
@@ -258,7 +259,6 @@
                 });
                 return false;
             }else if (obj.event === 'show') {
-
                 content = miniPage.getHrefContent('/educode_sales/operation_reports/' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({

data/app/views/educode_sales/operation_plans/_weekPlan.html.erb

@@ -84,7 +84,7 @@
                     {
                         field: 'id',
                         width: 80,
-                        title: '序号'
+                        title:'序号',type: 'numbers',
                     },
                     {
                         field: 'staff',
@@ -147,8 +147,7 @@
                     }
                 ]
             ],
-            limits: [10, 15, 20, 25, 50, 100],
-            limit: 15,
+            limit: 20,
             page: true,
             skin: 'line'
         });

data/app/views/educode_sales/operation_plans/_weekly.html.erb

@@ -85,7 +85,7 @@
                     {
                         field: 'id',
                         width: 80,
-                        title: '序号'
+                        title:'序号',type: 'numbers',
                     },
                     {
                         field: 'staff',
@@ -165,6 +165,7 @@
                     });
                 })
             },
+            limit: 20,
             page: true,
         });
 

data/app/views/educode_sales/operation_plans/edit_month.html.erb

@@ -31,9 +31,10 @@
         <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
       </div>
     </div>
-    <div class="layui-inline">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="update_sale_plan">提交
-      </button>
+    <div class="layui-form-item m-t-20">
+      <div class="layui-input-block">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="update_sale_plan">提交</button>
+      </div>
     </div>
   </div>
 </form>

data/app/views/educode_sales/operation_plans/edit_monthly.html.erb

@@ -93,7 +93,7 @@
                 {
                     field: 'id',
                     width: 80,
-                    title: '序号'
+                    title:'序号',type: 'numbers',
                 },
                 {
                     field: 'username',
@@ -161,8 +161,8 @@
             "rate": "100%",
             "updateTime": "2021-07-27",
         }],
-        limits: [10, 15, 20, 25, 50, 100],
-        limit: 15,
+
+
         page: true,
         skin: 'line'
     });

data/app/views/educode_sales/operation_plans/edit_week.html.erb

@@ -39,9 +39,10 @@
         <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
       </div>
     </div>
-    <div class="layui-inline">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="update_sale_plan">提交
-      </button>
+    <div class="layui-form-item m-t-20">
+      <div class="layui-input-block">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="update_sale_plan">提交</button>
+      </div>
     </div>
   </div>
 </form>

data/app/views/educode_sales/operation_plans/edit_weekly.html.erb

@@ -91,7 +91,7 @@
                 {
                     field: 'id',
                     width: 80,
-                    title: '序号'
+                    title:'序号',type: 'numbers',
                 },
                 {
                     field: 'username',
@@ -159,8 +159,8 @@
             "rate": "100%",
             "updateTime": "2021-07-27",
         }],
-        limits: [10, 15, 20, 25, 50, 100],
-        limit: 15,
+
+
         page: true,
         skin: 'line'
     });

data/app/views/educode_sales/operation_plans/new_month.html.erb

@@ -9,7 +9,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">教师</label>
       <div class="layui-input-inline">
-        <%= select_tag "teacher_id", options_for_select(@teachers), {"lay-verify": "required", include_blank: true} %>
+        <%= select_tag "teacher_id", options_for_select(@teachers, @teacher&.id), {"lay-verify": "required", include_blank: true} %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
@@ -39,9 +39,10 @@
         </select>
       </div>
     </div>
-    <div class="layui-inline">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_month_plan">提交
-      </button>
+    <div class="layui-form-item m-t-20">
+      <div class="layui-input-block">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_month_plan">提交</button>
+      </div>
     </div>
   </div>
 </div>

data/app/views/educode_sales/operation_plans/new_monthly.html.erb

@@ -82,7 +82,7 @@
                 {
                     field: 'id',
                     width: 80,
-                    title: '序号'
+                    title:'序号',type: 'numbers',
                 },
                 {
                     field: 'staff',
@@ -134,8 +134,8 @@
                 }
             ]
         ],
-        limits: [10, 15, 20, 25, 50, 100],
-        limit: 15,
+
+
         page: true,
         skin: 'line'
     });

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

@@ -16,7 +16,7 @@
       <label class="layui-form-label required">教师</label>
       <div class="layui-input-inline">
 
-        <%= select_tag "teacher_id", options_for_select(@teachers), {"lay-verify": "required", include_blank: true} %>
+        <%= select_tag "teacher_id", options_for_select(@teachers, @teacher&.id), {"lay-verify": "required", include_blank: true} %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
@@ -46,9 +46,10 @@
         </select>
       </div>
     </div>
-    <div class="layui-inline">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_week_plan">提交
-      </button>
+    <div class="layui-form-item m-t-20">
+      <div class="layui-input-block">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_week_plan">提交</button>
+      </div>
     </div>
   </div>
 </div>

data/app/views/educode_sales/operation_plans/new_weekly.html.erb

@@ -78,7 +78,7 @@
                     {
                         field: 'id',
                         width: 80,
-                        title: '序号'
+                        title:'序号',type: 'numbers',
                     },
                     {
                         field: 'staff',
@@ -135,8 +135,8 @@
                 }
             ]
         ],
-        limits: [10, 15, 20, 25, 50, 100],
-        limit: 15,
+
+
         page: true,
         skin: 'line'
     });

data/app/views/educode_sales/operation_plans/show_monthly.html.erb

@@ -89,7 +89,7 @@
                 {
                     field: 'id',
                     width: 80,
-                    title: '序号'
+                    title:'序号',type: 'numbers',
                 },
                 {
                     field: 'username',
@@ -157,8 +157,8 @@
             "rate": "100%",
             "updateTime": "2021-07-27",
         }],
-        limits: [10, 15, 20, 25, 50, 100],
-        limit: 15,
+
+
         page: true,
         skin: 'line'
     });

data/app/views/educode_sales/operation_plans/show_weekly.html.erb

@@ -88,7 +88,7 @@
                 {
                     field: 'id',
                     width: 80,
-                    title: '序号'
+                    title:'序号',type: 'numbers',
                 },
                 {
                     field: 'username',
@@ -156,8 +156,8 @@
             "rate": "100%",
             "updateTime": "2021-07-27",
         }],
-        limits: [10, 15, 20, 25, 50, 100],
-        limit: 15,
+
+
         page: true,
         skin: 'line'
     });