educode_sales 0.4.6 → 0.5.0

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

@@ -41,6 +41,21 @@
           id="invitation_at_edit" placeholder="请选择日期">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">中标时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" value="<%= @follow_up.bidded_date %>" name="bidded_date"
+          id="invitation_at_edit" placeholder="请选择日期">
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">签单时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" value="<%= @follow_up.signed_date %>" name="signed_date"
+          id="invitation_at_edit" placeholder="请选择日期">
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label">验收时间</label>
       <div class="layui-input-inline">

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

@@ -0,0 +1,154 @@
+<script type="text/html" id="toolbarDemo">
+  <div class="layui-btn-container">
+    <span class="table-label">附件信息</span>
+    <%# if can? :create, EducodeSales::file %>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="upload_file">上传文件</button>
+    <%# end %>
+  </div>
+</script>
+
+<table class="layui-hide" id="file" lay-filter="file"></table>
+
+<script type="text/html" id="currentTableBar_file">
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="preview">预览</a>
+  <a href="/missions/upload_files/download?id={{d.id}}" class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="download">下载</a>
+    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+</script>
+
+<script type="text/html" id="showchance">
+  <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}</a>
+</script>
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            upload = layui.upload;
+        miniPage = layui.miniPage;
+
+
+        var business_id = parent.id
+        table.render({
+            elem: '#file',
+            url: '/missions/upload_files?business_id='+business_id,
+            toolbar: '#toolbarDemo',
+            defaultToolbar: [],
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        width: 80,
+                        title:'序号',type: 'numbers',
+                    },
+                    {
+                        field: 'name',
+                        title: '文件名'
+                    },
+                    {
+                        field: 'size',
+                        width: 100,
+                        title: '文件大小',
+                    },
+                    {
+                        field: 'created_on',
+                        width: 200,
+                        title: '上传时间',
+                        sort: true
+                    },
+                    {
+                        field: 'upload_person',
+                        width: 80,
+                        totalRow:true,
+                        title: '上传人',
+                    },
+                    {
+                        title: '操作',
+                        width: 200,
+                        toolbar: '#currentTableBar_file',
+                        align: "center"
+                    }
+                ]
+            ],
+            limit: 20,
+            limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true
+        });
+
+
+        var sort = {};
+        table.on('sort(file)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('file', {
+                initSort: obj,
+                where: {
+                    sort: sort
+                }
+            });
+        })
+
+
+        table.on('toolbar(file)', function (obj) {
+            if (obj.event === 'upload_file') {  //
+                id =parent.id
+                var content = miniPage.getHrefContent('/missions/businesses/upload_file');
+                var openWH = miniPage.getOpenWidthHeight();
+                import_index = layer.open({
+                    title: '上传文件',
+                    type: 1,
+                    shade: 0.2,
+                    shadeClose: true,
+                    area: ['200px', '100px'],
+                    offset: 'auto',
+                    closeBtn: 0,
+                    content: content,
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }
+        });
+
+
+
+        table.on('tool(file)', function (obj) {
+            var data = obj.data;
+            var id = data.id
+            name = data.disk_filename
+            if (obj.event === 'preview') {
+                if (data.content_type.split("/")[0] === "image"){
+                    // var img = "<img src='/images/" + name + "' />";
+                    layer.photos({
+                        photos: { "data": [{"src": '/images/'+name}] }
+                        ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机
+                    });
+                }else if (data.content_type.split("/")[1] === "pdf"){
+                    var pdf = '/images/' + name;
+                    console.log(pdf);
+                    var openWH = miniPage.getOpenWidthHeight();
+                    layer.open({
+                        title: data.name,
+                        type: 2,
+                        area: ['1000px', '750px'],
+                        fixed: false, //不固定
+                        maxmin: true,
+                        content: pdf
+                    });
+                }else{
+                    layer.msg("附件不支持预览，请下载查看！")
+                }
+                return false;
+            }else if (obj.event === 'delete') {
+                layer.confirm('确定删除' + data.name, function (index) {
+                    request.delete('missions/upload_files/' + data.id + '?disk_filename=' + data.disk_filename, {}, function (res) {
+                        layer.close(index);
+                        table.reload("file")
+                    })
+                });
+            }
+        });
+
+    });
+</script>

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

@@ -5,7 +5,7 @@
         <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">
+            <input type="text" name="name" autocomplete="off" class="layui-input" value="<%=params[:name] %>">
           </div>
         </div>
         <div class="layui-inline">
@@ -114,9 +114,9 @@
           elem: '#businesses_table',
           url: '/missions/businesses',
           where: {q: form.val('search_form')},
+          defaultToolbar: ['filter'],
           toolbar: '#bussinessBar',
           totalRow: true,//开启合并行
-          defaultToolbar: [],
           cols: [
             [
               {
@@ -132,18 +132,18 @@
               },
               {
                 field: 'school',
-                width: 200,
+                width: 150,
                 title: '单位',
               },
               {
                 field: 'department',
-                width: 140,
+                width: 150,
                 title: '部门'
               },
               {
                 field: 'follow_ups_count',
                 title: '跟进',
-                width: 100,
+                width: 60,
                 templet: '#show_follow',
                   totalRow: true,
               },
@@ -155,12 +155,12 @@
               // },
               {
                 field: 'clazz',
-                width: 120,
+                width: 80,
                 title: '类型'
               },
               {
                 field: 'stage',
-                width: 100,
+                width: 90,
                 title: '阶段'
               },
               {
@@ -169,6 +169,16 @@
                 title: '招标时间',
                 sort: true
               },
+              {
+                field: 'bidded_date',
+                width: 105,
+                title: '中标时间',
+              },
+              {
+                field: 'signed_date',
+                width: 105,
+                title: '签单时间',
+              },
               {
                 field: 'reception_at',
                 width: 105,
@@ -191,17 +201,17 @@
               },
               {
                 field: 'place',
-                width: 110,
+                width: 80,
                 title: '渠道'
               },
               {
                 field: 'source',
-                width: 110,
+                width: 90,
                 title: '商机来源'
               },
               {
                 field: 'last_follow_person',
-                width: 120,
+                width: 100,
                 title: '最新跟进人'
               },
               {
@@ -248,6 +258,12 @@
             case 'edit':
               edit(id);
               break;
+            case 'file':
+              file(id, elem.data('name'));
+              break;
+            case 'time_line':
+              time_line(id, elem.data('name'));
+              break;
             case 'delete':
               deleteBusiness(id, elem.data('name'));
               break;
@@ -292,6 +308,41 @@
           layer.full(sindex);
         });
       }
