educode_sales 0.9.80 → 0.9.82

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 395f66b5ef943bc9225deabd8c08878c41fc4c557107f1728c97e4db077950d0
-  data.tar.gz: c359c0122a4889fb641d8a7ced439aec7e2110db21edae0944cb33fc82b95fb3
+  metadata.gz: a5c4108bbab976a92d5f43a438e6d39e16331c222a0046a45745e6730e751a87
+  data.tar.gz: 7e13154cfed9228addd477ffd99ae03ba8d0defcba553f586078ad440035f7d8
 SHA512:
-  metadata.gz: 62eb2a7d7487db2adf78a544af31aae449c76026f5d29fd366a56b6ad96a25c47d3adcc3c30a1a9cc7ec0b9a53a9cca82ee5f9241ee5555d575c8bab1ac2b183
-  data.tar.gz: 9fe50dbd0b57e981e65976cef26a2ed96f69b09aa07df4c6ce15e6e97bf02caf23e960eb922266b32d32cde40cfdaa60795702cbdf2db8b96f1e337825a16087
+  metadata.gz: 40591e809b707f2c944e7662373e3d3160eecd854407aa900fc520c2a498a681c1e75e5c012ecab902debaefa41bcb636bdcb9a5717100fcfb5ba25bf3cc4737
+  data.tar.gz: e7c0c20ceae1b0fbadd8547cd6cf209e762bbe1b451d8659c20ff59b0f1244b94861f066134e4e7cf71fbe213f5e523cb64d5b3a52acdd99bd79d03e7d245de4

data/app/controllers/educode_sales/businesses_controller.rb

@@ -315,6 +315,8 @@ module EducodeSales
              
           end
 
+          @business_count = @businesses.distinct.count
+          
           if params[:sort].present? && params[:sort][:field]
             if params[:sort][:field] == "service_end_time"
               @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")
@@ -325,7 +327,6 @@ module EducodeSales
             @businesses = @businesses.order("educode_sales_businesses.created_at desc")
           end
 
-          @business_count = @businesses.distinct.count
           # mysql -select
           watch_sql = " "
           unless @current_admin.is_admin?

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

@@ -3,21 +3,21 @@
     <span class="table-label">跟进记录</span>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="time_line"> 时间线视图>></button>
     <%unless !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
-  <% if can? :add_follow, EducodeSales::Business %>
-      <% if @current_admin.is_admin %>
-        <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
-      <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
-        <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
+      <% if can? :add_follow, EducodeSales::Business %>
+        <% if @current_admin.is_admin %>
+          <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
+        <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
+          <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
+        <% end %>
       <% end %>
     <% end %>
-    <% end %>
     <%if !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
-  <% if @current_admin.is_admin %>
+      <% if @current_admin.is_admin %>
         <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right add_follow" lay-event="add"> 添加跟进记录</button>
       <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
         <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right add_follow" lay-event="add"> 添加跟进记录</button>
       <% end %>
-      <% end %>
+    <% end %>
     <span class="table-label pull-right" style="padding-right: 20px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
   </div>
 </script>
@@ -25,23 +25,23 @@
   <div class="z-index">
     <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
   </div>
-<table class="layui-hide" id="unfinish_table" lay-filter="unfinish_table" style="min-height: 300px;"></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>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
   <% end %>
   {{#  if(d.is_latest && d.flag){ }}
 
   <%unless !can?(:update_follow, EducodeSales::Business) && can?(:self_edit_follow, EducodeSales::Business)%>
-<% if can? :update_follow, EducodeSales::Business %>
-    <% if @current_admin.is_admin %>
-      <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
-    <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
-      <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    <% if can? :update_follow, EducodeSales::Business %>
+      <% if @current_admin.is_admin %>
+        <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+      <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
+        <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+      <% end %>
     <% end %>
   <% end %>
-  <% end %>
 
   <%if !can?(:update_follow, EducodeSales::Business) && can?(:self_edit_follow, EducodeSales::Business)%>
     {{#  if(d.self_flag){ }}
@@ -53,16 +53,17 @@
     {{#  } }}
   <% end %>
 
-  <%unless !can?(:destroy_follow, EducodeSales::Business) && can?(:self_delete_follow, EducodeSales::Business)%>
-<% if can? :destroy_follow, EducodeSales::Business %>
-  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
-  <% end %>
-  <% end %>
-  <%if !can?(:destroy_follow, EducodeSales::Business) && can?(:self_delete_follow, EducodeSales::Business)%>
+  <% if can?(:destroy_follow, EducodeSales::Business) && !can?(:self_delete_follow, EducodeSales::Business) ||  @current_admin.is_admin %>
+    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% elsif !can?(:destroy_follow, EducodeSales::Business) && can?(:self_delete_follow, EducodeSales::Business)%>
     {{#  if(d.self_flag){ }}
     <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
     {{#  } }}
-<% end %>
+  <% end %>
+  {{# } else if (d.is_latest) { }}
+  <% if @current_admin.is_admin %>
+    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
   {{#  } }}
 </script>
 

data/app/views/educode_sales/contracts/_list.html.erb

@@ -113,7 +113,11 @@
 
 </script>
 
-
+<script type="text/html" id="toolbar_contract">
+  <div class="layui-btn-container">
+    <span class="table-label">合同列表</span>
+  </div>
+</script>
 <script>
   layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown','laytpl', 'xmSelect'], function () {
       var $ = layui.jquery,
@@ -441,15 +445,15 @@
       return false;
     });
       var business_table = table.render({
-          elem: '#contact_table',
-          url: '/missions/contracts',
-          autoSort: false,
-          where: {q: data},
-          defaultToolbar: ['filter'],
-          title: '合同数据表',
-          totalRow: true,//开启合并行
-          cols: cols_table,
-
+        elem: '#contact_table',
+        url: '/missions/contracts',
+        autoSort: false,
+        where: {q: data},
+        defaultToolbar: ['filter'],
+        title: '合同数据表',
+        totalRow: true,//开启合并行
+        cols: cols_table,
+        toolbar: '#toolbar_contract',
         limit: 20,
         limits: [10,15,20,30,40,50,60,70,80,90],
         page: true,

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.80'
+  VERSION = '0.9.82'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.80
+  version: 0.9.82
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-05-09 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
@@ -670,7 +671,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -685,8 +686,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: []