educode_sales 0.6.8 → 0.7.2

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

@@ -57,6 +57,12 @@
                   <%= select_tag "area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
                 </div>
               </div>
+              <div class="layui-inline show_item" style="display:none;">
+                <label class="layui-form-label">所属年度</label>
+                <div class="layui-input-inline">
+                  <%= select_tag "business_year", options_for_select((2015..Time.now.year).to_a.reverse, params[:business_year]), { include_blank: true } %>
+                </div>
+              </div>
               <div class="layui-inline show_item" style="display:none;">
                 <label class="layui-form-label">创建时间</label>
                 <div class="layui-input-inline">
@@ -88,7 +94,9 @@
 <script type="text/html" id="bussinessBar">
   <div class="layui-btn-container">
     <span class="table-label">商机列表</span>
-    <a class="layui-btn-xs data-count-edit export_more-btn pull-right" style="color: #0000FF;" data-name="export" data-id="export">导出<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
+    <% if can?(:export_business, EducodeSales::Business) %>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm data-count-edit export_more-btn pull-right" style="color: #0000FF;" data-name="export" data-id="export">导出<i class="layui-icon layui-icon-down  layui-nav-more" style="font-size: 12px"></i></button>
+    <% end %>
     <% if can? :create, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加商机</button>
     <% end %>
@@ -97,15 +105,37 @@
   </div>
 </script>
 <script type="text/html" id="currentTableBar">
