educode_sales 0.6.2 → 0.6.6

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

@@ -19,44 +19,44 @@
           <%= select_tag "professional_title", options_for_select(['教授', '研究员', '副教授', '副研究员', '讲师', '助理研究员', '助理教授'], @person&.professional_title), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">导流来源</label>
         <div class="layui-input-inline">
           <%= select_tag "teacher_source", options_for_select(EducodeSales::Common.where(clazz: 'teacher_source').pluck(:name, :id)), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">态度</label>
         <div class="layui-input-inline">
 
           <%= select_tag "attitude", options_for_select(EducodeSales::Common.where(clazz: 'teacher_attitude').pluck(:name, :id)), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <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="time" placeholder="请选择时间" autocomplete="off" name="regist_at">
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">注册状态</label>
         <div class="layui-input-inline">
           <%= select_tag "status", options_for_select([["已注册","1"],["未注册","0"]]), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">区域</label>
         <div class="layui-input-inline">
           <%= select_tag "area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <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="date" name="date" autocomplete="off" placeholder=" - ">
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">教研助理</label>
         <div class="layui-input-inline">
           <%= select_tag "assist", options_for_select(@staffs, params[:assist]), { 'lay-filter': 'assist', include_blank: true } %>
@@ -68,6 +68,8 @@
         </button>
         <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_teachers">搜 索
         </button>
+        <a style="padding-left: 20px;color: #0000FF"  href="javascript:;" type="submit" class="" lay-submit lay-filter="show_hide">展开/收起
+        </a>
       </div>
     </div>
   </form>
@@ -150,12 +152,14 @@
                     width: 60,
                     title:'序号',type: 'numbers',
                     totalRowText:'合计',
+                    fixed: 'left'
 
                 },
                 {
                     field: 'name',
                     width: 80,
                     title: '姓名',
+                    fixed: 'left',
                     templet: "#name"
                 },
                 {
@@ -409,6 +413,10 @@
             })
             return false;
         });
+        form.on('submit(show_hide)', function (data) {
+            $(".show_item").toggle()
+            return false;
+        });
         /**
          * toolbar事件监听
          */

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

@@ -9,12 +9,15 @@
   <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
   <%= stylesheet_link_tag "educode_sales/application", media: "all" %>
   <%= javascript_include_tag "educode_sales/application" %>
+  <script src="https://cdn.jsdelivr.net/npm/cxselect@1.4.0/js/jquery.cxselect.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/cxselect@1.4.0/js/jquery.cxselect.min.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.js"></script>
 </head>
 <body class="" id="body">
 <div class="layui-layout layui-layout-admin " >
   <div class="layui-header">
     <a href="/missions">
-      <div class="layui-hide-xs layui-bg-black layuimini-logo layui-logo">
+      <div class="layui-bg-black layuimini-logo layui-logo" id="head_a">
       <%= image_tag "educode_sales/logo.png", class: 'header-logo' %>
       <span class="app-title">营销系统</span>
     </div>
@@ -22,6 +25,7 @@
 
 
     <ul class="layui-nav i_class" style="left: 200px">
+      <%= image_tag "educode_sales/logo.png", class: 'header-logo tubiao layui-hide-sm layui-hide-xs' %>
       <li class="layui-nav-item layui-show-xs-inline-block " lay-header-event="menuLeft">
         <a href="javascript:;"> <i id="leftEnumIcon" class="layui-icon layui-icon-shrink-right"></i></a>
       </li>
@@ -45,7 +49,7 @@
     </ul>
   </div>
 
-  <div class="layui-side layui-bg-black">
+  <div class="layui-side layui-bg-black" id="head_b">
     <div class="layui-side-scroll ">
       <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
       <ul class="layui-nav layui-nav-tree ul"
@@ -66,6 +70,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? :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>
+            <% end %>
             <% if can? :read, EducodeSales::Customer %>
               <dd><a href="/missions/customers" class="<%= current?('layui-this', customers_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/客户管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>客户管理</a>
               </dd>
@@ -205,6 +213,10 @@
                     $(".i_class").animate({left: '200px'},"fast");
                     $(".layui-nav-item").addClass('layui-nav-itemed')
                     $("#logout").removeClass('layui-nav-itemed')
+                    $("#head_b").removeClass('layui-hide-xs')
+                    $("#head_a").removeClass('layui-hide-xs')
+                    $(".tubiao").addClass('layui-hide')
+                    $(".tubiao").addClass('layui-hide-xs')
                 }
 
                 function menuHide(btn) {
@@ -212,6 +224,10 @@
                     btn.removeClass('layui-icon-shrink-right').addClass('layui-icon-spread-left');
                     body.addClass('layuimini-mini');
                     $(".i_class").animate({left: '60px'});
+                    $("#head_b").addClass('layui-hide-xs')
+                    $("#head_a").addClass('layui-hide-xs')
+                    $(".tubiao").removeClass('layui-hide')
+                    $(".tubiao").removeClass('layui-hide-xs')
                 }
             }
         });

data/config/routes.rb

@@ -20,6 +20,8 @@ EducodeSales::Engine.routes.draw do
   end
   resources :customer_follows do
   end
+  resources :money_plans do
+  end
 
   resources :customers do
     collection do

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -8,6 +8,14 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
     end
     if EducodeSales::Permission.last.nil?
 
+      #附件管理权限
+      EducodeSales::Permission.create(name: '查看附件', subject: 'Business', action: 'show_file', clazz: 'business', position: '11')
+      EducodeSales::Permission.create(name: '上传附件', subject: 'Business', action: 'upload_file', clazz: 'business', position: '11')
+      EducodeSales::Permission.create(name: '下载附件', subject: 'Business', action: 'download_file', clazz: 'business', position: '11')
+      EducodeSales::Permission.create(name: '删除附件', subject: 'Business', action: 'delete_file', clazz: 'business', position: '11')
+      #回款管理权限
+      EducodeSales::Permission.create(name: '查看回款列表', subject: 'MoneyPlan', action: 'read', clazz: 'money_plan', position: '15')
+
       #客户管理权限
       EducodeSales::Permission.create(name: '查看客户', subject: 'Customer', action: 'read', clazz: 'customer')
       EducodeSales::Permission.create(name: '添加客户', subject: 'Customer', action: 'create', clazz: 'customer')

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.6.2'
+  VERSION = '0.6.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.6
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,6 +109,7 @@ files:
 - app/assets/images/educode_sales/loading-2.gif
 - app/assets/images/educode_sales/loginbg.png
 - app/assets/images/educode_sales/logo.png
+- app/assets/images/educode_sales/money_plans.png
 - app/assets/images/educode_sales/回收站.png
 - app/assets/images/educode_sales/客户管理.png
 - app/assets/javascripts/educode_sales/application.js
@@ -145,6 +146,7 @@ files:
 - app/controllers/educode_sales/home_controller.rb
 - app/controllers/educode_sales/import_teachers_controller.rb
 - app/controllers/educode_sales/key_person_controller.rb
+- app/controllers/educode_sales/money_plans_controller.rb
 - app/controllers/educode_sales/operation_plans_controller.rb
 - app/controllers/educode_sales/operation_reports_controller.rb
 - app/controllers/educode_sales/operations_controller.rb
@@ -253,6 +255,8 @@ files:
 - app/views/educode_sales/home/search_teacher.json.jbuilder
 - app/views/educode_sales/home/search_users.json.jbuilder
 - app/views/educode_sales/home/statistics.html.erb
+- app/views/educode_sales/money_plans/index.html.erb
+- app/views/educode_sales/money_plans/index.json.jbuilder
 - app/views/educode_sales/operation_plans/_monthPlan.html.erb
 - app/views/educode_sales/operation_plans/_monthly.html.erb
 - app/views/educode_sales/operation_plans/_weekPlan.html.erb