educode_sales 0.6.6 → 0.7.0

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

@@ -60,13 +60,13 @@
               <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=" - ">
+                  <input type="text" class="layui-input" id="date" name="date" placeholder=" - " autocomplete="off">
                 </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=" - ">
+                  <input type="text" class="layui-input" id="invitation_at" name="invitation_at" placeholder=" - " autocomplete="off">
                 </div>
               </div>
               <div class="layui-inline">
@@ -74,7 +74,7 @@
                 </button>
                 <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">搜索
                 </button>
-                <a style="padding-left: 20px;color: #0000FF"  href="javascript:;" type="submit" class="" lay-submit lay-filter="show_hide">展开/收起
+                <a style="padding-left: 20px;color: #0000FF"  href="javascript:;" type="submit" class="" lay-submit lay-filter="show_hide">高级搜索
                 </a>
               </div>
             </div>
@@ -88,6 +88,9 @@
 <script type="text/html" id="bussinessBar">
   <div class="layui-btn-container">
     <span class="table-label">商机列表</span>
+    <% if can?(:export_business, EducodeSales::Business) %>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm data-count-edit export_more-btn pull-right" style="color: #0000FF;" data-name="export" data-id="export">导出<i class="layui-icon layui-icon-down layui-nav-more"></i></button>
+    <% end %>
     <% if can? :create, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加商机</button>
     <% end %>
@@ -96,15 +99,37 @@
   </div>
 </script>
 <script type="text/html" id="currentTableBar">
-  <% if can? :add_follow, EducodeSales::Business %>
+  <%unless !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
+<% if can? :add_follow, EducodeSales::Business %>
+  <% if @current_admin.is_admin %>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
+  <% else %>
+  {{# if ( d.assign_follow_ups.length > 0 && d.assign_follow_ups.indexOf(d.current_staff_id) >=0 || (d.assign_follow_ups.length == 0) || (d.current_staff_id == d.staff_id) ) {}}
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
+  {{# }}}
+<% end %>
+  <% end %>
+  <% end %>
+  <%if !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
+    {{# if (d.self_flag) {}}
   <% if @current_admin.is_admin %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
   <% else %>
   {{# if ( d.assign_follow_ups.length > 0 && d.assign_follow_ups.indexOf(d.current_staff_id) >=0 || (d.assign_follow_ups.length == 0) || (d.current_staff_id == d.staff_id) ) {}}
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
   {{# }}}
+<% end %>
+    {{# }}}
+  <% end %>
+  <%if can?(:update, EducodeSales::Business)%>
+  <%unless !can?(:update, EducodeSales::Business) && can?(:self_edit_business, EducodeSales::Business)%>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <% end %>
-  
+  <% end %>
+  <%if !can?(:update, EducodeSales::Business) && can?(:self_edit_business, EducodeSales::Business)%>
+    {{# if (d.self_flag) {}}
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    {{# }}}
   <% end %>
   <% if @more %>
     <a class="layui-btn-xs data-count-edit more-btn" data-name={{d.name}} data-id={{d.id}}>更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
@@ -203,12 +228,13 @@
 
 
       table = layui.table;
-      table.render({
+      var business_table = table.render({
           elem: '#businesses_table',
           url: '/missions/businesses',
           where: {q: form.val('search_form')},
           defaultToolbar: ['filter'],
           toolbar: '#bussinessBar',
+          title: '商机数据表',
           totalRow: true,//开启合并行
           cols: [
             [
@@ -328,14 +354,24 @@
                 sort: true,
                   totalRow: true
               },
+              {
+                field: 'return_money_days',
+                width: 150,
+                title: '首次回款周期(天)',
+              },
               {
                 field: 'place',
                 width: 160,
                 title: '渠道',
               },
+              {
+                field: 'year',
+                width: 105,
+                title: '所属年度',
+              },
               {
                 title: '操作',
-                minWidth: 170,
+                minWidth: 220,
                 toolbar: '#currentTableBar',
                 align: "center",
                 fixed: 'right'
@@ -348,12 +384,16 @@
           page: true,
           skin: 'line',
           done: function (res) {
-            drowpdwonRender()
+              exportData=res.data;
+              console.log(exportData);
+              drowpdwonRender()
+            export_drowpdwonRender()
           }
 
       });
 
       var dropmenu = gon.menus;
+      var export_dropmenu = gon.export_menus;
 
       drowpdwonRender = function() {
         dropdown.render({
@@ -386,6 +426,118 @@
         });
       }
 
+        export_drowpdwonRender = function() {
+        dropdown.render({
+          elem: '.export_more-btn',
+          data: export_dropmenu,
+          click: function(data, othis){
+            var elem = $(this.elem);
+            id = elem.data('id');
+            switch (data.event) {
+            case 'export_csv':
+                export_csv();
+              break;
+            case 'export_excel':
+                export_excel();
+              break;
+            case 'export_records':
+                export_records();
+              break;
+            }
+          }
+        });
+      }
+
+        function export_csv() {
+            var data = form.val("search_form");
+            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.place_id = index_place_list.getValue('valueStr');
+            data.business_type = business_type.toString();
+            data.business_step = business_step.toString();
+            layer.load(0, {});
+            console.log(data);
+            request.authPost("/missions/businesses/get_export_data", {
+                name: data.name,
+                area: data.area,
+                business_step: data.business_step,
+                business_type: data.business_type,
+                date: data.date,
+                department: data.department,
+                invitation_at: data.invitation_at,
+                place_id: data.place_id,
+                select: data.select,
+                staff_id: data.staff_id
+            }, function (res) {
+                console.log(res.data);
+                data = res.data
+                table.exportFile(business_table.config.id,data, 'csv');
+                layer.closeAll('loading');
+                request.get('/missions/businesses/add_export_records?type=csv', {}, function (res) {
+                })
+            })
+
+        }
+        function export_excel() {
+            var data = form.val("search_form");
+            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.place_id = index_place_list.getValue('valueStr');
+            data.business_type = business_type.toString();
+            data.business_step = business_step.toString();
+            layer.load(0, {});
+            console.log(data);
+            request.authPost("/missions/businesses/get_export_data", {
+                name: data.name,
+                area: data.area,
+                business_step: data.business_step,
+                business_type: data.business_type,
+                date: data.date,
+                department: data.department,
+                invitation_at: data.invitation_at,
+                place_id: data.place_id,
+                select: data.select,
+                staff_id: data.staff_id
+            }, function (res) {
+                console.log(res.data);
+                data = res.data
+                table.exportFile(business_table.config.id,data, 'xls');
+                layer.closeAll('loading');
+                request.get('/missions/businesses/add_export_records?type=xls', {}, function (res) {
+                })
+            })
+
+        }
+        function export_records() {
+            var content = miniPage.getHrefContent('/missions/businesses/export_records')
+            var openWH = miniPage.getOpenWidthHeight();
+            sindex = 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(sindex);
+            });
+        }
+
       function week(id) {
         var content = miniPage.getHrefContent('/missions/plans/new_week?business_id=' + id);
         var openWH = miniPage.getOpenWidthHeight();
@@ -734,6 +886,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'show_follow') {
+                 self_flag = data.self_flag
                 business_id = obj.data.id
                  business_name = data.name
                 content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);

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

@@ -1,4 +1,5 @@
-follow_ups_count = 0
+follow_up_ids = EducodeSales::AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
+follow_count = 0
 json.data do
   json.array! @businesses do |d|
     json.id d.id
@@ -6,21 +7,22 @@ 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.where(deleted_at: nil).size
-    follow_ups_count += d.follow_ups_count
+    follow_ups_count = d.follow_ups.where(deleted_at: nil).size
+    json.follow_ups_count follow_ups_count
+    follow_count += follow_ups_count
     json.follow_up_id d.last_follow_up_id
-    # json.teachers_count d.follow_ups.sum(:key_people_count)
-    # json.teachers_count EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).present? ? EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).key_people_count : 0
     json.clazz d.last_follow_up&.clazz&.name || ""
     json.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.year d.last_follow_up&.year.to_s
     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.to_i.round(2)
+    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '已完成').present? ? (d.last_follow_up.money_plans.where(clazz: '已完成').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
     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
@@ -28,11 +30,12 @@ json.data do
     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 : ''
-  end
+    json.self_flag (d.staff_id == @current_admin.id) || (d.last_follow_up_id.in? follow_up_ids)
+    end
 end
 
 json.totalRow do
-  json.follow_ups_count follow_ups_count.to_s
+  json.follow_ups_count follow_count.to_i.to_s
 end
 json.code 0
 json.count @businesses.total_count

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

@@ -87,10 +87,9 @@
     <br>
     <div class="layui-inline new_place_select">
       <label class="layui-form-label">渠道</label>
-      <div class="layui-input-inline" style="z-index: 101">
+      <div class="layui-input-inline" style="">
         <div id="place" style="width: 190px;"></div>
       </div>
-      总额里，渠道拿到的部分。
     </div>
   <br>
     <div class="layui-inline">
@@ -98,6 +97,7 @@
       <div class="layui-input-inline">
         <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount%>">
       </div>
+      总额里，渠道拿到的部分。
     </div>
     <div class="layui-form-item">
     <div class="layui-inline">
@@ -110,10 +110,10 @@
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
-      <div class="layui-input-inline" style="z-index: 102">
+      <div class="layui-input-inline" style="">
        <div id="assign_follow" style="width: 512px;"></div>
       </div>
-       <div class="layui-inline" style="padding: 9px 15px">
+       <div class="layui-inline" style="padding: 9px 15px;z-index: -1;">
          <label class="layui-form-label" style="padding-left: 220px"></label>
            指定跟进人和商机创建者，同时拥有对该商机的管理权限
        </div>
@@ -143,7 +143,7 @@
     </div>
     <div class="layui-form-item m-t-20">
       <div class="layui-input-block">
-        <button class="layui-btn layui-btn-normal" lay-submit lay-filter="add_follow_up">提交</button>
+        <button class="layui-btn layui-btn-normal submit-btn" lay-submit lay-filter="add_follow_up">提交</button>
       </div>
     </div>
   </div>
@@ -248,6 +248,7 @@
       form.render();
 
       form.on('submit(add_follow_up)', function (data) {
+          $(".submit-btn").addClass("layui-hide");
           var assign_follow = [];
         sales_list.getValue().forEach(function(d) {
           assign_follow.push(d.value);

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

@@ -2,13 +2,22 @@
   <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 %>
+    <%unless !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
+  <% 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>
       <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
         <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
       <% end %>
     <% end %>
+    <% end %>
+    <%if !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
+  <% if @current_admin.is_admin %>
+        <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right add_follow" lay-event="add"> 添加跟进记录</button>
+      <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
+        <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right add_follow" lay-event="add"> 添加跟进记录</button>
+      <% end %>
+      <% end %>
     <span class="table-label pull-right" style="padding-right: 20px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
   </div>
 </script>
@@ -23,16 +32,37 @@
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="show">查看</a>
   <% end %>
   {{#  if(d.is_latest && d.flag){ }}
-  <% if can? :update_follow, EducodeSales::Business %>
+
+  <%unless !can?(:update_follow, EducodeSales::Business) && can?(:self_edit_follow, EducodeSales::Business)%>
+<% 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>
     <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
       <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
     <% end %>
   <% end %>
-  <% if can? :destroy_follow, EducodeSales::Business %>
+  <% end %>
+
+  <%if !can?(:update_follow, EducodeSales::Business) && can?(:self_edit_follow, EducodeSales::Business)%>
+    {{#  if(d.self_flag){ }}
+    <% if @current_admin.is_admin %>
+      <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    <% elsif @business.staff_id == @current_admin.id || @business.last_follow_up.nil? || @business.last_follow_up.assign_follow_ups.blank? || (@business.last_follow_up.assign_follow_ups.pluck(:staff_id).include?(@current_admin.id)) %>
+      <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    <% end %>
+    {{#  } }}
+  <% end %>
+
+  <%unless !can?(:destroy_follow, EducodeSales::Business) && can?(:self_delete_follow, EducodeSales::Business)%>
+<% if can? :destroy_follow, EducodeSales::Business %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
   <% end %>
+  <% end %>
+  <%if !can?(:destroy_follow, EducodeSales::Business) && can?(:self_delete_follow, EducodeSales::Business)%>
+    {{#  if(d.self_flag){ }}
+    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+    {{#  } }}
+<% end %>
   {{#  } }}
 </script>
 
@@ -201,6 +231,10 @@
         });
       })
 
+        if(!parent.self_flag){
+            $('.add_follow').addClass("layui-hide");
+        }
+
       table.on('toolbar(sale_plan_follow_table)', function (obj) {
         if (obj.event === 'add') { // 监听添加操作
             business_id = parent.business_id

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

@@ -19,6 +19,7 @@ json.data do
     json.is_latest d.id == @latest&.id
     json.flag d.created_at.present? ? (Time.now - d.created_at).to_f/3600 < 24 : false
     json.description d.description
+    json.self_flag d.staff_id == @current_admin.id
   end
 end
 

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

@@ -129,4 +129,10 @@
     });
 
   });
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 0px; !important;
+    }
+
+</style>

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

@@ -25,7 +25,12 @@
 <!--          <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">-->
 <!--        </div>-->
 <!--      </div>-->
-
+      <div class="layui-inline">
+        <label class="layui-form-label">性质</label>
+        <div class="layui-input-inline">
+          <div id="property" style="width: 190px;"></div>
+        </div>
+      </div>
       <div class="layui-inline">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
         </button>
@@ -94,6 +99,19 @@
         //     window.onload=hn;
         // });
 
+        var property_list = xmSelect.render({
+            el: '#property',
+            data: [
+                {value: 0, name: '985工程'},
+                {value: 1, name: '211工程'},
+                {value: 2, name: '本科院校'},
+                {value: 3, name: '大专院校'},
+                {value: 4, name: '中专学校'},
+                {value: 5, name: '军事院校'},
+                {value: 6, name: '企业'}
+            ]
+        })
+
         laydate.render({
             elem: '#date',
             range: true
@@ -122,6 +140,7 @@
                     {
                         field: 'name',
                         title: '客户名称',
+                        width: 100,
                         templet: "#name"
                     },
                     {
@@ -129,6 +148,11 @@
                         width: 100,
                         title: '区域',
                     },
+                    {
+                        field: 'property',
+                        width: 200,
+                        title: '性质',
+                    },
                     {
                         field: 'department',
                         width: 100,
@@ -238,6 +262,11 @@
 
         // 监听搜索操作
         form.on('submit(search_teachers)', function (data) {
+            var property = [];
+            property_list.getValue().forEach(function(d) {
+                property.push(d.value);
+            })
+            data.field.property = property.toString();
             search = data.field
             table.reload('customers_table', {
                 page: {
@@ -263,6 +292,7 @@
                 assist: "",
                 teacher_source: ""
             });
+            property_list.setValue([])
             return false;
         });
         /**

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

@@ -14,6 +14,18 @@ json.data do
     json.id d.id
     json.name d.name
     json.area d.province
+    school_property = d.school_property
+    property = []
+    if school_property.present?
+    property << '985工程' if school_property.project_985
+    property << '211工程' if school_property.project_211
+    property << '本科院校' if school_property.regular_college
+    property << '大专院校' if school_property.junior_college
+    property << '中专学校' if school_property.secondary_school
+    property << '军事院校' if school_property.military_school
+    property << '企业' if school_property.enterprise
+    end
+    json.property property.join("、")
     json.department d.departments.size
     json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.school_id = ?", d.id).size
     json.follow follow_ups.size + customer_follows.size