educode_sales 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 660c43183c6a1edf9d5aab4b549bce9d2b68edf789010d85379198372be1a120
-  data.tar.gz: 28beeb3a7026076f4e6da6dc966bf75523e7be06717b787041d2e14500902532
+  metadata.gz: c060696641e16a80fea2b02631788112e85082b8ccba0a037a2635d6563dbe24
+  data.tar.gz: 07230a0582b71a0ebfceddc1ce347a667651f778fed3640a0c82b22ee952f620
 SHA512:
-  metadata.gz: d7f6b1515f819aac77b135ba6d52a3562c4fef76d650fd1a74c44bf3dcaffacc41ec34e1623337538a36bf40cff2591d14d40e83575cd7920a69fcfadb5662c4
-  data.tar.gz: ff102c87e89e482809f4b8e84e0f27c5f42a3dd22863f6ebfe0a4fd115eae1d026de70cd738c5b0d83e9e3ab78aee3a276eb0fed4f6a66c467ab8926c7737ed2
+  metadata.gz: 110a25d3261f894f5ce6c5fed8e08d7afd62dd186ce6e18a10fe8d7f68033f03e48e2bdeca23df1408495e608899fc1383e5f3a0da25f1c13736b04488179820
+  data.tar.gz: 876c22dbca43a2624dbb2407cd5520c1ea0e044d696b4e3adb9571d65220560b0de3c13ecb337a9d914097b93cce6373db0a598dc5be440bbd925ee8744f995e

data/app/controllers/educode_sales/businesses_controller.rb

@@ -176,6 +176,7 @@ module EducodeSales
             last_follow.reception_at,
             last_follow.bidded_date,
             last_follow.signed_date,
+            last_follow.actual_amount,
             last_follow.total_amount").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
           ").page(params[:page]).per(params[:limit])

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -16,31 +16,40 @@ module EducodeSales
       @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:total_amount).round(2)
       stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
       @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).sum(:total_amount).round(2)
+      @actual_goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).sum(:actual_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.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids).sum(:total_amount).round(2)
+      @actual_service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", s_stage_ids).sum(:actual_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 >= ?  AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).sum(:amount).round(2)
       a = Common.where(clazz: '商机类型', name: Common.find_by(extras: EducodeSales::Common::ATYPE)&.name).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: Common.find_by(extras: EducodeSales::Common::BTYPE)&.name).pluck(:id)
       @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).sum(:total_amount).round(2)
 
+      count_type = params[:count_type] || "actual_amount"
       common = Common.find_by(clazz: 'staff_type', name: '销售')
       names = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
       x_business_ids = []
-      default_dates = (7.day.ago.to_date..Date.today).to_a #默认时间范围
+      default_dates = (30.day.ago.to_date..Date.today).map { |d| d.strftime("%Y-%W")}.uniq #默认时间范围
       Business.all.each do |d|
         if d.last_follow_up&.clazz&.id == x
           x_business_ids << d.id
         end
       end
-      colors = ['#44D7B6','#4CACFF','#F7B500','#FF0000', '#FF7F00', '#FFFF00', '#00FF00', '#00FFFF', '#0000FF', '#8B00FF', 'rgba(255, 99, 132, 1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)']
-      @follow_count_range = params[:follow_count_range] || "day"
-      @goal_count_range = params[:goal_count_range] || "day"
+      colors = ['#44D7B6','#4CACFF','#F7B500','#FF0000', '#FF7F00', '#FFFF00', '#00FF00', '#00FFFF', '#0000FF', '#8B00FF', 'rgba(255, 99, 132, 1)', 'rgba(54, 162, 235, 1)', 'rgba(255, 206, 86, 1)', 'rgba(75, 192, 192, 1)', 'rgba(153, 102, 255, 1)', 'rgba(255, 159, 64, 1)' ,'rgba(255, 0, 250, 1)']
+      @follow_count_range = params[:follow_count_range] || "week"
+      @goal_count_range = params[:goal_count_range] || "month"
       # 商机跟进数图表
-      @follow_count_data = day_follow_count_chart(default_dates,names,x_business_ids,colors)
+      @follow_count_data = week_follow_count_chart(default_dates,names,x_business_ids,colors)
       if params[:follow_count_range].present?
         case params[:follow_count_range]
-        when "week"
+        when "week"  #按周
+          if params[:date_week].present?
+            date = params[:date_week].split(" - ")
+            dates = (date[0].to_date..date[1].to_date).map { |d|
+              d.strftime("%Y-%W")}.uniq
+            @follow_count_data = week_follow_count_chart(dates,names,x_business_ids,colors)
+          end
         when "month"  #按月
           if params[:date_month].present?
             # (Date.new(2020,12,1)..Date.new(2021,12,1)).map { |d| d.strftime("%Y-%m")}.uniq
@@ -67,27 +76,8 @@ module EducodeSales
       # 已中标图表
       goal_default_dates = ("#{Time.now.year}-01".."#{Time.now.year}-#{Time.now.month}").to_a
       sale_names = ['已中标','已签单','已回款']
-       @goal_count_data =
-      {
-        labels: goal_default_dates,
-        datasets: sale_names.map do |name|{
-                     label: name,
-                     data: goal_default_dates.map{ |d|
-                       case sale_names.index(name)
-                       when 0
-                         Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", stage_ids).sum(:total_amount).round(2)
-                       when 1
-                         Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", s_stage_ids).sum(:total_amount).round(2)
-                       else
-                         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 >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01", "#{d}-31").sum(:amount).round(2)
-                       end
-                     },
-                     backgroundColor: colors[sale_names.index(name)],
-                     borderColor: colors[sale_names.index(name)],
-                     borderWidth: 1
-                   }
-        end
-      }
+      10.times{p count_type}
+       @goal_count_data = month_sale_chart(goal_default_dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
       if params[:goal_count_range].present?
         case params[:goal_count_range]
         when "week"
@@ -95,49 +85,13 @@ module EducodeSales
           if params[:goal_date_month].present?
             date = params[:goal_date_month].split(" - ")
             dates = ((date[0]+"-01").to_date..(date[1]+"-01").to_date).map { |d| d.strftime("%Y-%m")}.uniq
-            @goal_count_data =  {
-              labels: dates,
-              datasets: sale_names.map do |name|{
-                           label: name,
-                           data: dates.map{ |d|
-                             case sale_names.index(name)
-                             when 0
-                               Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", stage_ids).sum(:total_amount).round(2)
-                             when 1
-                               Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", s_stage_ids).sum(:total_amount).round(2)
-                             else
-                               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 >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01", "#{d}-31").sum(:amount).round(2)
-                             end                           },
-                           backgroundColor: colors[sale_names.index(name)],
-                           borderColor: colors[sale_names.index(name)],
-                           borderWidth: 1
-                         }
-              end
-            }
+            @goal_count_data =  month_sale_chart(dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
           end
-          else   #按年
+          else        #按年
           if params[:goal_date_year].present?
             date = params[:goal_date_year].split(" - ")
             dates = (date[0]..date[1]).to_a
-            @goal_count_data =  {
-              labels: dates,
-              datasets:sale_names.map do |name| {
-                           label: name,
-                           data: dates.map{ |d|
-                             case sale_names.index(name)
-                             when 0
-                               Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01-01", "#{d}-12-31", stage_ids).sum(:total_amount).round(2)
-                             when 1
-                               Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01-01", "#{d}-12-31", s_stage_ids).sum(:total_amount).round(2)
-                             else
-                               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 >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01-01", "#{d}-12-31").sum(:amount).round(2)
-                             end                           },
-                           backgroundColor: colors[sale_names.index(name)],
-                           borderColor: colors[sale_names.index(name)],
-                           borderWidth: 1
-                         }
-              end
-            }
+            @goal_count_data = year_sale_chart(dates,sale_names,colors,x,stage_ids,s_stage_ids,count_type)
           end
         end
       end
@@ -165,16 +119,42 @@ module EducodeSales
     def day_follow_count_chart(dates,names,x_business_ids,colors)
       {
         labels: dates,
-        datasets:names.map do |name|
+        datasets:names.map.with_index do |name,i|
           {
-            hidden: names.index(name) < 3 ? false : true,
+            hidden: i < 3 ? false : true,
             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: colors[names.index(name)%15],
-            borderColor: colors[names.index(name)%15],
-            pointBackgroundColor: colors[names.index(name)%15],
-            borderWidth: 4
+            pointBorderColor: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2
+          }
+        end
+      }
+    end
+    def week_follow_count_chart(dates,names,x_business_ids,colors)
+      {
+        labels: dates,
+        datasets:names.map.with_index do |name,i|
+          {
+            hidden: i < 3 ? false : true,
+            label: name[0],
+            data: dates.map{ |d|
+              d = d.split("-")
+              year = d[0].to_i
+              week = d[1].to_i
+               if week == 0
+                 @follow_up = 0
+               else
+                 @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", Date.commercial(year,week).strftime("%Y-%m-%d"), Date.commercial(year,week,7).strftime("%Y-%m-%d")).where.not(business: x_business_ids).count
+               end
+               },
+            backgroundColor: "#fff",
+            pointBorderColor: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2
           }
         end
       }
@@ -182,16 +162,16 @@ module EducodeSales
     def month_follow_count_chart(dates,names,x_business_ids,colors)
       {
         labels: dates,
-        datasets:names.map do |name|
+        datasets:names.map.with_index do |name,i|
           {
-            hidden: names.index(name) < 3 ? false : true,
+            hidden: i < 3 ? false : true,
             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: colors[names.index(name)%15],
-            borderColor: colors[names.index(name)%15],
-            pointBackgroundColor: colors[names.index(name)%15],
-            borderWidth: 4,
+            pointBorderColor: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2,
           }
         end
       }
@@ -199,21 +179,66 @@ module EducodeSales
     def year_follow_count_chart(dates,names,x_business_ids,colors)
       {
         labels: dates,
-        datasets:names.map do |name|
+        datasets:names.map.with_index do |name,i|
           {
-            hidden: names.index(name) < 3 ? false : true,
+            hidden: i < 3 ? false : true,
             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: colors[names.index(name)%15],
-            borderColor: colors[names.index(name)%15],
-            pointBackgroundColor: colors[names.index(name)%15],
-            borderWidth: 4
+            pointBorderColor: colors[i%15+1],
+            borderColor: colors[i%15+1],
+            pointBackgroundColor: colors[i%15+1],
+            borderWidth: 2
           }
         end
       }
     end
 
+    def month_sale_chart(dates,names,colors,x,stage_ids,s_stage_ids,count_type)
+      {
+        labels: dates,
+        datasets: names.map.with_index do |name,i|{
+          label: name,
+          data: dates.map{ |d|
+            case i
+            when 0
+              Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", stage_ids).sum(count_type).round(2)
+            when 1
+              Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01", "#{d}-31", s_stage_ids).sum(count_type).round(2)
+            else
+              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 >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01", "#{d}-31").sum(:amount).round(2)
+            end
+          },
+          backgroundColor: colors[i],
+          borderColor: colors[i],
+          borderWidth: 1
+        }
+        end
+      }
+    end
+
+    def year_sale_chart(dates,names,colors,x,stage_ids,s_stage_ids,count_type)
+      {
+        labels: dates,
+        datasets:names.map.with_index do |name,i| {
+          label: name,
+          data: dates.map{ |d|
+            case i
+            when 0
+              Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01-01", "#{d}-12-31", stage_ids).sum(count_type).round(2)
+            when 1
+              Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.signed_date >= ? AND educode_sales_follow_ups.signed_date <= ?  AND educode_sales_follow_ups.stage_id IN (?)", "#{d}-01-01", "#{d}-12-31", s_stage_ids).sum(count_type).round(2)
+            else
+              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 >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{d}-01-01", "#{d}-12-31").sum(:amount).round(2)
+            end                           },
+          backgroundColor: colors[i],
+          borderColor: colors[i],
+          borderWidth: 1
+        }
+        end
+      }
+    end
+
 
   end
 end

data/app/controllers/educode_sales/upload_files_controller.rb

@@ -20,7 +20,7 @@ module EducodeSales
     end
 
     def create
-      folder = File.join(Rails.root, "public", "images", 'educode_sales')
+      folder = File.join(Rails.root, "public", "files", 'educode_sales')
       upload_file = params["file"]
       raise "未上传文件" unless upload_file
       save_path = File.join(folder)
@@ -48,7 +48,7 @@ module EducodeSales
     end
 
     def destroy
-      folder = File.join(Rails.root, "public", "images", 'educode_sales')
+      folder = File.join(Rails.root, "public", "files", 'educode_sales')
       file = Attachment.find(params[:id])
       file.destroy
       File.delete(folder +  "/" +file.disk_filename) if FileTest::exist?(folder +  "/" +file.disk_filename)
@@ -56,7 +56,7 @@ module EducodeSales
     end
 
     def download
-      folder = File.join(Rails.root, "public", "images", 'educode_sales')
+      folder = File.join(Rails.root, "public", "files", 'educode_sales')
       file = Attachment.find_by_id(params[:id])
       raise "未找到文件" unless file
       send_file(folder +  "/" +file.disk_filename, filename: file.title, stream: true, type: file.content_type.presence || 'application/octet-stream')

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

@@ -118,16 +118,14 @@
             var id = data.id
             name = data.disk_filename
             folder = gon.folder
-            console.log(folder);
             if (obj.event === 'preview') {
                 if (data.content_type.split("/")[0] === "image"){
                     layer.photos({
-                        photos: { "data": [{"src": '/images/educode_sales/' + name}] }
+                        photos: { "data": [{"src": '/files/educode_sales/' + name}] }
                         ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机
                     });
                 }else if (data.content_type.split("/")[1] === "pdf"){
-                    var pdf = '/images/educode_sales/' + name;
-                    console.log(pdf);
+                    var pdf = '/files/educode_sales/' + name;
                     var openWH = miniPage.getOpenWidthHeight();
                     layer.open({
                         title: data.name,

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

@@ -35,7 +35,7 @@
         <div class="layui-inline">
           <label class="layui-form-label">渠道名称</label>
           <div class="layui-input-inline">
-            <%= select_tag "place_id", options_for_select(EducodeSales::Place.pluck(:name, :id)), { include_blank: true } %>
+            <%= select_tag "place_id", options_for_select(EducodeSales::Place.pluck(:name, :id),params[:place_id]), { include_blank: true } %>
           </div>
         </div>
         <div class="layui-inline">
@@ -194,6 +194,13 @@
                   totalRow: true,
                 sort: true
               },
+              {
+                field: 'actual_amount',
+                width: 100,
+                title: '合同额',
+                  totalRow: true,
+                sort: true
+              },
               {
                 field: 'return_money',
                 width: 100,

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

@@ -17,6 +17,7 @@ json.data do
     json.bidded_date d.last_follow_up&.bidded_date.to_s
     json.signed_date d.last_follow_up&.signed_date.to_s
     json.total_amount d.last_follow_up&.total_amount
+    json.actual_amount d.last_follow_up&.actual_amount
     json.return_money d.return_money
     json.place d.last_follow_up&.place&.name
     json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name

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

@@ -17,6 +17,11 @@
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
   <% end %>
 </script>
+<script type="text/html" id="business_a">
+  <div class="layui-text">
+    <a href="/missions/businesses?place_id={{d.id}}">{{d.businesses_count}}</a>
+  </div>
+</script>
 
 <script type="text/html" id="showchance">
   <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}</a>
@@ -56,20 +61,25 @@
                   {
                       field: 'businesses_count',
                       width: 120,
-                      totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
-                      title: '商机'
+                      totalRow: true,
+                      sort: true,
+                      title: '商机',
+                      templet: "#business_a",
+
                   },
                   {
                       field: 'amount',
                       width: 120,
                       totalRow:true,
-                      title: '中标'
+                      sort: true,
+                      title: '中标金额'
                   },
                   {
                       field: 'return_mount',
                       width: 120,
                       totalRow:true,
-                      title: '回款',
+                      sort: true,
+                      title: '回款金额',
                   },
                   {
                       title: '操作',

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

@@ -1,3 +1,4 @@
+all_businesses_count = 0
 area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @places do |d|
@@ -13,11 +14,16 @@ json.data do
     else
       json.area_id  ''
     end
-    json.businesses_count EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").count
+    business_count = EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").count
+    json.businesses_count business_count
+    all_businesses_count += business_count
     json.amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum(:profit_amount).round(2)
     json.return_mount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").sum(:return_money).round(2)
   end
 end
 
+json.totalRow do
+  json.businesses_count all_businesses_count.to_s
+end
 json.code 0
 json.count @places.total_count

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

@@ -101,7 +101,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>已中标<a href="/missions/businesses?name=(销售态势-<%=@year %>-已中标商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                    <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"><%= @goal_amount %>万</h1>
@@ -114,7 +114,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>已签单<a href="/missions/businesses?name=(销售态势-<%=@year %>-已签单商机)"   style="color: #0000FF;float: right">查看商机</a></h5>
+                    <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"><%= @service_amount %>万</h1>
@@ -148,6 +148,32 @@
                 </div>
               </div>
             </div>
+            <div class="layui-col-xs3">
+              <div class="panel layui-bg-number">
+                <div class="panel-body">
+                  <div class="panel-title">
+                    <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"><%= @actual_goal_amount %>万</h1>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="layui-col-xs3">
+              <div class="panel layui-bg-number">
+                <div class="panel-body">
+                  <div class="panel-title">
+                    <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"><%= @actual_service_amount %>万</h1>
+                  </div>
+                </div>
+              </div>
+            </div>
+
             <div class="layui-row layui-col-space30" >
             <div class="layui-col-xs3">
               <div class="panel layui-bg-number">
@@ -181,7 +207,7 @@
             <div class="layui-inline m-t-10">
               <label class="layui-form-label">视图</label>
               <div class="layui-input-inline">
-                <%= select_tag "follow_count_range", options_for_select([['按天','day'],['按月','month'],['按年','year']],params[:follow_count_range]), {'lay-filter': 'follow_count'}%>
+                <%= select_tag "follow_count_range", options_for_select([['按周','week'],['按天','day'],['按月','month'],['按年','year']],params[:follow_count_range]), {'lay-filter': 'follow_count'}%>
               </div>
             </div>
             <div class="layui-inline">
@@ -189,7 +215,8 @@
               <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].present? ? params[:date] : (Time.now - 7.days).to_s(:date) + ' - ' + Time.now.to_s(:date)   %>">
+                  <input type="text"  class="layui-input week " id="date_week" name="date_week" placeholder=" - " value="<%=params[:date_week].present? ? params[:date_week] : (Time.now - 30.days).to_s(:date) + ' - ' + Time.now.to_s(:date)   %>">
+                  <input type="text"  class="layui-input day layui-hide" id="date" name="date" placeholder=" - " value="<%=params[:date] %>">
                   </div>
             </div>
             <div class="layui-inline">
@@ -214,6 +241,12 @@
       <div style="margin: 10px 10px 10px 10px">
       <form class="layui-form layui-form-pane" lay-filter="search_form">
         <div class="layui-form-item">
+          <div class="layui-inline m-t-10">
+            <label class="layui-form-label">维度</label>
+            <div class="layui-input-inline">
+              <%= select_tag "count_type", options_for_select([['按合同额统计','actual_amount'],['按总额统计','total_amount']],params[:count_type]), {'lay-filter': 'count_type'}%>
+            </div>
+          </div>
           <div class="layui-inline m-t-10">
             <label class="layui-form-label">视图</label>
             <div class="layui-input-inline">
@@ -275,15 +308,23 @@
         if(follow_type == "day"){
             $(".year").addClass('layui-hide')
             $(".month").addClass('layui-hide')
+            $(".week").addClass('layui-hide')
             $(".day").removeClass('layui-hide')
         }else if(follow_type == "month"){
             $(".year").addClass('layui-hide')
+            $(".week").addClass('layui-hide')
             $(".month").removeClass('layui-hide')
             $(".day").addClass('layui-hide')
+        }else if(follow_type == "week"){
+            $(".year").addClass('layui-hide')
+            $(".day").addClass('layui-hide')
+            $(".week").removeClass('layui-hide')
+            $(".month").addClass('layui-hide')
         }else {
             $(".year").removeClass('layui-hide')
             $(".month").addClass('layui-hide')
             $(".day").addClass('layui-hide')
+            $(".week").addClass('layui-hide')
         }
 
         if(goal_type == "year"){
@@ -330,7 +371,6 @@
             range: true
         });
         laydate.render({
-            type: 'week',
             elem: '#date_week',
             range: true
         });
@@ -367,15 +407,24 @@
           if(value == "month"){
               $(".year").addClass('layui-hide')
               $(".day").addClass('layui-hide')
+              $(".week").addClass('layui-hide')
               $(".month").removeClass('layui-hide')
           }else if(value == "year"){
               $(".month").addClass('layui-hide')
               $(".day").addClass('layui-hide')
+              $(".week").addClass('layui-hide')
               $(".year").removeClass('layui-hide')
+          }else if(value == "week"){
+              $(".month").addClass('layui-hide')
+              $(".day").addClass('layui-hide')
+              $(".week").removeClass('layui-hide')
+              $(".year").addClass('layui-hide')
           }else {
               $(".month").addClass('layui-hide')
               $(".year").addClass('layui-hide')
               $(".day").removeClass('layui-hide')
+              $(".week").addClass('layui-hide')
+
           }
         })
 

data/lib/educode_sales/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2021-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails