educode_sales 0.7.1 → 0.7.4

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">
@@ -89,7 +95,7 @@
   <div class="layui-btn-container">
     <span class="table-label">商机列表</span>
     <% 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"></i></button>
+    <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>
@@ -142,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',
@@ -224,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',
@@ -316,26 +338,32 @@
               },
               {
                 field: 'signed_date',
-                width: 105,
-                title: '签单时间',
+                  width: 105,
+                  title: '签单时间',
                   sort: true
               },
-              {
-                field: 'reception_at',
-                width: 105,
-                title: '验收时间',
-                sort: true
-              },
-              {
-                field: 'total_amount',
-                width: 100,
-                title: '总额',
-                  totalRow: true,
-                sort: true
-              },
-              {
-                field: 'actual_amount',
-                width: 100,
+                    {
+                        field: 'reception_at',
+                        width: 105,
+                        title: '验收时间',
+                        sort: true
+                    },
+                    {
+                        field: 'service_end_time',
+                        width: 200,
+                        title: '服务期',
+                        sort: true
+                    },
+                    {
+                        field: 'total_amount',
+                        width: 100,
+                        title: '总额',
+                        totalRow: true,
+                        sort: true
+                    },
+                    {
+                        field: 'actual_amount',
+                        width: 100,
                 title: '合同额',
                   totalRow: true,
                 sort: true
@@ -639,12 +667,6 @@
         });
       }
 
-        function hn(){
-            $("#search_bt").trigger("click");
-        }
-        $(document).ready(function(){
-            window.onload=hn;
-        });
 
 
       var sort = {}, search = {};
@@ -699,11 +721,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([])

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

@@ -17,12 +17,13 @@ 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.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.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

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

@@ -19,11 +19,11 @@
       <label class="layui-form-label required">项目类型</label>
       <%if @last_follow_up&.clazz&.name == @o_name %>
       <div class="layui-input-inline">
-        <%= select_tag "clazz_id", options_for_select([[@o_name,EducodeSales::Common.find_by(name: @o_name).id]]),:disabled => true, class: 'required' %>
+        <%= select_tag "clazz_id", options_for_select([[@o_name, EducodeSales::Common.find_by(name: @o_name).id]]), { 'lay-filter': 'clazz_id', class: 'required', :disabled => true } %>
       </div>
         <%else %>
         <div class="layui-input-inline">
-          <%= select_tag "clazz_id", options_for_select(@clazz, @last_follow_up&.clazz_id), class: 'required' %>
+          <%= select_tag "clazz_id", options_for_select(@clazz, @last_follow_up&.clazz_id), { 'lay-filter': 'clazz_id', class: 'required', } %>
         </div>
         <%end %>
     </div>
@@ -64,23 +64,31 @@
       <div class="layui-input-inline">
         <input type="text" class="layui-input" name="reception_at" autocomplete="off" id="reception_at_add"
           value="<%= @last_follow_up&.reception_at%>"
-          placeholder="请选择日期">
+               placeholder="请选择日期">
       </div>
     </div>
     <br>
+    <div class="layui-inline service_show layui-hide">
+      <label class="layui-form-label required">服务期</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input required" id="service_time" name="service_time" placeholder=" - " autocomplete="off">
+      </div>
+    </div>
+    <br class="service_show layui-hide">
     <div class="layui-inline">
       <label class="layui-form-label">总额(万)</label>
       <div class="layui-input-inline">
         <input name="total_amount" type="number" class="layui-input" autocomplete="off"
-          value="<%= @last_follow_up&.total_amount%>">
+               value="<%= @last_follow_up&.total_amount %>">
       </div>
-      客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。    </div>
+      客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。
+    </div>
     <br>
     <div class="layui-inline">
       <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
         <input name="actual_amount" type="number" class="layui-input" autocomplete="off" placeholder="本单位的签单金额"
-          value="<%= @last_follow_up&.actual_amount%>">
+               value="<%= @last_follow_up&.actual_amount %>">
       </div>
       客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
@@ -150,132 +158,161 @@
 </div>
 
 <script>
