educode_sales 0.5.5 → 0.5.9

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

@@ -1,66 +1,80 @@
-<div class="min-height-table">
-  <div style="margin: 10px 10px 10px 10px">
-    <form class="layui-form layui-form-pane" lay-filter="search_form">
-      <div class="layui-form-item">
-        <div class="layui-inline">
-          <label class="layui-form-label">商机名称</label>
-          <div class="layui-input-inline">
-            <input type="text" name="name" autocomplete="off" class="layui-input" value="<%=params[:name] %>">
-          </div>
-        </div>
-        <div class="layui-inline">
-          <label class="layui-form-label">单位</label>
-          <div class="layui-input-inline">
-            <input type="text" name="department" autocomplete="off" class="layui-input">
-          </div>
-        </div>
-        <div class="layui-inline">
-          <label class="layui-form-label">销售人员</label>
-          <div class="layui-input-inline">
-            <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true } %>
-          </div>
-        </div>
-        <div class="layui-inline">
-          <label class="layui-form-label">项目类型</label>
-          <div class="layui-input-inline">
-            <%= select_tag "business_type", options_for_select(EducodeSales::Common.where(clazz: 'business_type').pluck(:name, :id), params[:clazz_id]), { 'lay-filter': 'clazz_id', include_blank: true } %>
-          </div>
-        </div>
-        <div class="layui-inline m-t-10">
-          <label class="layui-form-label">项目阶段</label>
-          <div class="layui-input-inline">
-            <%= select_tag "business_step", options_for_select(EducodeSales::Common.where(clazz: 'business_step').pluck(:name, :id)), { include_blank: true } %>
-          </div>
-        </div>
-        <div class="layui-inline">
-          <label class="layui-form-label">渠道名称</label>
-          <div class="layui-input-inline">
-            <%= select_tag "place_id", options_for_select(EducodeSales::Place.pluck(:name, :id),params[:place_id]), { include_blank: true } %>
-          </div>
-        </div>
-        <div class="layui-inline">
-          <label class="layui-form-label">区域</label>
-          <div class="layui-input-inline">
-            <%= select_tag "area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
-          </div>
-        </div>
-        <div class="layui-inline">
-          <label class="layui-form-label">起止时间</label>
-          <div class="layui-input-inline">
-            <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">
-          </div>
-        </div>
-        <div class="layui-inline">
-          <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
-          </button>
-          <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">搜索
-          </button>
+<div class="layui-tab" lay-filter="operation_tab">
+  <ul class="layui-tab-title">
+    <li class="layui-this follows_li">跟进动态</li>
+    <li class="businesses_list_li" >商机列表</li>
+  </ul>
+  <div class="layui-tab-content">
+    <div class="layui-tab-item follows_div layui-show">
+<!--      跟进动态-->
+      <%=render 'follows' %>
+    </div>
+    <div class="layui-tab-item businesses_list_div">
+<!--商机列表-->
+      <div class="min-height-table">
+        <div style="margin: 10px 10px 10px 10px">
+          <form class="layui-form layui-form-pane" lay-filter="search_form">
+            <div class="layui-form-item">
+              <div class="layui-inline">
+                <label class="layui-form-label">商机名称</label>
+                <div class="layui-input-inline">
+                  <input type="text" name="name" autocomplete="off" class="layui-input" value="<%=params[:name] %>">
+                </div>
+              </div>
+              <div class="layui-inline">
+                <label class="layui-form-label">单位</label>
+                <div class="layui-input-inline">
+                  <input type="text" name="department" autocomplete="off" value="<%=params[:school] %>" class="layui-input">
+                </div>
+              </div>
+              <div class="layui-inline">
+                <label class="layui-form-label">销售人员</label>
+                <div class="layui-input-inline">
+                  <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true } %>
+                </div>
+              </div>
+              <div class="layui-inline">
+                <label class="layui-form-label">项目类型</label>
+                <div class="layui-input-inline">
+                  <%= select_tag "business_type", options_for_select(EducodeSales::Common.where(clazz: 'business_type').pluck(:name, :id), params[:clazz_id]), { 'lay-filter': 'clazz_id', include_blank: true } %>
+                </div>
+              </div>
+              <div class="layui-inline">
+                <label class="layui-form-label">项目阶段</label>
+                <div class="layui-input-inline">
+                  <%= select_tag "business_step", options_for_select(EducodeSales::Common.where(clazz: 'business_step').pluck(:name, :id)), { include_blank: true } %>
+                </div>
+              </div>
+              <div class="layui-inline">
+                <label class="layui-form-label">渠道名称</label>
+                <div class="layui-input-inline">
+                  <div id="index_place" style="width: 190px;"></div>
+                </div>
+              </div>
+              <div class="layui-inline">
+                <label class="layui-form-label">区域</label>
+                <div class="layui-input-inline">
+                  <%= select_tag "area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
+                </div>
+              </div>
+              <div class="layui-inline">
+                <label class="layui-form-label">起止时间</label>
+                <div class="layui-input-inline">
+                  <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">
+                </div>
+              </div>
+              <div class="layui-inline">
+                <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
+                </button>
+                <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">搜索
+                </button>
+              </div>
+            </div>
+          </form>
         </div>
+        <table class="layui-hide" id="businesses_table" lay-filter="businesses_table"></table>
       </div>
-    </form>
+    </div>
   </div>
-
-  <table class="layui-hide" id="businesses_table" lay-filter="businesses_table"></table>
 </div>
 <script type="text/html" id="bussinessBar">
   <div class="layui-btn-container">
@@ -109,6 +123,60 @@
         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');
+      }
+
+        var index_place_list = xmSelect.render({
+            el: '#index_place',
+            model: {
+                icon: 'hidden',
+                label: {
+                    type: 'text',
+                    text: {
+                        //左边拼接的字符
+                        left: '',
+                        //右边拼接的字符
+                        right: '',
+                        //中间的分隔符
+                        separator: ', ',
+                    },
+                }
+            },
+            remoteSearch: true,
+            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});
+                        }
+
+                    }
+                })
+            }
+        })
+            index_place_list.setValue(gon.place)
+
+
       table = layui.table;
       table.render({
           elem: '#businesses_table',
@@ -128,17 +196,20 @@
               {
                 field: 'name',
                 width: 170,
-                title: '名称'
+                  title: '名称',
+                  templet:'<div><span title="{{d.name}}">{{d.name}}</span></div>'
               },
               {
                 field: 'school',
                 width: 150,
                 title: '单位',
+                  templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
               },
               {
                 field: 'department',
                 width: 150,
-                title: '部门'
+                title: '部门',
+                  templet:'<div><span title="{{d.department}}">{{d.department}}</span></div>'
               },
               {
                 field: 'follow_ups_count',
@@ -156,7 +227,8 @@
               {
                 field: 'clazz',
                 width: 80,
-                title: '类型'
+                title: '类型',
+                  templet:'<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>'
               },
               {
                 field: 'stage',
@@ -210,8 +282,8 @@
               },
               {
                 field: 'place',
-                width: 80,
-                title: '渠道'
+                width: 160,
+                title: '渠道',
               },
               {
                 field: 'source',
@@ -403,7 +475,8 @@
 
         // 监听搜索操作
         form.on('submit(search_bussiness)', function (data) {
-          search = data.field
+            data.field.place_id = index_place_list.getValue('valueStr');
+            search = data.field
             console.log(search);
             table.reload('businesses_table', {
             page: {
@@ -411,6 +484,15 @@
             },
             where: {q: search, sort: sort}
           }, 'data');
+            table.reload('teachers_table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: search, sort: sort}
+            }, 'data');
+            form.val('search_follows', {
+                name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area
+            })
 
           return false;
         });
@@ -626,4 +708,11 @@
     .layui-table-tool-temp{
         padding-right: 30px; !important;
     }
+    .layui-table-fixed .layui-table-body {
+        height: auto!important;
+    }
+    .layui-table-fixed.layui-hide {
+        display: block!important;
+    }
+
 </style>

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

@@ -10,7 +10,7 @@ json.data do
     json.follow_up_id d.last_follow_up_id
     # json.teachers_count d.follow_ups.sum(:key_people_count)
     # json.teachers_count EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).present? ? EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).key_people_count : 0
-    json.clazz d.last_follow_up&.clazz&.name
+    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

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

@@ -10,6 +10,9 @@
       <label class="layui-form-label required">单位部门</label>
       <div class="layui-input-block" id="add_department" style="width: 300px;"></div>
     </div>
+     <div class="layui-inline" >
+       <a href="/missions/customers" style=" color: #0000FF">添加单位/部门</a>
+     </div>
      <br>
       <div class="layui-inline" style="padding-top: 20px">
         <label class="layui-form-label ">商机来源</label>

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

@@ -83,10 +83,10 @@
       </div>
     </div>
     <br>
-    <div class="layui-inline">
+    <div class="layui-inline new_place_select">
       <label class="layui-form-label">渠道</label>
-      <div class="layui-input-inline">
-        <%= select_tag "place_id", options_for_select(@places, @last_follow_up&.place_id), include_blank: true %>
+      <div class="layui-input-inline" style="z-index: 101">
+        <div id="place" style="width: 190px;"></div>
       </div>
     </div>
     <div class="layui-inline">
@@ -94,6 +94,15 @@
       <div class="layui-input-inline">
         <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount%>">
       </div>
+    </div>
+    <div class="layui-form-item">
+    <div class="layui-inline">
+      <label class="layui-form-label required">所属年度</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="year" autocomplete="off"  lay-verify="required" id="year"
+               value="<%= @last_follow_up&.year%>"
+               placeholder="请选择年度">      </div>
+    </div>
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
@@ -147,6 +156,10 @@
       xmSelect = layui.xmSelect,
       $ = layui.$;
 
+      laydate.render({
+        elem: '#year',
+          type: 'year'
+      })
       laydate.render({
         elem: '#invitation_at_add'
       })
@@ -182,18 +195,63 @@
           })
         }
       })
+      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();
 
       form.on('submit(add_follow_up)', function (data) {
-        var assign_follow = [];
+          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 %>";
-        request.authPost("missions/follow_ups", data.field, function (res) {
+        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 {
@@ -201,6 +259,7 @@
             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')
           }
         })
 
@@ -209,4 +268,9 @@
       });
 
   });
-</script>
+</script>
+<style>
+    .new_place_select xm-select > .xm-body{
+        width: 300px; !important;
+    }
+</style>

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

@@ -74,7 +74,7 @@
 
       table.render({
           elem: '#sale_plan_follow_table',
-          url: '/missions/businesses/show_follow?id=' + parent.id ,
+          url: '/missions/businesses/show_follow?id=' + parent.business_id ,
           toolbar: '#toolbarDemo_follow',
           defaultToolbar: ['filter'],
           cols: [
@@ -117,6 +117,11 @@
                     title: '回款计划',
                     templet: '#edit_plan'
                 },
+                {
+                    field: 'description',
+                    width: 120,
+                    title: '最新进展',
+                },
               {
                 field: 'invitation_at',
                 width: 110,
@@ -160,7 +165,7 @@
 
               {
                 field: 'place',
-                width: 200,
+                width: 400,
                 title: '渠道',
               },
               {
@@ -198,7 +203,7 @@
       table.on('toolbar(sale_plan_follow_table)', function (obj) {
         if (obj.event === 'add') { // 监听添加操作
             business_id = parent.business_id
-            var content = miniPage.getHrefContent('/missions/businesses/new_follow_record?id=' + parent.id);
+            var content = miniPage.getHrefContent('/missions/businesses/new_follow_record?id=' + parent.business_id);
           var openWH = miniPage.getOpenWidthHeight();
           sale_plan_index = layer.open({
             title: '添加商机跟进记录',
@@ -220,7 +225,7 @@
             layer.closeAll()
             business_id = parent.business_id
             business_name = parent.business_name
-            var content = miniPage.getHrefContent('/missions/businesses/time_line?business_id=' + id);
+            var content = miniPage.getHrefContent('/missions/businesses/time_line?business_id=' + parent.business_id);
             var openWH = miniPage.getOpenWidthHeight();
             sindex = layer.open({
                 title: '商机列表/'+ parent.business_name +'的跟进时间线',
@@ -248,6 +253,7 @@
                   layer.close(index);
                     table.reload("businesses_table");
                     table.reload("sale_plan_follow_table");
+                    table.reload('teachers_table')
                 })
               });
           } else if (obj.event === 'show') { // 监听添加操作
@@ -335,34 +341,33 @@
        // 未完成计划
          table.render({
             elem: '#unfinish_table',
-            url: '/missions/businesses/' + parent.id + "/unfinish_plans",
+            url: '/missions/businesses/' + parent.business_id + "/unfinish_plans",
             toolbar: '#unfinish_table_tabar',
             defaultToolbar: [],
             cols: [
               [
                 {
                   field: 'id',
-                  width: 80,
+                  width: 60,
                   title:'序号',type: 'numbers',
                 },
                 {
                   field: 'staff',
-                  width: 140,
+                  width: 100,
                   title: '姓名'
                 },
                 {
                   field: 'month',
-                  width: 120,
+                  width: 100,
                   title: '月份',
                 },
                 {
                   field: 'weekly',
-                  width: 120,
+                  width: 100,
                   title: '周次'
                 },
                 {
                   field: 'content',
-                  width: 300,
                   title: '计划内容'
                 },
                 {

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

@@ -18,6 +18,7 @@ json.data do
     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
+    json.description d.description
   end
 end
 

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

@@ -78,6 +78,14 @@
         <%= @follow_up.divide_amount %>万
       </div>
     </div>
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">所属年度</label>
+        <div class="layui-input-inline">
+          <%= @follow_up&.year %>年
+        </div>
+      </div>
+    </div>
     <div class="ayui-form-item">
       <label class="layui-form-label" style="width: 85px;">指定跟进人：</label>
       <div class="layui-input-inline">

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

@@ -43,7 +43,7 @@
     function demo(){
         layer.closeAll()
         business_id = parent.business_id
-        var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);
+        var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + parent.business_id);
         var openWH = miniPage.getOpenWidthHeight();
         sindex = layer.open({
             title: '商机列表/'+ parent.business_name +'的跟进记录',

data/app/views/educode_sales/customers/edit.html.erb

@@ -0,0 +1,60 @@
+<%#= Gon::Base.render_data %>
+<form class="layui-form " action="">
+  <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-form-item">
+      <label class="layui-form-label required">负责区域</label>
+      <div class="layui-input-block">
+        <div id="area_edit" class="demo-transfer"></div>
+      </div>
+    </div>
+    <div class="layui-inline" style="padding-left: 30px">
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="submits">提交
+      </button>
+    </div>
+  </div>
+</form>
+
+
+<script>
+
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            transfer = layui.transfer,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            $ = layui.$;
+
+        form.render();
+
+        // 当前弹出层，防止ID被覆盖
+        var parentIndex = layer.index;
+
+
+
+
+        //监听提交
+        form.on('submit(submits)', function (data) {
+
+            var area_ids = []
+            layui.each(transfer.getData('area_list'), function (i, v) {
+                area_ids.push(v.value)
+            })
+            if (area_ids.length == 0) {
+                layer.alert("请选择负责区域");
+                return false;
+            }
+            data.field['area_ids'] = area_ids;
+            request.authPut("missions/places/" + data.field.id, data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.closeAll();
+                    table.reload('place')
+                }
+            })
+            return false;
+        });
+    });
+</script>