educode_sales 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb60117f75870a9280a833425b4a29bac7172e70da78b061fa41ea92abc7c985
-  data.tar.gz: 203aaf0c96f4e246ab734cd3dc4844542563404f6939bc2613ae286fe37d8be7
+  metadata.gz: bbb707c74c7909b2a42a4cc3eaf395677a436c8a210db16ba31cfb5abb0c9cdd
+  data.tar.gz: 7c08a37d777b84396fc415076c6fa768eb0bd9dc56d9e6307451832212141a71
 SHA512:
-  metadata.gz: 688e3848050cd08d8598e8434e0039db4aa6fb0972f3bd558ad026b68462080fe898802082f94dfcf67b7e3a765631ecc39befad5382028c30c0b4259fb4e045
-  data.tar.gz: 5ed1048e97b6cf03f127040239eb7a7c8011b72edf8a94deb42d65a829a4e7ed15b98ecb94bdeb662dc6dc66efe3fff6e22cfeef28d819082a8f8ce9879cfeee
+  metadata.gz: d96671e32dfe8e9469c6f93927cf453d86861004d123bbbc01b1118295e7827fd37a1b039ac629a51803d1132341afed7b58fb630919387251253481377d7720
+  data.tar.gz: '0628d9062d5c4b72851dc9cbb0f997169cb395713c3e20263c7b32df369ef323c79370955dffb428b88ff33d9cb297e0ebd3720b1c6bb1f04fdeeb198fbf49ad'

data/app/controllers/educode_sales/businesses_controller.rb

@@ -40,6 +40,18 @@ module EducodeSales
             end
           end
 
+          if params[:q].present? && params[:q][:all].present?
+            @businesses = @businesses
+          end
+
+          if params[:q].present? && params[:q][:mine].present?
+            ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+            ids1 = FollowUp.where(id: ids).pluck(:business_id)
+            # ids2 = Business.where(staff_id: @current_admin.id).pluck(:id)
+            # @businesses = Business.where(id: ids1+ids2)
+            @businesses =@businesses.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
+          end
+
           @businesses = @businesses
           if params[:q].present? && params[:q][:name].present?
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
@@ -88,17 +100,7 @@ module EducodeSales
 
           @business_count = @businesses.count
 
-          if params[:q].present? && params[:q][:all].present?
-            @businesses = Business.all
-          end
 
-          if params[:q].present? && params[:q][:mine].present?
-            ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
-            ids1 = FollowUp.where(id: ids).pluck(:business_id)
-            ids2 = Business.where(staff_id: @current_admin.id).pluck(:id)
-            # @businesses = Business.where(id: ids1+ids2)
-            @businesses =Business.where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
-          end
 
           @businesses = @businesses.select("
             educode_sales_businesses.*,
@@ -235,7 +237,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_rate, :description, :advise, :place_id)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id)
     end
 
   end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -156,7 +156,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_rate, :description, :advise, :place_id)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id)
     end
 
     def teacher_params

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -17,7 +17,7 @@ module EducodeSales
       @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, stage_ids).sum(:total_amount).round(2)
       s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
       @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, s_stage_ids).sum(:total_amount).round(2)
-      @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_money_plans.date_at >= ?", year_time).sum(:amount).round(2)
+      @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?", year_time).sum(:amount).round(2)
       a = Common.where(clazz: '商机类型', name: 'A类').pluck(:id)
       @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).sum(:total_amount).round(2)
       b = Common.where(clazz: '商机类型', name: 'B类').pluck(:id)

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -34,7 +34,7 @@ module EducodeSales
     def update
       follow_up = TeacherFollow.find(params[:id])
       follow_up.assign_attributes(follow_up_params)
-      # follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_rate.to_i) * 0.01 if follow_up.actual_amount
+      # follow_up.profit_amount = follow_up.actual_amount * (100-follow_up.divide_amount.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save
         render_success
       else

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

@@ -71,7 +71,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成</label>
       <div class="layui-input-inline">
-        <input name="divide_rate" class="layui-input" value="<%= @follow_up.divide_rate%>">
+        <input name="divide_amount" class="layui-input" value="<%= @follow_up.divide_amount%>">
       </div>
     </div>
     <div class="layui-form-item">

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

@@ -75,7 +75,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成</label>
       <div class="layui-input-inline">
-        <input name="divide_rate" class="layui-input" value="<%= @last_follow_up&.divide_rate%>">
+        <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount%>">
       </div>
     </div>
      <div class="layui-form-item">

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

@@ -128,7 +128,7 @@
                 title: '合同额',
               },
               {
-                field: 'divide_rate',
+                field: 'divide_amount',
                 width: 100,
                 title: '渠道分成',
               },

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

@@ -9,11 +9,11 @@ json.data do
     json.reception_at d.reception_at&.to_s(:date)
     json.total_amount d.total_amount
     json.actual_amount d.actual_amount
-    json.divide_rate d.divide_amount ? d.divide_amount : ""
+    json.divide_amount d.divide_amount ? d.divide_amount : ""
     json.staff d.staff.user.real_name
     json.place d.place&.name
     json.money_plans_count d.money_plans_count
-    json.money d.money_plans.where(clazz: 1).sum(:amount)
+    json.money d.money_plans.where(clazz: 1).sum(:amount).round(2)
     json.is_latest d.id == @latest&.id
   end
 end

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

@@ -62,7 +62,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.divide_rate %>
+        <%= @follow_up.divide_amount %>
       </div>
     </div>
     <div class="ayui-form-item">

data/app/views/educode_sales/operation_reports/audit.html.erb

@@ -1,4 +1,4 @@
-<form class="layui-form layui-form-pane" action="">
+<form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -14,36 +14,37 @@
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">个人总结</label>
       <div class="layui-input-block">
-        <textarea name="content" placeholder="此处填写要点：
+        <textarea name="content"  placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text">
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">大区意见</label>
       <div class="layui-input-block">
         <textarea name="level1_opinion" placeholder="给出评价、提醒、建议、办法等。"
-          class="layui-textarea"><%= @sale_report.level1_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level1_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar4"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar4" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">总监意见</label>
       <div class="layui-input-block">
         <textarea name="level2_opinion" placeholder="给出评价、提醒、建议、办法等。"
-          class="layui-textarea"><%= @sale_report.level2_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level2_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar5"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar5" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">副总意见</label>
       <div class="layui-input-block">
         <textarea name="level3_opinion" placeholder="给出评价、提醒、建议、办法等。"
-          class="layui-textarea"><%= @sale_report.level3_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level3_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar6"></div>
+    <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <br>
     <div class="layui-inline m-t-10">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="audit_weekly_report"
         style="margin-left: 18px">提交
@@ -53,7 +54,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+</div>
 <script type="text/html" id="show_follow_audit">
   <a href="javascript:void(0);" lay-event="show_follow_audit" class="layui-table-link">{{ d.count }}</a>
 </script>
@@ -210,5 +213,29 @@
       ],
       page: true
     });
+      autosize();
+      function autosize(){
+          var text = $('.autosize');
+
+          text.each(function(){
+              $(this).attr('rows',1);
+              resize($(this));
+          });
+
+          text.on('input', function(){
+              resize($(this));
+          });
+
+          function resize ($text) {
+              $text.css('height', 'auto');
+              $text.css('height', $text[0].scrollHeight+'px');
+          }
+      }
   })
 </script>
+<style>
+    .autosize {
+        resize: none;
+        overflow: hidden;
+    }
+</style>

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

@@ -9,7 +9,7 @@
     {{#  } }}
   </div>
 </script>
-<form class="layui-form layui-form-pane">
+<form class="layui-form layui-form-pane" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -39,7 +39,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyTable"></table>
+</div>
 <script type="text/html" id="show_follow_edit">
   <a href="javascript:void(0);" lay-event="show_follow_edit" class="layui-table-link">{{ d.count }}</a>
 </script>

data/app/views/educode_sales/operation_reports/show.html.erb

@@ -1,4 +1,4 @@
-<form class="layui-form layui-form-pane" action="">
+<form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -16,33 +16,33 @@
         <textarea name="desc" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。"  disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text">
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">大区意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
-                  class="layui-textarea"><%= @sale_report.level1_opinion %></textarea>
+                  class="layui-textarea autosize"><%= @sale_report.level1_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar4"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar4" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">总监意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
-                  class="layui-textarea"><%= @sale_report.level2_opinion %></textarea>
+                  class="layui-textarea autosize"><%= @sale_report.level2_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar5"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar5" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">副总意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
-                  class="layui-textarea"><%= @sale_report.level3_opinion %></textarea>
+                  class="layui-textarea autosize"><%= @sale_report.level3_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar6"></div>
+    <div id="weekStar6" style="margin-bottom: 40px"></div>
     <br>
   </div>
 </form>
@@ -51,7 +51,9 @@
   <a href="javascript:void(0);" lay-event="show_follow_show" class="layui-table-link">{{ d.count }}</a>
 </script>
 <!--表格-->
-<table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+</div>
 <!--<script type="text/html" id="currentShowWeekly">-->
 <!--  <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="edit">编辑</a>-->
@@ -69,17 +71,23 @@
         rate.render({
             elem: '#weekStar4',
             half: true,
-            readonly: true
+            readonly: true,
+            value: "<%= @sale_report.level1_score %>",
+            length: "<%= @sale_report.level1_score %>"
         })
         rate.render({
             elem: '#weekStar5',
             half: true,
-            readonly: true
+            readonly: true,
+            value: "<%= @sale_report.level2_score %>",
+            length: "<%= @sale_report.level2_score %>"
         })
         rate.render({
             elem: '#weekStar6',
             half: true,
-            readonly: true
+            readonly: true,
+            value: "<%= @sale_report.level3_score %>",
+            length: "<%= @sale_report.level3_score %>"
         })
 
 
@@ -244,8 +252,31 @@
                 });
             }
         });
+        autosize();
+        function autosize(){
+            var text = $('.autosize');
 
+            text.each(function(){
+                $(this).attr('rows',1);
+                resize($(this));
+            });
+
+            text.on('input', function(){
+                resize($(this));
+            });
+
+            function resize ($text) {
+                $text.css('height', 'auto');
+                $text.css('height', $text[0].scrollHeight+'px');
+            }
+        }
 
 
     })
 </script>
+<style>
+    .autosize {
+        resize: none;
+        overflow: hidden;
+    }
+</style>

data/app/views/educode_sales/sale_reports/audit.html.erb

@@ -1,4 +1,4 @@
-<form class="layui-form layui-form-pane" action="">
+<form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -18,36 +18,37 @@
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">个人总结</label>
       <div class="layui-input-block">
-        <textarea name="content" placeholder="此处填写要点：
+        <textarea name="content"  placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text">
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">大区意见</label>
       <div class="layui-input-block">
         <textarea name="level1_opinion" placeholder="给出评价、提醒、建议、办法等。"
-          class="layui-textarea"><%= @sale_report.level1_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level1_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar4"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar4" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">总监意见</label>
       <div class="layui-input-block">
         <textarea name="level2_opinion" placeholder="给出评价、提醒、建议、办法等。"
-          class="layui-textarea"><%= @sale_report.level2_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level2_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar5"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar5" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">副总意见</label>
       <div class="layui-input-block">
         <textarea name="level3_opinion" placeholder="给出评价、提醒、建议、办法等。"
-          class="layui-textarea"><%= @sale_report.level3_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level3_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar6"></div>
+    <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <br>
     <div class="layui-inline m-t-10">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="audit_weekly_report"
         style="margin-left: 18px">提交
@@ -57,7 +58,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+</div>
 <script type="text/html" id="show_follow">
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>
@@ -205,5 +208,29 @@
       ],
       page: true
     });
+      autosize();
+      function autosize(){
+          var text = $('.autosize');
+
+          text.each(function(){
+              $(this).attr('rows',1);
+              resize($(this));
+          });
+
+          text.on('input', function(){
+              resize($(this));
+          });
+
+          function resize ($text) {
+              $text.css('height', 'auto');
+              $text.css('height', $text[0].scrollHeight+'px');
+          }
+      }
   })
 </script>
+<style>
+    .autosize {
+        resize: none;
+        overflow: hidden;
+    }
+</style>

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

@@ -9,7 +9,7 @@
     {{#  } }}
   </div>
 </script>
-<form class="layui-form layui-form-pane">
+<form class="layui-form layui-form-pane" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -43,7 +43,9 @@
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="newWeeklyTable" lay-filter="newWeeklyTable"></table>
+</div>
 <script type="text/html" id="show_follow">
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>

data/app/views/educode_sales/sale_reports/show.html.erb

@@ -1,4 +1,4 @@
-<form class="layui-form layui-form-pane" action="">
+<form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
@@ -20,39 +20,41 @@
         <textarea name="desc" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text">
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">大区意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
-          class="layui-textarea"><%= @sale_report.level1_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level1_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar4"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar4" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">总监意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
-          class="layui-textarea"><%= @sale_report.level2_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level2_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar5"></div>
-    <div class="layui-form-item layui-form-text">
+    <div id="weekStar5" style="margin-bottom: 40px"></div>
+    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">副总意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
-          class="layui-textarea"><%= @sale_report.level3_opinion %></textarea>
+          class="layui-textarea autosize"><%= @sale_report.level3_opinion %></textarea>
       </div>
     </div>
-    <div id="weekStar6"></div>
+    <div id="weekStar6" style="margin-bottom: 40px"></div>
     <br>
   </div>
 </form>
 
 <!--表格-->
-<table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+<div style="padding: 20px">
+  <table class="layui-hide" id="showWeeklyTable" lay-filter="showWeeklyTable"></table>
+</div>
 <script type="text/html" id="show_follow">
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>
@@ -166,7 +168,31 @@
     ],
     page: true
   });
-  })
 
 
+      autosize();
+      function autosize(){
+          var text = $('.autosize');
+
+          text.each(function(){
+              $(this).attr('rows',1);
+              resize($(this));
+          });
+
+          text.on('input', function(){
+              resize($(this));
+          });
+
+          function resize ($text) {
+              $text.css('height', 'auto');
+              $text.css('height', $text[0].scrollHeight+'px');
+          }
+      }
+  })
 </script>
+<style>
+    .autosize {
+        resize: none;
+        overflow: hidden;
+    }
+</style>

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

@@ -13,7 +13,7 @@
 <body class="" id="body">
 <div class="layui-layout layui-layout-admin " >
   <div class="layui-header">
-    <div class="layui-logo layui-hide-xs layui-bg-black layuimini-logo">
+    <div class="layui-hide-xs layui-bg-black layuimini-logo layui-logo">
       <%= image_tag "educode_sales/logo.png", class: 'header-logo' %>
       <span class="app-title">营销系统</span>
     </div>
@@ -24,7 +24,7 @@
       </li>
     </ul>
     <ul class="layui-nav layui-layout-right">
-      <li class="layui-nav-item layui-hide layui-show-md-inline-block">
+      <li class="layui-nav-item layui-hide layui-show-md-inline-block" id="logout">
         <a href="javascript:;">
           <%= image_tag "/images/#{url_to_avatar(@current_admin.user)}", class: 'layui-nav-img' %>
           <%= @current_admin.user.real_name %>
@@ -43,66 +43,67 @@
   </div>
 
   <div class="layui-side layui-bg-black">
-    <div class="layui-side-scroll">
+    <div class="layui-side-scroll ">
       <!-- 左侧导航区域（可配合layui已有的垂直导航） -->
-      <ul class="layui-nav layui-nav-tree" lay-filter="test">
-        <li class="layui-nav-item layui-nav-itemed">
-          <a class="" href="javascript:;"><b><i class="layui-icon layui-icon-template-1" style="font-size: 25px;  padding-right: 20px"></i>销售活动</b></a>
+      <ul class="layui-nav layui-nav-tree"
+          lay-filter="test">
+        <li class="layui-nav-item layui-nav-itemed menu-li" >
+          <a class="" href="javascript:;"><b><%= image_tag "educode_sales/1.销售活动.png",size:"15"%><i style="padding-right: 25px"></i>销售活动</b></a>
           <dl class="layui-nav-child">
             <% if can? :trends, EducodeSales::SaleTrend %>
               <dd>
-                <a href="/missions/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>"><i class="layui-icon layui-icon-chart-screen" style="font-size: 25px;  padding-right: 20px"></i>市场态势</a>
+                <a href="/missions/sale_trends/trends" class="<%= current?('layui-this', trends_sale_trends_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/2.市场态势.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>市场态势</a>
               </dd>
             <% end %>
             <% if can? :sales, EducodeSales::Staff %>
-              <dd><a href="/missions/sales" class="<%= current?('layui-this', sales_path) %>"><i class="layui-icon  layui-icon-username" style="font-size: 25px;  padding-right: 20px"></i>销售分工</a>
+              <dd><a href="/missions/sales" class="<%= current?('layui-this', sales_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/3.销售分工.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售分工</a>
               </dd>
             <% end %>
             <% if can? :read, EducodeSales::Business %>
-              <dd><a href="/missions/businesses" class="<%= current?('layui-this', businesses_path) %>"><i class="layui-icon layui-icon-component" style="font-size: 25px;  padding-right: 20px"></i>商机管理</a>
+              <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::Place %>
-              <dd><a href="/missions/places" class="<%= current?('layui-this', places_path) %>"><i class="layui-icon layui-icon-tabs" style="font-size: 25px;  padding-right: 20px"></i>渠道管理</a></dd>
+              <dd><a href="/missions/places" class="<%= current?('layui-this', places_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/5.渠道管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>渠道管理</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::SalePlan %>
-              <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>"><i class="layui-icon layui-icon-form" style="font-size: 25px;  padding-right: 20px"></i>销售计划</a></dd>
+              <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/6.销售计划.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售计划</a></dd>
             <% end %>
           </dl>
         </li>
-        <li class="layui-nav-item layui-nav-itemed">
-          <a class="" href="javascript:;"><b><i class="layui-icon layui-icon-app" style="font-size: 25px;  padding-right: 20px"></i>运营活动</b></a>
+        <li class="layui-nav-item layui-nav-itemed menu-li">
+          <a class="" href="javascript:;"><b><%= image_tag "educode_sales/7.运营活动.png",size:"15"%><i  style="font-size: 25px;  padding-right: 25px"></i>运营活动</b></a>
           <dl class="layui-nav-child">
             <% if can? :read, EducodeSales::OperationTrend %>
               <dd>
-                <a href="/missions/operations/trends" class="<%= current?('layui-this', trends_operations_path) %>"><i class="layui-icon  layui-icon-chart" style="font-size: 25px;  padding-right: 20px"></i>运营态势</a>
+                <a href="/missions/operations/trends" class="<%= current?('layui-this', trends_operations_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/8.运营态势.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>运营态势</a>
               </dd>
             <% end %>
             <% if can? :operations, EducodeSales::Staff %>
               <dd>
-                <a href="/missions/sales/operations" class="<%= current?('layui-this', operations_sales_path) %>"><i class="layui-icon layui-icon-friends" style="font-size: 25px;  padding-right: 20px"></i>运营分工</a>
+                <a href="/missions/sales/operations" class="<%= current?('layui-this', operations_sales_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/9.运营分工.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>运营分工</a>
               </dd>
             <% end %>
             <% if can? :read, EducodeSales::Teacher %>
-              <dd><a href="/missions/teachers" class="<%= current?('layui-this', teachers_path) %>"><i class="layui-icon layui-icon-release" style="font-size: 25px;  padding-right: 20px"></i>教师运营</a></dd>
+              <dd><a href="/missions/teachers" class="<%= current?('layui-this', teachers_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/10.教师运营.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>教师运营</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::Activity %>
-              <dd><a href="/missions/activities" class="<%= current?('layui-this', activities_path) %>"><i class="layui-icon layui-icon-engine" style="font-size: 25px;  padding-right: 20px"></i>活动运营</a></dd>
+              <dd><a href="/missions/activities" class="<%= current?('layui-this', activities_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/11.活动运营.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>活动运营</a></dd>
             <% end %>
             <% if can? :read, EducodeSales::OperationPlan %>
               <dd>
-                <a href="/missions/operation_plans" class="<%= current?('layui-this', operation_plans_path) %>"><i class="layui-icon layui-icon-log" style="font-size: 25px;  padding-right: 20px"></i>运营计划</a>
+                <a href="/missions/operation_plans" class="<%= current?('layui-this', operation_plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/12.运营计划.png",size:"15"%><i style="font-size: 25px;  padding-right: 15px"></i>运营计划</a>
               </dd>
             <% end %>
           </dl>
         </li>
         <% if @current_admin.is_admin %>
-          <li class="layui-nav-item layui-nav-itemed">
-            <a class="" href="javascript:;"><b><i class="layui-icon layui-icon-set-sm" style="font-size: 25px;  padding-right: 20px"></i>系统设置</b></a>
+          <li class="layui-nav-item layui-nav-itemed menu-li">
+            <a class="" href="javascript:;"><b><%= image_tag "educode_sales/13.系统设置.png",size:"15"%><i  style="font-size: 25px;  padding-right: 25px"></i>系统设置</b></a>
             <dl class="layui-nav-child">
-              <dd><a href="/missions/roles" class="<%= current?('layui-this', roles_path) %>"><i class="layui-icon layui-icon-username" style="font-size: 25px;  padding-right: 20px"></i>角色管理</a></dd>
-              <dd><a href="/missions/staffs" class="<%= current?('layui-this', staffs_path) %>"><i class="layui-icon layui-icon-user" style="font-size: 25px;  padding-right: 20px"></i>人员管理</a></dd>
-              <dd><a href="/missions/commons" class="<%= current?('layui-this', commons_path) %>"><i class="layui-icon layui-icon-file" style="font-size: 25px;  padding-right: 20px"></i>字典列表</a></dd>
+              <dd><a href="/missions/roles" class="<%= current?('layui-this', roles_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/14.角色管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>角色管理</a></dd>
+              <dd><a href="/missions/staffs" class="<%= current?('layui-this', staffs_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/15.人员管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>人员管理</a></dd>
+              <dd><a href="/missions/commons" class="<%= current?('layui-this', commons_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/16.字典列表.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>字典列表</a></dd>
             </dl>
           </li>
         <% end %>
@@ -127,6 +128,17 @@
 </body>
 </html>
 <script type="text/javascript" charset="utf-8">
+
+//  if(true){
+//      var $ = layui.jquery;
+//      var body = $("#body");
+//      var btn = $("#leftEnumIcon");
+//      $(".layui-nav-item").removeClass('layui-nav-itemed')
+//      btn.removeClass('layui-icon-shrink-right').addClass('layui-icon-spread-left');
+//      body.addClass('layuimini-mini');
+//      $(".i_class").animate({left: '60px'});
+//  }
+
     //头部事件
     layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
         var $ = layui.jquery,
@@ -134,11 +146,17 @@
             table = layui.table,
             request = layui.request,
             util = layui.util,
-            miniPage = layui.miniPage;
-
+            layer = layui.layer,
+            miniMenu = layui.miniMenu,
+            miniTheme = layui.miniTheme,
+            element = layui.element ,
+            miniTab = layui.miniTab;
+        miniPage = layui.miniPage;
+            $ = layui.jquery;
         util.event('lay-header-event', {  //util 记得 声明 var util = layui.util
             //左侧菜单事件
             menuLeft: function (othis) {
+                var li = $(".li")
                 var body = $("#body");
                 var btn = $("#leftEnumIcon");
                 if (btn.hasClass('layui-icon-shrink-right')) {
@@ -161,36 +179,77 @@
                         if (!btn.hasClass('btn-index')) {
                             if (btn.hasClass('layui-icon-spread-left')) {
                                 menuHide(btn);
-
                             }
                         }
-
-
                     }
-
                 });
 
                 function menuShow(btn) {
+                    try {
+                        layer.close(window.openTips);
+                    } catch (e) {
+                        console.log(e.message);
+                    }
                     btn.removeClass('layui-icon-spread-left').addClass('layui-icon-shrink-right');
                     body.removeClass('layuimini-mini')
-                    $(".i_class").animate({left: '200px'});
-                    // $(".zq-logo").animate({width: 'toggle'});
-                    // $(".layui-body").animate({left: '200px'});
-                    // $(".layui-footer").animate({left: '200px'});
+                    $(".i_class").animate({left: '200px'},"fast");
+                    $(".layui-nav-item").addClass('layui-nav-itemed')
+                    $("#logout").removeClass('layui-nav-itemed')
                 }
 
                 function menuHide(btn) {
+                    $(".layui-nav-item").removeClass('layui-nav-itemed')
                     btn.removeClass('layui-icon-shrink-right').addClass('layui-icon-spread-left');
                     body.addClass('layuimini-mini');
-                    // $(".layui-side").animate({width: '50px'}); //toggle如果原来div是隐藏的就会把元素显示，如果原来是显示则隐藏
                     $(".i_class").animate({left: '60px'});
-                    // $(".layui-body").animate({left: '0px'});
-                    // $(".layui-footer").animate({left: '0px'});
                 }
             }
         });
+
+
+
+
+        $(document).ready(function() {
+            var btn = $("#leftEnumIcon");
+            $("body").on("mouseenter", ".menu-li", function () {
+                    tips = $(this).prop("innerHTML")
+                    flag = btn.hasClass('layui-icon-spread-left')
+                if (flag && tips) {
+                    tips = "<ul class='layuimini-menu-left-zoom layui-nav layui-nav-tree layui-this' style='width: 170px'><li class='layui-nav-item layui-nav-itemed'>"+tips+"</li></ul>" ;
+                    window.openTips = layer.tips(tips, $(this), {
+                        tips: [2, '#2f4056'],
+                        time: 300000,
+                        skin:"popup-tips",
+                        success:function (el) {
+                            var left = $(el).position().left - 150 ;
+                            $(el).css({ left:left});
+                            element.render();
+                        }
+                    });
+                }
+            });
+
+            $("body").on("mouseleave", ".layui-nav-child", function () {
+                    try {
+                        layer.close(window.openTips);
+                    } catch (e) {
+                        console.log(e.message);
+                    }
+            });
+
+            $("body").on("mouseenter", ".layui-body", function () {
+                    try {
+                        layer.close(window.openTips);
+                    } catch (e) {
+                        console.log(e.message);
+                    }
+            });
+
+
+
+        })
     });
-</script>
-<style>
 
-</style>
+
+
+</script>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -82,6 +82,23 @@ files:
 - app/assets/fonts/iconfont.ttf
 - app/assets/fonts/iconfont.woff
 - app/assets/fonts/iconfont.woff2
+- app/assets/images/educode_sales/1.销售活动.png
+- app/assets/images/educode_sales/10.教师运营.png
+- app/assets/images/educode_sales/11.活动运营.png
+- app/assets/images/educode_sales/12.运营计划.png
+- app/assets/images/educode_sales/13.系统设置.png
+- app/assets/images/educode_sales/14.角色管理.png
+- app/assets/images/educode_sales/15.人员管理.png
+- app/assets/images/educode_sales/16.字典列表.png
+- app/assets/images/educode_sales/2.市场态势.png
+- app/assets/images/educode_sales/3.销售分工.png
+- app/assets/images/educode_sales/4.商机管理.png
+- app/assets/images/educode_sales/5.渠道管理.png
+- app/assets/images/educode_sales/6.销售计划.png
+- app/assets/images/educode_sales/7.运营活动.png
+- app/assets/images/educode_sales/8.运营态势.png
+- app/assets/images/educode_sales/9.运营分工.png
+- app/assets/images/educode_sales/a.png
 - app/assets/images/educode_sales/favicon.ico
 - app/assets/images/educode_sales/icon-ext.png
 - app/assets/images/educode_sales/icon-login.png