educode_sales 0.1.0 → 0.1.1

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

@@ -3,58 +3,61 @@
     <div class="layui-inline">
       <label class="layui-form-label">月份</label>
       <div class="layui-input-inline">
-        <select name="quiz">
-          <option value="">请选择月份</option>
-          <option value="010">北京</option>
-          <option value="021">上海</option>
-          <option value="0571">杭州</option>
-        </select>
+        <%= select_tag "month", options_for_select(@months, @sale_plan.month.strftime("%Y-%m")), class: 'required' %>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">教师</label>
       <div class="layui-input-inline">
-        <select name="quiz" id="edit_chance3">
-          <option value="">请选择</option>
-          <option value="010">北京</option>
-          <option value="021">上海</option>
-          <option value="0571">杭州</option>
-          <option value="人工智能实验室建设1">人工智能实验室建设1</option>
-        </select>
+        <%#= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
+        <%= select_tag "teacher_id", options_for_select(@teachers), class: 'required' %>
+
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">计划内容</label>
       <div class="layui-input-block">
-        <textarea name="desc" id="edit_plan3" placeholder="简要填写具体的营销计划，例如：
+        <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"><%= @sale_plan.content %></textarea>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">完成率</label>
       <div class="layui-input-inline">
-        <select name="quiz" id="edit_rate3">
-          <option value="0%">0%</option>
-          <option value="10%">10%</option>
-          <option value="20%">20%</option>
-          <option value="30%">30%</option>
-          <option value="40%">40%</option>
-          <option value="50%">50%</option>
-          <option value="60%">60%</option>
-          <option value="70%">70%</option>
-          <option value="80%">80%</option>
-          <option value="90%">90%</option>
-          <option value="1001%">1001%</option>
-        </select>
+        <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
       </div>
     </div>
     <div class="layui-inline">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
-      </button>
-      <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-search-btn">取消
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="update_sale_plan">提交
       </button>
     </div>
   </div>
-</form>
+</form>
+
+
+<script>
+    layui.use(['form', 'table', 'laytpl', 'request'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            request = layui.request,
+            $ = layui.$;
+
+        form.render();
+
+        form.on('submit(update_sale_plan)', function (data) {
+            console.log(data.field);
+            request.authPut("educode_sales/operation_plans/"+ <%= @sale_plan.id %> , data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.closeAll()
+                    table.reload('monthPlanTable')
+                }
+            })
+            return false;
+        });
+    });
+</script>

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

@@ -3,70 +3,71 @@
     <div class="layui-inline">
       <label class="layui-form-label">月份</label>
       <div class="layui-input-inline">
-        <select name="quiz">
-          <option value="">请选择月份</option>
-          <option value="010">北京</option>
-          <option value="021">上海</option>
-          <option value="0571">杭州</option>
-        </select>
+        <%= select_tag "month", options_for_select(@months, @sale_plan.month.strftime("%Y-%m")), class: 'required' %>
       </div>
     </div>
+    <% if @sale_plan.weekly.present? %>
     <div class="layui-inline">
       <label class="layui-form-label">周次</label>
       <div class="layui-input-inline">
-        <select name="quiz" id="edit_week1">
-          <option value="">请选择周</option>
-          <option value="010">北京</option>
-          <option value="021">上海</option>
-          <option value="0571">杭州</option>
-          <option value="2021-33周">2021-33周</option>
-        </select>
+        <%= select_tag "weekly", options_for_select(@weeks, @sale_plan.weekly), class: 'required' %>
       </div>
     </div>
+    <% end %>
+
     <div class="layui-inline">
       <label class="layui-form-label">教师</label>
       <div class="layui-input-inline">
-        <select name="quiz" id="edit_chance1">
-          <option value="">请选择</option>
-          <option value="010">北京</option>
-          <option value="021">上海</option>
-          <option value="0571">杭州</option>
-          <option value="人工智能实验室建设">人工智能实验室建设</option>
-        </select>
+        <%#= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
+        <%= select_tag "teacher_id", options_for_select(@teachers), class: 'required' %>
+
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">计划内容</label>
       <div class="layui-input-block">
-        <textarea name="desc" id="edit_plan1" placeholder="简要填写具体的营销计划，例如：
+        <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"><%= @sale_plan.content %></textarea>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">完成率</label>
       <div class="layui-input-inline">
