educode_sales 0.2.0 → 0.2.1

data/app/views/educode_sales/staffs/follow_up_schools.json.jbuilder

@@ -8,5 +8,4 @@ json.data do
   end
 end
 
-json.code 0
-json.count @count
+json.code 0

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

@@ -32,17 +32,17 @@
           {
             field: 'id',
             width: 80,
-            title: 'ID',
+            title:'序号',type: 'numbers',
             sort: true
           },
           {
             field: 'name',
-            width: 150,
+            width: 120,
             title: '用户名'
           },
           {
             field: 'role',
-            width: 100,
+            width: 120,
             title: '角色'
           },
           {
@@ -53,11 +53,10 @@
           {
             field: 'area',
             title: '负责区域',
-            minWidth: 150
           },
           {
             field: 'month',
-            width: 150,
+            width: 120,
             title: '有效月份'
           },
           {
@@ -67,14 +66,13 @@
           },
           {
             title: '操作',
-            minWidth: 150,
+              width: 200,
             toolbar: '#staff_bar',
             align: "center"
           }
         ]
       ],
-      limits: [10, 15, 20, 25, 50, 100],
-      limit: 15,
+      limit: 20,
       page: true,
       skin: 'line'
     });

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

@@ -36,7 +36,7 @@
         layReqText: '请填写文本', //同layui form参数lay-ReqText
         initValue: '', // 渲染初始化默认值
         hasSelectIcon: false,
-        placeholder: '请输入头歌平台上用户名或登录账号', // 渲染的inputplaceholder值
+        placeholder: '请输入头歌平台上用户名、手机号、邮箱或登录账号', // 渲染的inputplaceholder值
         data: [],
         remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
         remoteMethod: function (value, cb) { // 远程搜索的回调函数

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

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

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

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

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

@@ -1,6 +1,6 @@
 <%= Gon::Base.render_data %>
-<div class="layuimini-main edit-table">
-  <div class="layui-form layuimini-form" lay-filter="teacher_form">
+<div class="layuimini-main edit-table" >
+  <div class="layui-form layuimini-form" lay-filter="teacher_form" id="show_follow_box">
     <fieldset class="table-search-fieldset">
       <legend>添加关键人</legend>
       <div class="layui-form-item">
@@ -34,7 +34,7 @@
         <div class="layui-input-inline" style="width: 300px;">
           <label class="layui-form-label required">态度</label>
           <div class="layui-input-block">
-            <%= select_tag "attitude_id", options_for_select(@attitudes, @person&.attitude_id), class: 'required' %>
+            <%= select_tag "attitude_id", options_for_select(@attitudes, @person&.attitude_id), {"lay-verify": "required", include_blank: true} %>
           </div>
         </div>
       </div>
@@ -58,8 +58,9 @@
         </div>
       </div>
     </fieldset>
-
   </div>
+
+
   <h4 class="m-t-10">关键人列表</h4>
   <table class="layui-hide" id="key_person" style="min-height: 300px;" lay-filter="key_person"></table>
 </div>
@@ -97,10 +98,15 @@
   </div>
 </script>
 <script type="text/html" id="key_person_tabar">
+  {{#  if(parent.is_latest){ }}
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">保存</a>
   <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="delete">删除</a>
+  {{#  } }}
 </script>
 <script>
+  if(!parent.is_latest){
+      document.getElementById("show_follow_box").style.display="none";//隐藏
+  }
   layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'laydate', 'selectInput'], function () {
     var form = layui.form,
       layer = layui.layer,
@@ -189,7 +195,7 @@
         [{
           field: 'id',
           width: 80,
-          title: 'ID',
+          title:'序号',type: 'numbers',
           sort: true
         }, {
           field: 'name',

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

@@ -28,7 +28,8 @@
       <div class="layui-inline">
         <label class="layui-form-label">态度</label>
         <div class="layui-input-inline">
-          <%= select_tag "attitude", options_for_select(EducodeSales::Common.where(clazz: 'key_attitude').pluck(:name, :id)), { include_blank: true } %>
+
+          <%= select_tag "attitude", options_for_select(EducodeSales::Common.where(clazz: 'teacher_attitude').pluck(:name, :id)), { include_blank: true } %>
         </div>
       </div>
       <div class="layui-inline">
@@ -78,10 +79,10 @@
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addWeek">添加周计划</a>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addMonth">添加月计划</a>
   <% end %>
-  <% if can? :update, EducodeSales::OperationPlan %>
+  <% if can? :update, EducodeSales::Teacher %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <% end %>
-  <% if can? :destroy, EducodeSales::OperationPlan %>
+  <% if can? :destroy, EducodeSales::Teacher %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
    <% end %>
 </script>
@@ -136,7 +137,7 @@
                 {
                     field: 'id',
                     width: 120,
-                    title: '序号',
+                    title:'序号',type: 'numbers',
                 },
                 {
                     field: 'name',
@@ -225,6 +226,7 @@
                 }
               ]
             ],
+            limit: 20,
             page: true,
         });
 
@@ -347,7 +349,7 @@
                     })
                 });
             } else if (obj.event === 'addWeek') {
-                var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_week');
+                var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_week?teacher_id=' + obj.data.id);
                 var openWH = miniPage.getOpenWidthHeight();
 
                 sindex = layer.open({
@@ -364,7 +366,7 @@
                     layer.full(sindex);
                 });
             } else if (obj.event === 'addMonth') {
-                var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_month');
+                var content = miniPage.getHrefContent('/educode_sales/operation_plans/new_month?teacher_id=' + obj.data.id);
                 var openWH = miniPage.getOpenWidthHeight();
                 sindex = layer.open({
                     title: '添加月计划',

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

@@ -81,6 +81,7 @@
                     parent.table.reload('monthPlanTable')
                     parent.table.reload('monthlyTable')
                     parent.table.reload('weeklyTable')
+                    table.reload('show_teachers_table')
                 }
             })
 

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

