educode_sales 1.10.58 → 1.10.70

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

@@ -1,99 +1,121 @@
 <div class="layui-tab" lay-filter="sale_tab">
   <ul class="layui-tab-title">
-    <li class="layui-this" data="week">周计划</li>
-    <li data="weekly">周报</li>
-    <li data="month">月计划</li>
-    <li data="monthly">月报</li>
-    <li data="year">年计划</li>
-    <!-- <li data="target_track">年度执行</li> -->
+    <!--    <li data="week">周计划</li>-->
+    <!--    <li data="weekly">周报</li>-->
+    <!--    <li data="month">月计划</li>-->
+    <!--    <li data="monthly">月报</li>-->
+    <!--    <li data="year">年计划</li>-->
+    <li class="layui-this" data="year_execute">年度执行</li>
+    <li data="year_plan">年度目标</li>
   </ul>
   <div class="layui-tab-content">
-    <div class="layui-tab-item layui-show">
-      <%= render 'weekPlan' %>
-    </div>
-    <div class="layui-tab-item">
-      <div id="weekly_tab_wraper"></div>
-    </div>
-    <div class="layui-tab-item ">
-      <div id="month_plan_tab_wraper"></div>
-    </div>
-    <div class="layui-tab-item">
-      <div id="monthly_tab_wraper"></div>
-    </div>
-    <div class="layui-tab-item">
-      <div id="year_plan_tab_wraper"></div>
-    </div>
-    <div class="layui-tab-item" id="target_track_tab">
-    </div>
+    <!--    <div class="layui-tab-item layui-show">-->
+    <%#= render 'weekPlan' %>
+    <!--    </div>-->
+    <!--    <div class="layui-tab-item">-->
+    <!--      <div id="weekly_tab_wraper"></div>-->
+    <!--    </div>-->
+    <!--    <div class="layui-tab-item ">-->
+    <!--      <div id="month_plan_tab_wraper"></div>-->
+    <!--    </div>-->
+    <!--    <div class="layui-tab-item">-->
+    <!--      <div id="monthly_tab_wraper"></div>-->
+    <!--    </div>-->
+    <!--    <div class="layui-tab-item">-->
+    <!--      <div id="year_plan_tab_wraper"></div>-->
+    <!--    </div>-->
+    <div class="layui-tab-item layui-show" id="year_execute_tab"></div>
+    <div class="layui-tab-item" id="year_target_tab"></div>
   </div>
 </div>
 
 <script>
-  layui.use(['element', 'table', 'jquery'], function () {
-    var $ = layui.jquery,
-      table = layui.table,
-      element = layui.element;
-    // element.on('tab(sale_tab)', function (data) {
-    //   var status = $(this).attr('data')
-    //   switch (status) {
-    //     case 'week':
-    //        $("#week_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
-    //        $("#week_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
-    //       break;
-    //     case 'weekly':
-    //       $("#sales_weelky_table .layui-table-fixed-r")[0].classList.remove('layui-hide');
-    //       $("#sales_weelky_table .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
-    //       break;
-    //     ;
-    //     case 'monthly':
-    //       $("#monthly_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
-    //       $("#monthly_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
-    //       break;
-    //     case 'month':
-    //       $("#month_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
-    //       $("#month_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
-    //       break;
-    //     case 'year':
-    //       $("#year_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
-    //       $("#year_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
-    //       break;
-    //   }
-     
-          
-    // })
+    layui.use(['element', 'table', 'jquery'], function () {
+        var $ = layui.jquery,
+            table = layui.table,
+            element = layui.element;
+        // element.on('tab(sale_tab)', function (data) {
+        //   var status = $(this).attr('data')
+        //   switch (status) {
+        //     case 'week':
+        //        $("#week_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
+        //        $("#week_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
+        //       break;
+        //     case 'weekly':
+        //       $("#sales_weelky_table .layui-table-fixed-r")[0].classList.remove('layui-hide');
+        //       $("#sales_weelky_table .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
+        //       break;
+        //     ;
+        //     case 'monthly':
+        //       $("#monthly_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
+        //       $("#monthly_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
+        //       break;
+        //     case 'month':
+        //       $("#month_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
+        //       $("#month_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
+        //       break;
+        //     case 'year':
+        //       $("#year_table_wraper .layui-table-fixed-r")[0].classList.remove('layui-hide');
+        //       $("#year_table_wraper .layui-table-fixed-r .layui-table-body")[0].style.height="auto";
+        //       break;
+        //   }
 
 
-    element.render();
-    element.on('tab(sale_tab)', function(data) {
-      if (data.index == 1 && $("#sales_weelky_table").length == 0) {
-        loadPage('/missions/plans/weekly')
-      } else if (data.index == 2 && $("#month_table_wraper").length == 0) {
-        loadPage('/missions/plans/month_plan')
-      } else if (data.index == 3 && $("#monthly_table_wraper").length == 0) {
-        loadPage('/missions/plans/monthly')
-      } else if (data.index == 4 && $("#year_table_wraper").length == 0) {
-        loadPage('/missions/plans/year_plan')
-      } else if (data.index == 5 && $("#target_track_wraper").length == 0) {
-        loadPage('/missions/plans/target_track')
-      }
-    });
+        // })
+        loadPage('/missions/plans/year_execute')
+        //loadPage('/missions/plans/year_target')
+        element.render();
+        element.on('tab(sale_tab)', function (data) {
+            if (data.index === 0 && $("#year_execute_wraper").length == 0) {
+                loadPage('/missions/plans/year_execute')
+            } else if (data.index === 1 && $("#year_target_wraper").length == 0) {
+                loadPage('/missions/plans/year_target')
+            }
+        });
+        /*
+        element.on('tab(sale_tab)', function (data) {
+            if (data.index == 1 && $("#sales_weelky_table").length == 0) {
+                loadPage('/missions/plans/weekly')
+            } else if (data.index == 2 && $("#month_table_wraper").length == 0) {
+                loadPage('/missions/plans/month_plan')
+            } else if (data.index == 3 && $("#monthly_table_wraper").length == 0) {
+                loadPage('/missions/plans/monthly')
+            } else if (data.index == 4 && $("#year_table_wraper").length == 0) {
+                loadPage('/missions/plans/year_plan')
+            } else if (data.index == 5 && $("#year_execute_wraper").length == 0) {
+                loadPage('/missions/plans/year_execute')
+            } else if (data.index == 6 && $("#year_target_wraper").length == 0) {
+                loadPage('/missions/plans/year_target')
+            }
+        });
+        */
 
 
-    function loadPage(url) {
-      var layer_index = layer.load(0, {shade: [0.1, '#fff']});
-      Rails.ajax({
-        url: url,
-        type: 'GET',
-        dataType: "script",
-        success: function (res) {
-          layer.close(layer_index);
+        function loadPage(url) {
+            var layer_index = layer.load(0, {shade: [0.1, '#fff']});
+            Rails.ajax({
+                url: url,
+                type: 'GET',
+                dataType: "script",
+                success: function (res) {
+                    layer.close(layer_index);
+                }
+            });
         }
-      });
-    }
-  })
- </script>
+    })
+</script>
 <style>
-    .layui-table-tool-temp{
-        padding-right: 30px; !important;
+    .layui-table-tool-temp {
+        padding-right: 30px;
+    !important;
+    }
+
+    .layui-table-view .layui-table td[data-edit] .layui-table-cell {
+        background: #e4fad2;
+    }
+
+    .mtarget {
+        color: #46d1db;
+        font-weight: bold;
     }
 </style>

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

@@ -0,0 +1,96 @@
+<style>
+    /* 添加自定义样式规则来居中对齐表格内容 */
+    .z-index .layui-table-tool{
+        z-index: 10000; !important;
+    }
+</style>
+<script type="text/html" id="staff_year_target_log_toolbar">
+  <div class="layui-btn-container">
+    <span class="table-label">
+    </span>
+  </div>
+</script>
+<div class="z-index">
+  <table class="layui-hide" id="staff_year_business" lay-filter="staff_year_business"></table>
+</div>
+<script>
+  var hide = false;
+</script>
+<% if @type == 'plan' %>
+  <% if @target_clazz == '中标' %>
+  <script>
+    var moneyTitle = "计划投标金额";
+    var moneyTime = "计划投标时间";
+    var createTime = "计划创建时间";
+  </script>
+  <% elsif @target_clazz == '商机' %>
+    <script>
+        var moneyTitle = "计划A类金额";
+        var moneyTime = "计划A类时间";
+        var createTime = "计划创建时间";
+    </script>
+  <% elsif @target_clazz == '回款' %>
+    <script>
+        var moneyTitle = "计划回款金额";
+        var moneyTime = "计划回款时间";
+        var createTime = "计划创建时间";
+    </script>
+  <% end %>
+<% elsif @type == 'finish' %>
+  <% if @target_clazz == '中标' %>
+    <script>
+        var moneyTitle = "合同额";
+        var moneyTime = "中标时间";
+        var createTime = "创建时间";
+        var hide = true;
+    </script>
+  <% elsif @target_clazz == '商机' %>
+    <script>
+        var moneyTitle = "预算额";
+        var moneyTime = "中标时间";
+        var createTime = "创建时间";
+        var hide = true;
+    </script>
+  <% elsif @target_clazz == '回款' %>
+    <script>
+        var moneyTitle = "回款金额";
+        var moneyTime = "回款时间";
+        var createTime = "创建时间";
+        var hide = true;
+    </script>
+  <% end %>
+<% end %>
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            request =layui.request,
+            miniPage = layui.miniPage;
+            table = layui.table;
+            table.render({
+                elem: '#staff_year_business',
+                url: '/missions/plans/staff_year_business?year=' + parent._year + '&month=' + parent.month
+                  + '&school_tag_id=' + parent.school_tag_id +  '&staff_id=' + parent.staff_id
+                  + '&target_clazz=' + parent._target_clazz + '&type=' + parent.type,
+                toolbar: '#staff_year_business_toolbar',
+                defaultToolbar: ['filter', 'exports'],
+                totalRow: true,
+                cols: [[
+                {field: 'id', title: '序号', type: 'numbers', totalRowText: '合计'}
+                , {field: 'name', title: '商机名称'}
+                , {field: 'school', title: '单位'}
+                , {field: 'school_tag_name', title: '客户类型'}
+                , {field: 'target_clazz', title: '目标类别'}
+                , {field: 'clazz', title: '商机类型'}
+                , {field: 'money', title: moneyTitle, totalRow: true}
+                , {field: 'time', title: moneyTime}
+                , {field: 'created_at', title: createTime, hide: hide}
+                , {field: 'staff', title: '销售经理'}
+                ]],
+                page: true
+            });
+    });
+</script>
+<style>
+    
+</style>

data/app/views/educode_sales/plans/staff_year_business.json.jbuilder

@@ -0,0 +1,22 @@
+json.data do
+  json.array! @data do |d|
+    json.id d.id
+    json.name d.name
+    json.clazz_id d.clazz_id
+    json.clazz d.clazz.name
+    json.staff d&.last_follow_up&.assign_follow_ups.present? ? (d&.last_follow_up&.assign_follow_ups.map{ |d| d.staff&.user&.real_name}.join("、")) : d.staff&.user&.real_name
+    json.school_id d.school_id
+    json.school d.department&.school&.name
+    json.school_tag_name d.school_tag_name
+    json.school_tag_id d.school_tag_id
+    json.year @year
+    json.target_clazz @target_clazz
+    json.money d.money
+    json.time d.time
+    json.created_at d.created_at.to_s(:date)
+
+  end
+end
+
+json.code 0
+json.count @data.total_count

data/app/views/educode_sales/plans/staff_year_target.json.jbuilder

@@ -0,0 +1,35 @@
+json.data do
+  json.array! @data do |d|
+    json.id d.id
+    json.staff d.staff.user.real_name
+    json.staff_id d.staff_id
+    json.school_tag d.school_tag.name
+    json.school_tag_id d.school_tag_id
+    json.year d.year
+    json.target_clazz d.target_clazz
+    json.year_target d.year_target
+    json.year_finish d.year_finish
+    json.year_diff d.year_diff
+    json.reviewer d.reviewer&.user&.real_name
+    json.comment d.comment
+    json.state d.state
+    json.target_1 d.target_1
+    json.target_2 d.target_2
+    json.target_3 d.target_3
+    json.target_4 d.target_4
+    json.target_5 d.target_5
+    json.target_6 d.target_6
+    json.target_7 d.target_7
+    json.target_8 d.target_8
+    json.target_9 d.target_9
+    json.target_10 d.target_10
+    json.target_11 d.target_11
+    json.target_12 d.target_12
+    json.updated_at d.updated_at.to_s(:date)
+    json.created_at d.created_at.to_s(:date)
+
+  end
+end
+
+json.code 0
+json.count @data.total_count

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

@@ -0,0 +1,62 @@
+<style>
+    /* 添加自定义样式规则来居中对齐表格内容 */
+    .z-index .layui-table-tool{
+        z-index: 10000; !important;
+    }
+</style>
+<script type="text/html" id="staff_year_target_log_toolbar">
+  <div class="layui-btn-container">
+    <span class="table-label">
+    </span>
+  </div>
+</script>
+<div class="z-index">
+  <table class="layui-hide" id="staff_year_target_log" lay-filter="staff_year_target_log"></table>
+</div>
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            request =layui.request,
+            miniPage = layui.miniPage;
+
+        table = layui.table;
+            table.render({
+                elem: '#staff_year_target_log',
+                url: '/missions/plans/staff_year_target_log?target_id=' + parent.id ,
+                toolbar: '#staff_year_target_log_toolbar',
+                defaultToolbar: ['filter', 'exports'],
+                cols: [[
+                {field: 'id', title: '序号', width: 80, type: 'numbers'}
+                , {field: 'staff', title: '姓名', width: 100}
+                , {field: 'school_tag', title: '客户类型', width: 100}
+                , {field: 'target_clazz', title: '目标类别', width: 100}
+                , {field: 'year', title: '年份', width: 100}
+                , {field: 'year_target', title: '年度目标', minWidth: 100}
+                , {field: 'year_finish', title: '年度完成', minWidth: 100}
+                , {field: 'year_diff', title: '年度差额', minWidth: 100}
+                , {field: 'target_1', title: '1月', minWidth: 60}
+                , {field: 'target_2', title: '2月', minWidth: 60}
+                , {field: 'target_3', title: '3月', minWidth: 60}
+                , {field: 'target_4', title: '4月', minWidth: 60}
+                , {field: 'target_5', title: '5月', minWidth: 60}
+                , {field: 'target_6', title: '6月', minWidth: 60}
+                , {field: 'target_7', title: '7月', minWidth: 60}
+                , {field: 'target_8', title: '8月', minWidth: 60}
+                , {field: 'target_9', title: '9月', minWidth: 60}
+                , {field: 'target_10', title: '10月', minWidth: 60}
+                , {field: 'target_11', title: '11月', minWidth: 60}
+                , {field: 'target_12', title: '12月', minWidth: 60}
+                , {field: 'state', title: '状态', width: 100}
+                , {field: 'reviewer', title: '审批人', width: 100}
+                , {field: 'comment', title: '审核意见', width: 150}
+                , {field: 'updated_at', title: '更新时间', width: 180}
+                ]],
+                page: true
+            });
+    });
+</script>
+<style>
+    
+</style>

data/app/views/educode_sales/plans/staff_year_target_log.json.jbuilder

@@ -0,0 +1,34 @@
+json.data do
+  json.array! @data do |d|
+    json.id d.id
+    json.staff d.staff.user.real_name
+    json.staff_id d.staff_id
+    json.school_tag d.school_tag.name
+    json.school_tag_id d.school_tag_id
+    json.year d.year
+    json.target_clazz d.target_clazz
+    json.year_target d.year_target
+    json.year_finish d.year_finish
+    json.year_diff d.year_diff
+    json.reviewer d.reviewer&.user&.real_name
+    json.comment d.comment
+    json.state d.state
+    json.target_1 d.target_1
+    json.target_2 d.target_2
+    json.target_3 d.target_3
+    json.target_4 d.target_4
+    json.target_5 d.target_5
+    json.target_6 d.target_6
+    json.target_7 d.target_7
+    json.target_8 d.target_8
+    json.target_9 d.target_9
+    json.target_10 d.target_10
+    json.target_11 d.target_11
+    json.target_12 d.target_12
+    json.updated_at d.updated_at.to_s(:db)
+
+  end
+end
+
+json.code 0
+json.count @data.count

data/app/views/educode_sales/plans/year_execute.js.erb

@@ -0,0 +1 @@
+$("#year_execute_tab").html("<%= j render 'year_execute' %>");

data/app/views/educode_sales/plans/year_target.js.erb

@@ -0,0 +1 @@
+$("#year_target_tab").html("<%= j render 'year_target' %>");

data/app/views/educode_sales/plans/year_target.json.jbuilder

@@ -0,0 +1,48 @@
+json.data do
+  json.array! @data do |d|
+    json.id d.id
+    json.num d.num
+    json.is_use d.is_use
+    json.staff d.staff.user.real_name
+    json.staff_id d.staff_id
+    json.school_tag d.school_tag.name
+    json.school_tag_id d.school_tag_id
+    json.year d.year
+    json.target_clazz d.target_clazz
+    json.year_target d.year_target
+    json.year_finish d.year_finish
+    json.year_diff d.year_diff
+    json.reviewer d.reviewer&.user&.real_name
+    json.comment d.comment
+    json.state d.state
+    json.target_1 d.target_1
+    json.m_target_1 d.m_target_1
+    json.target_2 d.target_2
+    json.m_target_2 d.m_target_2
+    json.target_3 d.target_3
+    json.m_target_3 d.m_target_3
+    json.target_4 d.target_4
+    json.m_target_4 d.m_target_4
+    json.target_5 d.target_5
+    json.m_target_5 d.m_target_5
+    json.target_6 d.target_6
+    json.m_target_6 d.m_target_6
+    json.target_7 d.target_7
+    json.m_target_7 d.m_target_7
+    json.target_8 d.target_8
+    json.m_target_8 d.m_target_8
+    json.target_9 d.target_9
+    json.m_target_9 d.m_target_9
+    json.target_10 d.target_10
+    json.m_target_10 d.m_target_10
+    json.target_11 d.target_11
+    json.m_target_11 d.m_target_11
+    json.target_12 d.target_12
+    json.m_target_12 d.m_target_12
+    json.updated_at d.updated_at.to_s(:date)
+
+  end
+end
+
+json.code 0
+json.count @data.total_count

data/app/views/educode_sales/plans/years_all_target.json.jbuilder

@@ -0,0 +1,54 @@
+json.data do
+  json.array! @data do |item|
+    json.id item['id']
+    json.staff_id item['staff_id']
+    json.name item['name']
+    json.school_tag_id item['school_tag_id']
+    json.school_tag_name item['school_tag_name']
+    json.target_clazz item['target_clazz']
+    json.target_1 item['target_1'].present? ? item['target_1'].round(2) : 0
+    json.target_2 item['target_2'].present? ? item['target_2'].round(2) : 0
+    json.target_3 item['target_3'].present? ? item['target_3'].round(2) : 0
+    json.target_4 item['target_4'].present? ? item['target_4'].round(2) : 0
+    json.target_5 item['target_5'].present? ? item['target_5'].round(2) : 0
+    json.target_6 item['target_6'].present? ? item['target_6'].round(2) : 0
+    json.target_7 item['target_7'].present? ? item['target_7'].round(2) : 0
+    json.target_8 item['target_8'].present? ? item['target_8'].round(2) : 0
+    json.target_9 item['target_9'].present? ? item['target_9'].round(2) : 0
+    json.target_10 item['target_10'].present? ? item['target_10'].round(2) : 0
+    json.target_11 item['target_11'].present? ? item['target_11'].round(2) : 0
+    json.target_12 item['target_12'].present? ? item['target_12'].round(2) : 0
+    json.finish_1 item['finish_1'].present? ? item['finish_1'].round(2) : 0
+    json.finish_2 item['finish_2'].present? ? item['finish_2'].round(2) : 0
+    json.finish_3 item['finish_3'].present? ? item['finish_3'].round(2) : 0
+    json.finish_4 item['finish_4'].present? ? item['finish_4'].round(2) : 0
+    json.finish_5 item['finish_5'].present? ? item['finish_5'].round(2) : 0
+    json.finish_6 item['finish_6'].present? ? item['finish_6'].round(2) : 0
+    json.finish_7 item['finish_7'].present? ? item['finish_7'].round(2) : 0
+    json.finish_8 item['finish_8'].present? ? item['finish_8'].round(2) : 0
+    json.finish_9 item['finish_9'].present? ? item['finish_9'].round(2) : 0
+    json.finish_10 item['finish_10'].present? ? item['finish_10'].round(2) : 0
+    json.finish_11 item['finish_11'].present? ? item['finish_11'].round(2) : 0
+    json.finish_12 item['finish_12'].present? ? item['finish_12'].round(2) : 0
+    json.plan_1 item['plan_1'].present? ? item['plan_1'].round(2) : 0
+    json.plan_2 item['plan_2'].present? ? item['plan_2'].round(2) : 0
+    json.plan_3 item['plan_3'].present? ? item['plan_3'].round(2) : 0
+    json.plan_4 item['plan_4'].present? ? item['plan_4'].round(2) : 0
+    json.plan_5 item['plan_5'].present? ? item['plan_5'].round(2) : 0
+    json.plan_6 item['plan_6'].present? ? item['plan_6'].round(2) : 0
+    json.plan_7 item['plan_7'].present? ? item['plan_7'].round(2) : 0
+    json.plan_8 item['plan_8'].present? ? item['plan_8'].round(2) : 0
+    json.plan_9 item['plan_9'].present? ? item['plan_9'].round(2) : 0
+    json.plan_10 item['plan_10'].present? ? item['plan_10'].round(2) : 0
+    json.plan_11 item['plan_11'].present? ? item['plan_11'].round(2) : 0
+    json.plan_12 item['plan_12'].present? ? item['plan_12'].round(2) : 0
+    json.year_target 0
+    json.year_clazz_target ((item['target_1'].present? ? item['target_1'].round(2) : 0)+(item['target_2'].present? ? item['target_2'].round(2) : 0)+(item['target_3'].present? ? item['target_3'].round(2) : 0)+(item['target_4'].present? ? item['target_4'].round(2) : 0)+(item['target_5'].present? ? item['target_5'].round(2) : 0)+(item['target_6'].present? ? item['target_6'].round(2) : 0)+(item['target_7'].present? ? item['target_7'].round(2) : 0)+(item['target_8'].present? ? item['target_8'].round(2) : 0)+(item['target_9'].present? ? item['target_9'].round(2) : 0)+(item['target_10'].present? ? item['target_10'].round(2) : 0)+(item['target_11'].present? ? item['target_11'].round(2) : 0)+(item['target_12'].present? ? item['target_12'].round(2) : 0)).round(2)
+    json.year_plan item['year_plan'].round(2)
+    json.year_finish ((item['finish_1'].present? ? item['finish_1'].round(2) : 0)+(item['finish_2'].present? ? item['finish_2'].round(2) : 0)+(item['finish_3'].present? ? item['finish_3'].round(2) : 0)+(item['finish_4'].present? ? item['finish_4'].round(2) : 0)+(item['finish_5'].present? ? item['finish_5'].round(2) : 0)+(item['finish_6'].present? ? item['finish_6'].round(2) : 0)+(item['finish_7'].present? ? item['finish_7'].round(2) : 0)+(item['finish_8'].present? ? item['finish_8'].round(2) : 0)+(item['finish_9'].present? ? item['finish_9'].round(2) : 0)+(item['finish_10'].present? ? item['finish_10'].round(2) : 0)+(item['finish_11'].present? ? item['finish_11'].round(2) : 0)+(item['finish_12'].present? ? item['finish_12'].round(2) : 0)).round(2)
+    json.year_diff ((item['target_1'].present? ? item['target_1'].round(2) : 0)+(item['target_2'].present? ? item['target_2'].round(2) : 0)+(item['target_3'].present? ? item['target_3'].round(2) : 0)+(item['target_4'].present? ? item['target_4'].round(2) : 0)+(item['target_5'].present? ? item['target_5'].round(2) : 0)+(item['target_6'].present? ? item['target_6'].round(2) : 0)+(item['target_7'].present? ? item['target_7'].round(2) : 0)+(item['target_8'].present? ? item['target_8'].round(2) : 0)+(item['target_9'].present? ? item['target_9'].round(2) : 0)+(item['target_10'].present? ? item['target_10'].round(2) : 0)+(item['target_11'].present? ? item['target_11'].round(2) : 0)+(item['target_12'].present? ? item['target_12'].round(2) : 0)) - ((item['finish_1'].present? ? item['finish_1'].round(2) : 0)+(item['finish_2'].present? ? item['finish_2'].round(2) : 0)+(item['finish_3'].present? ? item['finish_3'].round(2) : 0)+(item['finish_4'].present? ? item['finish_4'].round(2) : 0)+(item['finish_5'].present? ? item['finish_5'].round(2) : 0)+(item['finish_6'].present? ? item['finish_6'].round(2) : 0)+(item['finish_7'].present? ? item['finish_7'].round(2) : 0)+(item['finish_8'].present? ? item['finish_8'].round(2) : 0)+(item['finish_9'].present? ? item['finish_9'].round(2) : 0)+(item['finish_10'].present? ? item['finish_10'].round(2) : 0)+(item['finish_11'].present? ? item['finish_11'].round(2) : 0)+(item['finish_12'].present? ? item['finish_12'].round(2) : 0)).round(2)
+  end
+end
+
+json.code 0
+json.count @total_count

data/app/views/educode_sales/sales_details/_index.html.erb

@@ -88,7 +88,7 @@
   <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" id="upload_sales_btn" style="margin-left: 20px;">批量导入销售明细</button>
 </script>
 <script>
-  layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown', 'laytpl', 'xmSelect', 'upload'], function() {
+  layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown', 'laytpl', 'xmSelect', 'upload', 'functions'], function() {
     var $ = layui.jquery,
       form = layui.form,
       request = layui.request,
@@ -96,7 +96,8 @@
       dropdown = layui.dropdown,
       xmSelect = layui.xmSelect,
       upload = layui.upload,
-      laydate = layui.laydate;
+      laydate = layui.laydate,
+        functions = layui.functions;
     var openWH = miniPage.getOpenWidthHeight();
     laydate.render({
       elem: '#date',
@@ -223,7 +224,7 @@
       }]
     ]
 
-
+      cols_table[0] = functions.initTableColumnsFilter('sales_details_table', cols_table[0]);
     var sales_details_table = table.render({
       elem: '#sales_details_table',
       url: '/missions/sales_details',
@@ -244,6 +245,8 @@
         if ($('#upload_sales_btn').length > 0) {
           uploadSales();
         }
+        var that = this;
+        functions.observerTableColumnFilter(that);
       }
     });