+      function time_line(id,name) {
+        var content = miniPage.getHrefContent('/missions/businesses/time_line?business_id=' + id);
+        var openWH = miniPage.getOpenWidthHeight();
+        sindex = layer.open({
+            title: '商机列表/'+name+'的跟进时间线',
+          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(sindex);
+        });
+      }
+      function file(id, name) {
+          id = id
+          var content = miniPage.getHrefContent('/missions/businesses/file?business_id=' + id);
+        var openWH = miniPage.getOpenWidthHeight();
+        sindex = layer.open({
+          title: '商机列表/'+name+'的附件信息',
+          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(sindex);
+        });
+      }
 
       function month(id) {
         var content = miniPage.getHrefContent('/missions/plans/new_month?business_id=' + id);
@@ -533,6 +584,7 @@
                 });
             } else if (obj.event === 'show_follow') {
                 business_id = obj.data.id
+                 business_name = data.name
                 content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({

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

@@ -14,6 +14,8 @@ json.data do
     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
+    json.bidded_date d.last_follow_up&.bidded_date.to_s
+    json.signed_date d.last_follow_up&.signed_date.to_s
     json.total_amount d.last_follow_up&.total_amount
     json.return_money d.return_money
     json.place d.last_follow_up&.place&.name
@@ -22,7 +24,7 @@ json.data do
     json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
     json.current_staff_id @current_admin.id
     json.staff_id d.staff_id
-    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : d.created_at.to_s
   end
 end
 

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

@@ -42,6 +42,23 @@
           placeholder="请选择日期">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">中标时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="bidded_date" autocomplete="off" id="invitation_at_add"
+          value="<%= @last_follow_up&.bidded_date%>"
+          placeholder="请选择日期">
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">签单时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="signed_date" autocomplete="off" id="invitation_at_add"
+          value="<%= @last_follow_up&.signed_date%>"
+          placeholder="请选择日期">
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label">验收时间</label>
       <div class="layui-input-inline">

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

@@ -1,6 +1,8 @@
 <script type="text/html" id="toolbarDemo_follow">
   <div class="layui-btn-container">
     <span class="table-label">跟进记录</span>
+    <span class="table-label" style="padding-left: 200px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="time_line"> 时间线视图>></button>
     <% if can? :add_follow, EducodeSales::Business %>
       <% if @current_admin.is_admin %>
         <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
@@ -11,14 +13,16 @@
   </div>
 </script>
 <div class="edit-table">
-<table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
+  <div class="z-index">
+    <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
+  </div>
 <table class="layui-hide" id="unfinish_table" lay-filter="unfinish_table" style="min-height: 300px;"></table>
 </div>
 <script type="text/html" id="currentTableBar_follow">
   <% if can? :follow, EducodeSales::Business %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
   <% end %>
-  {{#  if(d.is_latest){ }}
+  {{#  if(d.is_latest && d.flag){ }}
   <% if can? :update_follow, EducodeSales::Business %>
     <% if @current_admin.is_admin %>
       <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
@@ -72,7 +76,7 @@
           elem: '#sale_plan_follow_table',
           url: '/missions/businesses/show_follow?id=' + parent.id ,
           toolbar: '#toolbarDemo_follow',
-          defaultToolbar: [],
+          defaultToolbar: ['filter'],
           cols: [
             [
               {
@@ -107,11 +111,27 @@
                 title: '关键人',
                 templet: '#add_keys'
               },
+                {
+                    field: 'money_plans_count',
+                    width: 120,
+                    title: '回款计划',
+                    templet: '#edit_plan'
+                },
               {
                 field: 'invitation_at',
                 width: 110,
                 title: '招标时间',
               },
+              {
+                field: 'bidded_date',
+                width: 110,
+                title: '中标时间',
+              },
+              {
+                field: 'signed_date',
+                width: 110,
+                title: '签单时间',
+              },
               {
                 field: 'reception_at',
                 width: 110,
@@ -137,12 +157,7 @@
                 width: 100,
                 title: '已回款',
               },
-              {
-                field: 'money_plans_count',
-                width: 120,
-                title: '回款计划',
-                templet: '#edit_plan'
-              },
+
               {
                 field: 'place',
                 width: 200,
@@ -201,6 +216,25 @@
           $(window).on("resize", function () {
               layer.full(index);
           });
+        } else if (obj.event === 'time_line') { // 监听添加操作
+            layer.closeAll()
+            business_id = parent.business_id
+            business_name = parent.business_name
+            var content = miniPage.getHrefContent('/missions/businesses/time_line?business_id=' + id);
+            var openWH = miniPage.getOpenWidthHeight();
+            sindex = layer.open({
+                title: '商机列表/'+ parent.business_name +'的跟进时间线',
+                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(sindex);
+            });
         }
       });
 
@@ -219,7 +253,7 @@
           } else if (obj.event === 'show') { // 监听添加操作
               var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + data.id);
               var openWH = miniPage.getOpenWidthHeight();
-              var index = layer.open({
+               show_index = layer.open({
                 title: '查看商机跟进记录',
                 type: 1,
                 shade: 0.2,
@@ -495,5 +529,8 @@
 
     });
 </script>
-
-
+<style>
+  .z-index .layui-table-tool{
+      z-index: 10000; !important;
+  }
+</style>

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

@@ -7,6 +7,8 @@ json.data do
     json.teachers_count d.key_people_count
     json.invitation_at d.invitation_at&.to_s(:date)
     json.reception_at d.reception_at&.to_s(:date)
+    json.bidded_date d.bidded_date&.to_s(:date)
+    json.signed_date d.signed_date&.to_s(:date)
     json.total_amount d.total_amount
     json.actual_amount d.actual_amount
     json.divide_amount d.divide_amount ? d.divide_amount : ""
@@ -15,6 +17,7 @@ json.data do
     json.money_plans_count d.money_plans_count
     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
   end
 end
 

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

@@ -1,6 +1,6 @@
 <h1 class="text-center m-t-20"><%= @follow_up.business.name %></h1>
 <form class="layui-form form-value">
-  <div class="layui-form-item" style="padding: 25px">
+  <div class="layui-form-item" style="padding: 10px 25px 0;">
     <div class="layui-inline">
       <label class="layui-form-label">单位：</label>
       <div class="layui-input-inline">
@@ -33,6 +33,19 @@
         <%= @follow_up.invitation_at.to_s %>
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">中标时间：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.bidded_date.to_s %>
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">签单时间：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.signed_date.to_s %>
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label">验收时间：</label>
       <div class="layui-input-inline">
@@ -96,4 +109,69 @@
       </div>
     </div>
   </div>
-</form>
+</form>
+<div  style=" text-align:center;">
+  <div class="layui-btn-group">
+
+    <%if @pre_id != 0 %>
+    <button type="button" class="layui-btn" onclick="pre_follow()">上一条</button>
+    <%else %>
+    <button type="button" class="layui-btn layui-btn-disabled layui-btn-radius">上一条</button>
+    <%end %>
+
+    <%if @next_id != 0 %>
+    <button type="button" class="layui-btn" onclick="next_follow()">下一条</button>
+    <%else %>
+    <button type="button" class="layui-btn layui-btn-disabled layui-btn-radius">下一条</button>
+    <%end %>
+
+  </div>
+</div>
+
+<script type="text/javascript" charset="utf-8">
+
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            miniPage = layui.miniPage;
+
+    });
+    function pre_follow(){
+        layer.close(parent.show_index)
+        var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + <%=@pre_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);
+        });
+    }
+    function next_follow(){
+        layer.close(parent.show_index)
+        var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + <%=@next_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);
+        });
+    }
+</script>

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

@@ -0,0 +1,62 @@
+<div class="layui-btn-container" style="padding-right: 200px;padding-top: 10px">
+<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" onclick="demo()"  >跟进记录列表>></button>
+</div>
+<div style="padding: 50px">
+  <ul class="layui-timeline">
+    <%if @follow_ups.present? %>
+  <%@follow_ups.each do |f| %>
+  <li class="layui-timeline-item">
+    <i class="layui-icon layui-timeline-axis">&#xe63f;</i>
+    <div class="layui-timeline-content layui-text">
+      <h3 class="layui-timeline-title"><%=f.created_at %>---<%=f.staff.user.real_name %></h3>
+      <p>
+        最新进展：<%=f.description %>
+        <br>
+        团队建议：<%=f.advise %>
+        <br>
+        项目类型：<%=f.clazz.name %>
+        <br>
+        项目阶段：<%=f.stage.name %>
+        <br>
+        关键人：<% teacher_ids =  f.key_person.present? ? f.key_person.pluck(:teacher_id) : [] %>
+               <%= EducodeSales::Teacher.where(id: teacher_ids).pluck(:name).join("、") %>
+      </p>
+    </div>
+  </li>
+    <%end %>
+      <%else %>
+      <h1 class="layui-timeline-title" style="text-align: center">暂无跟进记录</h1>
+  <%end %>
+</ul>
+</div>
+
+<script type="text/javascript" charset="utf-8">
+
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            miniPage = layui.miniPage;
+
+    });
+    function demo(){
+        layer.closeAll()
+        business_id = parent.business_id
+        var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);
+        var openWH = miniPage.getOpenWidthHeight();
+        sindex = layer.open({
+            title: '商机列表/'+ parent.business_name +'的跟进记录',
+            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(sindex);
+        });
+    }
+</script>