educode_sales 0.9.56 → 0.9.58

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

@@ -37,6 +37,12 @@
           <input type="text" name="description" class="layui-input">
         </div>
       </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">态度</label>
+        <div class="layui-input-inline">
+          <%= select_tag "attitude_id",options_for_select(EducodeSales::Common.where(clazz: "teacher_attitude").pluck(:name, :id)), {include_blank: true }%>
+        </div>
+      </div>
 
       <div class="layui-inline">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_follows_search">重置
@@ -154,7 +160,7 @@
                       title: '团队建议',
                       templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
                   },
-                  
+
                   {
                       title: '操作',
                       width: 80,
@@ -191,7 +197,7 @@
             },
             where: {q: search, sort: sort}
           }, 'data');
-  
+
           return false;
         });
 

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

@@ -62,6 +62,12 @@
           <%= select_tag "assist", options_for_select(@staffs, params[:assist]), { 'lay-filter': 'assist', include_blank: true } %>
         </div>
       </div>
+      <div class="layui-inline show_item" style="display:none;">
+        <label class="layui-form-label">电话</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" id="mobile" placeholder="请输入电话" autocomplete="off" name="mobile">
+        </div>
+      </div>
 
       <div class="layui-inline">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置

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

@@ -63,6 +63,10 @@
               <dd><a href="/missions/businesses" class="<%= current?('layui-this', businesses_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>商机管理</a>
               </dd>
             <% end %>
+            <% if can? :contract_business, EducodeSales::Business %>
+              <dd><a href="/missions/businesses/contract" class="<%= current?('layui-this', contract_businesses_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/4.商机管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>合同管理</a>
+              </dd>
+            <% end %>
             <% if can? :read, EducodeSales::MoneyPlan %>
               <dd><a href="/missions/money_plans" class="<%= current?('layui-this', money_plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/money_plans.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>回款计划</a>
               </dd>
@@ -125,6 +129,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 +144,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/config/routes.rb

@@ -116,6 +116,7 @@ EducodeSales::Engine.routes.draw do
       get :followed
       get :daily_paper
       get :search
+      get :contract
     end
 
     member do
@@ -123,6 +124,7 @@ EducodeSales::Engine.routes.draw do
       post :add_follow_up
       get :unfinish_plans
       put :update_follow_up
+      put :audit
     end
   end
 

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/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/db/migrate/20230314122536_add_delet_reason_to_business.rb

@@ -0,0 +1,7 @@
+class AddDeletReasonToBusiness < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_businesses, :delete_reason, :string
+    add_column :educode_sales_businesses, :auth_desc, :string, comment: '审核说明'
+    add_column :educode_sales_businesses, :state_id, :integer, default: 0, comment: '正常:0, 待审核删除:1, 进入回收站:2, A类降级:3'
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.56'
+  VERSION = '0.9.58'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.56
+  version: 0.9.58
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -248,6 +248,8 @@ files:
 - 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/contract.html.erb
+- app/views/educode_sales/businesses/contract.json.jbuilder
 - 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
@@ -555,6 +557,8 @@ files:
 - 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
+- db/migrate/20230314122536_add_delet_reason_to_business.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb