educode_sales 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87e480da43efa545f556407cb3aced122684a09ebba821cc1d5ba1b33013758c
-  data.tar.gz: f8a1d0d849c2f45fac61856394ebd61fa19c6993349393cf30c73061071e200b
+  metadata.gz: 660c43183c6a1edf9d5aab4b549bce9d2b68edf789010d85379198372be1a120
+  data.tar.gz: 28beeb3a7026076f4e6da6dc966bf75523e7be06717b787041d2e14500902532
 SHA512:
-  metadata.gz: 2b9b85218c9ab2ba92752aaac23ed8329bd130c48f27c00488d4e8a484cdb8791b29b9be8bb9ccafa6828ba9bc4500c4365718d5c080cfd789960c5125c2da33
-  data.tar.gz: 8ae91d1a4d9337886c87067b69728cd93831e8d7a85bf524c6acef57915561726a574d6a3c5a1c2eb4cead28ea6aea1450dd94949920d0113856b7390f418445
+  metadata.gz: d7f6b1515f819aac77b135ba6d52a3562c4fef76d650fd1a74c44bf3dcaffacc41ec34e1623337538a36bf40cff2591d14d40e83575cd7920a69fcfadb5662c4
+  data.tar.gz: ff102c87e89e482809f4b8e84e0f27c5f42a3dd22863f6ebfe0a4fd115eae1d026de70cd738c5b0d83e9e3ab78aee3a276eb0fed4f6a66c467ab8926c7737ed2

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -171,10 +171,10 @@ module EducodeSales
             label: name[0],
             data: dates.map{ |d| @follow_up = FollowUp.where(staff_id: name[1], created_at: d.beginning_of_day..d.end_of_day).where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
-            pointBorderColor: "#fff",
+            pointBorderColor: colors[names.index(name)%15],
             borderColor: colors[names.index(name)%15],
             pointBackgroundColor: colors[names.index(name)%15],
-            borderWidth: 1
+            borderWidth: 4
           }
         end
       }
@@ -188,10 +188,10 @@ module EducodeSales
             label: name[0],
             data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01", "#{d}-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
-            pointBorderColor: "#fff",
+            pointBorderColor: colors[names.index(name)%15],
             borderColor: colors[names.index(name)%15],
             pointBackgroundColor: colors[names.index(name)%15],
-            borderWidth: 1
+            borderWidth: 4,
           }
         end
       }
@@ -205,10 +205,10 @@ module EducodeSales
             label: name[0],
             data: dates.map { |d| @follow_up = FollowUp.where( staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01-01", "#{d}-12-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
-            pointBorderColor: "#fff",
+            pointBorderColor: colors[names.index(name)%15],
             borderColor: colors[names.index(name)%15],
             pointBackgroundColor: colors[names.index(name)%15],
-            borderWidth: 1
+            borderWidth: 4
           }
         end
       }

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

@@ -65,13 +65,13 @@
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label">总额</label>
+      <label class="layui-form-label">总额(万)</label>
       <div class="layui-input-inline">
         <input name="total_amount" type="number" class="layui-input" value="<%= @follow_up.total_amount %>">
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">合同额</label>
+      <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
          <input name="actual_amount" type="number" class="layui-input" placeholder="本单位的签单金额" value="<%= @follow_up.actual_amount %>">
       </div>
@@ -84,7 +84,7 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">渠道分成</label>
+      <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
         <input name="divide_amount" class="layui-input" value="<%= @follow_up.divide_amount%>">
       </div>

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

@@ -126,7 +126,7 @@
                         ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机
                     });
                 }else if (data.content_type.split("/")[1] === "pdf"){
-                    var pdf = '/images/business_file/' + name;
+                    var pdf = '/images/educode_sales/' + name;
                     console.log(pdf);
                     var openWH = miniPage.getOpenWidthHeight();
                     layer.open({

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

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

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

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

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -189,7 +189,7 @@
               <div class="layui-input-inline">
                   <input type="text"  class="layui-input month layui-hide" id="date_month" name="date_month" placeholder=" - " value="<%=params[:date_month] %>" >
                   <input type="text"  class="layui-input year layui-hide" id="date_year" name="date_year" placeholder=" - " value="<%=params[:date_year] %>">
-                  <input type="text"  class="layui-input day" id="date" name="date" placeholder=" - " value="<%=params[:date] %>">
+                  <input type="text"  class="layui-input day" id="date" name="date" placeholder=" - " value="<%=params[:date].present? ? params[:date] : (Time.now - 7.days).to_s(:date) + ' - ' + Time.now.to_s(:date)   %>">
                   </div>
             </div>
             <div class="layui-inline">
@@ -223,7 +223,7 @@
           <div class="layui-inline">
             <label class="layui-form-label">时间范围</label>
             <div class="layui-input-inline">
-              <input type="text"  class="layui-input goal_month " id="goal_date_month" name="goal_date_month" placeholder=" - " value="<%=params[:goal_date_month] %>">
+              <input type="text"  class="layui-input goal_month " id="goal_date_month" name="goal_date_month" placeholder=" - " value="<%=params[:goal_date_month].present? ? params[:goal_date_month] : Time.now.year.to_s + "-01"  + " - " + Time.now.strftime("%Y-%m")  %>">
               <input type="text"  class="layui-input goal_year layui-hide" id="goal_date_year" name="goal_date_year" placeholder=" - " value="<%=params[:goal_date_year] %>">
             </div>
           </div>
@@ -264,13 +264,12 @@
         $(document).ready(function () {
             $(".follow_count_bt").click(function () {
                 layer.msg("图表绘制中...", {
-                    time: 0, //不自动关闭
                     offset:['40%','46%']
                 })
                 layer.load(0, {});
                 setTimeout(function () {
                     layer.closeAll('loading');
-                }, 10000);
+                }, 3000);
             });
         });
         if(follow_type == "day"){
@@ -328,43 +327,31 @@
         // 时间选择器
         laydate.render({
             elem: '#date',
-            min: -15
-            ,max: 0,
             range: true
         });
         laydate.render({
             type: 'week',
             elem: '#date_week',
-            min: -90
-            ,max: 0,
             range: true
         });
         laydate.render({
             type: 'month',
             elem: '#date_month',
-            min: -365
-            ,max: 0,
             range: true
         });
         laydate.render({
             type: 'year',
             elem: '#date_year',
-            min: -3660
-            ,max: 0,
             range: true
         });
         laydate.render({
             type: 'year',
             elem: '#goal_date_year',
-            min: -3660
-            ,max: 0,
             range: true
         });
         laydate.render({
             type: 'month',
             elem: '#goal_date_month',
-            min: -365
-            ,max: 0,
             range: true
         });
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - anke1460