educode_sales 0.3.8 → 0.4.2

data/app/controllers/educode_sales/teachers_controller.rb

@@ -55,13 +55,16 @@ module EducodeSales
             @teachers = @teachers.where("educode_sales_teachers.name like ?", "%#{params[:q][:name]}%")
           end
           if params[:q].present? && params[:q][:professional_title].present?
-            @teachers = @teachers.where("educode_sales_teachers.professional_title like ?", "%#{params[:q][:professional_title]}%")
+            @teachers = @teachers.where("educode_sales_teachers.professional_title = ?", "#{params[:q][:professional_title]}")
           end
           if params[:q].present? && params[:q][:regist_at].present?
             @teachers = @teachers.where("educode_sales_teachers.regist_at like ?", "%#{params[:q][:regist_at]}%")
           end
           if params[:q].present? && params[:q][:attitude].present?
-            @teachers = @teachers.where("educode_sales_teachers.attitude_id = ?", "#{params[:q][:attitude]}")
+            # @teachers = @teachers.where("educode_sales_teachers.attitude_id = ?", "#{params[:q][:attitude]}")
+            @teachers = @teachers.joins("
+              JOIN educode_sales_teacher_follows ON educode_sales_teachers.follow_up_id = educode_sales_teacher_follows.id
+            ").where("educode_sales_teacher_follows.attitude_id = ?", params[:q][:attitude])
           end
           if params[:q].present? && params[:q][:teacher_source].present?
             @teachers = @teachers.where("educode_sales_teachers.source_id = ?", "#{params[:q][:teacher_source]}")
@@ -82,16 +85,18 @@ module EducodeSales
           end
           if params[:q].present? && params[:q][:date].present?
             date = params[:q][:date].split(" - ")
-            @teachers = @teachers.where("created_at > ? AND created_at < ?", date[0], date[1])
+            @teachers = @teachers.where("educode_sales_teachers.created_at > ? AND educode_sales_teachers.created_at < ?", date[0], date[1])
           end
 
-          @teachers = @teachers.order("created_at desc").page(params[:page]).per(params[:limit])
+          @teachers = @teachers.order("educode_sales_teachers.created_at desc").page(params[:page]).per(params[:limit])
 
         end
       end
     end
 
-
+    def import
+      render layout: false
+    end
 
     def new
       render layout: false
@@ -109,17 +114,24 @@ module EducodeSales
         teacher.regist_at = Time.now
       end
 
-      if params[:activity_id].present? && params[:user_id].present?
-        @teacher_id = EducodeSales::Teacher.find_by(name: params[:name]).id
+      unless params[:activity_id].present?
+      return render json: {msg: '该教师已存在', success: false } if EducodeSales::Teacher.find_by(department_id: params[:department_id],name: params[:name])
+      end
 
+      if params[:activity_id].present?
+        if params[:user_id].present?
         # 把老师添加到活动列表，提取判断下老师列表是否存在
-        find_teacher = Teacher.find_by(user_id: params[:user_id])
-        if find_teacher
-          teacher = find_teacher
+          find_teacher = Teacher.find_by(user_id: params[:user_id])
+          if find_teacher
+            teacher = find_teacher
+          end
+        else
+           _teacher = EducodeSales::Teacher.find_by(department_id: params[:department_id],name: params[:name])
+           teacher = _teacher if _teacher.present?
         end
+        return render json: {msg: '该教师已在活动中', success: false } if teacher && teacher.activity_teachers.find_by(activity_id: params[:activity_id]).present?
       end
       if params[:activity_id].present?
-        return render json: {msg: '该教师已在活动中', success: false } if teacher.activity_teachers.find_by(activity_id: params[:activity_id]).present?
         teacher.activity_teachers.build(activity_id: params[:activity_id])
       end
 
@@ -268,7 +280,7 @@ module EducodeSales
     def course_list
       user = User.find_by(id: params[:user_id])
       if user
-      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).distinct("course_id").page(params[:page]).per(params[:limit])
+      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct("course_id").page(params[:page]).per(params[:limit])
       else
         @courses = Course.none
       end

data/app/models/educode_sales/assign_follow_up.rb

@@ -0,0 +1,6 @@
+module EducodeSales
+  class AssignFollowUp < ApplicationRecord
+    belongs_to :staff
+    belongs_to :follow_up
+  end
+end

data/app/models/educode_sales/follow_up.rb

@@ -5,6 +5,7 @@ module EducodeSales
     has_many :money_plans, dependent: :destroy
     has_many :key_person
     has_many :teachers, through: :key_person
+    has_many :assign_follow_ups, dependent: :destroy
     belongs_to :staff
     belongs_to :stage, class_name: 'Common'
     belongs_to :clazz, class_name: 'Common'

data/app/models/educode_sales/teacher.rb

@@ -37,7 +37,7 @@ module EducodeSales
 
     def students_count
       if user_id.present?
-        course_ids = CourseMember.where.not(role: "STUDENT").where(user_id: user_id).pluck(:course_id)
+        course_ids = Course.joins(:course_members).where(course_members: {user_id: user_id}).where("is_delete = 0 and role != 4  and excellent = 0  and is_hidden = 0").where("start_date is null or start_date <= '#{Date.today}'").distinct("course_id").pluck(:course_id)
         CourseMember.where(course_id: course_ids, role: "STUDENT").count
       else
         0

data/app/models/educode_sales/teacher_follow.rb

@@ -2,5 +2,6 @@ module EducodeSales
   class TeacherFollow < ApplicationRecord
     belongs_to :teacher, counter_cache: true
     belongs_to :staff
+    belongs_to :attitude, class_name: 'Common'
   end
 end

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

@@ -67,7 +67,6 @@
 
         //监听提交
         form.on('submit(data-reset-btn)', function (data) {
-            console.log(data.field);
             request.authPut("missions/activities/" + <%= @activity.id %>, data.field, function (res) {
                 if (res.success === false) {
                     layer.alert(res.msg)

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

@@ -2,7 +2,8 @@
   <div class="layui-btn-container">
     <span class="table-label">活动列表</span>
     <% if can? :create, EducodeSales::Activity %>
-    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加活动</button>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import">导入数据</button>
+      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加活动</button>
     <% end %>
   </div>
 </script>
@@ -84,6 +85,7 @@
               ]
             ],
             limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
             page: true
         });
 
@@ -119,6 +121,23 @@
               layer.full(index);
             });
           }
+          else if (obj.event === 'import') {  //
+              var content = miniPage.getHrefContent('/missions/teachers/import');
+              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(activities_table)', function (obj) {

data/app/views/educode_sales/activities/show_teachers.html.erb

@@ -15,7 +15,7 @@
   {{# if (d.login) { }}
   <a href="<%= base_url%>/users/{{d.login}}" class="layui-table-link" target="_blank">{{ d.name }}</a>
   {{# } else {}}
-  <a href="<%= base_url%>/users/{{d.login}}" class="">{{ d.name }}</a>
+  <a href="javascript:;" class="">{{ d.name }}</a>
   {{# }}}
 </script>
 <script type="text/html" id="courses">

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

@@ -2,9 +2,9 @@
 <div class="layui-form layuimini-form">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
-      <label class="layui-form-label required">名称</label>
+      <label class="layui-form-label required">商机名称</label>
       <div class="layui-input-block">
-        <input type="text" name="name" autocomplete="off" lay-verify="required" class="layui-input" value="<%= @business.name %>">
+        <input type="text" name="name" autocomplete="off" lay-verify="required" class="layui-input"  value="<%= @business.name %>" style="width: 300px;">
       </div>
     </div>
     <div class="layui-inline">

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) {
@@ -229,7 +237,7 @@
               edit(id);
               break;
             case 'delete':
-              deleteBusiness(id, elem.data['name']);
+              deleteBusiness(id, elem.data('name'));
               break;
             }
           }
@@ -292,7 +300,7 @@
       }
 
       function deleteBusiness(id, name) {
-        layer.confirm('确定删除' + name, function (index) {
+          layer.confirm('确定删除' + name, function (index) {
           request.delete('missions/businesses/' + id, {}, function (res) {
             layer.close(index);
             table.reload("businesses_table")
@@ -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

@@ -1,3 +1,4 @@
+<%= Gon::Base.render_data %>
 <h1 class="m-t-20 text-center"><%= @business.name %></h1>
 <div class="layui-form layuimini-form">
   <div class="layui-form-item" style="padding: 25px">
@@ -77,6 +78,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 +117,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 +134,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});
+                }
 
+            }
+          })
+        }
+      })
+
+      sales_list.setValue(gon.sales);
       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_plans/new_month.html.erb

@@ -73,8 +73,10 @@
                     layer.close(parent.new_monthly_index)
                     layer.close(parent.monthPlanIndex)
                     layer.close(parent.teacherindex2)
+                    layer.close(parent.sindex)
                     table.reload('monthPlanTable')
                     table.reload("newMonthlyTable")
+                    table.reload("newWeeklyTable")
                 }
             })
             return false;