educode_sales 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e75cbf87f4530e2665dd16d6fa56d82a14a0479ba0ce6f9f2cb39f5282ddb034
-  data.tar.gz: b4ab6a572903f23688eeb0441f66776f43ca4cabc70467cb013fff2f1c922473
+  metadata.gz: 3c77c9d72b776a5250acf438fad00e27b871430b26bdf994a93d1189e0aaba14
+  data.tar.gz: 6ea39f9c64190ccec5427668596827663e702ddd5a0e0d8c0fa5cace8931d1ba
 SHA512:
-  metadata.gz: 05cac4d3624e3c08a12957400aef7a091ef51b7edd288e767a6f31f8f8bdfdab6af587335abac527005ed657d115d8a938ef6a8e62f0c6c33514041857335309
-  data.tar.gz: d23d1bd4ce8bcb827e5423e01351eb5c661b95cb64f4c61076cf974752c360b35587c74263e69f6a6392255d08686edc77a4e5813032534f00663afe8724ca2b
+  metadata.gz: 842442865a01e90e7aa227fd5f0b33fd994d509b9d1bad0bff8fe3ebfe59d818fd48b05fcef54c665504d0f5b0a0ec70c2efaccbdc5c017269ef507565866073
+  data.tar.gz: 365f1987a2fe002df56e11f72ba6456c1c15fefa880b06001dce1b4ae4ee1f95a92fae61b5afb3ff28c2ba51c04309b7d06f05067effee9f8aa8e618d0d38eae

data/app/controllers/educode_sales/businesses_controller.rb

@@ -66,6 +66,10 @@ module EducodeSales
             end
           end
 
+          if params[:q].present? && params[:q][:name].present?
+            @year = params[:q][:name].split("-")[1].present? ? params[:q][:name].split("-")[1] : ''
+          end
+
           if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-现有商机)"
             a_id = Common.find_by(extras: EducodeSales::Common::ATYPE)&.id
             b_id = Common.find_by(extras: EducodeSales::Common::BTYPE)&.id
@@ -77,23 +81,26 @@ module EducodeSales
             ").where("educode_sales_follow_ups.clazz_id in (?)",ids)
           end
 
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-已中标商机)"
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已中标商机)"
             @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            ").where("educode_sales_follow_ups.bidded_date > ? AND educode_sales_follow_ups.bidded_date < ?", "#{Time.now.year}-01-01", "#{Time.now.year}-12-31")
+            ").where("educode_sales_follow_ups.bidded_date > ? AND educode_sales_follow_ups.bidded_date < ?", "#{@year}-01-01", "#{@year}-12-31")
           end
 
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-已签单商机)"
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已签单商机)"
             @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            ").where("educode_sales_follow_ups.signed_date > ? AND educode_sales_follow_ups.signed_date < ?", "#{Time.now.year}-01-01", "#{Time.now.year}-12-31")
+            ").where("educode_sales_follow_ups.signed_date > ? AND educode_sales_follow_ups.signed_date < ?", "#{@year}-01-01", "#{@year}-12-31")
           end
 
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-已回款商机)"
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] == "(销售态势-" + @year + "-已回款商机)"
             x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
-            @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ? AND educode_sales_businesses.return_money > 0", "#{Time.now.year}-01-01", "#{Time.now.year}-12-31").joins("
-              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            ").where.not("educode_sales_follow_ups.clazz_id = ?",x_id)
+            # @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ? AND educode_sales_businesses.return_money > 0", "#{@year}-01-01", "#{@year}-12-31").joins("
+            #   JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            # ").where.not("educode_sales_follow_ups.clazz_id = ?",x_id)
+            year_time = "#{@year}-01-01 00:00:00"
+            year_over_time = "#{@year}-12-31 23:59:59"
+            @businesses = @businesses.joins(follow_ups: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x_id).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).distinct
           end
 
           if params[:q].present? && params[:q][:all].present?
@@ -107,7 +114,7 @@ module EducodeSales
           end
 
           @businesses = @businesses
-          if params[:q].present? && params[:q][:name].present? && params[:q][:name] != "(销售态势-已中标商机)" && params[:q][:name] != "(销售态势-已签单商机)" && params[:q][:name] != "(销售态势-已回款商机)" && params[:q][:name] != "(销售态势-现有商机)"
+          if params[:q].present? && params[:q][:name].present? && params[:q][:name] != "(销售态势-" + @year + "-已中标商机)" && params[:q][:name] != "(销售态势-" + @year + "-已签单商机)" && params[:q][:name] != "(销售态势-" + @year + "-已回款商机)" && params[:q][:name] != "(销售态势-现有商机)"
             @businesses = @businesses.where("educode_sales_businesses.name like ?", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:department].present?

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -52,6 +52,7 @@ module EducodeSales
     end
     def new_week
       @teacher = Teacher.find_by(id: params[:teacher_id])
+      @week = Time.now.strftime('%W').to_i
       week = Time.now.strftime('%W').to_i
       if week > 3
         @weeks = [[week+2,week+2], [week+1,week+1], [week.to_s + '  本周',week], [week - 1,week - 1], [week - 2,week - 2]]

data/app/controllers/educode_sales/plans_controller.rb

@@ -70,6 +70,7 @@ module EducodeSales
 
     def new_week
       @business = Business.find_by(id: params[:business_id])
+      @week = Time.now.strftime('%W').to_i
       week = Time.now.strftime('%W').to_i
       if week > 3
         @weeks = [[week+2,week+2], [week+1,week+1], [week.to_s + '  本周',week], [week - 1,week - 1], [week - 2,week - 2]]
@@ -80,7 +81,7 @@ module EducodeSales
       end
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
       @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
-      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
       render layout: false
     end
 
@@ -98,7 +99,7 @@ module EducodeSales
       @business = Business.find_by(id: params[:business_id])
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
       @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
-      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
       render layout: false
     end
 
@@ -133,7 +134,7 @@ module EducodeSales
     def edit_week
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
       @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
-      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
       @sale_plan = SalePlan.find(params[:id])
       if @sale_plan.weekly.present?
         week = Time.now.strftime('%W').to_i
@@ -188,7 +189,7 @@ module EducodeSales
     def edit_month
       business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
       @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id).order(created_at: :desc)
-      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
+      @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : b.created_at.to_s), b.id] }
       @sale_plan = SalePlan.find(params[:id])
       @finish_rates = []
       11.times { |d| @finish_rates << ["#{d*10}%", d * 10]}

data/app/controllers/educode_sales/upload_files_controller.rb

@@ -8,7 +8,13 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @files = Attachment.where(description: "business", container_id:params[:business_id]).page(params[:page]).per(params[:limit])
+          @files = Attachment.where(description: "business", container_id:params[:business_id])
+          if params[:sort].present? && params[:sort][:field]
+            @files = @files.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @files = @files.order("created_on desc")
+          end
+          @files = @files.page(params[:page]).per(params[:limit])
         end
       end
     end

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

@@ -1,13 +1,13 @@
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">附件信息</span>
-    <%# if can? :create, EducodeSales::Place %>
+    <%# if can? :create, EducodeSales::file %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="upload_file">上传文件</button>
     <%# end %>
   </div>
 </script>
 
-<table class="layui-hide" id="place" lay-filter="currentTableFilter"></table>
+<table class="layui-hide" id="file" lay-filter="file"></table>
 
 <script type="text/html" id="currentTableBar_file">
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="preview">预览</a>
@@ -31,7 +31,7 @@
 
         var business_id = parent.id
         table.render({
-            elem: '#place',
+            elem: '#file',
             url: '/missions/upload_files?business_id='+business_id,
             toolbar: '#toolbarDemo',
             defaultToolbar: [],
@@ -44,7 +44,6 @@
                     },
                     {
                         field: 'name',
-                        width: 500,
                         title: '文件名'
                     },
                     {
@@ -53,18 +52,20 @@
                         title: '文件大小',
                     },
                     {
-                        field: 'upload_time',
-                        width: 300,
-                        title: '上传时间'
+                        field: 'created_on',
+                        width: 200,
+                        title: '上传时间',
+                        sort: true
                     },
                     {
                         field: 'upload_person',
-                        width: 120,
+                        width: 80,
                         totalRow:true,
                         title: '上传人',
                     },
                     {
                         title: '操作',
+                        width: 200,
                         toolbar: '#currentTableBar_file',
                         align: "center"
                     }
@@ -76,7 +77,20 @@
         });
 
 
-        table.on('toolbar(currentTableFilter)', function (obj) {
+        var sort = {};
+        table.on('sort(file)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('file', {
+                initSort: obj,
+                where: {
+                    sort: sort
+                }
+            });
+        })
+
+
+        table.on('toolbar(file)', function (obj) {
             if (obj.event === 'upload_file') {  //
                 id =parent.id
                 var content = miniPage.getHrefContent('/missions/businesses/upload_file');
@@ -99,7 +113,7 @@
 
 
 
-        table.on('tool(currentTableFilter)', function (obj) {
+        table.on('tool(file)', function (obj) {
             var data = obj.data;
             var id = data.id
             name = data.disk_filename
@@ -130,7 +144,7 @@
                 layer.confirm('确定删除' + data.name, function (index) {
                     request.delete('missions/upload_files/' + data.id + '?disk_filename=' + data.disk_filename, {}, function (res) {
                         layer.close(index);
-                        table.reload("place")
+                        table.reload("file")
                     })
                 });
             }

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

@@ -173,13 +173,11 @@
                 field: 'bidded_date',
                 width: 105,
                 title: '中标时间',
-                sort: true
               },
               {
                 field: 'signed_date',
                 width: 105,
                 title: '签单时间',
-                sort: true
               },
               {
                 field: 'reception_at',
@@ -335,14 +333,14 @@
           title: '商机列表/'+name+'的附件信息',
           type: 1,
           shade: 0.2,
-          maxmin: true,
+          // maxmin: true,
           shadeClose: true,
           area: [openWH[0] + 'px', openWH[1] + 'px'],
           offset: [openWH[2] + 'px', openWH[3] + 'px'],
           content: content
         });
         $(window).on("resize", function () {
-          layer.full(sindex);
+          // layer.full(sindex);
         });
       }
 

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

@@ -1,6 +1,7 @@
 <script type="text/html" id="toolbarDemo_follow">
   <div class="layui-btn-container">
     <span class="table-label">跟进记录</span>
+    <span class="table-label" style="padding-left: 200px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="time_line"> 时间线视图>></button>
     <% if can? :add_follow, EducodeSales::Business %>
       <% if @current_admin.is_admin %>
@@ -21,7 +22,7 @@
   <% if can? :follow, EducodeSales::Business %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
   <% end %>
-  {{#  if(d.is_latest){ }}
+  {{#  if(d.is_latest && d.flag){ }}
   <% if can? :update_follow, EducodeSales::Business %>
     <% if @current_admin.is_admin %>
       <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>

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

@@ -17,6 +17,7 @@ json.data do
     json.money_plans_count d.money_plans_count
     json.money d.money_plans.where(clazz: 1).sum(:amount).round(2)
     json.is_latest d.id == @latest&.id
+    json.flag d.created_at.present? ? (Time.now - d.created_at).to_f/3600 < 24 : false
   end
 end
 

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

@@ -1,6 +1,6 @@
 <h1 class="text-center m-t-20"><%= @follow_up.business.name %></h1>
 <form class="layui-form form-value">
-  <div class="layui-form-item" style="padding: 25px">
+  <div class="layui-form-item" style="padding: 10px 25px 0;">
     <div class="layui-inline">
       <label class="layui-form-label">单位：</label>
       <div class="layui-input-inline">

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

@@ -3,6 +3,7 @@
 </div>
 <div style="padding: 50px">
   <ul class="layui-timeline">
+    <%if @follow_ups.present? %>
   <%@follow_ups.each do |f| %>
   <li class="layui-timeline-item">
     <i class="layui-icon layui-timeline-axis">&#xe63f;</i>
@@ -23,6 +24,9 @@
     </div>
   </li>
     <%end %>
+      <%else %>
+      <h1 class="layui-timeline-title" style="text-align: center">暂无跟进记录</h1>
+  <%end %>
 </ul>
 </div>
 
@@ -42,7 +46,7 @@
         var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);
         var openWH = miniPage.getOpenWidthHeight();
         sindex = layer.open({
-            title: '商机列表/'+ parent.business_name +'的跟进时间线',
+            title: '商机列表/'+ parent.business_name +'的跟进记录',
             type: 1,
             shade: 0.2,
             maxmin: true,

data/app/views/educode_sales/operation_plans/new_week.html.erb

@@ -9,7 +9,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">周次</label>
       <div class="layui-input-inline">
-        <%= select_tag "weekly", options_for_select(@weeks), class: 'required' %>
+        <%= select_tag "weekly", options_for_select(@weeks,@week), class: 'required' %>
       </div>
     </div>
     <%if @teacher.present? %>

data/app/views/educode_sales/plans/new_monthly.html.erb

@@ -112,33 +112,33 @@
             },
             {
               field: 'staff',
-              width: 120,
+              width: 80,
               title: '姓名'
             },
             {
                 field: 'business_name',
-                width: 270,
+                width: 170,
                 title: '商机名称',
             },
             {
                 field: 'school',
-                width: 200,
+                width: 170,
                 title: '单位'
             },
             {
                 field: 'department',
-                width: 190,
+                width: 170,
                 title: '部门'
             },
             {
               field: 'follow_ups_count',
-              width: 100,
+              width: 80,
               title: '跟进',
               templet: '#show_follow'
             },
             {
               field: 'finish_rate',
-              width: 100,
+              width: 80,
               title: '完成率',
             },
             {

data/app/views/educode_sales/plans/new_week.html.erb

@@ -9,7 +9,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">周次</label>
       <div class="layui-input-inline">
-        <%= select_tag "weekly", options_for_select(@weeks), class: 'required' %>
+        <%= select_tag "weekly", options_for_select(@weeks,@week), class: 'required' %>
       </div>
     </div>
     <div class="layui-inline">

data/app/views/educode_sales/plans/new_weekly.html.erb

@@ -134,38 +134,38 @@
             },
             {
               field: 'staff',
-              width: 120,
+              width: 80,
               title: '姓名'
             },
             {
                 field: 'business_name',
-                width: 270,
+                width: 170,
                 title: '商机名称',
             },
             {
                 field: 'school',
-                width: 200,
+                width: 170,
                 title: '单位'
             },
             {
                 field: 'department',
-                width: 190,
+                width: 170,
                 title: '部门'
             },
             {
               field: 'weekly',
-              width: 100,
+              width: 80,
               title: '周次',
             },
             {
               field: 'follow_ups_count',
-              width: 100,
+              width: 80,
               title: '跟进',
               templet: '#show_follow'
             },
             {
               field: 'finish_rate',
-              width: 100,
+              width: 80,
               title: '完成率',
             },
             {

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

@@ -88,7 +88,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>现有商机<a href="/missions/businesses?name=(销售态势-现有商机)"  style="padding-left: 100px;color: #0000FF">查看商机</a></h5>
+                    <h5>现有商机<a href="/missions/businesses?name=(销售态势-现有商机)"  style="color: #0000FF;float: right">查看商机</a></h5>
                   </div>
                   <div class="panel-content y-t-10">
                     <h1 class="no-margins"><%= @business_amount %>万</h1>
@@ -101,7 +101,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>已中标<a href="/missions/businesses?name=(销售态势-已中标商机)"   style="padding-left: 100px;color: #0000FF">查看商机</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=(销售态势-已签单商机)"   style="padding-left: 100px;color: #0000FF">查看商机</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>
@@ -127,7 +127,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>已回款<a href="/missions/businesses?name=(销售态势-已回款商机)"  style="padding-left: 100px;color: #0000FF">查看商机</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"><%= @return_amount %>万</h1>
@@ -140,7 +140,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>A类商机<a href="/missions/businesses?clazz_id=<%=EducodeSales::Common.find_by(extras: EducodeSales::Common::ATYPE)&.id %>"  style="padding-left: 100px;color: #0000FF">查看商机</a></h5>
+                    <h5>A类商机<a href="/missions/businesses?clazz_id=<%=EducodeSales::Common.find_by(extras: EducodeSales::Common::ATYPE)&.id %>"  style="color: #0000FF;float: right">查看商机</a></h5>
                   </div>
                   <div class="panel-content y-t-10">
                     <h1 class="no-margins"><%= @a_amount %>万</h1>
@@ -153,7 +153,7 @@
               <div class="panel layui-bg-number">
                 <div class="panel-body">
                   <div class="panel-title">
-                    <h5>B类商机<a href="/missions/businesses?clazz_id=<%=EducodeSales::Common.find_by(extras: EducodeSales::Common::BTYPE)&.id %>" style="padding-left: 100px;color: #0000FF">查看商机</a></h5>
+                    <h5>B类商机<a href="/missions/businesses?clazz_id=<%=EducodeSales::Common.find_by(extras: EducodeSales::Common::BTYPE)&.id %>" style="color: #0000FF;float: right">查看商机</a></h5>
                   </div>
                   <div class="panel-content y-t-10">
                     <h1 class="no-margins"><%= @b_amount %>万</h1>

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

@@ -3,7 +3,7 @@ json.data do
     json.id d.id
     json.name d.filename
     json.size d.filesize < 1000000 ? (d.filesize.to_f / 1000).round(2).to_s + 'KB' : (d.filesize.to_f / 1000000).round(2).to_s + 'MB'
-    json.upload_time d.created_on.to_s
+    json.created_on d.created_on.to_s
     json.upload_person EducodeSales::Staff.find(d.author_id).user.real_name
     json.disk_filename d.disk_filename
     json.content_type d.content_type

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.4.9'
+  VERSION = '0.5.0'
 end

metadata

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