-  layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {
-    var form = layui.form,
-      layer = layui.layer,
-      table = layui.table,
-      laytpl = layui.laytpl,
-      request = layui.request,
-      laydate = layui.laydate,
-      xmSelect = layui.xmSelect,
-      $ = layui.$;
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            laydate = layui.laydate,
+            xmSelect = layui.xmSelect,
+            $ = layui.$;
 
-      laydate.render({
-        elem: '#year',
-          type: 'year'
-      })
-      laydate.render({
-        elem: '#invitation_at_add'
-      })
+        flag =
+        <%=@last_follow_up&.clazz&.name == @o_name %>
+        if (flag) {
+            $(".service_show").removeClass('layui-hide')
+        }
 
-      laydate.render({
-        elem: '#reception_at_add'
-      });
-      var sales_list = xmSelect.render({
-        el: '#assign_follow',
-        remoteSearch: true,
-        clickClose: true,
-        delay: 1000,
-        paging: true,
-        pageRemote: true,
-        filterable: true,
-        remoteMethod: function (val, cb, show, pageIndex) {
-          $.ajax( '/missions/sales_staff', {
-            method: 'get',
-            data: {
-              q: val,
-              page: pageIndex
-            },
-            dataType: 'json',
-            success: function (res) {
-                var data = res.data;
-                if (res.code == 0) {
-                  cb(res.data, res.count);
-                } else {
-                  layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
-                }
+        form.on('select(clazz_id)', function (data) {
+            console.log(data.value)
+            const value = data.value;
+            if (value == <%= EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>) {
+                $(".service_show").removeClass('layui-hide')
+            } else {
+                console.log(data.value)
+                $(".service_show").addClass('layui-hide')
+            }
+        })
+
+        laydate.render({
+            elem: '#service_time',
+            range: true
+        });
+
+        laydate.render({
+            elem: '#year',
+            type: 'year'
+        })
+        laydate.render({
+            elem: '#invitation_at_add'
+        })
 
+        laydate.render({
+            elem: '#reception_at_add'
+        });
+        var sales_list = xmSelect.render({
+            el: '#assign_follow',
+            remoteSearch: true,
+            clickClose: true,
+            delay: 1000,
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                $.ajax('/missions/sales_staff', {
+                    method: 'get',
+                    data: {
+                        q: val,
+                        page: pageIndex
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        var data = res.data;
+                        if (res.code == 0) {
+                            cb(res.data, res.count);
+                        } else {
+                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                        }
+
+                    }
+                })
             }
-          })
-        }
-      })
-      var place_list = xmSelect.render({
-        el: '#place',
-        remoteSearch: true,
-          model: {
-              icon: 'hidden',
-              label: {
-                  type: 'text',
-                  text: {
-                      //左边拼接的字符
-                      left: '',
-                      //右边拼接的字符
-                      right: '',
-                      //中间的分隔符
-                      separator: ', ',
-                  },
-              }
-          },
-        clickClose: true,
-        delay: 1000,
-        paging: true,
-          radio: true,
-        pageRemote: true,
-        filterable: true,
-        remoteMethod: function (val, cb, show, pageIndex) {
-          $.ajax( '/missions/sales_place', {
-            method: 'get',
-            data: {
-              q: val,
-              page: pageIndex
-            },
-            dataType: 'json',
-            success: function (res) {
-                var data = res.data;
-                if (res.code == 0) {
-                  cb(res.data, res.count);
-                } else {
-                  layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+        })
+        var place_list = xmSelect.render({
+            el: '#place',
+            remoteSearch: true,
+            model: {
+                icon: 'hidden',
+                label: {
+                    type: 'text',
+                    text: {
+                        //左边拼接的字符
+                        left: '',
+                        //右边拼接的字符
+                        right: '',
+                        //中间的分隔符
+                        separator: ', ',
+                    },
                 }
+            },
+            clickClose: true,
+            delay: 1000,
+            paging: true,
+            radio: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                $.ajax('/missions/sales_place', {
+                    method: 'get',
+                    data: {
+                        q: val,
+                        page: pageIndex
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        var data = res.data;
+                        if (res.code == 0) {
+                            cb(res.data, res.count);
+                        } else {
+                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                        }
 
+                    }
+                })
             }
-          })
-        }
-      })
+        })
 
-      sales_list.setValue(gon.sales);
-      place_list.setValue(gon.place);
-      form.render();
+        sales_list.setValue(gon.sales);
+        place_list.setValue(gon.place);
+        form.render();
 
-      form.on('submit(add_follow_up)', function (data) {
-          $(".submit-btn").addClass("layui-hide");
-          var assign_follow = [];
-        sales_list.getValue().forEach(function(d) {
-          assign_follow.push(d.value);
-        })
-        data.field.assign_follow_up = assign_follow;
-        data.field.business_id = "<%= @business.id %>";
-        data.field.place_id = place_list.getValue('valueStr');
-          request.authPost("missions/follow_ups", data.field, function (res) {
-          if (res.success == false) {
-            layer.alert(res.msg)
-          } else {
-            layer.close(parent.sale_plan_index);
-            parent.layer.close(parent.layer.getFrameIndex(window.name))
-            parent.table.reload('sale_plan_follow_table')
-            parent.table.reload('businesses_table')
-            parent.table.reload('teachers_table')
-          }
-        })
+        form.on('submit(add_follow_up)', function (data) {
+            if (data.field.clazz_id == <%= EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>) {
+                if (data.field.service_time.length == 0) {
+                    layer.msg('请选择服务期', {time: 2000, icon: 2, shade: 0.01});
+                    return false;
+                }
+            }
+            $(".submit-btn").addClass("layui-hide");
+            var assign_follow = [];
+            sales_list.getValue().forEach(function (d) {
+                assign_follow.push(d.value);
+            })
+            data.field.assign_follow_up = assign_follow;
+            data.field.business_id = "<%= @business.id %>";
+            data.field.place_id = place_list.getValue('valueStr');
+            request.authPost("missions/follow_ups", data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.sale_plan_index);
+                    parent.layer.close(parent.layer.getFrameIndex(window.name))
+                    parent.table.reload('sale_plan_follow_table')
+                    parent.table.reload('businesses_table')
+                    parent.table.reload('teachers_table')
+                }
+            })
 
 
-        return false;
-      });
+            return false;
+        });
 
-  });
+    });
 </script>
 <style>
-    .new_place_select xm-select > .xm-body{
-        width: 300px; !important;
+    .new_place_select xm-select > .xm-body {
+        width: 300px;
+    !important;
     }
 </style>