educode_sales 0.8.4 → 0.8.7

data/app/assets/stylesheets/educode_sales/layuimini.css

@@ -37,7 +37,7 @@
 .layui-layout-admin .layui-nav-tree .layui-nav-child dd.layui-this,
 .layui-layout-admin .layui-nav-tree .layui-nav-child dd.layui-this a {
   background-color: #1aa094 !important;
-} */
+}
 
 
 /**头部样式 */

data/app/controllers/educode_sales/assessments_controller.rb

@@ -26,11 +26,23 @@ module EducodeSales
             end
           end
           format.json do
-            @year2 = params[:q]&[:assessment_year] || '2022'
-            p @year2
-            @year = params[:q].present? && params[:q][:assessment_year].present? ? params[:q][:assessment_year]:'2022'
+            if @current_admin.is_admin?
+              @assessments = AssessmentsSetting.all
+            else
+              level = @current_admin.role.role_areas.find_by(clazz: '绩效考核').level
+              case level
+              when '自己'
+                @assessments = AssessmentsSetting.where(staff_id: @current_admin.id)
+              when '区域'
+                @staffs = EducodeSales::Staff.joins(:areas).where("educode_sales_commons.id in (?)", @current_admin.areas.pluck(:id)).distinct
+                @assessments = EducodeSales::AssessmentsSetting.where(staff_id: @staffs.select(:id))
+              else
+                @assessments = AssessmentsSetting.all
+              end
+            end
+            @year = params[:q].present? && params[:q][:assessment_year].present? ? params[:q][:assessment_year]:Time.now.year
             @assessments_id = params[:q].present? && params[:q][:assessment_id].present? ? params[:q][:assessment_id]: '1'
-            @assessments = AssessmentsSetting.where("assessment_year >= ? and assessment_year <= ?", "#{@year}-01-01 00:00:00".to_date, "#{@year}-12-31 23:59:00".to_date)
+            @assessments = @assessments.where("assessment_year >= ? and assessment_year <= ?", "#{@year}-01-01 00:00:00".to_date, "#{@year}-12-31 23:59:00".to_date)
             @assessments = @assessments.where(assessment: @assessments_id).order("updated_at desc")
             if params[:q].present? && params[:q][:staff_id].present?
               @assessments = @assessments.where(staff_id: params[:q][:staff_id]).order("updated_at desc")
@@ -98,16 +110,11 @@ module EducodeSales
       end
     end
 
-
-
-
     # 导出数据
     def get_export_data
       p 'get_export_data'
     end
 
-
-
     # 考核完成情况
     def progress
       p 'progress'
@@ -116,11 +123,25 @@ module EducodeSales
 
 
     def progress_or_get_export_data
+      if @current_admin.is_admin?
+        @assessments = AssessmentsSetting.all
+      else
+        level = @current_admin.role.role_areas.find_by(clazz: '绩效考核').level
+        case level
+        when '自己'
+          @assessments = AssessmentsSetting.where(staff_id: @current_admin.id)
+        when '区域'
+          @staffs = EducodeSales::Staff.joins(:areas).where("educode_sales_commons.id in (?)", @current_admin.areas.pluck(:id)).distinct
+          @assessments = EducodeSales::AssessmentsSetting.where(staff_id: @staffs.select(:id))
+        else
+          @assessments = AssessmentsSetting.all
+        end
+      end
       # common = Common.find_by(clazz: 'staff_type', name: '销售')
       # @staff_ids = Staff.joins(:user).where(job_type: common.id).pluck(:id)
       @assessment_id = params[:q].present? && params[:q][:assessment_id].present? ? params[:q][:assessment_id]:'1'
       @assessment_year = params[:q].present? && params[:q][:assessment_year].present? ?  params[:q][:assessment_year] : Time.now.year
-      @assessments =AssessmentsSetting.where(assessment: @assessment_id)
+      @assessments =@assessments.where(assessment: @assessment_id)
                                       .where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
                                       .order("created_at desc")
       if @assessments.present?
@@ -170,7 +191,7 @@ module EducodeSales
         data_count=[]
         data_list = FollowUp.joins("JOIN educode_sales_businesses ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id")
                 .where("educode_sales_businesses.id in (?)",businesses.pluck(:id)).map do |m|
-          {value: m.actual_amount.to_i, date:m.signed_date.to_s[5..6].to_i}
+          {value: m.actual_amount.to_f, date:m.signed_date.to_s[5..6].to_i}
         end
         count_data(data_list,data_count)  #  统计数据
         update_assessments_progress(data_count,d) #  批量更新assessment数据  事物  一个commit
@@ -203,7 +224,7 @@ module EducodeSales
       @staff_ids.each do |d|
         data_count = []
         data_list = @money_plans.where(staff_id: d).map do |m|
-          {date:m.date_at.to_s[5..6].to_i, value:m.amount.to_i}
+          {date:m.date_at.to_s[5..6].to_i, value:m.amount.to_f}
         end
         count_data(data_list,data_count)
         update_assessments_progress(data_count, d)
@@ -304,11 +325,11 @@ module EducodeSales
 
     # 更新assessments_settings表中数据
     def update_assessments_progress(data_count,staff_id)
-      data_count[12] = data_count[0].to_i + data_count[1].to_i + data_count[2].to_i
-      data_count[13] = data_count[3].to_i + data_count[4].to_i + data_count[5].to_i
-      data_count[14] = data_count[6].to_i + data_count[7].to_i + data_count[8].to_i
-      data_count[15] = data_count[9].to_i + data_count[10].to_i + data_count[11].to_i
-      data_count[16] = data_count[12].to_i + data_count[13].to_i + data_count[14].to_i + data_count[15].to_i
+      data_count[12] = data_count[0].to_f  + data_count[1].to_f  + data_count[2].to_f
+      data_count[13] = data_count[3].to_f  + data_count[4].to_f  + data_count[5].to_f
+      data_count[14] = data_count[6].to_f  + data_count[7].to_f  + data_count[8].to_f
+      data_count[15] = data_count[9].to_f  + data_count[10].to_f  + data_count[11].to_f
+      data_count[16] = data_count[12].to_f + data_count[13].to_f + data_count[14].to_f + data_count[15].to_f
         # 开启事物  处理 批量修改数据
         assessments = @assessments.where(staff_id: staff_id)
         assessments.update(annual_progress: data_count[16], first_quarter_progress: data_count[12], second_quarter_progress: data_count[13], third_quarter_progress: data_count[14], fourth_quarter_progress: data_count[15],

data/app/controllers/educode_sales/businesses_controller.rb

@@ -597,10 +597,10 @@ module EducodeSales
             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
           ")
-
         end
       end
     end
+
     #关注接口
     def following
       if brs=follow_business(@current_admin.user_id,params[:business_id])
@@ -642,7 +642,7 @@ module EducodeSales
     end
 
     def followed
-      if brs=follow_business(@current_admin.user_id,params[:business_id])
+      if follow_business(@current_admin.user_id,params[:business_id])
         render json: {msg:'确定取消关注？'}
       else
         render json: {msg:'确定关注？'}
@@ -664,7 +664,7 @@ module EducodeSales
       EduSetting.get(name)
     end
 
-    def follow_business(user_id,business_id)
+    def  follow_business(user_id,business_id)
       BusinessRelationShip.where(user_id:user_id,business_id:business_id).first
     end
   end

data/app/helpers/educode_sales/application_helper.rb

@@ -55,7 +55,7 @@ module EducodeSales
 
     # 完成率completion_rate
     def completion_rate(setting,progress)
-      if setting.to_i == 0 || progress.to_i >= setting.to_i
+      if setting.to_i == 0
         '100%'
       else
         (progress.to_f/setting.to_f*100).round(2).to_s + "%"

data/app/models/educode_sales/business.rb

@@ -23,10 +23,5 @@ module EducodeSales
       self.follow_ups.update_all(deleted_at: Time.now)
       EducodeSales::Recycle.create(source: self, deleter_id: user_id)
     end
-
-
-
-
-
   end
 end

data/app/models/educode_sales/staff.rb

@@ -3,7 +3,6 @@ module EducodeSales
     belongs_to :user
     belongs_to :role, optional: true
 
-    has_many :market_areas, dependent: :destroy
     has_many :follow_ups, dependent: :destroy
     has_many :operation_plans, dependent: :destroy
     has_many :operation_reports, dependent: :destroy
@@ -16,6 +15,7 @@ module EducodeSales
     has_many :sale_plans, dependent: :destroy
     has_many :staff_schools, dependent: :destroy
 
+    has_many :market_areas, dependent: :destroy
     has_many :areas, through: :market_areas
     validates :user_id, uniqueness: { message: '已存在' }
 

data/app/views/educode_sales/assessments/_progress.html.erb

@@ -1,12 +1,3 @@
-<script type="text/html" id="progress_Toolbar">
-  <div class="layui-btn-container">
-    <span class="table-label">指标完成情况</span>
-    <% if can?(:export_result, EducodeSales::AssessmentsSetting) %>
-      <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" style="font-size: 12px"></i></button>
-  <%end %>
-  </div>
-</script>
 <!--搜索-->
 <div class="layuimini-main  min-height-table" id="monthly_table_wraper">
   <form class="layui-form layui-form-pane" lay-filter="assessment_progress_form">
@@ -29,7 +20,7 @@
         </div>
       </div>
       <div class="layui-inline">
-        <label class="layui-form-label">人员</label>
+        <label class="layui-form-label">考核人员</label>
         <div class="layui-input-inline large-select">
           <%= select_tag "staff_id", options_for_select(@staffs), { id: 'weekly_staff_id', include_blank: true} %>
         </div>
@@ -44,21 +35,202 @@
   </form>
 
   <!--表格-->
-  <table class="layui-hide" id="progressTable" style="min-height: 600px;" lay-filter="progressTable"></table>
-
-
-
+  <table class="layui-tab " id="progressTable"  lay-filter="progressTable"></table>
+</div>
 
+<!--隐藏导出用的table-->
+<div class="layui-hide">
+  <table class="layui-table" lay-data="{height:315, url: '/missions/assessments/progress' }" id="export-table"  lay-filter="export-table">
+  <thead>
+  <tr>
+    <th lay-data="{width:80, type:'numbers' ,sort: true}" rowspan="2">序号</th>
+    <th lay-data="{field:'name', width:120}" rowspan="2">考核人员</th>
+    <th lay-data="{align:'center'}" colspan="5">全年</th>
+    <th lay-data="{align:'center'}" colspan="5">第1季度</th>
+    <th lay-data="{align:'center'}" colspan="5">1月</th>
+    <th lay-data="{align:'center'}" colspan="5">2月</th>
+    <th lay-data="{align:'center'}" colspan="5">3月</th>
+    <th lay-data="{align:'center'}" colspan="5">第2季度</th>
+    <th lay-data="{align:'center'}" colspan="5">4月</th>
+    <th lay-data="{align:'center'}" colspan="5">5月</th>
+    <th lay-data="{align:'center'}" colspan="5">6月</th>
+    <th lay-data="{align:'center'}" colspan="5">第3季度</th>
+    <th lay-data="{align:'center'}" colspan="5">7月</th>
+    <th lay-data="{align:'center'}" colspan="5">8月</th>
+    <th lay-data="{align:'center'}" colspan="5">9月</th>
+    <th lay-data="{align:'center'}" colspan="5">第4季度</th>
+    <th lay-data="{align:'center'}" colspan="5">10月</th>
+    <th lay-data="{align:'center'}" colspan="5">11月</th>
+    <th lay-data="{align:'center'}" colspan="5">12月</th>
+  </tr>
+  <tr>
+    <th lay-data="{field:'annual', width:80}">目标</th>
+    <th lay-data="{field:'annual_progress', width:80}">完成</th>
+    <th lay-data="{field:'annual_dif', width:80}">差额</th>
+    <th lay-data="{field:'annual_rate', width:80}">完成率</th>
+    <th lay-data="{field:'annual_score', width:80}">得分</th>
+
+    <th lay-data="{field:'first_quarter', width:80}">目标</th>
+    <th lay-data="{field:'first_quarter_progress', width:80}">完成</th>
+    <th lay-data="{field:'first_quarter_dif', width:80}">差额</th>
+    <th lay-data="{field:'first_quarter_rate', width:80}">完成率</th>
+    <th lay-data="{field:'first_quarter_score', width:80}">得分</th>
+
+    <th lay-data="{field:'january', width:80}">目标</th>
+    <th lay-data="{field:'january_progress', width:80}">完成</th>
+    <th lay-data="{field:'january_dif', width:80}">差额</th>
+    <th lay-data="{field:'january_rate', width:80}">完成率</th>
+    <th lay-data="{field:'january_score', width:80}">得分</th>
+
+    <th lay-data="{field:'february', width:80}">目标</th>
+    <th lay-data="{field:'february_progress', width:80}">完成</th>
+    <th lay-data="{field:'february_dif', width:80}">差额</th>
+    <th lay-data="{field:'february_rate', width:80}">完成率</th>
+    <th lay-data="{field:'february_score', width:80}">得分</th>
+
+    <th lay-data="{field:'march', width:80}">目标</th>
+    <th lay-data="{field:'march_progress', width:80}">完成</th>
+    <th lay-data="{field:'march_dif', width:80}">差额</th>
+    <th lay-data="{field:'march_rate', width:80}">完成率</th>
+    <th lay-data="{field:'march_score', width:80}">得分</th>
+
+    <th lay-data="{field:'second_quarter', width:80}">目标</th>
+    <th lay-data="{field:'second_quarter_progress', width:80}">完成</th>
+    <th lay-data="{field:'second_quarter_dif', width:80}">差额</th>
+    <th lay-data="{field:'second_quarter_rate', width:80}">完成率</th>
+    <th lay-data="{field:'second_quarter_score', width:80}">得分</th>
+
+    <th lay-data="{field:'april', width:80}">目标</th>
+    <th lay-data="{field:'april_progress', width:80}">完成</th>
+    <th lay-data="{field:'april_dif', width:80}">差额</th>
+    <th lay-data="{field:'april_rate', width:80}">完成率</th>
+    <th lay-data="{field:'april_score', width:80}">得分</th>
+
+    <th lay-data="{field:'may', width:80}">目标</th>
+    <th lay-data="{field:'may_progress', width:80}">完成</th>
+    <th lay-data="{field:'may_dif', width:80}">差额</th>
+    <th lay-data="{field:'may_rate', width:80}">完成率</th>
+    <th lay-data="{field:'may_score', width:80}">得分</th>
+
+    <th lay-data="{field:'june', width:80}">目标</th>
+    <th lay-data="{field:'june_progress', width:80}">完成</th>
+    <th lay-data="{field:'june_dif', width:80}">差额</th>
+    <th lay-data="{field:'june_rate', width:80}">完成率</th>
+    <th lay-data="{field:'june_score', width:80}">得分</th>
+
+    <th lay-data="{field:'third_quarter', width:80}">目标</th>
+    <th lay-data="{field:'third_quarter_progress', width:80}">完成</th>
+    <th lay-data="{field:'third_quarter_dif', width:80}">差额</th>
+    <th lay-data="{field:'third_quarter_rate', width:80}">完成率</th>
+    <th lay-data="{field:'third_quarter_score', width:80}">得分</th>
+
+    <th lay-data="{field:'july', width:80}">目标</th>
+    <th lay-data="{field:'july_progress', width:80}">完成</th>
+    <th lay-data="{field:'july_dif', width:80}">差额</th>
+    <th lay-data="{field:'july_rate', width:80}">完成率</th>
+    <th lay-data="{field:'july_score', width:80}">得分</th>
+
+    <th lay-data="{field:'august', width:80}">目标</th>
+    <th lay-data="{field:'august_progress', width:80}">完成</th>
+    <th lay-data="{field:'august_dif', width:80}">差额</th>
+    <th lay-data="{field:'august_rate', width:80}">完成率</th>
+    <th lay-data="{field:'august_score', width:80}">得分</th>
+
+    <th lay-data="{field:'september', width:80}">目标</th>
+    <th lay-data="{field:'september_progress', width:80}">完成</th>
+    <th lay-data="{field:'september_dif', width:80}">差额</th>
+    <th lay-data="{field:'september_rate', width:80}">完成率</th>
+    <th lay-data="{field:'september_score', width:80}">得分</th>
+
+    <th lay-data="{field:'fourth_quarter', width:80}">目标</th>
+    <th lay-data="{field:'fourth_quarter_progress', width:80}">完成</th>
+    <th lay-data="{field:'fourth_quarter_dif', width:80}">差额</th>
+    <th lay-data="{field:'fourth_quarter_rate', width:80}">完成率</th>
+    <th lay-data="{field:'fourth_quarter_score', width:80}">得分</th>
+
+    <th lay-data="{field:'october', width:80}">目标</th>
+    <th lay-data="{field:'october_progress', width:80}">完成</th>
+    <th lay-data="{field:'october_dif', width:80}">差额</th>
+    <th lay-data="{field:'october_rate', width:80}">完成率</th>
+    <th lay-data="{field:'october_score', width:80}">得分</th>
+
+    <th lay-data="{field:'november', width:80}">目标</th>
+    <th lay-data="{field:'november_progress', width:80}">完成</th>
+    <th lay-data="{field:'november_dif', width:80}">差额</th>
+    <th lay-data="{field:'november_rate', width:80}">完成率</th>
+    <th lay-data="{field:'november_score', width:80}">得分</th>
+
+    <th lay-data="{field:'december', width:80}">目标</th>
+    <th lay-data="{field:'december_progress', width:80}">完成</th>
+    <th lay-data="{field:'december_dif', width:80}">差额</th>
+    <th lay-data="{field:'december_rate', width:80}">完成率</th>
+    <th lay-data="{field:'december_score', width:80}">得分</th>
+
+  </tr>
+  </thead>
+</table>
 </div>
 
 
+<script src="educode_sales/table2excel.js"></script>
+<script type="text/html" id="progress_Toolbar">
+  <div class="layui-btn-container">
+    <span class="table-label">指标完成情况</span>
+    <% if can?(:export_result, EducodeSales::AssessmentsSetting) %>
+      <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" style="font-size: 12px"></i></button>
+    <%end %>
+  </div>
+</script>
 
 
 <script>
-    layui.use(['form', 'table', 'miniPage', 'element', 'rate', 'laydate', 'request'], function () {
+      var $=layui.jquery
+      var demo = function() {
+          let header_tr = $("#export-table").next().find(".layui-table-header").find("tr");
+          let body_tr = $("#export-table").next().find(".layui-table-body").find("tr");
+          let header_html = "";
+          let body_html = "";
+  // 获取表头html，包括单元格的合并
+          $.each(header_tr,function (i,tr) {
+              let header_th = $(tr).find("th");
+              header_html += "<tr>";
+              $.each(header_th,function (j,th) {
+                  let rowspan_num = $(th).attr("rowspan");// 行合并数
+                  let colspan_num = $(th).attr("colspan");// 列合并数
+                  if (rowspan_num && !colspan_num){// 只有行合并时
+                      header_html += '<th rowspan= "'+ rowspan_num +'">';
+                  } else if (colspan_num && !rowspan_num){// 只有列合并时
+                      header_html += '<th colspan= "'+ colspan_num +'">';
+                  } else if (rowspan_num && colspan_num){// 行列合并均有时
+                      header_html += '<th rowspan= "'+ rowspan_num +'" colspan="'+ colspan_num +'">';
+                  } else {// 没有发生单元格合并
+                      header_html += '<th>';
+                  }
+                  header_html += $(th).children().children().text() + '</th>';// 获取表头名称并拼接th标签
+                  console.log(header_html)
+              })
+              header_html += '</tr>';
+          })
+  // 获取表格body数据
+          $.each(body_tr,function (i,tr) {
+              let body_td = $(tr).find("td");
+              body_html += '<tr>';
+              $.each(body_td,function (j,td) {
+                  body_html += '<td>' + $(td).children().text() + '</td>';
+              })
+              body_html += '</tr>';
+          })
+          $("#export-table tr").remove();// 清除之前的doom结构
+          $("#export-table").append(header_html).append(body_html);
+          $("#export-table").hide();
+      }
 
+</script>
 
 
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'rate', 'laydate', 'request'], function () {
 
         var $ = layui.jquery,
             form = layui.form,
@@ -69,6 +241,7 @@
             miniPage = layui.miniPage;
             dropdown = layui.dropdown;
 
+
         laydate.render({
             elem: '#assessment_year',
             type: 'year'
@@ -83,13 +256,12 @@
             ,totalRow:true
             ,title: "绩效考核指标完成情况" // 目前发现的作用(导出文件的文件名)
             ,defaultToolbar: ['filter']
-            // ,limit: 10
             ,limits: [10,15,20,30,40,50,60,70,80,90]
             ,limit: 10
             ,page: true
             ,cols:[
                     [ //标题栏
-                        { title: '序号', width: 80, rowspan: 2,type:'numbers',fixed:'left',sort: true,} //rowspan即纵向跨越的单元格数
+                        { title: '序号', width: 80, rowspan: 2,type:'numbers',fixed:'left',} //rowspan即纵向跨越的单元格数
                         ,{field: 'name', title: '考核人员', width: 120, rowspan: 2,fixed:'left'}
                         ,{align: 'center', title: '全年', colspan: 5} //colspan即横跨的单元格数，这种情况下不用设置field和width
                         ,{align: 'center', title: '第1季度', colspan: 5} //colspan即横跨的单元格数，这种情况下不用设置field和width
@@ -104,10 +276,10 @@
                         ,{align: 'center', title: '7月', colspan: 5} //colspan即横跨的单元格数，这种情况下不用设置field和width
                         ,{align: 'center', title: '8月', colspan: 5} //colspan即横跨的单元格数，这种情况下不用设置field和width
                         ,{align: 'center', title: '9月', colspan: 5} //colspan即横跨的单元格数，这种情况下不用设置field和width
-                        ,{align: 'center', title: '第4季度', colspan: 5} //colspan即横跨的单元格数，这种情况下不用设置field和width
-                        ,{align: 'center', title: '10月', colspan: 5} //colspan即横跨的单元格数，这种情况下不用设置field和width
-                        ,{align: 'center', title: '11月', colspan: 5} //colspan即横跨的单元格数，这种情况下不用设置field和width
-                        ,{align: 'center', title: '12月', colspan: 5} //colspan即横跨的单元格数，这种情况下不用设置field和width
+                        ,{align: 'center', title: '第4季度', colspan: 5}
+                        ,{align: 'center', title: '10月', colspan: 5}
+                        ,{align: 'center', title: '11月', colspan: 5}
+                        ,{align: 'center', title: '12月', colspan: 5}
                     ],
                     [
                         {field: 'annual', title: '目标', width: 80}
@@ -260,17 +432,17 @@
             })
 
         }
+
         function export_excel() {
-            var data = form.val("assessment_progress_form");
-            request.authPost("/missions/assessments/get_export_data", {
-                assessment_year: data.assessment_year,
-                assessment_id: data.assessment_id,
-                staff_id: data.staff_id,
-            }, function (res) {
-                data = res.data;
-                table.exportFile(progress_table.config.id,data, 'xls');
-                layer.closeAll('loading');
-            })
+            demo()
+            let table2excel = new Table2Excel();
+            /**
+             * 此处的show()是为了避免table2excel将hide属性带入excel中
+             * 导致下载后的excel中所有数据被隐藏
+             */
+            $('#export-table').show();
+            table2excel.export($('#export-table'), "指标完成情况");
+            $('#export-table').hide();
 
         }
 
@@ -302,13 +474,20 @@
                     sort: sort
                 }
             }, 'data');
-
+            // 导出table中的数据也要reload
+            table.reload('export-table', {
+                page: {
+                    curr: 1
+                },
+                where: {
+                    q: search,
+                    sort: sort
+                }
+            })
             return false;
         });
 
         form.on('submit(progress_resert_btn)', function (data) {
-            var field = data.field;
-            console.log("--------------------")
             console.log(gon.export_menus)
             form.val('assessment_progress_form', {
                 staff_id: '',
@@ -319,118 +498,7 @@
         });
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        /**
-         * toolbar事件监听
-         */
-        // table.on('toolbar(progressTable)', function (obj) {
-        //     if (obj.event === 'add') { // 监听添加操作
-        //         var content = miniPage.getHrefContent('/missions/plans/new_monthly');
-        //         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(progressTable)', function (obj) {
-        //     var data = obj.data;
-        //     if (obj.event === 'edit') {
-        //         var content = miniPage.getHrefContent('/missions/sale_reports/' + data.id + "/edit");
-        //         var openWH = miniPage.getOpenWidthHeight();
-        //         from_edit_monthly = true
-        //         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);
-        //         });
-        //         return false;
-        //     } else if (obj.event === 'delete') {
-        //         layer.confirm('确定删除ID为' + data.id + " 的月报", function (index) {
-        //             request.delete('missions/sale_reports/' + data.id, {}, function (res) {
-        //                 layer.close(index);
-        //                 table.reload("progressTable")
-        //             })
-        //         });
-        //     } else if (obj.event === 'show') {
-        //         content = miniPage.getHrefContent('/missions/sale_reports/' + data.id);
-        //         openWH = miniPage.getOpenWidthHeight();
-        //         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);
-        //         });
-        //         return false;
-        //     } else if (obj.event === 'audit') {
-        //         content = miniPage.getHrefContent('/missions/sale_reports/' + data.id + "/audit");
-        //         openWH = miniPage.getOpenWidthHeight();
-        //         from_source = 'monthly';
-        //         report_id = data.id;
-        //         sindex = layer.open({
-        //             title: '审查'+ data.staff +'的月报',
-        //             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);
-        //         });
-        //         return false;
-        //     }
-        // });
-
     });
 </script>
 
+