educode_sales 0.9.6 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2452ba0a38c51eeb2288c262c3749009e8a73482fa5bb3762cf3d8cac604f7fd
-  data.tar.gz: c0d98a9cb2d391b3a5c4600bf317c5d47aeb0fc14d8ca95ef12a049f228a67c3
+  metadata.gz: ff567b174c17bc652954bfeb48e7782de31affa2fd4995a1565bfc970b1654af
+  data.tar.gz: 8e3cb25e06155a626a838c6f96605be47e8f8f0d7bd65351210c9fae24d2a0fa
 SHA512:
-  metadata.gz: 523896d3267cec4e5bf9681e8d15b02af20dcdfa1fba104a8f698fffac80f0f553627480f0e8a71df4052a46b8402e92d34b0daac34005cfb347a25395b9546d
-  data.tar.gz: f80418f62799d2ccb0c8ed839cb3c5e1aa0cb0e941f666eef5b2e596ff273ec02b5c6a0fda81154631d588bde03aabc0d6cf3a0ca10f7eac2f35f43b91e75a7d
+  metadata.gz: c8e37e4e9cd7ffa20ab9294d8f929dcc11a7c1ef0c385cb801bef72edf8f7b849664d3c0fa09725e7bc4c2abdd19d704a79ad6cd06d27cca389fa79551720bb9
+  data.tar.gz: a7ac56a8babcb87de9fef65ffcca053be0925608b345505f00e5ed26960714e8c24405af3ff2e5fe56851ed12bda269b07b348b403b92a5a2bd1da4bae6438f1

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/businesses_controller.rb

@@ -208,6 +208,11 @@ module EducodeSales
             ").where("educode_sales_follow_ups.invitation_at > ? AND educode_sales_follow_ups.invitation_at < ?", date[0] + '00:00:00', date[1] + '23:59:59')
           end
 
+          # 根据编号获取商机
+          if params[:q].present? && params[:q][:number].present?
+            @businesses = @businesses.where("number like :data",  data: "%#{params[:q][:number].strip}%")
+          end
+
           if params[:sort].present? && params[:sort][:field]
             if params[:sort][:field] = "service_end_time"
               @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -82,21 +82,26 @@ 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)
+        # 增加o商机编号
+        add_business_number
         render_success
       else
         render_failure follow_up
@@ -132,6 +137,9 @@ module EducodeSales
       follow_up.assign_follow_ups = assign_follow_ups
       follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) * 0.01 if follow_up.actual_amount
       if follow_up.save
+        # 增加o类商机
+        @business = follow_up.business
+        add_business_number
         render_success
       else
         render_failure follow_up
@@ -232,6 +240,15 @@ module EducodeSales
       @business = Business.find(params[:business_id])
     end
 
+    # o类商机增加编号
+    def add_business_number
+      if (@business.number.blank?) && params[:clazz_id] == '74'
+        totual_count = EducodeSales::Business.unscoped.where("number like :data",data: "#{Time.now.year}%").count
+        current_number = Time.now.year*1000 + totual_count + 1
+        @business.update(number: current_number.to_s)
+      end
+    end
+
     def follow_up_params
       params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment)
     end

data/app/models/educode_sales/business.rb

@@ -1,6 +1,8 @@
 module EducodeSales
   class Business < ApplicationRecord
 
+    validates_uniqueness_of :number ,allow_nil: true
+
     belongs_to :staff
     belongs_to :department
     belongs_to :last_follow_up, class_name: 'FollowUp', optional: true # 允许last_follow_up_id字段中的数为nil

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

@@ -1,6 +1,7 @@
 json.data do
   json.array! @businesses do |d|
     json.id d.id
+    json.number d.number
     json.name d.name
     json.department d.department.name
     json.school d.department.school.name

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

@@ -75,6 +75,12 @@
                   <input type="text" class="layui-input" id="invitation_at" name="invitation_at" placeholder=" - " autocomplete="off">
                 </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="number" name="number" placeholder=" - " autocomplete="off">
+                </div>
+              </div>
               <div class="layui-inline">
                 <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
                 </button>
@@ -266,6 +272,13 @@
                     totalRowText: '合计',
                     fixed: "left"
                 },
+                {
+                    field: 'number',
+                    width: 120,
+                    title: '编号',
+                    fixed: 'left',
+                    hide: gon.filter.number
+                },
                 {
                     field: 'name',
                     width: 170,
@@ -306,7 +319,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
                 },
                 {
@@ -849,7 +862,7 @@
             var field = data.field;
             form.val('search_form', {
                 name: '', department: '', staff_id: '', business_type: '', business_step: '',
-                place_id: '', date: '', area: '', invitation_at: '', business_year: ''
+                place_id: '', date: '', area: '', invitation_at: '', business_year: '', number: ''
             })
             business_type_list.setValue([])
             business_step_list.setValue([])

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

@@ -3,6 +3,7 @@ follow_count = 0
 json.data do
   json.array! @businesses do |d|
     json.id d.id
+    json.number d.number
     json.name d.name
     json.department d.department.name
     json.school d.department.school.name
@@ -12,6 +13,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/businesses/show_follow_record.html.erb

@@ -7,6 +7,14 @@
         <%= @follow_up.business.department&.school&.name %>
       </div>
     </div>
+    <%if @follow_up.business.number.present?%>
+      <div class="layui-inline">
+        <label class="layui-form-label">编号：</label>
+        <div class="layui-input-inline">
+          <%= @follow_up.business.number %>
+        </div>
+      </div>
+    <%end %>
     <div class="layui-inline">
       <label class="layui-form-label">部门：</label>
       <div class="layui-input-inline">

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.8'
 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.8
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
+- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -473,6 +474,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
@@ -481,7 +483,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -496,8 +498,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []