app/views/educode_sales/sales/index.html.erb in educode_sales-0.5.8 vs app/views/educode_sales/sales/index.html.erb in educode_sales-0.5.9

@@ -1,13 +1,12 @@
 <div class="section">
-  <form class="layui-form" action="">
+  <form class="layui-form select_year" action="">
     <span>销售人员列表</span>
-    <div style="float:right;">年度
-    <div class="layui-input-inline">
+    <div class="layui-input-inline" style="float: right">
       <%= select_tag "years", options_for_select(@years,@year), {'lay-filter': 'year' } %>
     </div>
-    </div>
+    <span style="float: right;padding-right: 10px">年度</span>
   </form>
   <hr>
   <table class="layui-hide" id="table" lay-filter="table" ></table>
 </div>
 <script type="text/html" id="toolbarDemo">
@@ -121,34 +120,59 @@
             {
             field: 'goal',
             title: '中标金额',
             totalRow:true,sort:true,
             width: 120
-          }, {
+          },
+            {
             field: 'return_money',
             title: '回款金额',
             totalRow:true,sort:true,
             width: 120
-          }
+          },
+            {
+            field: 'school_count',
+            title: '负责学校数',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
+            {
+            field: 'follow_school_count',
+            title: '跟进学校数',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
+            {
+            field: 'follow_school_counts',
+            title: '跟进学校次数',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
+            {
+            field: 'follow_school_rate',
+            title: '学校覆盖率',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
+            {
+            field: 'follow_department_rate',
+            title: '学院覆盖率',
+            totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+            width: 120
+          },
         ]
       ],
       limit: 20,
           limits: [10,15,20,30,40,50,60,70,80,90],
       page: true
     });
 
-      // var sort = {}, search = {};
-      // table.on('sort(table)', function (obj) {
-      //     sort.field = obj.field;
-      //     sort.order = obj.type;
-      //     table.reload('table', {
-      //         initSort: obj,
-      //         where: {
-      //             sort: sort,
-      //             q: search
-      //         }
-      //     });
-      // })
 
-
   });
-</script>
+</script>
+<style>
+    .select_year .layui-form-select .layui-input {
+        padding-right: 30px;
+        cursor: pointer;
+        height: 22px;
+    }
+</style>
\ No newline at end of file