educode_sales 0.4.5 → 0.4.9

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

@@ -1,36 +1,36 @@
 <div class="layui-form layuimini-form">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
-      <label class="layui-form-label">月份</label>
+      <label class="layui-form-label required">月份</label>
       <div class="layui-input-inline">
         <input type="text" class="layui-input" id="edit_week_plan_month" autocomplete="off" name="month">
       </div>
     </div>
     <% if @sale_plan.weekly.present? %>
     <div class="layui-inline">
-      <label class="layui-form-label">周次</label>
+      <label class="layui-form-label required">周次</label>
       <div class="layui-input-inline">
         <%= select_tag "weekly", options_for_select(@weeks, @sale_plan.weekly), class: 'required' %>
       </div>
     </div>
     <% end %>
     <div class="layui-inline">
-      <label class="layui-form-label">商机</label>
-      <div class="layui-input-inline">
-        <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), class: 'required' %>
+      <label class="layui-form-label required">商机</label>
+      <div class="layui-input-inline" style="width: 500px">
+        <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), {"lay-verify": "required", include_blank: true} %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">计划内容</label>
+      <label class="layui-form-label required">计划内容</label>
       <div class="layui-input-block">
-        <textarea name="content" placeholder="简要填写具体的营销计划，例如：
+        <textarea name="content" lay-verify="required" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
 3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">完成率</label>
+      <label class="layui-form-label required">完成率</label>
       <div class="layui-input-inline">
         <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
       </div>

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

@@ -3,12 +3,12 @@
     <div class="layui-inline">
       <label class="layui-form-label required">月份</label>
       <div class="layui-input-inline">
-        <input type="text" class="layui-input" id="new_month_month" autocomplete="off" name="month">
+        <input type="text" lay-verify="required" class="layui-input" id="new_month_month" autocomplete="off" name="month">
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
-      <div class="layui-input-inline">
+      <div class="layui-input-inline" style="width: 500px">
          <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
       </div>
     </div>

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

@@ -6,7 +6,14 @@
     <% end %>
   </div>
 </script>
+<h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
 <form class="layui-form layui-form-pane" style="padding-right: 20px">
+  <div class="layui-form-item">
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label>负责区域:</label>
+      <span><%= @area %></span>
+    </div>
+  </div>
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -23,6 +30,11 @@
       <span><%= @total_amount %>万</span>
        <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
     </div>
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label style="margin-left: 100px">提交时间:</label>
+      <span><%= Time.now %></span>
+       <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
+    </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <div class="layui-form-item layui-form-text">

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

@@ -3,7 +3,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">月份</label>
       <div class="layui-input-inline">
-        <input type="text" class="layui-input" id="new_week_month" autocomplete="off" name="month">
+        <input type="text" lay-verify="required" class="layui-input" id="new_week_month" autocomplete="off" name="month">
       </div>
     </div>
     <div class="layui-inline">
@@ -14,7 +14,7 @@
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
-      <div class="layui-input-inline">
+      <div class="layui-input-inline" style="width: 500px">
         <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
       </div>
     </div>

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

@@ -4,6 +4,13 @@
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
   </div>
 </script>
+<h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
+<div class="layui-form-item">
+  <div class="layui-inline" style="margin:18px; font-weight: bold">
+    <label>负责区域:</label>
+    <span><%= @area %></span>
+  </div>
+</div>
 <form class="layui-form layui-form-pane" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
@@ -21,6 +28,11 @@
       <span><%= @total_amount %>万</span>
        <%= hidden_field_tag 'amount', @total_amount, {id: 'weekly_amount_hide'} %>
     </div>
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label style="margin-left: 100px">提交时间:</label>
+      <span><%= Time.now %></span>
+      <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
+    </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <div class="layui-form-item layui-form-text">

data/app/views/educode_sales/sale_reports/audit.html.erb

@@ -1,5 +1,12 @@
+<h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
 <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
-  <div class="layui-form-item">
+  <div class="layui-form-item" style="margin-bottom: 0">
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label>负责区域:</label>
+      <span><%= @area%></span>
+    </div>
+  </div>
+  <div class="layui-form-item" style="margin-bottom: 0">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
       <span><%= @sale_report.finish_rate %>%</span>
@@ -13,6 +20,11 @@
       <label style="margin-left: 100px">项目金额:</label>
       <span><%= @sale_report.amount %>万</span>
     </div>
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label style="margin-left: 100px">提交时间:</label>
+      <span><%= @sale_report.created_at %></span>
+      <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
+    </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <div class="layui-form-item layui-form-text">
@@ -159,38 +171,38 @@
           },
           {
             field: 'staff',
-            width: 120,
+            width: 80,
             title: '姓名'
           },
           {
             field: 'business_name',
-            width: 270,
+            width: 170,
             title: '商机名称',
           },
           {
             field: 'school',
-            width: 200,
+            width: 170,
             title: '单位'
           },
           {
             field: 'department',
-            width: 190,
+            width: 170,
             title: '部门'
           },
           {
             field: 'weekly',
-            width: 100,
+            width: 80,
             title: '周次',
           },
           {
             field: 'follow_ups_count',
-            width: 100,
+            width: 80,
             title: '跟进',
             templet: '#show_follow'
           },
           {
             field: 'finish_rate',
-            width: 100,
+            width: 80,
             title: '完成率',
           },
           {

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

@@ -9,8 +9,15 @@
     {{#  } }}
   </div>
 </script>
+<h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
 <form class="layui-form layui-form-pane" style="padding-right: 20px">
-  <div class="layui-form-item">
+  <div class="layui-form-item" style="margin-bottom: 0">
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label>负责区域:</label>
+      <span><%= @area%></span>
+    </div>
+  </div>
+  <div class="layui-form-item" style="margin-bottom: 0">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
       <span><%= @sale_report.finish_rate %>%</span>
@@ -23,6 +30,11 @@
       <label style="margin-left: 100px">项目金额:</label>
       <span><%= @sale_report.amount %>万</span>
     </div>
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label style="margin-left: 100px">提交时间:</label>
+      <span><%= @sale_report.created_at %></span>
+      <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
+    </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <div class="layui-form-item layui-form-text">
@@ -96,38 +108,38 @@
           },
           {
             field: 'staff',
-            width: 120,
+            width: 80,
             title: '姓名'
           },
           {
             field: 'business_name',
-            width: 270,
+            width: 170,
             title: '商机名称',
           },
           {
             field: 'school',
-            width: 200,
+            width: 170,
             title: '单位'
           },
           {
             field: 'department',
-            width: 190,
+            width: 170,
             title: '部门'
           },
           {
             field: 'weekly',
-            width: 100,
+            width: 80,
             title: '周次',
           },
           {
             field: 'follow_ups_count',
-            width: 100,
+            width: 80,
             title: '跟进',
             templet: '#show_follow'
           },
           {
             field: 'finish_rate',
-            width: 100,
+            width: 80,
             title: '完成率',
           },
           {

data/app/views/educode_sales/sale_reports/show.html.erb

@@ -1,5 +1,12 @@
+<h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
 <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
-  <div class="layui-form-item">
+  <div class="layui-form-item" style="margin-bottom: 0">
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label>负责区域:</label>
+      <span><%= @area%></span>
+    </div>
+  </div>
+  <div class="layui-form-item" style="margin-bottom: 0">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
       <span><%= @sale_report.finish_rate %>%</span>
@@ -12,6 +19,11 @@
       <label style="margin-left: 100px">项目金额:</label>
       <span><%= @sale_report.amount %>万</span>
     </div>
+    <div class="layui-inline" style="margin:18px; font-weight: bold">
+      <label style="margin-left: 100px">提交时间:</label>
+      <span><%= @sale_report.created_at %></span>
+      <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
+    </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <div class="layui-form-item layui-form-text">
@@ -119,43 +131,42 @@
         },
         {
           field: 'staff',
-          width: 120,
+          width: 80,
           title: '姓名'
         },
         {
             field: 'business_name',
-            width: 270,
+            width: 170,
             title: '商机名称',
         },
         {
             field: 'school',
-            width: 200,
+            width: 170,
             title: '单位'
         },
         {
             field: 'department',
-            width: 190,
+            width: 170,
             title: '部门'
         },
         {
           field: 'weekly',
-          width: 100,
+          width: 80,
           title: '周次',
         },
         {
           field: 'follow_ups_count',
-          width: 100,
+          width: 80,
           title: '跟进',
           templet: '#show_follow'
         },
         {
           field: 'finish_rate',
-          width: 100,
+          width: 80,
           title: '完成率',
         },
         {
           field: 'content',
-          width: 300,
           title: '计划内容',
         },
         {

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -88,7 +88,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>现有商机</h5>
+                    <h5>现有商机<a href="/missions/businesses?name=(销售态势-现有商机)"  style="padding-left: 100px;color: #0000FF">查看商机</a></h5>
                   </div>
                   <div class="panel-content y-t-10">
                     <h1 class="no-margins"><%= @business_amount %>万</h1>
@@ -101,7 +101,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>已中标</h5>
+                    <h5>已中标<a href="/missions/businesses?name=(销售态势-已中标商机)"   style="padding-left: 100px;color: #0000FF">查看商机</a></h5>
                   </div>
                   <div class="panel-content y-t-10">
                     <h1 class="no-margins"><%= @goal_amount %>万</h1>
@@ -114,7 +114,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>已签单</h5>
+                    <h5>已签单<a href="/missions/businesses?name=(销售态势-已签单商机)"   style="padding-left: 100px;color: #0000FF">查看商机</a></h5>
                   </div>
                   <div class="panel-content y-t-10">
                     <h1 class="no-margins"><%= @service_amount %>万</h1>
@@ -127,7 +127,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>已回款</h5>
+                    <h5>已回款<a href="/missions/businesses?name=(销售态势-已回款商机)"  style="padding-left: 100px;color: #0000FF">查看商机</a></h5>
                   </div>
                   <div class="panel-content y-t-10">
                     <h1 class="no-margins"><%= @return_amount %>万</h1>
@@ -140,7 +140,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>A类商机</h5>
+                    <h5>A类商机<a href="/missions/businesses?clazz_id=<%=EducodeSales::Common.find_by(extras: EducodeSales::Common::ATYPE)&.id %>"  style="padding-left: 100px;color: #0000FF">查看商机</a></h5>
                   </div>
                   <div class="panel-content y-t-10">
                     <h1 class="no-margins"><%= @a_amount %>万</h1>
@@ -153,7 +153,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>B类商机</h5>
+                    <h5>B类商机<a href="/missions/businesses?clazz_id=<%=EducodeSales::Common.find_by(extras: EducodeSales::Common::BTYPE)&.id %>" style="padding-left: 100px;color: #0000FF">查看商机</a></h5>
                   </div>
                   <div class="panel-content y-t-10">
                     <h1 class="no-margins"><%= @b_amount %>万</h1>

data/app/views/educode_sales/sales/operations.html.erb

@@ -11,14 +11,10 @@
 <script type="text/html" id="currentTableBar">
 </script>
 <script type="text/html" id="school">
-  <div class="layui-text">
     <a href="javascript:void(0);" lay-event="school" class="layui-table-link">{{d.schools}}</a>
-  </div>
 </script>
 <script type="text/html" id="xschool">
-  <div class="layui-text">
     <a href="javascript:void(0);" lay-event="xschool" class="layui-table-link">{{d.departments}}</a>
-  </div>
 </script>
 <script>
     layui.use(['form', 'table', 'miniPage', 'element'], function () {

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

@@ -140,63 +140,63 @@
             where: {q: form.val('search_form')},
             toolbar: '#toolbarDemo',
             totalRow:true,
-            defaultToolbar: [],
+            defaultToolbar: ['filter'],
             cols: [
               [
                 {
                     field: 'id',
-                    width: 120,
+                    width: 60,
                     title:'序号',type: 'numbers',
                     totalRowText:'合计',
                 },
                 {
                     field: 'name',
-                    width: 120,
+                    width: 80,
                     title: '姓名',
                     templet: "#name"
                 },
                 {
                     field: 'school',
-                    width: 250,
+                    width: 160,
                     title: '单位',
                 },
                 {
                     field: 'department',
-                    width: 250,
+                    width: 130,
                     title: '部门'
                 },
                 {
                     field: 'professional_title',
                     title: '职称',
-                    width: 120,
+                    width: 80,
                     templet: '#show_follow'
                 },
                 {
                     field: 'job',
-                    width: 120,
+                    width: 80,
                     title: '职务',
                     templet: '#show_keys'
 
                 },
                 {
                   field: 'source',
-                  width: 120,
+                  width: 90,
                   title: '来源',
                 },
                 {
                     field: 'attitude',
-                    width: 120,
+                    width: 60,
                     title: '态度',
                 },
                 {
                     field: 'course_subjects_count',
-                    width: 120,
+                    width: 90,
                     title: '课程方向',
                     templet: "#courses"
                 },
                 {
                     field: 'teacher_follows_count',
-                    width: 120,
+                    width: 90,
                     title: '跟进情况',
                     totalRow:true,
                     templet: "#follow"
@@ -208,20 +208,20 @@
                 },
                 {
                     field: 'students',
-                    width: 120,
+                    width: 60,
                     totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                     title: '学生',
                 },
                 {
                     field: 'courses_count',
-                    width: 120,
+                    width: 60,
                     title: '课堂',
                     totalRow:true,
                     templet: "#class"
                 },
                 {
                     field: 'activities_count',
-                    width: 120,
+                    width: 100,
                     title: '参与活动',
                     templet: "#event"
                 },

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

@@ -6,8 +6,9 @@
     <% end %>
   </div>
 </script>
-
-<table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
+<div class="z-index">
+  <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
+</div>
 
 <script type="text/html" id="currentTableBar_follow">
   <% if can? :read, EducodeSales::TeacherFollow %>
@@ -36,7 +37,7 @@
                 elem: '#sale_plan_follow_table',
                 url: '/missions/teachers/show_follow?id=' + parent.id ,
                 toolbar: '#toolbarDemo_follow',
-                defaultToolbar: [],
+                defaultToolbar: ['filter'],
                 cols: [
                     [
                         {
@@ -490,4 +491,9 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .z-index .layui-table-tool{
+        z-index: 10000; !important;
+    }
+</style>

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

@@ -0,0 +1,13 @@
+json.data do
+  json.array! @files do |d|
+    json.id d.id
+    json.name d.filename
+    json.size d.filesize < 1000000 ? (d.filesize.to_f / 1000).round(2).to_s + 'KB' : (d.filesize.to_f / 1000000).round(2).to_s + 'MB'
+    json.upload_time d.created_on.to_s
+    json.upload_person EducodeSales::Staff.find(d.author_id).user.real_name
+    json.disk_filename d.disk_filename
+    json.content_type d.content_type
+  end
+end
+json.code 0
+json.count @files.total_count

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

@@ -45,7 +45,7 @@
   <div class="layui-side layui-bg-black">
     <div class="layui-side-scroll ">
       <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
-      <ul class="layui-nav layui-nav-tree"
+      <ul class="layui-nav layui-nav-tree ul"
           lay-filter="test">
         <li class="layui-nav-item layui-nav-itemed menu-li" >
           <a class="" href="javascript:;"><b><%= image_tag "educode_sales/1.销售活动.png",size:"15"%><i style="padding-right: 25px"></i>销售活动</b></a>
@@ -215,7 +215,7 @@
                     tips = $(this).prop("innerHTML")
                     flag = btn.hasClass('layui-icon-spread-left')
                 if (flag && tips) {
-                    tips = "<ul class='layuimini-menu-left-zoom layui-nav layui-nav-tree layui-this' style='width: 170px'><li class='layui-nav-item layui-nav-itemed'>"+tips+"</li></ul>" ;
+                    tips = "<ul class='ul-down layuimini-menu-left-zoom layui-nav layui-nav-tree layui-this' style='width: 170px'><li class='layui-nav-item layui-nav-itemed'>"+tips+"</li></ul>" ;
                     window.openTips = layer.tips(tips, $(this), {
                         tips: [2, '#2f4056'],
                         time: 300000,
@@ -252,4 +252,12 @@
 
 
 
-</script>
+</script>
+<style>
+    .layuimini-mini .ul .layui-nav-child{
+        display: none;!important;
+    }
+    .ul-down .layui-icon-down{
+        display: none;!important;
+    }
+</style>

data/config/routes.rb

@@ -7,6 +7,7 @@ EducodeSales::Engine.routes.draw do
   get :search_users, to: "home#search_users"
   get :search_teacher, to: "home#search_teacher"
   get :search_edu_teacher,to: "home#search_edu_teacher"
+  get :search_operation_teacher,to: "home#search_operation_teacher"
   get :search, to: "home#search"
   get :no_permission, to: "home#no_permission"
   get :sales_staff, to: "home#sales_staff"
@@ -60,6 +61,9 @@ EducodeSales::Engine.routes.draw do
       get :show_follow_record
       get :edit_follow_record
       get :edit_plan
+      get :file
+      get :time_line
+      get :upload_file
     end
 
     member do
@@ -114,6 +118,15 @@ EducodeSales::Engine.routes.draw do
 
   resources :import_teachers
 
+  resources :upload_files do
+    collection do
+      get :download
+    end
+
+    member do
+    end
+  end
+
   resources :teachers do
     collection do
       get :import

data/db/migrate/20211102085743_add_bidded_date_educode_sales_follow_ups.rb

@@ -0,0 +1,6 @@
+class AddBiddedDateEducodeSalesFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :bidded_date, :date
+    add_column :educode_sales_follow_ups, :signed_date, :date
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.4.5'
+  VERSION = '0.4.9'
 end