educode_sales 0.4.7 → 0.5.1

data/app/models/educode_sales/business.rb

@@ -1,10 +1,23 @@
 module EducodeSales
   class Business < ApplicationRecord
+
     belongs_to :staff
     belongs_to :department
     belongs_to :last_follow_up, class_name: 'FollowUp', optional: true
 
-    has_many :sale_plans, dependent: :destroy
-    has_many :follow_ups, dependent: :destroy
+    has_many :sale_plans
+    has_many :follow_ups
+
+    default_scope  -> {where(deleted_at: nil)}
+
+    def soft_destroy(user_id)
+      self.update(deleted_at: Time.now)
+      self.sale_plans.each do |d|
+        d.soft_destroy(user_id)
+      end
+      self.follow_ups.update_all(deleted_at: Time.now)
+      EducodeSales::Recycle.create(source: self, deleter_id: user_id)
+    end
+
   end
 end

data/app/models/educode_sales/common.rb

@@ -4,6 +4,10 @@ module EducodeSales
 
     XTYPE = "x_class"
     OTYPE = 'o_class'
+    ATYPE = 'a_class'
+    BTYPE = 'b_class'
+    CTYPE = 'c_class'
+    DTYPE = 'd_class'
 
     validates :name, uniqueness: {scope: :clazz, message: '已存在'}
     

data/app/models/educode_sales/follow_up.rb

@@ -1,14 +1,16 @@
 module EducodeSales
   class FollowUp < ApplicationRecord
+    include ::Deletable
     belongs_to :business, counter_cache: true
     belongs_to :place, optional: true
-    has_many :money_plans, dependent: :destroy
+    has_many :money_plans
     has_many :key_person
     has_many :teachers, through: :key_person
-    has_many :assign_follow_ups, dependent: :destroy
+    has_many :assign_follow_ups
     belongs_to :staff
     belongs_to :stage, class_name: 'Common'
     belongs_to :clazz, class_name: 'Common'
+    default_scope  -> {where(deleted_at: nil)}
 
 
   end

data/app/models/educode_sales/recycle.rb

@@ -0,0 +1,5 @@
+module EducodeSales
+  class Recycle < ApplicationRecord
+    belongs_to :source, polymorphic: true
+  end
+end

data/app/models/educode_sales/sale_plan.rb

@@ -1,8 +1,12 @@
 module EducodeSales
   class SalePlan < ApplicationRecord
+    include ::Deletable
     belongs_to :business
     belongs_to :staff
+    validates :business_id, presence: true
 
     validates :month, presence: true
+
+    default_scope  -> {where(deleted_at: nil)}
   end
 end

data/app/models/educode_sales/sale_report.rb

@@ -1,5 +1,7 @@
 module EducodeSales
   class SaleReport < ApplicationRecord
+    include ::Deletable
     belongs_to :staff
+    default_scope  -> {where(deleted_at: nil)}
   end
 end

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/edit_plan.html.erb

@@ -56,13 +56,13 @@
   </div>
 </script>
 <script type="text/html" id="return_money_tabar">
-  {{#  if(parent.is_latest){ }}
+  {{#  if(parent.is_latest && parent.flag){ }}
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">保存</a>
   <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="delete">删除</a>
   {{#  } }}
 </script>
 <script>
-    if(!parent.is_latest){
+    if(!parent.is_latest || !parent.flag){
         document.getElementById("show_plan_box").style.display="none";//隐藏
     }
   layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'laydate'], function () {

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">
@@ -53,7 +53,7 @@
         <div class="layui-inline">
           <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
           </button>
-          <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">搜索
+          <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">搜索
           </button>
         </div>
       </div>
@@ -169,6 +169,18 @@
                 title: '招标时间',
                 sort: true
               },
+              {
+                field: 'bidded_date',
+                width: 105,
+                title: '中标时间',
+                  sort: true
+              },
+              {
+                field: 'signed_date',
+                width: 105,
+                title: '签单时间',
+                  sort: true
+              },
               {
                 field: 'reception_at',
                 width: 105,
@@ -248,6 +260,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 +310,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);
@@ -320,6 +373,13 @@
         });
       }
 
+        function hn(){
+            $("#search_bt").trigger("click");
+        }
+        $(document).ready(function(){
+            window.onload=hn;
+        });
+
 
       var sort = {}, search = {};
       table.on('sort(businesses_table)', function (obj) {
@@ -337,7 +397,8 @@
         // 监听搜索操作
         form.on('submit(search_bussiness)', function (data) {
           search = data.field
-          table.reload('businesses_table', {
+            console.log(search);
+            table.reload('businesses_table', {
             page: {
                 curr: 1
             },
@@ -533,6 +594,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">
@@ -80,9 +97,13 @@
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
-      <div class="layui-input-inline">
+      <div class="layui-input-inline" style="z-index: 10000">
        <div id="assign_follow" style="width: 512px;"></div>
       </div>
+       <div class="layui-inline" style="padding: 9px 15px">
+         <label class="layui-form-label" style="padding-left: 220px"></label>
+           指定跟进人和商机创建者，同时拥有对该商机的管理权限
+       </div>
     </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label required">最新进展</label>

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

@@ -1,6 +1,7 @@
 <script type="text/html" id="toolbarDemo_follow">
   <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="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>
@@ -8,17 +9,20 @@
         <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
       <% end %>
     <% end %>
+    <span class="table-label pull-right" style="padding-right: 20px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
   </div>
 </script>
-<div class="edit-table">
-<table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
+<div class="edit-table tool">
+  <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>
@@ -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,
@@ -255,6 +289,7 @@
               content = miniPage.getHrefContent('/missions/teachers/add_keys?follow_up_id=' + obj.data.id);
               openWH = miniPage.getOpenWidthHeight();
               is_latest = obj.data.is_latest
+              flag = obj.data.flag
               keyindex = layer.open({
                   title: '关键人',
                   type: 1,
@@ -276,6 +311,7 @@
               content = miniPage.getHrefContent('/missions/businesses/edit_plan');
               openWH = miniPage.getOpenWidthHeight();
               is_latest = obj.data.is_latest
+              flag = obj.data.flag
               plan_index = layer.open({
                   title: '回款计划',
                   type: 1,
@@ -495,5 +531,11 @@
 
     });
 </script>
-
-
+<style>
+  .z-index .layui-table-tool{
+      z-index: 10000; !important;
+  }
+ .tool .layui-table-tool-temp{
+      padding-right: 30px; !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