-        <select name="quiz" id="edit_rate1">
-          <option value="0%">0%</option>
-          <option value="10%">10%</option>
-          <option value="20%">20%</option>
-          <option value="30%">30%</option>
-          <option value="40%">40%</option>
-          <option value="50%">50%</option>
-          <option value="60%">60%</option>
-          <option value="70%">70%</option>
-          <option value="80%">80%</option>
-          <option value="90%">90%</option>
-          <option value="100%">100%</option>
-        </select>
+        <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
       </div>
     </div>
     <div class="layui-inline">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
-      </button>
-      <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-search-btn">取消
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="update_sale_plan">提交
       </button>
     </div>
   </div>
-</form>
+</form>
+
+
+<script>
+    layui.use(['form', 'table', 'laytpl', 'request'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            request = layui.request,
+            $ = layui.$;
+
+        form.render();
+
+        form.on('submit(update_sale_plan)', function (data) {
+            console.log(data.field);
+            request.authPut("educode_sales/operation_plans/"+ <%= @sale_plan.id %> , data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.sindex);
+                    table.reload('weekPlanTable')
+                    table.reload('newWeeklyTable')
+                }
+            })
+            return false;
+        });
+    });
+</script>

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

@@ -0,0 +1,19 @@
+json.data do
+  json.array! @sale_plans do |d|
+    json.id d.id
+    json.staff d.staff.user.real_name
+    json.teacher_name d.teacher.name
+    json.department d.teacher.department&.name
+    json.school d.teacher.department&.school&.name
+    json.month d.month.strftime("%Y-%m")
+    json.week d.weekly
+    # json.teacher_id d.teacher_id
+    json.content d.content.truncate(30)
+    # json.follow_ups_count d.teacher.follow_ups_count
+    json.rate "#{d.finish_rate}%"
+    json.updated_at d.updated_at.to_s
+  end
+end
+
+json.code 0
+json.count @sale_plans.count

data/app/views/educode_sales/operation_plans/my_month.json.jbuilder

@@ -0,0 +1,18 @@
+json.data do
+  json.array! @sale_plans do |d|
+    json.id d.id
+    json.staff d.staff.user.real_name
+    json.teacher_name d.teacher.name
+    json.department d.teacher.department&.name
+    json.school d.teacher.department&.school&.name
+    json.month d.month.strftime("%Y-%m")
+    # json.teacher_id d.teacher_id
+    json.content d.content.truncate(30)
+    # json.follow_ups_count d.teacher.follow_ups_count
+    json.rate "#{d.finish_rate}%"
+    json.updated_at d.updated_at.to_s
+  end
+end
+
+json.code 0
+json.count @sale_plans.count

data/app/views/educode_sales/operation_plans/my_week.json.jbuilder

@@ -0,0 +1,19 @@
+json.data do
+  json.array! @sale_plans do |d|
+    json.id d.id
+    json.staff d.staff.user.real_name
+    json.teacher_name d.teacher.name
+    json.department d.teacher.department&.name
+    json.school d.teacher.department&.school&.name
+    json.month d.month.strftime("%Y-%m")
+    json.week d.weekly
+    # json.teacher_id d.teacher_id
+    json.content d.content.truncate(30)
+    # json.follow_ups_count d.teacher.follow_ups_count
+    json.rate "#{d.finish_rate}%"
+    json.updated_at d.updated_at.to_s
+  end
+end
+
+json.code 0
+json.count @sale_plans.count

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

@@ -3,13 +3,13 @@
     <div class="layui-inline">
       <label class="layui-form-label required">月份</label>
       <div class="layui-input-inline">
-        <%#= select_tag "month", options_for_select([Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]), class: 'required' %>
+        <%= select_tag "month", options_for_select([Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]), class: 'required' %>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">教师</label>
       <div class="layui-input-inline">
-        <%#= select_tag "business_id", options_for_select(@businesses), class: 'required' %>
+        <%= select_tag "teacher_id", options_for_select(@teachers), {"lay-verify": "required", include_blank: true} %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
@@ -24,7 +24,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">完成率</label>
       <div class="layui-input-inline">
-        <select name="quiz">
+        <select name="finish_rate">
           <option value="0">0%</option>
           <option value="10">10%</option>
           <option value="20">20%</option>
@@ -63,17 +63,12 @@
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {
-                    layer.close(parent.sindex);
-                    parent.layer.close(parent.layer.getFrameIndex(window.name))
-                    parent.table.reload('businesses_table')
+                    layer.closeAll()
+                    table.reload('monthPlanTable')
                 }
             })
             return false;
         });
 
-        form.on('submit(cancel_add_week)', function (data) {
-            layer.closeAll();
-            return false;
-        });
     });
 </script>

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

@@ -8,49 +8,27 @@
   <div class="layui-form-item">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
-      <span>80%</span>
+      <span><%= @rate %></span>
+      <%= hidden_field_tag 'finish_rate', @rate, {id: 'monthly_rate_hide'} %>
     </div>
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label style="margin-left: 100px">运营教师:</label>
-      <span>5</span>
+      <span><%= @departments_count%></span>
+      <%= hidden_field_tag 'client', @departments_count, {id: 'monthly_client_hide'} %>
     </div>
   </div>
   <div class="layui-form-item" style="margin-left: 18px">
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">个人总结</label>
       <div class="layui-input-block">
-        <textarea name="desc" placeholder="此处填写要点：
+        <textarea name="content" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
 3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"></textarea>
       </div>
     </div>
-    <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">大区意见</label>
-      <div class="layui-input-block">
-        <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" class="layui-textarea"></textarea>
-      </div>
-    </div>
-    <div id="weekStar4"></div>
-    <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">总监意见</label>
-      <div class="layui-input-block">
-        <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" class="layui-textarea"></textarea>
-      </div>
-    </div>
-    <div id="weekStar5"></div>
-    <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">副总意见</label>
-      <div class="layui-input-block">
-        <textarea name="desc" placeholder="给出评价、提醒、建议、办法等。" class="layui-textarea"></textarea>
-      </div>
-    </div>
-    <div id="weekStar6"></div>
-    <br>
     <div class="layui-inline">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn" style="margin-left: 18px">提交
-      </button>
-      <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-search-btn">取消
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_monthly_report" style="margin-left: 18px">提交
       </button>
     </div>
   </div>
@@ -67,21 +45,26 @@
 
 <script>
     layui.use(['rate', 'table'], function () {
-        var rate = layui.rate;
-        table = layui.table
-        rate.render({
-            elem: '#weekStar4'
-            , half: true
-        })
-        rate.render({
-            elem: '#weekStar5'
-            , half: true
-        })
-        rate.render({
-            elem: '#weekStar6'
-            , half: true
-        })
-    })
+        var rate = layui.rate,
+            form = layui.form,
+            $ = layui.jquery,
+            miniPage = layui.miniPage,
+            request = layui.request;
+        table = layui.table;
+
+        form.on('submit(add_monthly_report)', function (data) {
+            data.field.month = true;
+            request.authPost("educode_sales/operation_reports", data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    // layer.closeAll();
+                    parent.table.reload('monthlyTable');
+                    layer.alert('添加成功')
+                }
+            })
+            return false;
+        });
 
 
     table.render({
@@ -167,6 +150,7 @@
         page: true,
         skin: 'line'
     });
+    })
 </script>
 <style>
     .layui-form-item {

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

@@ -3,19 +3,21 @@
     <div class="layui-inline">
       <label class="layui-form-label required">月份</label>
       <div class="layui-input-inline">
-        <%#= select_tag "month", options_for_select([Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]), class: 'required' %>
+        <%= select_tag "month", options_for_select([Time.now.strftime("%Y-%m"), Time.now.months_ago(1).strftime("%Y-%m")]), class: 'required' %>
       </div>
     </div>
     <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), class: 'required' %>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">教师</label>
       <div class="layui-input-inline">
-        <%#= select_tag "business_id", options_for_select(@businesses), class: 'required' %>
+
+        <%#= select_tag "teacher_id", options_for_select(@teachers, @teacher&.id), {"lay-verify": "required", include_blank: true} %>
+        <%= select_tag "teacher_id", options_for_select(@teachers), {"lay-verify": "required", include_blank: true} %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
@@ -62,16 +64,14 @@
 
         form.render();
 
-        var parentIndex = layer.index;
 
         form.on('submit(add_week_plan)', function (data) {
             request.authPost("educode_sales/operation_plans", data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {
-                    layer.close(parent.sindex);
-                    parent.layer.close(parent.layer.getFrameIndex(window.name))
-                    parent.table.reload('businesses_table')
+                    layer.closeAll()
+                    table.reload('weekPlanTable')
                 }
             })
             return false;