educode_sales 0.9.12 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 518dc2f8c5a04be4e9865d17425ef4e3f51624fef4994db928233361ec5a9ac9
-  data.tar.gz: 1366d52aaac7c5ac23c4c495a61a46445ac5b99984dcdb2bede6f77bf7307f1e
+  metadata.gz: 5c96d308e38b3de53258837e9620c73e99e233e96f4bd7d0662485eafebeeba5
+  data.tar.gz: 194d1bfeeb27862245d9f850fcb8ca86d550fdf60c524fefa913b01efd1cc4b8
 SHA512:
-  metadata.gz: bcd5a2e3f17724446da729dd715201550ad4b8719ec68238ad39ce87ca2b37d1fb2f993cdbae4ec7e71e2a8afa80958e08d469150f3a229ea8394f83d8def798
-  data.tar.gz: 4ba4ac0b4b3ba8d62b53152d6d58056245e07b6e32305aa1b8bc77dca6e05f5b53f2a7f510db69fab4dc26017a43245e6f615c3f5512297ee29dbd950c8dce6e
+  metadata.gz: f0f3e2d3860c449a219f96082530b443765b314807ca616099f9e7fbd04cbff9e5a93e484f68769fc40eb43c3c198af7ff8b37455e1301e8a90cbbd0a1b61177
+  data.tar.gz: 250941523ed39042ee6de95bad6aabe860f03b45451bf98ddeef35a0eb4262160d41842c3589e8e4affc9e83ec7b8f1b448da94b27aa0a5b7fa79b3c40b03d71

data/app/controllers/educode_sales/businesses_controller.rb

@@ -257,6 +257,11 @@ module EducodeSales
       end
     end
 
+    def daily_paper
+      @followups = EducodeSales::FollowUp.where(staff_id: @current_admin.id).where("updated_at > ?", Time.now.beginning_of_day).order("updated_at")
+      render layout: false
+    end
+
     def create
       department = Department.find(params[:department_id])
       business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -244,12 +244,12 @@ module EducodeSales
     def add_business_number
       if ( @business.number.blank?) && params[:clazz_id] == '74'
         totual_count = EducodeSales::Business.unscoped.where("number like :data",data: "#{Time.now.year}%").count + 1 + Time.now.year*1000.to_i
-        @business_number_record = BusinessNumberRecord.first.value
-        while @business_number_record.include?(totual_count)
+        @business_number_record = BusinessNumberRecord.find_or_create_by(id: 1)
+        while @business_number_record.value.include?(totual_count) || Business.pluck(:number).include?(totual_count.to_s)
           totual_count += 1
         end
+        @business_number_record.update(value: @business_number_record.value | [ totual_count ])
         @business.update(number: totual_count.to_s)
-        BusinessNumberRecord.first.update(value: @business_number_record | [ totual_count ])
       end
     end
 

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

@@ -53,6 +53,7 @@
 <script type="text/html" id="toolbarDemo_follows">
   <div class="layui-btn-container">
     <span class="table-label">跟进动态</span>
+    <a class="layui-btn layui-btn-normal layui-btn-sm" style="margin-left: 20px;" lay-event="report_day">日报</a>
   </div>
 </script>
 <script type="text/html" id="currentTableBar_follows">
@@ -218,6 +219,24 @@
             })
             return false;
         });
+        table.on('toolbar(teachers_table)', function(obj){
+          if (obj.event === 'report_day') {
+            content = miniPage.getHrefContent('/missions/businesses/daily_paper');
+              openWH = miniPage.getOpenWidthHeight();
+              index = layer.open({
+                  title: '',
+                  type: 1,
+                  shade: 0.2,
+                  // maxmin: true,
+                  shadeClose: true,
+                  area: ['600px', '600px'],
+                  content: content
+              });
+              $(window).on("resize", function () {
+                  layer.full(index);
+              });
+            }
+        })
         table.on('tool(teachers_table)', function (obj) {
             var data = obj.data;
             id = data.id
@@ -238,7 +257,6 @@
                     layer.full(index);
                 });
             }  else if (obj.event === 'business') {
-                console.log(data);
                 business_id = data.business_id
                 business_name = data.business
                 content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);

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

@@ -0,0 +1,27 @@
+<div style="padding: 15px;" id="day_content">
+  <h2>今日跟进动态</h2>
+  <hr>
+  <div style="height: 480px;overflow: auto;">
+    <% text = "\n" %>
+    <% @followups.each_with_index do |d, i| %>
+      <% text += "#{i+1}、**学校--**商机：#{d .description}\n" %>
+      <p style="margin-bottom: 10px;"><%= i+1 %>、**学校--**商机：<%= d .description%></p>
+    <% end %>
+  </div>
+
+  <div id="content" style="display: none;" data-content="今日跟进动态<%=text %>"></div>
+  <button type="button" onclick="copy()" style=" margin-right: 20px; float: right;" class="layui-btn layui-btn-primary">复制</button>
+</div>
+<script>
+function copy() {
+  var copyText = document.getElementById("content").dataset.content;
+  var textArea = document.createElement("textarea");
+  textArea.value = copyText;
+  document.body.appendChild(textArea);
+  textArea.select();
+  if (document.execCommand("Copy")) {
+    layer.msg('已复制到剪贴板');
+    textArea.remove();
+  }
+}
+</script>

data/config/routes.rb

@@ -106,6 +106,7 @@ EducodeSales::Engine.routes.draw do
       get :upload_file
       get :following_businesses
       get :followed
+      get :daily_paper
     end
 
     member do

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.12'
+  VERSION = '0.9.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.14
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - 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/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
@@ -234,6 +235,7 @@ files:
 - app/views/educode_sales/assessments/new.html.erb
 - app/views/educode_sales/assessments/progress.json.jbuilder
 - app/views/educode_sales/businesses/_follows.html.erb
+- app/views/educode_sales/businesses/daily_paper.html.erb
 - app/views/educode_sales/businesses/edit.html.erb
 - app/views/educode_sales/businesses/edit_follow_record.html.erb
 - app/views/educode_sales/businesses/edit_plan.html.erb
@@ -485,7 +487,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -500,8 +502,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []