educode_sales 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cd066340676e40c41aa18730eacf453f8bf228ceb4416179f0e916581525999
-  data.tar.gz: a30becf3c8cc2c925c21b66948d429a241d3750289f5e921ab3c0cde5aeea3f4
+  metadata.gz: abfb5bbc3cbbe65b1c987c9e1b77bca81d06086e2db8b6c788163fdba557f2ef
+  data.tar.gz: 7e2a1aabfab1f07c614a76d65f33560f6da3e7d05200a819c4d7b905c5d976c3
 SHA512:
-  metadata.gz: adabc609d925eb080964dc566815134c5384f258fde90b7008296ceacf178a1435be37c553f49291844ce7043f6dfc4745f7713da687f40da40871acc67a6f8e
-  data.tar.gz: 042b06433756725fad2b2bd4bb612bca89616f3e18e6055e5c2df4a89d8ece4810f9fe80899047a52c86d60c6e263b14bdb92ee9107efe63bb662ee51dd73041
+  metadata.gz: 30bac077609756d5eb7ab205d40f2c3f2b7db4f88797c636038051316c1917af74a88f4cf390878c6b8adc83f4bf4e417d723ef349ecdbfc375a8176e5a3a6a8
+  data.tar.gz: 3b4b074197ba779c5b8f8134e97b1633f6173f8ba7a46232d761b132b123b1ffa1ac39fa1b47d484ce82197d060b02dbde8bf8d07fb9c1c5bff1e783d3b485e6

data/app/controllers/educode_sales/businesses_controller.rb

@@ -33,15 +33,25 @@ module EducodeSales
         format.html do
           common = Common.find_by(clazz: 'staff_type', name: '销售')
           @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
-          @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business)
+          # @more = can?(:create, EducodeSales::SalePlan) || can?(:update, EducodeSales::Business) || can?(:destroy, EducodeSales::Business) || can?(:show_file, EducodeSales::Business)
+          @more = true
           gon.menus = []
           gon.place = params[:place_id].present? ? [{ value: params[:place_id], name: EducodeSales::Place.find(params[:place_id]).name }] : []
+          gon.business_type = Common.where(clazz: 'business_type').map do |d|
+            {value: d.id, name: d.name}
+          end
+          gon.type = params[:clazz_id].present? ? [{ value: params[:clazz_id], name: Common.find(params[:clazz_id]).name }] : []
+          gon.business_step = Common.where(clazz: 'business_step').map do |d|
+            {value: d.id, name: d.name}
+          end
           if can?(:create, EducodeSales::SalePlan)
             gon.menus << { title: '添加周计划', event: 'week' }
             gon.menus << { title: '添加月计划', event: 'month' }
           end
           gon.menus << { title: '跟进时间线', event: 'time_line' }
-          gon.menus << { title: '附件管理', event: 'file' }
+          if can?(:show_file, EducodeSales::Business)
+            gon.menus << { title: '附件管理', event: 'file' }
+          end
           if can?(:update, EducodeSales::Business)
             gon.menus << { title: '编辑', event: 'edit' }
           end
@@ -137,12 +147,12 @@ module EducodeSales
           if params[:q].present? && params[:q][:business_type].present?
             @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            ").where("educode_sales_follow_ups.clazz_id = ?", params[:q][:business_type])
+            ").where("educode_sales_follow_ups.clazz_id in (?)", params[:q][:business_type].split(",").map(&:to_i))
           end
           if params[:q].present? && params[:q][:business_step].present?
             @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
-            ").where("educode_sales_follow_ups.stage_id = ?", params[:q][:business_step])
+            ").where("educode_sales_follow_ups.stage_id in (?)", params[:q][:business_step].split(",").map(&:to_i))
           end
           if  params[:q].present? && params[:q][:place_id].present?
             @businesses = @businesses.joins("
@@ -177,6 +187,13 @@ module EducodeSales
             @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1] + '23:59:59')
           end
 
+          if params[:q].present? && params[:q][:invitation_at].present?
+            date = params[:q][:invitation_at].split(" - ")
+            @businesses = @businesses.joins("
+              JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
+            ").where("educode_sales_follow_ups.invitation_at > ? AND educode_sales_follow_ups.invitation_at < ?", date[0] + '00:00:00', date[1] + '23:59:59')
+          end
+
           if params[:sort].present? && params[:sort][:field]
             @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
@@ -195,6 +212,7 @@ module EducodeSales
             last_follow.signed_date,
             last_follow.created_at as latest_time,
             last_follow.actual_amount,
+            (last_follow.actual_amount - educode_sales_businesses.return_money) as wait_return_money,
             last_follow.total_amount").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
           ").page(params[:page]).per(params[:limit])

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -12,21 +12,22 @@ module EducodeSales
           @staffs = Staff.joins(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id]}
         end
         format.json do
+          x_id = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
           if @current_admin.is_admin?
-            @money_plans = MoneyPlan.where(follow_up_id: follow_up_ids)
+            @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
           else
             level = @current_admin.role.role_areas.find_by(clazz: '回款管理').level
             case level
             when '自己'
-              @money_plans = MoneyPlan.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.staff_id)
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.staff_id)
             when '区域'
               a_ids = MoneyPlan.where(follow_up_id: follow_up_ids).where(staff_id: @current_admin.staff_id).ids
               school_ids = School.where(province: @current_admin.areas.pluck(:name)).pluck(:id)
               b_ids = Business.where(school_id: school_ids).pluck(:last_follow_up_id)
               ids = a_ids + b_ids
-              @money_plans = MoneyPlan.where(id: ids)
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(id: ids)
             else
-              @money_plans = MoneyPlan.where(follow_up_id: follow_up_ids)
+              @money_plans = MoneyPlan.joins(:follow_up).where("educode_sales_follow_ups.clazz_id != ?", x_id).where(follow_up_id: follow_up_ids)
             end
           end
 
@@ -47,13 +48,13 @@ module EducodeSales
           end
           if params[:q].present? && params[:q][:date].present?
             date = params[:q][:date].split(" - ")
-            @money_plans = @money_plans.where("educode_sales_money_plans.created_at > ? AND educode_sales_money_plans.created_at < ?", date[0], date[1] + '23:59:59')
+            @money_plans = @money_plans.where("educode_sales_money_plans.date_at >= ? AND educode_sales_money_plans.date_at < ?", date[0], date[1] + '23:59:59')
           end
 
           if params[:sort].present? && params[:sort][:field]
             @money_plans = @money_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
-            @money_plans = @money_plans.order(created_at: :desc)
+            @money_plans = @money_plans.order(date_at: :desc)
           end
           @total_amount = @money_plans.sum(:amount)
           @money_plans = @money_plans.page(params[:page]).per(params[:limit])

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

@@ -69,12 +69,14 @@
       <div class="layui-input-inline">
         <input name="total_amount" type="number" class="layui-input" value="<%= @follow_up.total_amount %>">
       </div>
-    </div>
+      客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。    </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
          <input name="actual_amount" type="number" class="layui-input" placeholder="本单位的签单金额" value="<%= @follow_up.actual_amount %>">
       </div>
+      客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
     <br>
     <div class="layui-inline place_select">
@@ -82,7 +84,9 @@
       <div class="layui-input-inline" style="z-index: 101">
         <div id="edit_place" style="width: 190px;"></div>
       </div>
+    总额里，渠道拿到的部分。
     </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
@@ -95,7 +99,8 @@
         <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>
+                 placeholder="请选择年度">
+        </div>
       </div>
     </div>
     <div class="layui-form-item">
@@ -103,6 +108,10 @@
       <div class="layui-input-inline">
         <div id="edit_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/file.html.erb

@@ -2,9 +2,9 @@
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">附件信息</span>
-    <%# if can? :create, EducodeSales::file %>
+    <% if can? :upload_file, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="upload_file">上传文件</button>
-    <%# end %>
+    <% end %>
   </div>
 </script>
 
@@ -12,8 +12,12 @@
 
 <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>
+  <% if can? :download_file, EducodeSales::Business %>
+<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>
+  <% end %>
+  <% if can? :delete_file, EducodeSales::Business %>
+<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
 </script>
 
 <script type="text/html" id="showchance">

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

@@ -33,41 +33,49 @@
                   <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true } %>
                 </div>
               </div>
-              <div class="layui-inline">
+              <div class="layui-inline show_item" style="display:none;">
                 <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 id="business_type" style="width: 190px;"></div>
                 </div>
               </div>
-              <div class="layui-inline">
+              <div class="layui-inline show_item" style="display:none;">
                 <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 id="business_step" style="width: 190px;"></div>
                 </div>
               </div>
-              <div class="layui-inline">
+              <div class="layui-inline show_item" style="display:none;">
                 <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">
+              <div class="layui-inline show_item" style="display:none;">
                 <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">
+              <div class="layui-inline show_item" style="display:none;">
                 <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 show_item" style="display:none;">
+                <label class="layui-form-label">招标时间</label>
+                <div class="layui-input-inline">
+                  <input type="text" class="layui-input" id="invitation_at" name="invitation_at" 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>
+                <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="show_hide">展开/收起
+                </button>
               </div>
             </div>
           </form>
@@ -126,6 +134,10 @@
         elem: '#date',
         range: true
       });
+      laydate.render({
+        elem: '#invitation_at',
+        range: true
+      });
 
          var is_show = <%=params[:name].present? || params[:clazz_id].present? || params[:place_id].present? || params[:school].present? %>
       if(is_show){
@@ -135,6 +147,15 @@
           $('.businesses_list_div').addClass('layui-show');
       }
 
+        var business_type_list = xmSelect.render({
+            el: '#business_type',
+            data: gon.business_type
+        })
+        business_type_list.setValue(gon.type)
+        var business_step_list = xmSelect.render({
+            el: '#business_step',
+            data: gon.business_step
+        })
         var index_place_list = xmSelect.render({
             el: '#index_place',
             model: {
@@ -189,10 +210,6 @@
           defaultToolbar: ['filter'],
           toolbar: '#bussinessBar',
           totalRow: true,//开启合并行
-          initSort: {
-              field: 'latest_time' //排序字段，对应 cols 设定的各字段名
-              ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
-          },
           cols: [
             [
               {
@@ -304,6 +321,13 @@
                 sort: true,
                   totalRow: true
               },
+              {
+                field: 'wait_return_money',
+                width: 100,
+                title: '待回款',
+                sort: true,
+                  totalRow: true
+              },
               {
                 field: 'place',
                 width: 160,
@@ -485,7 +509,17 @@
 
         // 监听搜索操作
         form.on('submit(search_bussiness)', function (data) {
+            var business_type = [];
+            business_type_list.getValue().forEach(function(d) {
+                business_type.push(d.value);
+            })
+            var business_step = [];
+            business_step_list.getValue().forEach(function(d) {
+                business_step.push(d.value);
+            })
             data.field.place_id = index_place_list.getValue('valueStr');
+            data.field.business_type = business_type.toString();
+            data.field.business_step = business_step.toString();
             search = data.field
             console.log(search);
             table.reload('businesses_table', {
@@ -507,12 +541,59 @@
           return false;
         });
 
+        form.on('submit(show_hide)', function (data) {
+            $(".show_item").toggle()
+            return false;
+        });
         form.on('submit(reset_business_search)', function (data) {
           var field = data.field;
           form.val('search_form', {
               name: '', department: '', staff_id: '', business_type: '', business_step: '',
-              place_id: '', date: '', area: ''
+              place_id: '', date: '', area: '', invitation_at: ''
           })
+            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});
+                            }
+
+                        }
+                    })
+                }
+            })
           return false;
         });
 

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

@@ -6,7 +6,7 @@ json.data do
     json.department d.department.name
     json.school d.department.school.name
     json.school_id d.department.school.id
-    json.follow_ups_count d.follow_ups_count
+    json.follow_ups_count d.follow_ups.where(deleted_at: nil).size
     follow_ups_count += d.follow_ups_count
     json.follow_up_id d.last_follow_up_id
     # json.teachers_count d.follow_ups.sum(:key_people_count)
@@ -20,13 +20,14 @@ json.data do
     json.total_amount d.last_follow_up&.total_amount
     json.actual_amount d.last_follow_up&.actual_amount
     json.return_money d.return_money
+    json.wait_return_money d.wait_return_money
     json.place d.last_follow_up&.place&.name
     json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
     json.source d.source
     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 : d.created_at.to_s
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
   end
 end
 

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

@@ -74,13 +74,15 @@
         <input name="total_amount" type="number" class="layui-input" autocomplete="off"
           value="<%= @last_follow_up&.total_amount%>">
       </div>
-    </div>
+      客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。    </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
         <input name="actual_amount" type="number" class="layui-input" autocomplete="off" placeholder="本单位的签单金额"
           value="<%= @last_follow_up&.actual_amount%>">
       </div>
+      客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
     <br>
     <div class="layui-inline new_place_select">
@@ -88,7 +90,9 @@
       <div class="layui-input-inline" style="z-index: 101">
         <div id="place" style="width: 190px;"></div>
       </div>
+      总额里，渠道拿到的部分。
     </div>
+  <br>
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
@@ -106,7 +110,7 @@
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
-      <div class="layui-input-inline" style="z-index: 100">
+      <div class="layui-input-inline" >
        <div id="assign_follow" style="width: 512px;"></div>
       </div>
        <div class="layui-inline" style="padding: 9px 15px">
@@ -144,6 +148,7 @@
     </div>
   </div>
 </div>
+</div>
 
 <script>
   layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {

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

@@ -767,4 +767,7 @@
     .layui-form .city_input .city  {
         display: block;
     }
+    .layui-edge{
+        display: none;!important;
+    }
 </style>

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

@@ -12,7 +12,7 @@
       <%= 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">
+  <div class="layui-form-item " style="padding-left: 150px">
     <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit_follow_up">提交
     </button>
   </div>

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

@@ -769,4 +769,7 @@
     .layui-form .city_input .city  {
         display: block;
     }
+    .layui-edge{
+        display: none;!important;
+    }
 </style>

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

@@ -12,7 +12,7 @@
         <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id)), { include_blank: true}%>
       </div>
     </div>
-  <div class="layui-form-item " style="padding-left: 110px">
+  <div class="layui-form-item " style="padding-left: 150px">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_follow_up">提交
       </button>
     </div>

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

@@ -393,7 +393,7 @@
                 content = miniPage.getHrefContent('/missions/customers/edit_follow_record?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 editFollowIndex = layer.open({
-                    title: '编辑',
+                    title: '编辑跟进记录',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,

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

@@ -26,7 +26,7 @@
         </div>
       </div>
       <div class="layui-inline">
-        <label class="layui-form-label">创建时间</label>
+        <label class="layui-form-label">回款时间</label>
         <div class="layui-input-inline">
           <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">
         </div>
@@ -52,9 +52,7 @@
 <script type="text/html" id="currentTableBar">
 </script>
 <script type="text/html" id="business">
-  <div class="layui-text">
-    <a href="/missions/businesses?name={{d.business}}&school={{d.school}}">{{d.business}}</a>
-  </div>
+  <a href="javascript:void(0);" lay-event="business" class="layui-table-link">{{ d.business }}</a>
 </script>
 
 <script type="text/html" id="school">
@@ -83,7 +81,7 @@
             totalRow: true,
             defaultToolbar: ['filter'],
             initSort: {
-                field: 'created_at' //排序字段，对应 cols 设定的各字段名
+                field: 'date_at' //排序字段，对应 cols 设定的各字段名
                 ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
             },
             cols: [
@@ -95,7 +93,7 @@
                         totalRowText:'本页/总计'
                     },
                     {
-                        field: 'created_at',
+                        field: 'date_at',
                         width: 120,
                         sort: true,
                         title: '回款时间'
@@ -174,6 +172,47 @@
             return false;
         });
 
+        table.on('tool(place)', 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>

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

@@ -2,11 +2,12 @@ total_amount = 0
 json.data do
   json.array! @money_plans do |d|
     json.id d.id
-    json.created_at d.created_at.to_s(:date)
+    json.date_at d.date_at.to_s(:date)
     json.amount d.amount
     total_amount += d.amount
     json.clazz d.clazz
     json.business d.follow_up.business.name
+    json.business_id d.follow_up.business.id
     json.school School.find(d.follow_up.business.school_id).name
     json.school_id School.find(d.follow_up.business.school_id).id
     json.staff d.staff.user.real_name

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

@@ -131,12 +131,26 @@
                       templet: "#business_a",
 
                   },
+                  // {
+                  //     field: 'amount',
+                  //     width: 120,
+                  //     totalRow:true,
+                  //     sort: true,
+                  //     title: '中标金额'
+                  // },
                   {
-                      field: 'amount',
+                      field: 'total_amount',
                       width: 120,
                       totalRow:true,
                       sort: true,
-                      title: '中标金额'
+                      title: '项目总额'
+                  },
+                  {
+                      field: 'divide_amount',
+                      width: 120,
+                      totalRow:true,
+                      sort: true,
+                      title: '渠道分成'
                   },
                   {
                       field: 'return_mount',

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

@@ -17,7 +17,9 @@ json.data do
     business_count = EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").count
     json.businesses_count business_count
     all_businesses_count += business_count
-    json.amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum("actual_amount - divide_amount").round(2)
+    # json.amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum("actual_amount - divide_amount").round(2)
+    json.total_amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum("actual_amount").round(2)
+    json.divide_amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum("divide_amount").round(2)
     json.return_mount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", @x).where("educode_sales_follow_ups.place_id = #{d.id}").sum(:return_money).round(2)
   end
 end

data/app/views/educode_sales/recycles/business.json.jbuilder

@@ -5,8 +5,8 @@ json.data do
     json.name business.name
     json.school business.department.school.name
     json.department business.department.name
-    json.last_follow_person business.last_follow_up.present? ? business.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(business.staff_id).user.real_name
-    json.latest_time business.last_follow_up.present? ? business.last_follow_up.created_at.to_s : business.created_at.to_s
+    json.last_follow_person business.last_follow_up_id.present? ? EducodeSales::FollowUp.unscoped.find(business.last_follow_up_id).staff.user.real_name : EducodeSales::Staff.find(business.staff_id).user.real_name
+    json.latest_time business.last_follow_up_id.present? ? EducodeSales::FollowUp.unscoped.find(business.last_follow_up_id).created_at.to_s : business.created_at.to_s
     json.deleter EducodeSales::Staff.find(d.deleter_id).user.real_name
     json.delete_time d.created_at.to_s
   end

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

@@ -36,7 +36,7 @@ json.data do
       business_d = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @d_clazz&.id).count
       business_e = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @e_clazz&.id).count
       business_o = @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id = ?", @o_clazz&.id).count
-      school_count = EducodeSales::CustomerExtension.where(customer_staff_id: d.id).size
+      school_count = EducodeSales::CustomerExtension.joins(:school).where(customer_staff_id: d.id).size
       json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).sum(:total_amount).round(2)
       json.return_money @businesses.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", @x).where.not("educode_sales_money_plans.clazz!= ?", 1).sum(:amount).round(2)
       json.school_count school_count
@@ -58,7 +58,7 @@ json.data do
       json.goal @businesses.joins("JOIN educode_sales_follow_ups on educode_sales_follow_ups.id = educode_sales_businesses.last_follow_up_id").where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.stage_id in (?)", @x, @step_ids).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ?", "#{@year}-01-01", "#{@year}-12-31").sum(:total_amount).round(2)
       json.return_money @businesses.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", @x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ?  AND educode_sales_money_plans.date_at <= ? ", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").sum(:amount).round(2)
       json.school_count school_count
-      follow_school_count = (EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").where(staff_id: d.id).pluck(:business_id).uniq).pluck(:school_id)).uniq.size
+      follow_school_count = (EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").pluck(:school_id) + EducodeSales::Business.where(id: EducodeSales::FollowUp.where("created_at >= ? AND created_at <= ?", "#{@year}-01-01 00:00:00", "#{@year}-12-31 23:59:59").where(staff_id: d.id).pluck(:business_id).uniq).pluck(:school_id)).uniq.size
       json.follow_school_count follow_school_count
       json.follow_school_counts EducodeSales::CustomerFollow.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size + EducodeSales::FollowUp.where(staff_id: d.id).where("created_at >= ? AND created_at <= ?", "#{@year}-01-01", "#{@year}-12-31").size
       follow_school_rate = (follow_school_count!=0 ? school_count.to_f * 100 / follow_school_count : 0).round(2)

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

@@ -19,44 +19,44 @@
           <%= select_tag "professional_title", options_for_select(['教授', '研究员', '副教授', '副研究员', '讲师', '助理研究员', '助理教授'], @person&.professional_title), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">导流来源</label>
         <div class="layui-input-inline">
           <%= select_tag "teacher_source", options_for_select(EducodeSales::Common.where(clazz: 'teacher_source').pluck(:name, :id)), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">态度</label>
         <div class="layui-input-inline">
 
           <%= select_tag "attitude", options_for_select(EducodeSales::Common.where(clazz: 'teacher_attitude').pluck(:name, :id)), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">注册时间</label>
         <div class="layui-input-inline">
           <input type="text" class="layui-input" id="time" placeholder="请选择时间" autocomplete="off" name="regist_at">
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">注册状态</label>
         <div class="layui-input-inline">
           <%= select_tag "status", options_for_select([["已注册","1"],["未注册","0"]]), { include_blank: true } %>
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <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">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">起止时间</label>
         <div class="layui-input-inline">
           <input type="text" class="layui-input" id="date" name="date" autocomplete="off" placeholder=" - ">
         </div>
       </div>
-      <div class="layui-inline">
+      <div class="layui-inline show_item" style="display:none;">
         <label class="layui-form-label">教研助理</label>
         <div class="layui-input-inline">
           <%= select_tag "assist", options_for_select(@staffs, params[:assist]), { 'lay-filter': 'assist', include_blank: true } %>
@@ -68,6 +68,8 @@
         </button>
         <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_teachers">搜 索
         </button>
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="show_hide">展开/收起
+        </button>
       </div>
     </div>
   </form>
@@ -150,12 +152,14 @@
                     width: 60,
                     title:'序号',type: 'numbers',
                     totalRowText:'合计',
+                    fixed: 'left'
 
                 },
                 {
                     field: 'name',
                     width: 80,
                     title: '姓名',
+                    fixed: 'left',
                     templet: "#name"
                 },
                 {
@@ -409,6 +413,10 @@
             })
             return false;
         });
+        form.on('submit(show_hide)', function (data) {
+            $(".show_item").toggle()
+            return false;
+        });
         /**
          * toolbar事件监听
          */

data/db/migrate/20210902064109_create_educode_sales_role_permissions.rb

@@ -8,6 +8,11 @@ class CreateEducodeSalesRolePermissions < ActiveRecord::Migration[5.2]
     end
     if EducodeSales::Permission.last.nil?
 
+      #附件管理权限
+      EducodeSales::Permission.create(name: '查看附件', subject: 'Business', action: 'show_file', clazz: 'business', position: '11')
+      EducodeSales::Permission.create(name: '上传附件', subject: 'Business', action: 'upload_file', clazz: 'business', position: '11')
+      EducodeSales::Permission.create(name: '下载附件', subject: 'Business', action: 'download_file', clazz: 'business', position: '11')
+      EducodeSales::Permission.create(name: '删除附件', subject: 'Business', action: 'delete_file', clazz: 'business', position: '11')
       #回款管理权限
       EducodeSales::Permission.create(name: '查看回款列表', subject: 'MoneyPlan', action: 'read', clazz: 'money_plan', position: '15')
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails