educode_sales 0.3.8 → 0.3.9

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

@@ -1,3 +1,4 @@
+<%= Gon::Base.render_data %>
 <h1 class="m-t-20 text-center"><%= @follow_up.business.name %></h1>
 <div class="layui-form layuimini-form">
   <div class="layui-form-item" style="padding: 25px">
@@ -74,6 +75,12 @@
       </div>
       <span style="margin-top: 10px; float:left;">%</span>
     </div>
+    <div class="layui-form-item">
+      <label class="layui-form-label">指定跟进人</label>
+      <div class="layui-input-inline">
+        <div id="edit_assign_follow" style="width: 512px;"></div>
+      </div>
+    </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label required">商机说明</label>
       <div class="layui-input-block">
@@ -107,10 +114,11 @@
 </div>
 
 <script>
-  layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate'], function () {
+  layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {
     var form = layui.form,
       layer = layui.layer,
       table = layui.table,
+      xmSelect = layui.xmSelect,
       laytpl = layui.laytpl,
       request = layui.request,
       laydate = layui.laydate,
@@ -124,8 +132,42 @@
       elem: '#reception_at_edit'
     });
 
+    var sales_list = xmSelect.render({
+      el: '#edit_assign_follow',
+      remoteSearch: true,
+      clickClose: true,
+      delay: 1000,
+      paging: true,
+      pageRemote: true,
+      filterable: true,
+      remoteMethod: function (val, cb, show, pageIndex) {
+        $.ajax( '/missions/sales_staff', {
+          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});
+            }
+          }
+        })
+      }
+    })
+    sales_list.setValue(gon.sales)
+
     form.render();
     form.on('submit(update_follow_up)', function (data) {
+      var assign_follow = [];
+      sales_list.getValue().forEach(function(d) {
+        assign_follow.push(d.value);
+      })
+      data.field.assign_follow_up = assign_follow;
       request.authPut("missions/follow_ups/<%= @follow_up.id%>", data.field, function (res) {
         if (res.success == false) {
           layer.alert(res.msg)

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

@@ -50,7 +50,7 @@
             <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">
           </div>
         </div>
-        <div class="layui-form-item m-t-10">
+        <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">搜索
@@ -72,7 +72,14 @@
 </script>
 <script type="text/html" id="currentTableBar">
   <% if can? :add_follow, EducodeSales::Business %>
-   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
+  <% 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 @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>
@@ -201,6 +208,7 @@
           ],
 
           limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
           page: true,
           skin: 'line',
           done: function (res) {
@@ -408,7 +416,6 @@
                     })
                 });
             }else if (obj.event === 'add_follow') { // 监听添加操作
-                console.log(parent.business_id);
                 business_id = parent.business_id
                 var content = miniPage.getHrefContent('/missions/businesses/new_follow_record?id=' + parent.id);
                 var openWH = miniPage.getOpenWidthHeight();

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

@@ -17,6 +17,9 @@ json.data do
     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 : ''
     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
   end
 end
 json.code 0

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

@@ -77,6 +77,12 @@
         <input name="divide_rate" class="layui-input" value="<%= @last_follow_up&.divide_rate%>">
       </div>
       <span style="margin-top: 10px; float:left;">%</span>
+    </div>
+     <div class="layui-form-item">
+      <label class="layui-form-label">指定跟进人</label>
+      <div class="layui-input-inline">
+       <div id="assign_follow" style="width: 512px;"></div>
+      </div>
     </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label required">商机说明</label>
@@ -110,13 +116,14 @@
 </div>
 
 <script>
-  layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate'], function () {
+  layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {
     var form = layui.form,
       layer = layui.layer,
       table = layui.table,
       laytpl = layui.laytpl,
       request = layui.request,
       laydate = layui.laydate,
+      xmSelect = layui.xmSelect,
       $ = layui.$;
 
       laydate.render({
@@ -126,22 +133,46 @@
       laydate.render({
         elem: '#reception_at_add'
       });
+      var sales_list = xmSelect.render({
+        el: '#assign_follow',
+        remoteSearch: true,
+        clickClose: true,
+        delay: 1000,
+        paging: true,
+        pageRemote: true,
+        filterable: true,
+        remoteMethod: function (val, cb, show, pageIndex) {
+          $.ajax( '/missions/sales_staff', {
+            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});
+                }
+
+            }
+          })
+        }
+      })
+
 
       form.render();
 
       form.on('submit(add_follow_up)', function (data) {
-          console.log(data);
-          data.field.business_id = "<%= @business.id %>";
-          console.log(data.field.business_id);
-          // request.authPut("missions/businesses/" + data.field.business_id +"/updateMoney/", {
-          //     return_money: 0
-          // }, function (res) {
-          //     if (res.success == false) {
-          //         layer.alert(res.msg)
-          //     } else {
-          //     }
-          // })
-          request.authPost("missions/follow_ups", data.field, function (res) {
+        var assign_follow = [];
+        sales_list.getValue().forEach(function(d) {
+          assign_follow.push(d.value);
+        })
+        data.field.assign_follow_up = assign_follow;
+        data.field.business_id = "<%= @business.id %>";
+        request.authPost("missions/follow_ups", data.field, function (res) {
           if (res.success == false) {
             layer.alert(res.msg)
           } else {

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

@@ -2,7 +2,11 @@
   <div class="layui-btn-container">
     <span class="table-label">跟进记录</span>
     <% if can? :add_follow, EducodeSales::Business %>
-    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
+      <% 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 %>
   </div>
 </script>
@@ -16,7 +20,11 @@
   <% end %>
   {{#  if(d.is_latest){ }}
   <% if can? :update_follow, EducodeSales::Business %>
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    <% 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 %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
@@ -142,7 +150,7 @@
               },
               {
                 title: '操作',
-                minWidth: 250,
+                minWidth: 200,
                 toolbar: '#currentTableBar_follow',
                 align: "center",
                 fixed: 'right'
@@ -150,6 +158,7 @@
             ]
           ],
           limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
           page: true,
           skin: 'line',
           // done: function (obj, first) {
@@ -173,7 +182,6 @@
 
       table.on('toolbar(sale_plan_follow_table)', function (obj) {
         if (obj.event === 'add') { // 监听添加操作
-            console.log(parent.business_id);
             business_id = parent.business_id
             var content = miniPage.getHrefContent('/missions/businesses/new_follow_record?id=' + parent.id);
           var openWH = miniPage.getOpenWidthHeight();
@@ -200,7 +208,6 @@
           var data = obj.data;
           follow_up_id = obj.data.id;
           if (obj.event === 'delete') {
-              console.log(data);
               layer.confirm('确定删除ID为' + data.id + "的跟进记录", function (index) {
                 request.authDelete("missions/follow_ups/" + data.id, {}, function() {
                   obj.del();

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

@@ -65,6 +65,12 @@
         <%= @follow_up.divide_rate %>%
       </div>
     </div>
+    <div class="ayui-form-item">
+      <label class="layui-form-label" style="width: 85px;">指定跟进人：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.assign_follow_ups.map{|d| d.staff.user.full_name}.join("、") %>
+      </div>
+    </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">商机说明：</label>
       <div class="layui-input-block" style="padding-right: 20px;">

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

@@ -50,7 +50,6 @@
     form.on('submit(saveBtn)', function(data) {
 
       request.authPost("missions/commons", data.field, function(res) {
-        console.log(res.success == false)
         if (res.success == false) {
           layer.alert(res.msg)
         } else {

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

@@ -50,6 +50,7 @@
         ]
       ],
       limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
       page: true,
       skin: 'line'
     });

data/app/views/educode_sales/home/sales_staff.json.jbuilder

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @staffs do |d|
+    json.value d.id
+    json.name d.user.full_name
+  end
+end
+json.count (@staffs.total_count/10 + 1)
+json.code 0
+json.msg "success"

data/app/views/educode_sales/operation_plans/_monthPlan.html.erb

@@ -129,7 +129,7 @@
                     },
                     {
                         title: '操作',
-                        minWidth: 300,
+                        minWidth: 200,
                         toolbar: '#currentTableBar',
                         align: "center",
                         fixed: 'right'
@@ -138,6 +138,7 @@
             ],
 
             limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
             page: true,
             skin: 'line'
         });
@@ -179,7 +180,6 @@
          */
         table.on('toolbar(currentTableFilter3)', function (obj) {
             if (obj.event === 'add') { // 监听添加操作
-                console.log("a");
                 var content = miniPage.getHrefContent('/missions/operation_plans/new_month');
                 var openWH = miniPage.getOpenWidthHeight();
                 monthPlanIndex = layer.open({

data/app/views/educode_sales/operation_plans/_monthly.html.erb

@@ -132,7 +132,7 @@
                     },
                     {
                         title: '操作',
-                        minWidth: 350,
+                        minWidth: 220,
                         toolbar: '#monthlyTableBar',
                         align: "center",
                         fixed: 'right'
@@ -166,6 +166,7 @@
             },
 
             limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
             page: true
         });
 
@@ -240,7 +241,7 @@
 
                 var content = miniPage.getHrefContent('/missions/operation_reports/' + data.id + '/edit');
                 var openWH = miniPage.getOpenWidthHeight();
-
+                from_edit_monthly = true
                 MonthlyIndex = layer.open({
                     title: '编辑',
                     type: 1,

data/app/views/educode_sales/operation_plans/_weekPlan.html.erb

@@ -140,7 +140,7 @@
                     },
                     {
                         title: '操作',
-                        minWidth: 280,
+                        minWidth: 200,
                         toolbar: '#week_plan_currentTableBar',
                         align: "center",
                         fixed: 'right'
@@ -149,6 +149,7 @@
             ],
 
             limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
             page: true,
             skin: 'line'
         });

data/app/views/educode_sales/operation_plans/_weekly.html.erb

@@ -133,7 +133,7 @@
                     },
                     {
                         title: '操作',
-                        width: 300,
+                        minWidth: 220,
                         toolbar: '#currentWeekTableBar',
                         align: "center",
                         fixed: 'right'
@@ -167,6 +167,7 @@
             },
 
             limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
             page: true,
         });
 
@@ -243,7 +244,8 @@
             if (obj.event === 'edit') {
                 var content = miniPage.getHrefContent('/missions/operation_reports/' + data.id + '/edit')
                 var openWH = miniPage.getOpenWidthHeight();
-                   WeeklyIndex = layer.open({
+                from_edit_monthly = false
+                WeeklyIndex = layer.open({
                     title: '编辑周报',
                     type: 1,
                     shade: 0.2,

data/app/views/educode_sales/operation_plans/edit_week.html.erb

@@ -70,6 +70,7 @@
                 } else {
                     layer.close(parent.index10)
                     layer.close(parent.editWeek_index)
+                    layer.close(parent.edit_week_index)
                     table.reload('weekPlanTable1')
                     table.reload('newWeeklyTable')
                     table.reload('unfinish_table')

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

@@ -1,7 +1,12 @@
 <script type="text/html" id="newWeeklyToolbar">
   <div class="layui-btn-container">
+    {{#  if(parent.from_edit_monthly){ }}
+    <span class="table-label">本月计划列表</span>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add_month"> 添加计划</button>
+    {{# } else { }}
     <span class="table-label">本周计划列表</span>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
+    {{#  } }}
   </div>
 </script>
 <form class="layui-form layui-form-pane">
@@ -162,6 +167,27 @@
         $(window).on("resize", function () {
           layer.full(sindex);
         });
+      }else if (obj.event === 'add_month') { // 监听添加操作
+          from_weekly = true;
+          var content = miniPage.getHrefContent('/missions/operation_plans/new_month');
+          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,
+              success: function (layero, index) {
+                  // 重新渲染弹层中的下拉选择框select
+                  form.render('select');
+              }
+          });
+          $(window).on("resize", function () {
+              layer.full(sindex);
+          });
       }
     });
     table.on('tool(newWeeklyTable)', function (obj) {
@@ -196,7 +222,7 @@
         from_sales = true;
         content = miniPage.getHrefContent('/missions/operation_plans/edit_week?id=' + id);
         openWH = miniPage.getOpenWidthHeight();
-        sindex = layer.open({
+        edit_week_index = layer.open({
           title: '编辑',
           type: 1,
           shade: 0.2,

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

@@ -75,9 +75,7 @@
                 return false;
             }
             data.field['area_ids'] = area_ids;
-            console.log(data.field);
             request.authPut("missions/places/" + data.field.id, data.field, function (res) {
-                console.log(res.success == false)
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {

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

@@ -75,6 +75,7 @@
                 ]
             ],
             limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
             page: true
         });
 

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

@@ -3,9 +3,9 @@ json.data do
     json.id d.id
     json.name d.name
     json.area_id d.areas.present? ? d.areas.pluck(:name).join("、") : ''
-    json.businesses_count EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.place_id = #{d.id}").count
-    json.amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum(:profit_amount).round(2)
-    json.return_mount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.place_id = #{d.id}").sum(:return_money)
+    json.businesses_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.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(:profit_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/places/new.html.erb

@@ -63,7 +63,6 @@
                 return false;
             }
             data.field['area_ids'] = area_ids;
-            console.log(data.field);
             request.authPost("missions/places", data.field, function (res) {
                 if (res.success === false) {
                     layer.alert(res.msg)

data/app/views/educode_sales/plans/_monthPlan.html.erb

@@ -133,7 +133,7 @@
               },
               {
                 title: '操作',
-                minWidth: 280,
+                minWidth: 200,
                 toolbar: '#week_plan_currentTableBar',
                 align: "center",
                 fixed: 'right'
@@ -142,6 +142,7 @@
             ],
 
             limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
             page: true,
         });
 
@@ -258,7 +259,6 @@
               });
             } else if (obj.event === 'delete') {
                 layer.confirm('确定删除' + data.id, function (index) {
-                    console.log("aaaaa");
                     request.delete('missions/plans/' + data.id, {}, function (res) {
                         layer.close(index);
                         table.reload("monthPlanTable")

data/app/views/educode_sales/plans/_monthly.html.erb

@@ -136,7 +136,7 @@
           },
           {
             title: '操作',
-            width: 300,
+              minWidth: 220,
             toolbar: '#currentmonthlyTableBar',
             align: "center",
             fixed: 'right'
@@ -171,6 +171,7 @@
       },
 
       limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
       page: true
     });
 

data/app/views/educode_sales/plans/_weekPlan.html.erb

@@ -138,7 +138,7 @@
               },
               {
                 title: '操作',
-                minWidth: 280,
+                minWidth: 200,
                 toolbar: '#week_plan_currentTableBar',
                 align: "center",
                 fixed: 'right'
@@ -147,6 +147,7 @@
           ],
 
           limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
           page: true,
           skin: 'line'
         });

data/app/views/educode_sales/plans/_weekly.html.erb

@@ -138,7 +138,7 @@
             },
             {
               title: '操作',
-              minWidth: 300,
+                minWidth: 220,
               toolbar: '#currentWeeklyTableBar',
               align: "center",
               fixed: 'right'
@@ -172,6 +172,7 @@
           },
 
           limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
           page: true
         });
 
@@ -243,6 +244,7 @@
             if (obj.event === 'edit') {
                 var content = miniPage.getHrefContent('/missions/sale_reports/' + data.id + "/edit");
                 var openWH = miniPage.getOpenWidthHeight();
+                from_edit_monthly = false
                 sindex = layer.open({
                   title: '编辑周报',
                   type: 1,

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

@@ -101,7 +101,6 @@
       return false;
     })
     form.on('submit(data)', function (data) {
-      console.log('data', data)
       Rails.ajax({
         url: '/missions/roles/'+ parent.role_id + "/view",
         type: 'PUT',

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

@@ -48,6 +48,7 @@
         }]
       ],
       limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
       page: true
     })
 
@@ -60,7 +61,6 @@
           var value = obj.value //得到修改后的值
               ,data = obj.data //得到所在行所有键值
               ,field = obj.field; //得到字段
-          console.log(obj.data);
           request.authPut('missions/roles/' + data.id + '/update_role/', data,
               function(res) {
                   if (res.success) {