educode_sales 0.4.8 → 0.5.2

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

@@ -9,13 +9,22 @@
     <div class="layui-inline">
       <label class="layui-form-label required">周次</label>
       <div class="layui-input-inline">
-        <%= select_tag "weekly", options_for_select(@weeks), class: 'required' %>
+        <%= select_tag "weekly", options_for_select(@weeks,@week), class: 'required' %>
       </div>
     </div>
-    <div class="layui-inline">
+    <%if @teacher.present? %>
+      <div class="layui-inline">
       <label class="layui-form-label required">教师</label>
-      <div class="layui-input-block" id="add_teacher" style="width: 400px"></div>
-    </div>
+      <div class="layui-input-inline">
+        <%= select_tag "teacher_id", options_for_select(@teachers, @teacher&.id), {"lay-verify": "required", include_blank: true} %>
+      </div>
+      </div>
+      <%else %>
+      <div class="layui-inline">
+        <label class="layui-form-label required">教师</label>
+        <div class="layui-input-block" id="add_teacher" style="width: 400px"></div>
+      </div>
+      <%end %>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label required">计划内容</label>
       <div class="layui-input-block">
@@ -52,6 +61,7 @@
 </div>
 
 <script>
+  flag = false
     layui.use(['form', 'table', 'laytpl', 'request'], function () {
         var form = layui.form,
             layer = layui.layer,
@@ -86,6 +96,7 @@
         });
 
         add_teacher.on('itemSelect(add_teacher)', function (obj) {
+            flag = true
             teacher_id = obj.data;
             var name = obj.textContent
             add_teacher.setValue(name)
@@ -99,7 +110,11 @@
 
 
         form.on('submit(add_week_plan)', function (data) {
-            data.field.teacher_id = teacher_id
+            console.log(flag);
+            if (flag){
+                data.field.teacher_id = teacher_id
+            }
+            console.log(data.field.teacher_id);
             request.authPost("missions/operation_plans", data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)

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

@@ -32,7 +32,8 @@
 3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <% if can? :level1_audit, EducodeSales::OperationReport %>
+  <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">大区意见</label>
       <div class="layui-input-block">
         <textarea name="level1_opinion" placeholder="给出评价、提醒、建议、办法等。"
@@ -40,7 +41,9 @@
       </div>
     </div>
     <div id="weekStar4" style="margin-bottom: 40px"></div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <%end %>
+    <% if can? :level2_audit, EducodeSales::OperationReport %>
+  <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">总监意见</label>
       <div class="layui-input-block">
         <textarea name="level2_opinion" placeholder="给出评价、提醒、建议、办法等。"
@@ -48,7 +51,9 @@
       </div>
     </div>
     <div id="weekStar5" style="margin-bottom: 40px"></div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <%end %>
+    <% if can? :level3_audit, EducodeSales::OperationReport %>
+  <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">副总意见</label>
       <div class="layui-input-block">
         <textarea name="level3_opinion" placeholder="给出评价、提醒、建议、办法等。"
@@ -56,11 +61,14 @@
       </div>
     </div>
     <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <%end %>
     <br>
     <div class="layui-inline m-t-10">
+      <% if (can? :level1_audit, EducodeSales::OperationReport) || (can? :level2_audit, EducodeSales::OperationReport) || (can? :level3_audit, EducodeSales::OperationReport) %>
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="audit_weekly_report"
         style="margin-left: 18px">提交
       </button>
+      <%end %>
     </div>
   </div>
 </form>
@@ -85,7 +93,7 @@
     rate.render({
       elem: '#weekStar4',
       half: true,
-      value: "<%= @sale_report.level1_score %>",
+      value: parseFloat("<%= @sale_report.level1_score || 0%>"),
       length: 5,
       choose: function(value){
         level1_score = value
@@ -94,7 +102,7 @@
     rate.render({
       elem: '#weekStar5',
       half: true,
-      value: "<%= @sale_report.level2_score %>",
+      value: parseFloat("<%= @sale_report.level2_score || 0%>"),
       length: 5,
       choose: function(value){
         level2_score = value
@@ -103,7 +111,7 @@
     rate.render({
       elem: '#weekStar6',
       half: true,
-      value: "<%= @sale_report.level3_score %>",
+      value: parseFloat("<%= @sale_report.level3_score || 0%>"),
       length: 5,
       choose: function(value){
         level3_score = value
@@ -165,32 +173,32 @@
         cols: [
             [{
                 field: 'id',
-                width: 80,
+                width: 60,
                 title:'序号',type: 'numbers',
             },
                 {
                     field: 'staff',
-                    width: 100,
+                    width: 80,
                     title: '姓名'
                 },
                 {
                     field: 'teacher_name',
-                    width: 100,
+                    width: 120,
                     title: '教师姓名',
                 },
                 {
                     field: 'school',
-                    width: 100,
+                    width: 170,
                     title: '单位'
                 },
                 {
                     field: 'department',
-                    width: 100,
+                    width: 170,
                     title: '部门'
                 },
                 {
                     field: 'week',
-                    width: 100,
+                    width: 80,
                     title: '周次',
                 },
                 {
@@ -200,18 +208,18 @@
                 },
                 {
                     field: 'count',
-                    width: 100,
+                    width: 80,
                     title: '跟进',
                     templet: '#show_follow_audit'
                 },
                 {
                     field: 'rate',
-                    width: 100,
+                    width: 80,
                     title: '完成率',
                 },
                 {
                     field: 'updated_at',
-                    width: 190,
+                    width: 170,
                     title: '更新时间',
                     sort: true,
                 },

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

@@ -97,32 +97,32 @@
       cols: [
         [{
             field: 'id',
-            width: 80,
+            width: 60,
             title:'序号',type: 'numbers',
         },
             {
                 field: 'staff',
-                width: 100,
+                width: 80,
                 title: '姓名'
             },
             {
                 field: 'teacher_name',
-                width: 100,
+                width: 120,
                 title: '教师姓名',
             },
             {
                 field: 'school',
-                width: 100,
+                width: 170,
                 title: '单位'
             },
             {
                 field: 'department',
-                width: 100,
+                width: 170,
                 title: '部门'
             },
             {
                 field: 'week',
-                width: 100,
+                width: 80,
                 title: '周次',
             },
             {
@@ -132,18 +132,18 @@
             },
             {
                 field: 'count',
-                width: 100,
+                width: 80,
                 title: '跟进',
                 templet: '#show_follow_edit'
             },
             {
                 field: 'rate',
-                width: 100,
+                width: 80,
                 title: '完成率',
             },
             {
                 field: 'updated_at',
-                width: 190,
+                width: 170,
                 title: '更新时间',
                 sort: true,
             },

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

@@ -31,7 +31,8 @@
 3、补充说明需要上级解决的问题和挑战。"  disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <% if @sale_report.level1_opinion.present? || @sale_report.level1_score %>
+  <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">大区意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
@@ -39,7 +40,9 @@
       </div>
     </div>
     <div id="weekStar4" style="margin-bottom: 40px"></div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <%end %>
+    <% if @sale_report.level2_opinion.present? || @sale_report.level2_score %>
+  <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">总监意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
@@ -47,7 +50,9 @@
       </div>
     </div>
     <div id="weekStar5" style="margin-bottom: 40px"></div>
-    <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
+    <%end %>
+    <% if @sale_report.level3_opinion.present? || @sale_report.level3_score %>
+  <div class="layui-form-item layui-form-text" style="margin-bottom: 0px">
       <label class="layui-form-label">副总意见</label>
       <div class="layui-input-block">
         <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" disabled
@@ -55,6 +60,7 @@
       </div>
     </div>
     <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <%end %>
     <br>
   </div>
 </form>
@@ -78,28 +84,25 @@
             $ = layui.jquery,
             miniPage = layui.miniPage,
             request = layui.request;
-        table = layui.table;
+        table = layui.table
 
         rate.render({
             elem: '#weekStar4',
             half: true,
             readonly: true,
-            value: "<%= @sale_report.level1_score %>",
-            length: "<%= @sale_report.level1_score %>"
+            value: parseFloat("<%= @sale_report.level1_score || 0%>"),
         })
         rate.render({
             elem: '#weekStar5',
             half: true,
             readonly: true,
-            value: "<%= @sale_report.level2_score %>",
-            length: "<%= @sale_report.level2_score %>"
+            value: parseFloat("<%= @sale_report.level2_score || 0%>"),
         })
         rate.render({
             elem: '#weekStar6',
             half: true,
             readonly: true,
-            value: "<%= @sale_report.level3_score %>",
-            length: "<%= @sale_report.level3_score %>"
+            value: parseFloat("<%= @sale_report.level3_score || 0%>"),
         })
 
 
@@ -111,32 +114,32 @@
         cols: [
             [{
                 field: 'id',
-                width: 80,
+                width: 60,
                 title:'序号',type: 'numbers',
             },
                 {
                     field: 'staff',
-                    width: 100,
+                    width: 80,
                     title: '姓名'
                 },
                 {
                     field: 'teacher_name',
-                    width: 100,
+                    width: 120,
                     title: '教师姓名',
                 },
                 {
                     field: 'school',
-                    width: 100,
+                    width: 170,
                     title: '单位'
                 },
                 {
                     field: 'department',
-                    width: 100,
+                    width: 170,
                     title: '部门'
                 },
                 {
                     field: 'week',
-                    width: 100,
+                    width: 80,
                     title: '周次',
                 },
                 {
@@ -146,18 +149,18 @@
                 },
                 {
                     field: 'count',
-                    width: 100,
+                    width: 80,
                     title: '跟进',
                     templet: '#show_follow_show'
                 },
                 {
                     field: 'rate',
-                    width: 100,
+                    width: 80,
                     title: '完成率',
                 },
                 {
                     field: 'updated_at',
-                    width: 190,
+                    width: 170,
                     title: '更新时间',
                     sort: true,
                 },

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

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

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

@@ -1,8 +1,18 @@
+area_ids = EducodeSales::Common.where(clazz: 'area').ids.sort.to_s
 json.data do
   json.array! @places do |d|
     json.id d.id
     json.name d.name
-    json.area_id d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    # json.area_id d.areas.present? ? d.areas.pluck(:name).join("、") : ''
+    if d.areas.present?
+      if d.areas.ids.sort.to_s == area_ids
+        json.area_id '全国'
+      else
+        json.area_id  d.areas.pluck(:name).join("、")
+      end
+    else
+      json.area_id  ''
+    end
     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)

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

@@ -122,7 +122,7 @@
           },
           {
             field: 'level1_score',
-            width: 180,
+            width: 120,
             title: '大区',
             templet: function (d) {
               return '<div class="star1"></div>'
@@ -130,7 +130,7 @@
           },
           {
             field: 'level2_score',
-            width: 180,
+            width: 120,
             title: '总监',
             templet: function (d) {
               return '<div class="star2"></div>'
@@ -138,7 +138,7 @@
           },
           {
             field: 'level3_score',
-            width: 180,
+            width: 120,
             title: '副总',
             templet: function (d) {
               return '<div class="star3"></div>'
@@ -146,7 +146,7 @@
           },
             {
                 field: 'created_at',
-                width: 300,
+                width: 200,
                 title: '提交时间',
             },
           {

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

@@ -124,7 +124,7 @@
             },
             {
               field: 'level1_score',
-              width: 180,
+              width: 120,
               title: '大区',
               templet: function (d) {
                 return '<div class="star1"></div>'
@@ -132,7 +132,7 @@
             },
             {
               field: 'level2_score',
-              width: 180,
+              width: 120,
               title: '总监',
               templet: function (d) {
                 return '<div class="star2"></div>'
@@ -140,7 +140,7 @@
             },
             {
               field: 'level3_score',
-              width: 180,
+              width: 120,
               title: '副总',
               templet: function (d) {
                 return '<div class="star3"></div>'
@@ -149,7 +149,7 @@
             },
               {
                   field: 'created_at',
-                  width: 300,
+                  width: 200,
                   title: '提交时间',
               },
             {

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

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

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

@@ -112,33 +112,33 @@
             },
             {
               field: 'staff',
-              width: 120,
+              width: 80,
               title: '姓名'
             },
             {
                 field: 'business_name',
-                width: 270,
+                width: 170,
                 title: '商机名称',
             },
             {
                 field: 'school',
-                width: 200,
+                width: 170,
                 title: '单位'
             },
             {
                 field: 'department',
-                width: 190,
+                width: 170,
                 title: '部门'
             },
             {
               field: 'follow_ups_count',
-              width: 100,
+              width: 80,
               title: '跟进',
               templet: '#show_follow'
             },
             {
               field: 'finish_rate',
-              width: 100,
+              width: 80,
               title: '完成率',
             },
             {

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

@@ -9,7 +9,7 @@
     <div class="layui-inline">
       <label class="layui-form-label required">周次</label>
       <div class="layui-input-inline">
-        <%= select_tag "weekly", options_for_select(@weeks), class: 'required' %>
+        <%= select_tag "weekly", options_for_select(@weeks,@week), class: 'required' %>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -134,38 +134,38 @@
             },
             {
               field: 'staff',
-              width: 120,
+              width: 80,
               title: '姓名'
             },
             {
                 field: 'business_name',
-                width: 270,
+                width: 170,
                 title: '商机名称',
             },
             {
                 field: 'school',
-                width: 200,
+                width: 170,
                 title: '单位'
             },
             {
                 field: 'department',
-                width: 190,
+                width: 170,
                 title: '部门'
             },
             {
               field: 'weekly',
-              width: 100,
+              width: 80,
               title: '周次',
             },
             {
               field: 'follow_ups_count',
-              width: 100,
+              width: 80,
               title: '跟进',
               templet: '#show_follow'
             },
             {
               field: 'finish_rate',
-              width: 100,
+              width: 80,
               title: '完成率',
             },
             {