@@ -105,8 +105,8 @@
                 "qi": "100",
                 "qi1": "20000",
             }],
-            // limits: [10, 15, 20, 25, 50, 100],
-            // limit: 15,
+            //
+            //
             // page: true,
             skin: 'line'
         });

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

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

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

@@ -13,12 +13,14 @@
   <% if can? :read, EducodeSales::TeacherFollow %>
   <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, EducodeSales::TeacherFollow %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <% end %>
   <% if can? :destroy, EducodeSales::TeacherFollow %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
   <% end %>
+  {{#  } }}
 </script>
 
 
@@ -40,7 +42,7 @@
                         {
                             field: 'id',
                             width: 100,
-                            title: '序号'
+                            title:'序号',type: 'numbers',
                         },
                         {
                             field: 'time',
@@ -109,8 +111,8 @@
                         }
                     ]
                 ],
-                limits: [10, 15, 20, 25, 50, 100],
-                limit: 15,
+
+
                 page: true,
                 skin: 'line'
             });
@@ -147,7 +149,7 @@
             var data = obj.data;
             var id = data.id
             if (obj.event === 'delete') {
-                layer.confirm('确定删除序号为' + data.id + "的跟进记录", function (index) {
+                layer.confirm('确定删除ID为' + data.id + "的跟进记录", function (index) {
                     request.authDelete("educode_sales/teacher_follows/" + data.id, {}, function() {
                         obj.del();
                         layer.close(index);
@@ -252,7 +254,7 @@
 <!--未完成计划列表-->
 <script type="text/html" id="unfinish_toolbar">
   <div class="layui-btn-container">
-    <span class="table-label">未完成计划列表</span>
+    <span class="table-label">跟进计划列表</span>
 <!--    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="addMonthPlan"> 添加月计划-->
 <!--    </button>-->
 <!--    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="addWeekPlan"> 添加周计划-->
@@ -293,7 +295,7 @@
                     {
                         field: 'id',
                         width: 100,
-                        title: '序号'
+                        title:'序号',type: 'numbers',
                     },
                     {
                         field: 'staff',
@@ -333,8 +335,8 @@
                     }
                 ]
             ],
-            limits: [10, 15, 20, 25, 50, 100],
-            limit: 15,
+
+
             page: true,
             skin: 'line'
         });
@@ -419,7 +421,7 @@
             var data = obj.data;
             var id = data.id
             if (obj.event === 'delete') {
-                layer.confirm('确定删除序号为' + data.id + "的计划", function (index) {
+                layer.confirm('确定删除ID为' + data.id + "的计划", function (index) {
                     request.authDelete("educode_sales/operation_plans/" + data.id, {}, function() {
                         obj.del();
                         layer.close(index);

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

@@ -13,6 +13,7 @@ json.data do
     json.evaluates_count d.evaluates_count
     json.course_shixuns_count d.course_shixuns_count
     json.shixuns_count d.shixuns_count
+    json.is_latest d.created_at.to_s.eql?@latest
   end
 end
 

data/app/views/layouts/educode_sales/application.html.erb

@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Educode sales</title>
+  <title>头歌营销系统</title>
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
   <%= Gon::Base.render_data %>
-  <%= favicon_link_tag "educode_sales/favicon.ico" %>
+  <%= favicon_link_tag "educode_sales/logo.png" %>
   <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
   <%= stylesheet_link_tag "educode_sales/application", media: "all" %>
   <%= javascript_include_tag "educode_sales/application" %>
@@ -15,7 +15,7 @@
   <div class="layui-header">
     <div class="layui-logo layui-hide-xs layui-bg-black">
       <%= image_tag "educode_sales/logo.png", class: 'header-logo' %>
-      <span class="app-title">营销支撑系统</span>
+      <span class="app-title">营销系统</span>
     </div>
     <ul class="layui-nav layui-layout-right">
       <li class="layui-nav-item layui-hide layui-show-md-inline-block">
@@ -41,7 +41,7 @@
       <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
       <ul class="layui-nav layui-nav-tree" lay-filter="test">
         <li class="layui-nav-item layui-nav-itemed">
-          <a class="" href="javascript:;">销售活动</a>
+          <a class="" href="javascript:;"><b>销售活动</b></a>
           <dl class="layui-nav-child">
             <% if can? :trends, EducodeSales::SaleTrend %>
             <dd>
@@ -65,7 +65,7 @@
           </dl>
         </li>
         <li class="layui-nav-item layui-nav-itemed">
-          <a class="" href="javascript:;">运营活动</a>
+          <a class="" href="javascript:;"><b>运营活动</b></a>
           <dl class="layui-nav-child">
              <% if can? :read, EducodeSales::OperationTrend %>
             <dd>
@@ -92,7 +92,7 @@
         </li>
         <% if @current_admin.is_admin %>
         <li class="layui-nav-item layui-nav-itemed">
-          <a class="" href="javascript:;">系统设置</a>
+          <a class="" href="javascript:;"><b>系统设置</b></a>
           <dl class="layui-nav-child">
             <dd><a href="/educode_sales/roles" class="<%= current?('layui-this', roles_path) %>">角色管理</a></dd>
             <dd><a href="/educode_sales/staffs" class="<%= current?('layui-this', staffs_path) %>">人员管理</a></dd>
@@ -115,9 +115,6 @@
     </div>
   </div>
 
-  <div class="layui-footer">
-    湖南智擎科技有限公司营销支撑系统
-  </div>
 </div>
 
 

data/config/routes.rb

@@ -62,6 +62,7 @@ EducodeSales::Engine.routes.draw do
     end
 
     member do
+      put :updateMoney
       post :add_follow_up
       get :unfinish_plans
       put :update_follow_up

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-18 00:00:00.000000000 Z
+date: 2021-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,6 +86,7 @@ files:
 - app/assets/images/educode_sales/icon-ext.png
 - 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/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif