educode_sales 0.9.55 → 0.9.57

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

@@ -24,6 +24,7 @@ json.data do
       end
     end
 
+    json.staff_manages d.last_follow_up&.assign_follow_ups.present? ? (d.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.staff&.user&.real_name
     json.divide_rate d.divide_rate
     json.divide_money d.divide_amount
     json.budget_amount d.budget_amount

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

@@ -2,6 +2,9 @@
   <ul class="layui-tab-title">
     <li class="layui-this follows_li">跟进动态</li>
     <li class="businesses_list_li" >商机列表</li>
+    <% if can?(:contract_business, EducodeSales::Business) %>
+      <li class="businesses_contract_li" >合同管理</li>
+    <% end %>
   </ul>
   <div class="layui-tab-content">
     <div class="layui-tab-item follows_div layui-show">
@@ -136,6 +139,11 @@
         </div>
       </div>
     </div>
+    <% if can?(:contract_business, EducodeSales::Business) %>
+      <div class="layui-tab-item businesses_contract_div">
+        <%=render 'contract' %>
+      </div>
+    <% end %>
   </div>
 </div>
 <script type="text/html" id="bussinessBar">
@@ -158,10 +166,13 @@
    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right area-btn" lay-event="area">区域管理商机</button>
    <% end %>
     <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right all-btn" lay-event="all"> 全部商机</button>
+  <% if can?(:delete_list, EducodeSales::Business) %>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right delete-btn" lay-event="delete_list">删除的商机</button>
+  <% end %>
   </div>
 </script>
 <script type="text/html" id="currentTableBar">
-  <%unless !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
+  <%unless !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business) %>
 <% if can? :add_follow, EducodeSales::Business %>
   <% if @current_admin.is_admin %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
@@ -418,6 +429,12 @@
                     title: '阶段',
                     hide: gon.filter.stage
                 },
+                {
+                  field: 'staff_manages',
+                  width: 150,
+                  title: '销售经理',
+                  hide: gon.filter.staff_manages
+                },
                 {
                     field: 'source',
                     width: 90,
@@ -590,7 +607,7 @@
                     minWidth: 220,
                     toolbar: '#currentTableBar',
                     align: "center",
-                    fixed: 'right',
+                    fixed: 'right'
                 }
             ]
         ]
@@ -981,6 +998,8 @@
               $(".s-btn").addClass("selected-btn");
             } else if (search['clazz'] == 'area') {
               $(".area-btn").addClass("selected-btn");
+            } else if (search['clazz'] == 'delete_list') {
+              $(".delete-btn").addClass("selected-btn");
             } else {
               $(".all-btn").addClass("selected-btn");
             }
@@ -1037,7 +1056,6 @@
                         })
                     });
             }
-
             if (obj.event === 'add') { // 监听添加操作
                 var content = miniPage.getHrefContent('/missions/businesses/new');
                 var openWH = miniPage.getOpenWidthHeight();
@@ -1061,7 +1079,9 @@
                     page: {
                         curr: 1
                     },
-                    where: {q: search, sort: sort}
+                    where: {q: search, sort: sort},
+                    done: function(res, curr, count){
+                    }
                 }, 'data');
                 form.val('search_form', {
                     name: '', department: '', staff_id: '', business_type: '', business_step: '',
@@ -1077,7 +1097,9 @@
                     page: {
                         curr: 1
                     },
-                    where: {q: search, sort: sort}
+                    where: {q: search, sort: sort},
+                    done: function(res, curr, count){
+                    }
                 }, 'data');
                 form.val('search_form', {
                     name: '', department: '', staff_id: '', business_type: '', business_step: '',
@@ -1094,7 +1116,9 @@
                     page: {
                         curr: 1
                     },
-                    where: {q: search, sort: sort}
+                    where: {q: search, sort: sort},
+                    done: function(res, curr, count){
+                    }
                 }, 'data');
                 form.val('search_form', {
                     name: '', department: '', staff_id: '', business_type: '', business_step: '',
@@ -1111,7 +1135,9 @@
                     page: {
                         curr: 1
                     },
-                    where: {q: search, sort: sort}
+                    where: {q: search, sort: sort},
+                    done: function(res, curr, count){
+                    }
                 }, 'data');
                 form.val('search_form', {
                     name: '', department: '', staff_id: '', business_type: '', business_step: '',
@@ -1128,7 +1154,9 @@
                     page: {
                         curr: 1
                     },
-                    where: {q: search, sort: sort}
+                    where: {q: search, sort: sort},
+                    done: function(res, curr, count){
+                    }
                 }, 'data');
                 form.val('search_form', {
                     name: '', department: '', staff_id: '', business_type: '', business_step: '',
@@ -1137,6 +1165,28 @@
                 $(".area-btn").addClass("selected-btn");
                 return false;
             }
+            else if (obj.event === 'delete_list') {
+              $(".layui-table-col-special").hide();
+              search = {"clazz": "delete_list"}
+              business_type_list.setValue([])
+              table.reload('businesses_table', {
+                  url: '/missions/businesses',
+                  page: {
+                      curr: 1
+                  },
+                  where: {q: search, sort: sort} 
+                  ,done: function(res, curr, count){
+                    $(".layui-table-col-special").hide();
+                  }
+              }, 'data');
+              form.val('search_form', {
+                  name: '', department: '', staff_id: '', business_type: '', business_step: '',
+                  place_id: '', date: '', area: ''
+              })
+              $(".delete-btn").addClass("selected-btn");
+             
+              return false;
+            } 
             else if (obj.event === 'delete') {
                 var checkStatus = table.checkStatus('currentTableId'),
                     data = checkStatus.data;

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

@@ -23,7 +23,8 @@ json.data do
     json.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
     json.created_at d.created_at.to_s
     json.no_followup_days (d['latest_time'] ? DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d['latest_time'].strftime("%Y-%m-%d")) : DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d.created_at.strftime("%Y-%m-%d"))).to_i
-
+    
+    json.staff_manages d.last_follow_up&.assign_follow_ups.present? ? (d.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.staff&.user&.real_name
     json.divide_rate d.divide_rate
     json.divide_money d.divide_amount.to_f.round(2)
     json.budget_amount d.budget_amount.to_f.round(2)  #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0

data/app/views/educode_sales/idea_recycles/detail.html.erb

@@ -1,6 +1,8 @@
 <div style=" text-align:left; margin-left: 100px;margin-top: 20px">
   <div class="layui-btn-group">
-    <button type="button" class="layui-btn" onclick="pre_follow()">历史记录</button>
+    <% if can? :read_history, EducodeSales::Idea %>
+      <button type="button" class="layui-btn" onclick="pre_follow()">历史记录</button>
+    <% end %>
   </div>
 </div>
 <% EducodeSales::Idea.where(school_id: @idea.school_id).order("id = #{@idea.id} DESC").each do |idea| %>

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

@@ -82,7 +82,9 @@
 </div>
 <script type="text/html" id="currentTableBar">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_recycle">恢复</a>
+  <% if can? :recycle, EducodeSales::Idea %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_recycle">恢复</a>
+  <% end %>
 </script>
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {

data/app/views/educode_sales/ideas/detail.html.erb

@@ -1,6 +1,8 @@
 <div style=" text-align:left; margin-left: 100px;margin-top: 20px">
   <div class="layui-btn-group">
-    <button type="button" class="layui-btn" onclick="pre_follow()">历史记录</button>
+    <% if can? :read_history, EducodeSales::Idea %>
+      <button type="button" class="layui-btn" onclick="pre_follow()">历史记录</button>
+    <% end %>
   </div>
 </div>
 <% EducodeSales::Idea.where(school_id: @idea.school_id).order("id = #{@idea.id} DESC").each do |idea| %>

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

@@ -75,7 +75,9 @@
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">方案管理</span>
-    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">新增项目方案</button>
+    <% if can? :create, EducodeSales::Idea %>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">新增项目方案</button>
+    <% end %>
   </div>
 </script>
 <div class="">
@@ -83,8 +85,12 @@
 </div>
 <script type="text/html" id="currentTableBar">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_edit">编辑</a>
-  <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="idea_recycle">移除</a>
+  <% if can? :update, EducodeSales::Idea %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_edit">编辑</a>
+  <% end %>
+  <% if can? :destroy, EducodeSales::Idea %>
+    <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="idea_recycle">移除</a>
+  <% end %>
 </script>
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {

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

@@ -227,7 +227,7 @@
                 },
                 {
                     field: 'followup_at',
-                    width: 120,
+                    width: 180,
                     title: '最新跟进时间',
                 },
                 {

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

@@ -37,13 +37,6 @@
       </div>
     </div>
     <br>
-    <div class="layui-inline">
-     <label class="layui-form-label ">手机号</label>
-     <div class="layui-input-block" style="width: 188px;">
-       <input type="text" name="mobile" autocomplete="off"  class="layui-input" placeholder="请输入手机号"  value="<%= @teacher.mobile %>">
-     </div>
-    </div>
-    <br>
     <div class="layui-inline">
       <label class="layui-form-label required">单位部门</label>
       <div class="layui-input-block" id="add_department2" style="width: 400px"></div>

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

@@ -20,9 +20,9 @@ json.data do
     json.actives d.actives
     json.experience d['experience'] || 0
     json.grade d['grade'] || 0
-    json.mobile d.mobile
+    json.mobile d.user&.phone || ''
     json.students d.students_count
-    json.followup_at d.followup_at.to_s
+    json.followup_at d.follow_up&.created_at&.to_s
     json.latest_time (d['latest_time'] ? DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d['latest_time'].strftime("%Y-%m-%d")) : DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d.created_at.strftime("%Y-%m-%d"))).to_i
 
     json.staff_manage @staff_manages[d.department&.school&.province]&.join(",")

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

@@ -33,12 +33,6 @@
            <%= select_tag "source_id", options_for_select(EducodeSales::Common.where(clazz: 'teacher_source').pluck(:name, :id)), { include_blank: true } %>
          </div>
        </div>
-       <div class="layui-inline">
-         <label class="layui-form-label ">手机号</label>
-         <div class="layui-input-block" style="width: 188px;">
-           <input type="text" name="mobile" autocomplete="off"  class="layui-input" placeholder="请输入手机号">
-         </div>
-       </div>
        <div class="layui-inline">
         <label class="layui-form-label ">微信号</label>
         <div class="layui-input-block" style="width: 188px;">

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

@@ -125,6 +125,8 @@
                   <i style="font-size: 25px;  padding-right: 15px"></i>绩效考核</a></dd>
             </dl>
           </li>
+        <% end %>
+        <% if can?(:read, EducodeSales::Idea) %>
           <li class="layui-nav-item layui-nav-itemed menu-li">
             <a class="" href="javascript:;"><b><%= image_tag "educode_sales/11.活动运营.png", size: "15" %>
               <i style="font-size: 25px;  padding-right: 25px"></i>方案支撑</b></a>
@@ -138,6 +140,7 @@
             </dl>
           </li>
         <% end %>
+
         <% if @current_admin.is_admin || @current_admin.code == 'userbe' %>
           <li class="layui-nav-item layui-nav-itemed menu-li">
             <a class="" href="javascript:;"><b><%= image_tag "educode_sales/13.系统设置.png", size: "15" %>

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -109,6 +109,13 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
       EducodeSales::Permission.create(name: '添加活动', subject: 'Activity', action: 'create', clazz: 'activity')
       EducodeSales::Permission.create(name: '编辑活动', subject: 'Activity', action: 'update', clazz: 'activity')
       EducodeSales::Permission.create(name: '删除活动', subject: 'Activity', action: 'destroy', clazz: 'activity')
+
+      # EducodeSales::Permission.create(name: '查看方案', subject: 'Idea', action: 'read', clazz: 'idea')
+      # EducodeSales::Permission.create(name: '添加方案', subject: 'Idea', action: 'create', clazz: 'idea')
+      # EducodeSales::Permission.create(name: '编辑方案', subject: 'Idea', action: 'update', clazz: 'idea')
+      # EducodeSales::Permission.create(name: '移除方案', subject: 'Idea', action: 'destroy', clazz: 'idea')
+      # EducodeSales::Permission.create(name: '恢复方案', subject: 'Idea', action: 'recycle', clazz: 'idea')
+      # EducodeSales::Permission.create(name: '查看历史记录', subject: 'Idea', action: 'read_history', clazz: 'idea')
     end
   end
 end

data/db/migrate/20230306131055_add_score_to_assessments_settings.rb

@@ -0,0 +1,26 @@
+class AddScoreToAssessmentsSettings < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_assessments_settings, :first_quarter_score, :string
+    add_column :educode_sales_assessments_settings, :january_score, :string
+    add_column :educode_sales_assessments_settings, :february_score, :string
+    add_column :educode_sales_assessments_settings, :march_score, :string
+    add_column :educode_sales_assessments_settings, :second_quarter_score, :string
+    add_column :educode_sales_assessments_settings, :april_score, :string
+    add_column :educode_sales_assessments_settings, :may_score, :string
+    add_column :educode_sales_assessments_settings, :june_score, :string
+    add_column :educode_sales_assessments_settings, :third_quarter_score, :string
+    add_column :educode_sales_assessments_settings, :july_score, :string
+    add_column :educode_sales_assessments_settings, :august_score, :string
+    add_column :educode_sales_assessments_settings, :september_score, :string
+    add_column :educode_sales_assessments_settings, :fourth_quarter_score, :string
+    add_column :educode_sales_assessments_settings, :october_score, :string
+    add_column :educode_sales_assessments_settings, :november_score, :string
+    add_column :educode_sales_assessments_settings, :december_score, :string
+
+
+    add_column :educode_sales_assessments_settings, :total_score, :string
+    add_column :educode_sales_assessments_settings, :cycle, :integer, default: 1
+
+    EducodeSales::Permission.find_or_create_by(name: '合同管理', subject: 'Business', action: 'contract_business', clazz: 'business', position: '15')
+  end
+end

data/db/migrate/20230308022633_add_permissions_to_educode_sales_permissions.rb

@@ -0,0 +1,11 @@
+class AddPermissionsToEducodeSalesPermissions < ActiveRecord::Migration[5.2]
+  def change
+    last_position = EducodeSales::Permission.all.order(position: :asc).last.position
+    EducodeSales::Permission.create(name: '查看方案', subject: 'Idea', action: 'read', clazz: 'idea', position: last_position + 1)
+    EducodeSales::Permission.create(name: '添加方案', subject: 'Idea', action: 'create', clazz: 'idea', position: last_position + 2)
+    EducodeSales::Permission.create(name: '编辑方案', subject: 'Idea', action: 'update', clazz: 'idea', position: last_position + 3)
+    EducodeSales::Permission.create(name: '移除方案', subject: 'Idea', action: 'destroy', clazz: 'idea', position: last_position + 4)
+    EducodeSales::Permission.create(name: '恢复方案', subject: 'Idea', action: 'recycle', clazz: 'idea', position: last_position + 5)
+    EducodeSales::Permission.create(name: '查看历史记录', subject: 'Idea', action: 'read_history', clazz: 'idea', position: last_position + 6)
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.55'
+  VERSION = '0.9.57'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.55
+  version: 0.9.57
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-03 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -247,6 +247,7 @@ files:
 - app/views/educode_sales/assessments/index.json.jbuilder
 - app/views/educode_sales/assessments/new.html.erb
 - app/views/educode_sales/assessments/progress.json.jbuilder
+- app/views/educode_sales/businesses/_contract.html.erb
 - 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
@@ -554,6 +555,8 @@ files:
 - db/migrate/20230220144737_add_clazz_id_to_business.rb
 - db/migrate/20230227061043_create_educode_sales_ideas.rb
 - db/migrate/20230228063555_create_educode_sales_idea_histories.rb
+- db/migrate/20230306131055_add_score_to_assessments_settings.rb
+- db/migrate/20230308022633_add_permissions_to_educode_sales_permissions.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb