educode_sales 0.5.4 → 0.5.8

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

@@ -52,24 +52,23 @@
                 {
                   field: 'name',
                   title: '活动名称',
-                  width: 400,
                   templet: '#teachers'
                 },
                 {
                   field: 'start_at',
-                  width: 120,
+                  width: 200,
                   title: '时间',
                   sort: true,
                 },
                 {
                   field: 'days',
                   title: '天数',
-                  width: 100
+                  width: 200
                 },
                 {
                   field: 'teachers_count',
                   title: '教师数',
-                  width: 100,
+                  width: 200,
                     totalRow:true,
                   templet: '#teachers_count'
                 },
@@ -77,7 +76,7 @@
                   field: 'students_count',
                   title: '学生数',
                     totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
-                  width: 100
+                  width: 200
                 },
                 {
                   title: '操作',

data/app/views/educode_sales/activities/show_teachers.html.erb

@@ -2,7 +2,7 @@
 <script type="text/html" id="teacher_toolbar">
   <div class="layui-btn-container">
     <span class="table-label">教师列表</span>
-    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="search_new"> 添加
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="search_new"> 添加教师
     </button>
   </div>
 </script>

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

@@ -0,0 +1,255 @@
+<div style="margin: 10px 10px 10px 10px">
+  <form class="layui-form layui-form-pane" lay-filter="search_follows">
+    <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">
+        </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 "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="follows_date" name="follows_date" autocomplete="off" placeholder=" - ">
+        </div>
+      </div>
+
+      <div class="layui-inline">
+        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_follows_search">重置
+        </button>
+        <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_follows">搜 索
+        </button>
+      </div>
+    </div>
+  </form>
+</div>
+<div class="">
+  <table class="layui-hide" id="teachers_table" style="min-height: 300px;" lay-filter="teachers_table"></table>
+</div>
+<script type="text/html" id="toolbarDemo_follows">
+  <div class="layui-btn-container">
+    <span class="table-label">跟进动态</span>
+  </div>
+</script>
+<script type="text/html" id="currentTableBar_follows">
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">详情</a>
+</script>
+<script type="text/html" id="business">
+  <a href="javascript:void(0);" lay-event="business" class="layui-table-link">{{ d.business }}</a>
+</script>
+
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            request = layui.request,
+            dropdown = layui.dropdown,
+            miniPage = layui.miniPage,
+            laydate = layui.laydate;
+
+        var laydate = layui.laydate;
+
+        laydate.render({
+            elem: '#follows_date',
+            range: true
+        });
+
+        table = layui.table;
+        table.render({
+            elem: '#teachers_table',
+            url: '/missions/follow_ups',
+            // where: {q: form.val('search_form')},
+            toolbar: '#toolbarDemo_follows',
+            defaultToolbar: ['filter'],
+            initSort: {
+                field: 'created_at' //排序字段，对应 cols 设定的各字段名
+                ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+            },
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        width: 60,
+                        title:'序号',type: 'numbers',
+                    },
+                    {
+                        field: 'description',
+                        title: '最新进展',
+                        templet:'<div><span title="{{d.description}}">{{d.description}}</span></div>'
+                    },
+                    {
+                        field: 'advise',
+                        width: 170,
+                        title: '团队建议',
+                        templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
+                    },
+                    {
+                        field: 'clazz',
+                        width: 80,
+                        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: 150,
+                        title: '所属商机',
+                        templet:'#business'
+                    },
+                    {
+                        field: 'school',
+                        width: 150,
+                        title: '单位',
+                    },
+                    {
+                        field: 'staff',
+                        width: 90,
+                        title: '跟进人',
+                    },
+                    {
+                        field: 'created_at',
+                        width: 170,
+                        title: '跟进时间',
+                        sort: true,
+                    },
+                    {
+                        title: '操作',
+                        width: 80,
+                        toolbar: '#currentTableBar_follows',
+                        align: "center",
+                        fixed: 'right'
+                    }
+                ]
+            ],
+            limit: 20,
+            limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true,
+        });
+
+
+
+
+
+        var sort = {}, search = {};
+        table.on('sort(teachers_table)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('teachers_table', {
+                initSort: obj,
+                where: {
+                    sort: sort,
+                    q: search
+                }
+            });
+        })
+
+        // 监听搜索操作
+        form.on('submit(search_follows)', function (data) {
+            search = data.field
+            table.reload('teachers_table', {
+                page: {
+                    curr: 1
+                },
+                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', {
+                area: "",
+                follows_date: "",
+                name: "",
+                department: "",
+                staff_id: ""
+            })
+            return false;
+        });
+        table.on('tool(teachers_table)', function (obj) {
+            var data = obj.data;
+            id = data.id
+            if (obj.event === 'add_event') { // 监听添加操作
+                var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + data.id);
+                var openWH = miniPage.getOpenWidthHeight();
+                show_index = layer.open({
+                    title: '查看商机跟进记录',
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: [openWH[0] + 'px', openWH[1] + 'px'],
+                    offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                    content: content
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }  else if (obj.event === 'business') {
+                console.log(data);
+                business_id = data.business_id
+                business_name = data.business
+                content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
+                openWH = miniPage.getOpenWidthHeight();
+                index = layer.open({
+                    title: '商机列表/' + data.business + '的跟进记录',
+                    type: 1,
+                    shade: 0.2,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: [openWH[0] + 'px', openWH[1] + 'px'],
+                    offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                    content: content
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }
+        });
+
+    });
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 30px; !important;
+    }
+</style>

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

@@ -77,10 +77,10 @@
       </div>
     </div>
     <br>
-    <div class="layui-inline">
+    <div class="layui-inline place_select">
       <label class="layui-form-label">渠道</label>
-      <div class="layui-input-inline">
-        <%= select_tag "place_id", options_for_select(@places, @follow_up.place_id), include_blank: true %>
+      <div class="layui-input-inline" style="z-index: 101">
+        <div id="edit_place" style="width: 190px;"></div>
       </div>
     </div>
     <div class="layui-inline">
@@ -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">所属年度</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" name="year" 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'
@@ -174,6 +187,49 @@
       }
     })
     sales_list.setValue(gon.sales)
+    var places_list = xmSelect.render({
+      el: '#edit_place',
+      remoteSearch: true,
+      clickClose: true,
+        model: {
+            icon: 'hidden',
+            label: {
+                type: 'text',
+                text: {
+                    //左边拼接的字符
+                    left: '',
+                    //右边拼接的字符
+                    right: '',
+                    //中间的分隔符
+                    separator: ', ',
+                },
+            }
+        },
+      delay: 1000,
+        radio: true,
+      paging: 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});
+            }
+          }
+        })
+      }
+    })
+    places_list.setValue(gon.place)
 
     form.render();
     form.on('submit(update_follow_up)', function (data) {
@@ -181,8 +237,9 @@
       sales_list.getValue().forEach(function(d) {
         assign_follow.push(d.value);
       })
-      data.field.assign_follow_up = assign_follow;
-      request.authPut("missions/follow_ups/<%= @follow_up.id%>", data.field, function (res) {
+        data.field.assign_follow_up = assign_follow;
+        data.field.place_id = places_list.getValue()[0].value;
+        request.authPut("missions/follow_ups/<%= @follow_up.id%>", data.field, function (res) {
         if (res.success == false) {
           layer.alert(res.msg)
         } else {
@@ -190,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')
         }
       })
 
@@ -198,4 +256,9 @@
     });
 
   });
-</script>
+</script>
+<style>
+    .place_select xm-select > .xm-body{
+        width: 300px; !important;
+    }
+</style>

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

@@ -118,16 +118,14 @@
             var id = data.id
             name = data.disk_filename
             folder = gon.folder
-            console.log(folder);
             if (obj.event === 'preview') {
                 if (data.content_type.split("/")[0] === "image"){
                     layer.photos({
-                        photos: { "data": [{"src": '/images/educode_sales/' + name}] }
+                        photos: { "data": [{"src": '/files/educode_sales/' + name}] }
                         ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机
                     });
                 }else if (data.content_type.split("/")[1] === "pdf"){
-                    var pdf = '/images/educode_sales/' + name;
-                    console.log(pdf);
+                    var pdf = '/files/educode_sales/' + name;
                     var openWH = miniPage.getOpenWidthHeight();
                     layer.open({
                         title: data.name,