educode_sales 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2452ba0a38c51eeb2288c262c3749009e8a73482fa5bb3762cf3d8cac604f7fd
-  data.tar.gz: c0d98a9cb2d391b3a5c4600bf317c5d47aeb0fc14d8ca95ef12a049f228a67c3
+  metadata.gz: aa0d6ecd7b1640ebee8c24dfedb2fa8aea54ebae05121178a5d7276a5e89bdcc
+  data.tar.gz: e187d271d9f14998d6c7dbcdc82bf12f82e8f2b53b0f5fe98262f63fffa8c8c3
 SHA512:
-  metadata.gz: 523896d3267cec4e5bf9681e8d15b02af20dcdfa1fba104a8f698fffac80f0f553627480f0e8a71df4052a46b8402e92d34b0daac34005cfb347a25395b9546d
-  data.tar.gz: f80418f62799d2ccb0c8ed839cb3c5e1aa0cb0e941f666eef5b2e596ff273ec02b5c6a0fda81154631d588bde03aabc0d6cf3a0ca10f7eac2f35f43b91e75a7d
+  metadata.gz: 2dfd27a654570f6f321fc71cf68ed3993d3be0f24a075b3a038d4ba83473a7a5b6f957d06e6d9fc3ad6ed8bb2e06269886f98853e8421c99f1c167511cf6064c
+  data.tar.gz: 8c589a6c2c1dee705f74167849a1ea69a4fa784193ab2b7063481d74b3114d0bb13e6cfec9b9d43c180d4a9642c4f7d6a873ee97c98db8e0f3c8c4c60e8e544a

data/app/assets/stylesheets/educode_sales/app.css

@@ -278,4 +278,20 @@ td .layui-table-cell .layui-form-select {
 .layui-form textarea:-ms-input-placeholder {
   /* Internet Explorer 10+ */
   color: #ccc;
+}
+
+.changed-true {
+  position: relative;
+  display: inline-block;
+  padding-left: 7px;
+}
+.changed-true::before {
+  content: " ";
+  width: 6px;
+  left: 0px;
+  position: absolute;
+  top: 10px;
+  height: 6px;
+  border-radius: 6px;
+  background-color: red;
 }

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -82,19 +82,22 @@ module EducodeSales
       end
 
       follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) if follow_up.actual_amount
+      last_follow_up = @business.last_follow_up
+      follow_up.clazz_changed = last_follow_up.clazz_id != follow_up.clazz_id if last_follow_up.present?
       if follow_up.save
-        if @business.last_follow_up.present?
-          @business.last_follow_up.key_person.each do |d|
+        if last_follow_up.present?
+          last_follow_up.key_person.each do |d|
             key_person = d.dup
             key_person.follow_up_id = follow_up.id
             key_person.save
           end
-          @business.last_follow_up.money_plans.each do |d|
+          last_follow_up.money_plans.each do |d|
             money = d.dup
             money.staff = @current_admin
             money.follow_up_id = follow_up.id
             money.save
           end
+
         end
         @business.update(last_follow_up_id: follow_up.id)
         render_success

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

@@ -306,7 +306,7 @@
                     field: 'clazz',
                     width: 80,
                     title: '类型',
-                    templet: '<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>',
+                    templet: "<div><span title='{{d.clazz}}' class='changed-{{d.clazz_changed}}'>{{d.clazz}}</span></div>",
                     hide: gon.filter.clazz
                 },
                 {

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

@@ -12,6 +12,7 @@ json.data do
     follow_count += follow_ups_count
     json.follow_up_id d.last_follow_up_id
     json.clazz d.last_follow_up&.clazz&.name || ""
+    json.clazz_changed d.last_follow_up&.clazz_changed || false
     json.stage d.last_follow_up&.stage&.name
     json.invitation_at d.last_follow_up&.invitation_at.to_s
     json.reception_at d.last_follow_up&.reception_at.to_s

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

@@ -29,8 +29,8 @@
         </div>
       </form>
       </div>
-      <canvas id="myChart2" width="960" height="400"></canvas>
-
+      <canvas id="myChart2" width="960" height="250"></canvas>
+      <canvas id="myChart2_1" width="960" height="250" style="margin-top: 30px;"></canvas>
   </div>
 </div>
 <script>
@@ -49,13 +49,13 @@
         animation: {
           duration: 1,
           onComplete: function () {
-            var chartInstance = this.chart,
-                ctx = chartInstance.ctx;
+            var chartInstance = this.chart, ctx = chartInstance.ctx;
             ctx.font = Chart.helpers.fontString(Chart.defaults.global.defaultFontSize, Chart.defaults.global.defaultFontStyle, Chart.defaults.global.defaultFontFamily);
             ctx.textAlign = 'center';
             ctx.textBaseline = 'bottom';
 
             this.data.datasets.forEach(function (dataset, i) {
+              ctx.fillStyle = "#444";
               var meta = chartInstance.controller.getDatasetMeta(i);
               meta.data.forEach(function (bar, index) {
                 var data = dataset.data[index];
@@ -66,6 +66,20 @@
         }
       };
 
+      var res_data = <%=raw @goal_count_data.to_json %>;
+      var datasets = [];
+      var color = ['#44D7B6', '#4CACFF', '#F7B500', '#FF0000', '#FF7F00' ];
+      res_data.datasets.forEach(function(d, i) {
+        datasets.push({
+          label: d.label,
+          type: 'line',
+          data: d.data,borderColor: color[i],
+          pointRadius: 1,
+          fill: false,
+          lineTension: 0
+        })
+      })
+
       laydate.render({
         type: 'year',
         elem: '#goal_date_year',
@@ -104,6 +118,15 @@
         data: <%=raw @goal_count_data.to_json %>,
         options: opt
       });
+      var ctx3 = document.getElementById('myChart2_1');
+      var myChart3 = new Chart(ctx3, {
+        type: 'line',
+        data: {
+          labels: res_data.labels,
+          datasets: datasets
+        },
+        options: opt
+      });
       form.render();
       form.on("submit(search_sales)", function(data) {
         var layer_index = layer.load(0, {shade: [0.1, '#fff']});

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

@@ -191,7 +191,7 @@
                           <h5>应收款<a href="/missions/businesses?name=(销售态势-<%=@year %>-应收款商机)"  style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
-                          <h1 class="no-margins"><%= @receivable_amount %>万</h1>
+                          <h1 class="no-margins"><%= @receivable_amount.round(2) %>万</h1>
                         </div>
                       </div>
                     </div>

data/db/migrate/20220921131116_add_change_clazz_to_follow_up.rb

@@ -0,0 +1,5 @@
+class AddChangeClazzToFollowUp < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :clazz_changed, :boolean, default: false
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -473,6 +473,7 @@ files:
 - db/migrate/20220523023609_update_assessment_month_column_to_assessment_settings.rb
 - db/migrate/20220523101628_update_column_to_follow_ups.rb
 - db/migrate/20220827130438_create_educode_sales_login_histories.rb
+- db/migrate/20220921131116_add_change_clazz_to_follow_up.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb