educode_sales 0.4.8 → 0.5.2

data/app/views/educode_sales/recycles/monthPlan.json.jbuilder

@@ -0,0 +1,16 @@
+json.data do
+  json.array! @monthPlans do |d|
+    next if EducodeSales::SalePlan.unscoped.find(d.source_id).weekly.present?
+    json.id d.id
+    json.name EducodeSales::SalePlan.unscoped.find(d.source_id).staff.user.real_name
+    json.month EducodeSales::SalePlan.unscoped.find(d.source_id).month.strftime("%Y-%m")
+    json.weekly EducodeSales::SalePlan.unscoped.find(d.source_id).weekly
+    json.plan EducodeSales::SalePlan.unscoped.find(d.source_id).content
+    json.update_at EducodeSales::SalePlan.unscoped.find(d.source_id).updated_at.to_s
+    json.deleter EducodeSales::Staff.find(d.deleter_id).user.real_name
+    json.delete_time d.created_at.to_s
+  end
+end
+
+json.code 0
+json.count @monthPlans.total_count

data/app/views/educode_sales/recycles/monthly.json.jbuilder

@@ -0,0 +1,15 @@
+json.data do
+  json.array! @monthly do |d|
+    next if EducodeSales::SaleReport.unscoped.find(d.source_id).weekly.present?
+    json.id d.id
+    json.name EducodeSales::SaleReport.unscoped.find(d.source_id).staff.user.real_name
+    json.month EducodeSales::SaleReport.unscoped.find(d.source_id).month.strftime('%Y-%m')
+    json.plan EducodeSales::SaleReport.unscoped.find(d.source_id).content
+    json.update_at EducodeSales::SaleReport.unscoped.find(d.source_id).updated_at.to_s
+    json.deleter EducodeSales::Staff.find(d.deleter_id).user.real_name
+    json.delete_time d.created_at.to_s
+  end
+end
+
+json.code 0
+json.count @monthly.total_count

data/app/views/educode_sales/recycles/weekPlan.json.jbuilder

@@ -0,0 +1,16 @@
+json.data do
+  json.array! @weekPlans do |d|
+    next if EducodeSales::SalePlan.unscoped.find(d.source_id).weekly.nil?
+    json.id d.id
+    json.name EducodeSales::SalePlan.unscoped.find(d.source_id).staff.user.real_name
+    json.month EducodeSales::SalePlan.unscoped.find(d.source_id).month.strftime("%Y-%m")
+    json.weekly EducodeSales::SalePlan.unscoped.find(d.source_id).weekly
+    json.plan EducodeSales::SalePlan.unscoped.find(d.source_id).content
+    json.update_at EducodeSales::SalePlan.unscoped.find(d.source_id).updated_at.to_s
+    json.deleter EducodeSales::Staff.find(d.deleter_id).user.real_name
+    json.delete_time d.created_at.to_s
+  end
+end
+
+json.code 0
+json.count @weekPlans.total_count

data/app/views/educode_sales/recycles/weekly.json.jbuilder

@@ -0,0 +1,15 @@
+json.data do
+  json.array! @weekly do |d|
+    next if EducodeSales::SaleReport.unscoped.find(d.source_id).weekly.nil?
+    json.id d.id
+    json.name EducodeSales::SaleReport.unscoped.find(d.source_id).staff.user.real_name
+    json.weekly EducodeSales::SaleReport.unscoped.find(d.source_id).weekly
+    json.plan EducodeSales::SaleReport.unscoped.find(d.source_id).content
+    json.update_at EducodeSales::SaleReport.unscoped.find(d.source_id).updated_at.to_s
+    json.deleter EducodeSales::Staff.find(d.deleter_id).user.real_name
+    json.delete_time d.created_at.to_s
+  end
+end
+
+json.code 0
+json.count @weekly.total_count

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

@@ -8,6 +8,7 @@
   </div>
 </script>
 <script type="text/html" id="role_bar">
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="rename">重命名</a>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
 </script>
@@ -35,7 +36,6 @@
           field: 'name',
           title: '角色',
           width: 120,
-            edit: 'text'
         }, {
           field: 'permissions',
           title: '模块浏览权限',
@@ -124,6 +124,24 @@
           layer.full(index);
         });
         return false;
+      }else if (obj.event === 'rename') {
+          id = data.id
+          var content = miniPage.getHrefContent('/missions/roles/rename?id='+id);
+          var openWH = miniPage.getOpenWidthHeight();
+          rename_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 === 'delete') {
         layer.confirm('确定删除' + data.name, function (index) {
           request.delete('missions/roles/'+ data.id, {}, function(res) {

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

@@ -0,0 +1,50 @@
+<form class="layui-form " action="">
+  <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-inline">
+      <label class="layui-form-label required">角色名称</label>
+      <div class="layui-input-block" style="line-height: 36px;">
+        <input type="text" name="name" id="name" required lay-verify="required" autocomplete="off"
+               class="layui-input" value="<%=@name %>">
+      </div>
+    </div>
+    <div class="layui-inline" style="padding-left: 30px">
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="submits">提交
+      </button>
+    </div>
+  </div>
+</form>
+
+
+<script>
+
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            transfer = layui.transfer,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            $ = layui.$;
+
+        form.render();
+
+        // 当前弹出层，防止ID被覆盖
+        var parentIndex = layer.index;
+
+        //监听提交
+        form.on('submit(submits)', function (data) {
+            console.log(data);
+            request.authPut('missions/roles/' + parent.id + '/update_role/', data.field,
+                function(res) {
+                    if (res.success) {
+                        table.reload('role');
+                        layer.close(parent.rename_index)
+                    } else {
+                        layer.alert(res.msg)
+                    }
+
+                })
+            return false;
+        });
+    });
+</script>

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

@@ -36,7 +36,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::SaleReport %>
+  <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="给出评价、提醒、建议、办法等。"
@@ -44,7 +45,10 @@
       </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::SaleReport %>
+  <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="给出评价、提醒、建议、办法等。"
@@ -52,7 +56,10 @@
       </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::SaleReport %>
+  <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="给出评价、提醒、建议、办法等。"
@@ -60,11 +67,15 @@
       </div>
     </div>
     <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <% end %>
+
     <br>
     <div class="layui-inline m-t-10">
+      <% if (can? :level1_audit, EducodeSales::SaleReport) || (can? :level2_audit, EducodeSales::SaleReport) || (can? :level3_audit, EducodeSales::SaleReport) %>
       <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>
@@ -89,7 +100,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
@@ -98,7 +109,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
@@ -107,7 +118,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
@@ -171,38 +182,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: '完成率',
           },
           {

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

@@ -108,38 +108,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: '完成率',
           },
           {

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

@@ -35,6 +35,7 @@
 3、补充说明需要上级解决的问题和挑战。" disabled class="layui-textarea autosize"><%= @sale_report.content %></textarea>
       </div>
     </div>
+    <% 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">
@@ -43,7 +44,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
@@ -51,7 +54,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
@@ -59,6 +64,7 @@
       </div>
     </div>
     <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <%end %>
     <br>
   </div>
 </form>
@@ -78,22 +84,19 @@
       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%>"),
     })
 
     table.on('tool(showWeeklyTable)', function (obj) {
@@ -136,12 +139,12 @@
         },
         {
             field: 'business_name',
-            width: 150,
+            width: 170,
             title: '商机名称',
         },
         {
             field: 'school',
-            width: 120,
+            width: 170,
             title: '单位'
         },
         {