-  <% if can? :add_follow, EducodeSales::Business %>
+  <%unless !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
+<% if can? :add_follow, EducodeSales::Business %>
+  <% if @current_admin.is_admin %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
+  <% else %>
+  {{# if ( d.assign_follow_ups.length > 0 && d.assign_follow_ups.indexOf(d.current_staff_id) >=0 || (d.assign_follow_ups.length == 0) || (d.current_staff_id == d.staff_id) ) {}}
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
+  {{# }}}
+<% end %>
+  <% end %>
+  <% end %>
+  <%if !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
+    {{# if (d.self_flag) {}}
   <% if @current_admin.is_admin %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
   <% else %>
   {{# if ( d.assign_follow_ups.length > 0 && d.assign_follow_ups.indexOf(d.current_staff_id) >=0 || (d.assign_follow_ups.length == 0) || (d.current_staff_id == d.staff_id) ) {}}
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
   {{# }}}
+<% end %>
+    {{# }}}
+  <% end %>
+  <%if can?(:update, EducodeSales::Business)%>
+  <%unless !can?(:update, EducodeSales::Business) && can?(:self_edit_business, EducodeSales::Business)%>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <% end %>
-  
+  <% end %>
+  <%if !can?(:update, EducodeSales::Business) && can?(:self_edit_business, EducodeSales::Business)%>
+    {{# if (d.self_flag) {}}
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    {{# }}}
   <% end %>
   <% if @more %>
     <a class="layui-btn-xs data-count-edit more-btn" data-name={{d.name}} data-id={{d.id}}>更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
@@ -118,35 +148,45 @@
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>
 <script type="text/html" id="school_name">
-  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
+  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school
+    }}</a>
 </script>
 
 
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown'], function () {
-      var $ = layui.jquery,
-        form = layui.form,
-        request = layui.request,
-        miniPage = layui.miniPage,
-        dropdown = layui.dropdown,
-        laydate = layui.laydate;
-
-      laydate.render({
-        elem: '#date',
-        range: true
-      });
-      laydate.render({
-        elem: '#invitation_at',
-        range: true
-      });
+        var $ = layui.jquery,
+            form = layui.form,
+            request = layui.request,
+            miniPage = layui.miniPage,
+            dropdown = layui.dropdown,
+            laydate = layui.laydate;
+
+        laydate.render({
+            elem: '#date',
+            range: true
+        });
+        laydate.render({
+            elem: '#invitation_at',
+            range: true
+        });
 
-         var is_show = <%=params[:name].present? || params[:clazz_id].present? || params[:place_id].present? || params[:school].present? %>
-      if(is_show){
-          $('.follows_li').removeClass('layui-this');
-          $('.follows_div').removeClass('layui-show');
-          $('.businesses_list_li').addClass('layui-this');
-          $('.businesses_list_div').addClass('layui-show');
-      }
+        // function hn() {
+        //     $("#search_bt").trigger("click");
+        // }
+        //
+        // $(document).ready(function () {
+        //     window.onload = hn;
+        // });
+
+        var is_show =
+        <%=params[:name].present? || params[:clazz_id].present? || params[:place_id].present? || params[:school].present? %>
+        if (is_show) {
+            $('.follows_li').removeClass('layui-this');
+            $('.follows_div').removeClass('layui-show');
+            $('.businesses_list_li').addClass('layui-this');
+            $('.businesses_list_div').addClass('layui-show');
+        }
 
         var business_type_list = xmSelect.render({
             el: '#business_type',
@@ -200,62 +240,68 @@
                 })
             }
         })
-            index_place_list.setValue(gon.place)
-
-
-      table = layui.table;
-      var business_table = table.render({
-          elem: '#businesses_table',
-          url: '/missions/businesses',
-          where: {q: form.val('search_form')},
-          defaultToolbar: ['filter'],
-          toolbar: '#bussinessBar',
-          title: '商机数据表',
-          totalRow: true,//开启合并行
-          cols: [
-            [
-              {
-                field: 'id',
-                width: 60,
-                title:'序号',type: 'numbers',
-                  totalRowText: '合计',
-              },
-              {
-                field: 'name',
-                width: 170,
-                  title: '名称',
-                  templet:'<div><span title="{{d.name}}">{{d.name}}</span></div>'
-              },
-              {
-                field: 'school',
-                width: 150,
-                title: '单位',
-                  templet:'#school_name'
-              },
-              {
-                field: 'department',
-                width: 150,
-                title: '部门',
-                  templet:'<div><span title="{{d.department}}">{{d.department}}</span></div>'
-              },
-              {
-                field: 'follow_ups_count',
-                title: '跟进',
-                width: 60,
-                templet: '#show_follow',
-                  totalRow: true,
-              },
-              // {
-              //   field: 'teachers_count',
-              //   width: 100,
-              //   title: '关键人',
-              //   templet: '#show_keys'
-              // },
-              {
-                field: 'clazz',
-                width: 80,
-                title: '类型',
-                  templet:'<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>'
+        index_place_list.setValue(gon.place)
+
+
+        var data = form.val("search_form");
+        data.business_type = <%=params[:clazz_id] %>
+            console.log(data);
+
+        table = layui.table;
+        var business_table = table.render({
+            elem: '#businesses_table',
+            url: '/missions/businesses',
+            where: {q: data},
+            defaultToolbar: ['filter'],
+            toolbar: '#bussinessBar',
+            title: '商机数据表',
+            totalRow: true,//开启合并行
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        width: 60,
+                        title: '序号', type: 'numbers',
+                        totalRowText: '合计',
+                        fixed: "left"
+                    },
+                    {
+                        field: 'name',
+                        width: 170,
+                        title: '商机名称',
+                        templet: '<div><span title="{{d.name}}">{{d.name}}</span></div>',
+                        fixed: 'left'
+                    },
+                    {
+                        field: 'school',
+                        width: 150,
+                        title: '单位',
+                        templet: '#school_name'
+                    },
+                    {
+                        field: 'department',
+                        width: 150,
+                        title: '部门',
+                        templet: '<div><span title="{{d.department}}">{{d.department}}</span></div>'
+                    },
+                    {
+                        field: 'follow_ups_count',
+                        title: '跟进',
+                        width: 60,
+                        templet: '#show_follow',
+                        totalRow: true,
+                    },
+                    // {
+                    //   field: 'teachers_count',
+                    //   width: 100,
+                    //   title: '关键人',
+                    //   templet: '#show_keys'
+                    // },
+                    {
+                        field: 'clazz',
+                        width: 80,
+                        title: '类型',
+                        templet: '<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>'
               },
               {
                 field: 'stage',
@@ -332,7 +378,7 @@
               },
               {
                 field: 'return_money_days',
-                width: 120,
+                width: 150,
                 title: '首次回款周期(天)',
               },
               {
@@ -340,9 +386,15 @@
                 width: 160,
                 title: '渠道',
               },
+              {
+                field: 'year',
+                width: 105,
+                title: '所属年度',
+                  sort: true
+              },
               {
                 title: '操作',
-                minWidth: 170,
+                minWidth: 220,
                 toolbar: '#currentTableBar',
                 align: "center",
                 fixed: 'right'
@@ -355,7 +407,7 @@
           page: true,
           skin: 'line',
           done: function (res) {
-              exportData=res.data1;
+              exportData=res.data;
               console.log(exportData);
               drowpdwonRender()
             export_drowpdwonRender()
@@ -420,14 +472,76 @@
       }
 
         function export_csv() {
-                table.exportFile(business_table.config.id,exportData, 'csv');
-            request.get('/missions/businesses/add_export_records?type=csv', {}, function (res) {
+            var data = form.val("search_form");
+            var business_type = [];
+            business_type_list.getValue().forEach(function(d) {
+                business_type.push(d.value);
+            })
+            var business_step = [];
+            business_step_list.getValue().forEach(function(d) {
+                business_step.push(d.value);
             })
+            data.place_id = index_place_list.getValue('valueStr');
+            data.business_type = business_type.toString();
+            data.business_step = business_step.toString();
+            layer.load(0, {});
+            console.log(data);
+            request.authPost("/missions/businesses/get_export_data", {
+                name: data.name,
+                area: data.area,
+                business_step: data.business_step,
+                business_type: data.business_type,
+                date: data.date,
+                department: data.department,
+                invitation_at: data.invitation_at,
+                place_id: data.place_id,
+                select: data.select,
+                staff_id: data.staff_id
+            }, function (res) {
+                console.log(res.data);
+                data = res.data
+                table.exportFile(business_table.config.id,data, 'csv');
+                layer.closeAll('loading');
+                request.get('/missions/businesses/add_export_records?type=csv', {}, function (res) {
+                })
+            })
+
         }
         function export_excel() {
-                table.exportFile(business_table.config.id,exportData, 'xls');
-            request.get('/missions/businesses/add_export_records?type=excel', {}, function (res) {
+            var data = form.val("search_form");
+            var business_type = [];
+            business_type_list.getValue().forEach(function(d) {
+                business_type.push(d.value);
             })
+            var business_step = [];
+            business_step_list.getValue().forEach(function(d) {
+                business_step.push(d.value);
+            })
+            data.place_id = index_place_list.getValue('valueStr');
+            data.business_type = business_type.toString();
+            data.business_step = business_step.toString();
+            layer.load(0, {});
+            console.log(data);
+            request.authPost("/missions/businesses/get_export_data", {
+                name: data.name,
+                area: data.area,
+                business_step: data.business_step,
+                business_type: data.business_type,
+                date: data.date,
+                department: data.department,
+                invitation_at: data.invitation_at,
+                place_id: data.place_id,
+                select: data.select,
+                staff_id: data.staff_id
+            }, function (res) {
+                console.log(res.data);
+                data = res.data
+                table.exportFile(business_table.config.id,data, 'xls');
+                layer.closeAll('loading');
+                request.get('/missions/businesses/add_export_records?type=xls', {}, function (res) {
+                })
+            })
+
         }
         function export_records() {
             var content = miniPage.getHrefContent('/missions/businesses/export_records')
@@ -547,12 +661,6 @@
         });
       }
 
-        function hn(){
-            $("#search_bt").trigger("click");
-        }
-        $(document).ready(function(){
-            window.onload=hn;
-        });
 
 
       var sort = {}, search = {};
@@ -607,11 +715,11 @@
             return false;
         });
         form.on('submit(reset_business_search)', function (data) {
-          var field = data.field;
-          form.val('search_form', {
-              name: '', department: '', staff_id: '', business_type: '', business_step: '',
-              place_id: '', date: '', area: '', invitation_at: ''
-          })
+            var field = data.field;
+            form.val('search_form', {
+                name: '', department: '', staff_id: '', business_type: '', business_step: '',
+                place_id: '', date: '', area: '', invitation_at: '', business_year: ''
+            })
             business_type_list.setValue([])
             business_step_list.setValue([])
             index_place_list.setValue([])
@@ -795,6 +903,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'show_follow') {
+                 self_flag = data.self_flag
                 business_id = obj.data.id
                  business_name = data.name
                 content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);

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

@@ -1,3 +1,4 @@
+follow_up_ids = EducodeSales::AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
 follow_count = 0
 json.data do
   json.array! @businesses do |d|
@@ -16,11 +17,12 @@ json.data do
     json.reception_at d.last_follow_up&.reception_at.to_s
     json.bidded_date d.last_follow_up&.bidded_date.to_s
     json.signed_date d.last_follow_up&.signed_date.to_s
+    json.year d.last_follow_up&.year.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.wait_return_money d.wait_return_money.to_i.round(2)
-    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '已完成').present? ? (d.last_follow_up.money_plans.where(clazz: '已完成').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
+    json.wait_return_money d.wait_return_money.to_f.round(2)
+    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '实际回款').present? ? (d.last_follow_up.money_plans.where(clazz: '实际回款').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
     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
     json.source d.source
@@ -28,36 +30,8 @@ json.data do
     json.current_staff_id @current_admin.id
     json.staff_id d.staff_id
     json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
-  end
-end
-json.data1 do
-  json.array! @businesses_exports do |d|
-    json.id d.id
-    json.name d.name
-    json.department d.department.name
-    json.school d.department.school.name
-    json.school_id d.department.school.id
-    json.follow_ups_count d.follow_ups.where(deleted_at: nil).size
-    json.follow_up_id d.last_follow_up_id
-    json.clazz d.last_follow_up&.clazz&.name || ""
-    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
-    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.wait_return_money d.wait_return_money.to_i.round(2)
-    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '已完成').present? ? (d.last_follow_up.money_plans.where(clazz: '已完成').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
-    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
-    json.source d.source
-    json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
-    json.current_staff_id @current_admin.id
-    json.staff_id d.staff_id
-    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
-  end
+    json.self_flag (d.staff_id == @current_admin.id) || (d.last_follow_up_id.in? follow_up_ids)
+    end
 end
 
 json.totalRow do

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

@@ -2,13 +2,22 @@
   <div class="layui-btn-container">
     <span class="table-label">跟进记录</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 %>
+    <%unless !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
+  <% if can? :add_follow, EducodeSales::Business %>
       <% if @current_admin.is_admin %>
         <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
       <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
         <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
       <% end %>
     <% end %>
+    <% end %>
+    <%if !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
+  <% if @current_admin.is_admin %>
+        <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right add_follow" lay-event="add"> 添加跟进记录</button>
+      <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
+        <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right add_follow" lay-event="add"> 添加跟进记录</button>
+      <% end %>
+      <% end %>
     <span class="table-label pull-right" style="padding-right: 20px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
   </div>
 </script>
@@ -23,16 +32,37 @@
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
   <% end %>
   {{#  if(d.is_latest && d.flag){ }}
-  <% if can? :update_follow, EducodeSales::Business %>
+
+  <%unless !can?(:update_follow, EducodeSales::Business) && can?(:self_edit_follow, EducodeSales::Business)%>
+<% 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>
+    <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
+      <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    <% end %>
+  <% end %>
+  <% end %>
+
+  <%if !can?(:update_follow, EducodeSales::Business) && can?(:self_edit_follow, EducodeSales::Business)%>
+    {{#  if(d.self_flag){ }}
     <% if @current_admin.is_admin %>
       <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
     <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
       <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
     <% end %>
+    {{#  } }}
   <% end %>
-  <% if can? :destroy_follow, EducodeSales::Business %>
+
+  <%unless !can?(:destroy_follow, EducodeSales::Business) && can?(:self_delete_follow, EducodeSales::Business)%>
+<% if can? :destroy_follow, EducodeSales::Business %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
   <% end %>
+  <% end %>
+  <%if !can?(:destroy_follow, EducodeSales::Business) && can?(:self_delete_follow, EducodeSales::Business)%>
+    {{#  if(d.self_flag){ }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+    {{#  } }}
+<% end %>
   {{#  } }}
 </script>
 
@@ -45,7 +75,7 @@
 <script type="text/html" id="edit_plan">
   <a href="javascript:void(0);" lay-event="edit_plan" class="layui-table-link">{{ d.money_plans_count }}</a>
 </script>
-<!--未完成计划列表-->
+<!--计划回款计划列表-->
 <script type="text/html" id="unfinish_table_tabar">
   <div class="layui-btn-container">
     <span class="table-label">跟进计划列表</span>
@@ -166,9 +196,15 @@
 
               {
                 field: 'place',
-                width: 400,
+                width: 120,
                 title: '渠道',
               },
+              {
+                field: 'year',
+                width: 120,
+                title: '所属年度',
+                  sort: true
+              },
               {
                 title: '操作',
                 minWidth: 200,
@@ -201,6 +237,10 @@
         });
       })
 
+        if(!parent.self_flag){
+            $('.add_follow').addClass("layui-hide");
+        }
+
       table.on('toolbar(sale_plan_follow_table)', function (obj) {
         if (obj.event === 'add') { // 监听添加操作
             business_id = parent.business_id
@@ -315,10 +355,11 @@
                   layer.full(keyindex);
               });
           } else if (obj.event === 'edit_plan') {
-              content = miniPage.getHrefContent('/missions/businesses/edit_plan');
-              openWH = miniPage.getOpenWidthHeight();
               is_latest = obj.data.is_latest
               flag = obj.data.flag
+              follow_up_id = obj.data.id
+              content = miniPage.getHrefContent('/missions/businesses/edit_plan');
+              openWH = miniPage.getOpenWidthHeight();
               plan_index = layer.open({
                   title: '回款计划',
                   type: 1,
@@ -339,7 +380,7 @@
           }
         });
 
-       // 未完成计划
+       // 计划回款计划
          table.render({
             elem: '#unfinish_table',
             url: '/missions/businesses/' + parent.business_id + "/unfinish_plans",

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

@@ -19,6 +19,8 @@ json.data do
     json.is_latest d.id == @latest&.id
     json.flag d.created_at.present? ? (Time.now - d.created_at).to_f/3600 < 24 : false
     json.description d.description
+    json.year d.year
+    json.self_flag d.staff_id == @current_admin.id
   end
 end