educode_sales 0.5.6 → 0.6.0

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

@@ -4,25 +4,25 @@
       <div class="layui-inline">
         <label class="layui-form-label">所属商机</label>
         <div class="layui-input-inline">
-          <input type="text" name="follows_business" autocomplete="off" class="layui-input">
+          <input type="text" name="name" autocomplete="off" class="layui-input">
         </div>
       </div>
       <div class="layui-inline">
         <label class="layui-form-label">单位</label>
         <div class="layui-input-inline">
-          <input type="text" name="follows_department" autocomplete="off" class="layui-input">
+          <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 "follows_staff_id", options_for_select(@staffs, params[:follows_staff_id]), { 'lay-filter': 'follows_staff_id', include_blank: true } %>
+          <%= 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 "follows_area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
+          <%= select_tag "area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
         </div>
       </div>
       <div class="layui-inline">
@@ -80,6 +80,10 @@
             // where: {q: form.val('search_form')},
             toolbar: '#toolbarDemo_follows',
             defaultToolbar: ['filter'],
+            initSort: {
+                field: 'created_at' //排序字段，对应 cols 设定的各字段名
+                ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+            },
             cols: [
                 [
                     {
@@ -90,27 +94,43 @@
                     {
                         field: 'description',
                         title: '最新进展',
+                        templet:'<div><span title="{{d.description}}">{{d.description}}</span></div>'
                     },
                     {
                         field: 'advise',
-                        width: 170,
+                        width: 120,
                         title: '团队建议',
+                        templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
                     },
                     {
                         field: 'clazz',
                         width: 80,
-                        title: '类型'
+                        title: '类型',
+                        templet:'<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>'
                     },
                     {
                         field: 'stage',
                         title: '阶段',
                         width: 90,
+                        templet:'<div><span title="{{d.stage}}">{{d.stage}}</span></div>'
                     },
                     {
                         field: 'key_people',
                         width: 90,
                         title: '关键人',
-
+                        templet:'<div><span title="{{d.key_people}}">{{d.key_people}}</span></div>'
+                    },
+                    {
+                        field: 'business',
+                        width: 120,
+                        title: '所属商机',
+                        templet:'#business'
+                    },
+                    {
+                        field: 'school',
+                        width: 120,
+                        title: '单位',
+                        templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
                     },
                     {
                         field: 'staff',
@@ -119,15 +139,11 @@
                     },
                     {
                         field: 'created_at',
-                        width: 170,
+                        width: 120,
                         title: '跟进时间',
                         sort: true,
-                    },
-                    {
-                        field: 'business',
-                        width: 150,
-                        title: '所属商机',
-                        templet:'#business'
+                        templet:'<div><span title="{{d.created_at}}">{{d.created_at}}</span></div>'
+
                     },
                     {
                         title: '操作',
@@ -169,17 +185,26 @@
                 },
                 where: {q: search, sort: sort}
             }, 'data');
+            table.reload('businesses_table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: search, sort: sort}
+            }, 'data');
+            form.val('search_form', {
+                name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area
+            })
             return false;
         });
 
         form.on('submit(reset_follows_search)', function (data) {
             var field = data.field;
             form.val('search_follows', {
-                follows_area: "",
+                area: "",
                 follows_date: "",
-                follows_business: "",
-                follows_department: "",
-                follows_staff_id: ""
+                name: "",
+                department: "",
+                staff_id: ""
             })
             return false;
         });

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

@@ -77,7 +77,7 @@
       </div>
     </div>
     <br>
-    <div class="layui-inline">
+    <div class="layui-inline place_select">
       <label class="layui-form-label">渠道</label>
       <div class="layui-input-inline" style="z-index: 101">
         <div id="edit_place" style="width: 190px;"></div>
@@ -89,6 +89,15 @@
         <input name="divide_amount" class="layui-input" value="<%= @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"  lay-verify="required" autocomplete="off" id="edit_year"
+                 value="<%= @follow_up&.year%>"
+                 placeholder="请选择年度">      </div>
+      </div>
+    </div>
     <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
       <div class="layui-input-inline">
@@ -141,6 +150,10 @@
     laydate.render({
       elem: '#invitation_at_edit'
     })
+    laydate.render({
+      elem: '#edit_year',
+        type: 'year'
+    })
 
     laydate.render({
       elem: '#reception_at_edit'
@@ -234,6 +247,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')
         }
       })
 
@@ -242,4 +256,9 @@
     });
 
   });
-</script>
+</script>
+<style>
+    .place_select xm-select > .xm-body{
+        width: 300px; !important;
+    }
+</style>

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

@@ -23,7 +23,7 @@
               <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">
+                  <input type="text" name="department" autocomplete="off" value="<%=params[:school] %>" class="layui-input">
                 </div>
               </div>
               <div class="layui-inline">
@@ -38,7 +38,7 @@
                   <%= 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">
+              <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 } %>
@@ -123,7 +123,7 @@
         range: true
       });
 
-         var is_show = <%=params[:name].present? || params[:clazz_id].present? %>
+         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');
@@ -174,6 +174,7 @@
                 })
             }
         })
+            index_place_list.setValue(gon.place)
 
 
       table = layui.table;
@@ -195,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',
@@ -223,7 +227,8 @@
               {
                 field: 'clazz',
                 width: 80,
-                title: '类型'
+                title: '类型',
+                  templet:'<div><span title="{{d.clazz}}">{{d.clazz}}</span></div>'
               },
               {
                 field: 'stage',
@@ -278,7 +283,7 @@
               {
                 field: 'place',
                 width: 160,
-                title: '渠道'
+                title: '渠道',
               },
               {
                 field: 'source',
@@ -479,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;
         });
@@ -694,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,7 +83,7 @@
       </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" style="z-index: 101">
         <div id="place" style="width: 190px;"></div>
@@ -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'
       })
@@ -246,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')
           }
         })
 
@@ -254,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

@@ -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: '渠道',
               },
               {
@@ -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') { // 监听添加操作
@@ -342,27 +348,26 @@
               [
                 {
                   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/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>

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

@@ -0,0 +1,54 @@
+<div class="layuimini-main">
+  <form class="layui-form  layuimini-form" action="">
+    <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-form-item" style="padding: 25px">
+      <div class="layui-inline">
+        <label class="layui-form-label required">部门名称</label>
+        <div class="layui-input-block" style="width: 300px;">
+          <input type="text" name="department_name" required lay-verify="required" autocomplete="off" placeholder="请输入"
+                 class="layui-input" id="inputFocus" value="<%=@department.name %>">
+        </div>
+      </div>
+      </div>
+      <div class="layui-form-item" style="padding-left: 130px">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-edit">提交
+        </button>
+      </div>
+    </div>
+  </form>
+</div>
+
+<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,
+            laydate = layui.laydate,
+            $ = layui.$;
+
+
+
+        form.render();
+
+        // 当前弹出层，防止ID被覆盖
+        var parentIndex = layer.index;
+
+
+        //监听提交
+        form.on('submit(data-edit)', function (data) {
+            request.authPut("missions/customers/"+ parent.department_id +"/update_department", data.field, function (res) {
+                if (res.success === false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.edit_index1);
+                    table.reload('sale_plan_follow_table')
+                }
+            })
+            return false;
+        });
+    });
+</script>

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

@@ -0,0 +1,50 @@
+<h1 class="text-center" style="padding: 25px"><%=@school.name %></h1>
+<form class="layui-form layuimini-form " action="">
+  <div class="layui-form-item layui-form-text" style="padding-right: 30px">
+    <label class="layui-form-label required">跟进内容</label>
+    <div class="layui-input-block">
+      <textarea name="content" placeholder="请输入跟进内容" lay-verify="required" style="height: 200px" class="layui-textarea" ><%=@follow_up.content %></textarea>
+    </div>
+  </div>
+  <div class="layui-form-item ">
+    <label class="layui-form-label">跟进部门</label>
+    <div class="layui-input-inline" style="width: 300px;">
+      <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id),@follow_up.department_id)%>
+    </div>
+  </div>
+  <div class="layui-form-item " style="padding-left: 110px">
+    <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit_follow_up">提交
+    </button>
+  </div>
+</form>
+<script>
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            laydate = layui.laydate,
+            $ = layui.$;
+
+
+        form.render();
+
+        form.on('submit(edit_follow_up)', function (data) {
+            request.authPut("missions/customer_follows/<%= @follow_up.id%>", data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.editFollowIndex);
+                    parent.layer.close(parent.layer.getFrameIndex(window.name))
+                    parent.table.reload('customers_table')
+                    parent.table.reload('unfinish_table')
+                }
+            })
+
+
+            return false;
+        });
+
+    });
+</script>

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

@@ -0,0 +1,51 @@
+<%= Gon::Base.render_data %>
+<form class="layui-form " action="">
+  <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-inline">
+      <label class="layui-form-label required">负责人</label>
+      <div class="layui-input-block">
+        <%= select_tag "staff_id", options_for_select(@staffs), { include_blank: true } %>
+      </div>
+    </div>
+    <div class="layui-inline" style="padding-left: 30px">
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
+      </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(data-reset-btn)', function (data) {
+            var school_ids = parent.ids
+            data.field['school_ids'] = school_ids;
+            console.log(data.field);
+            request.authPost("missions/customer_extensions", data.field, function (res) {
+                if (res.success === false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.closeAll(); //关闭所有层
+                    table.reload('customers_table')
+                }
+            })
+            return false;
+        });
+    });
+</script>