educode_sales 0.4.7 → 0.5.1

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

@@ -1,6 +1,6 @@
 <h1 class="text-center m-t-20"><%= @follow_up.business.name %></h1>
 <form class="layui-form form-value">
-  <div class="layui-form-item" style="padding: 25px">
+  <div class="layui-form-item" style="padding: 10px 25px 0;">
     <div class="layui-inline">
       <label class="layui-form-label">单位：</label>
       <div class="layui-input-inline">
@@ -33,6 +33,19 @@
         <%= @follow_up.invitation_at.to_s %>
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">中标时间：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.bidded_date.to_s %>
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">签单时间：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.signed_date.to_s %>
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label">验收时间：</label>
       <div class="layui-input-inline">
@@ -96,4 +109,69 @@
       </div>
     </div>
   </div>
-</form>
+</form>
+<div  style=" text-align:center;">
+  <div class="layui-btn-group">
+
+    <%if @pre_id != 0 %>
+    <button type="button" class="layui-btn" onclick="pre_follow()">上一条</button>
+    <%else %>
+    <button type="button" class="layui-btn layui-btn-disabled layui-btn-radius">上一条</button>
+    <%end %>
+
+    <%if @next_id != 0 %>
+    <button type="button" class="layui-btn" onclick="next_follow()">下一条</button>
+    <%else %>
+    <button type="button" class="layui-btn layui-btn-disabled layui-btn-radius">下一条</button>
+    <%end %>
+
+  </div>
+</div>
+
+<script type="text/javascript" charset="utf-8">
+
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            miniPage = layui.miniPage;
+
+    });
+    function pre_follow(){
+        layer.close(parent.show_index)
+        var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + <%=@pre_id %>);
+        var openWH = miniPage.getOpenWidthHeight();
+        show_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);
+        });
+    }
+    function next_follow(){
+        layer.close(parent.show_index)
+        var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + <%=@next_id %>);
+        var openWH = miniPage.getOpenWidthHeight();
+        show_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);
+        });
+    }
+</script>

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

@@ -0,0 +1,62 @@
+<div class="layui-btn-container" style="padding-right: 200px;padding-top: 10px">
+<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" onclick="demo()"  >跟进记录列表>></button>
+</div>
+<div style="padding: 50px">
+  <ul class="layui-timeline">
+    <%if @follow_ups.present? %>
+  <%@follow_ups.each do |f| %>
+  <li class="layui-timeline-item">
+    <i class="layui-icon layui-timeline-axis">&#xe63f;</i>
+    <div class="layui-timeline-content layui-text">
+      <h3 class="layui-timeline-title"><%=f.created_at %>---<%=f.staff.user.real_name %></h3>
+      <p>
+        最新进展：<%=f.description %>
+        <br>
+        团队建议：<%=f.advise %>
+        <br>
+        项目类型：<%=f.clazz.name %>
+        <br>
+        项目阶段：<%=f.stage.name %>
+        <br>
+        关键人：<% teacher_ids =  f.key_person.present? ? f.key_person.pluck(:teacher_id) : [] %>
+               <%= EducodeSales::Teacher.where(id: teacher_ids).pluck(:name).join("、") %>
+      </p>
+    </div>
+  </li>
+    <%end %>
+      <%else %>
+      <h1 class="layui-timeline-title" style="text-align: center">暂无跟进记录</h1>
+  <%end %>
+</ul>
+</div>
+
+<script type="text/javascript" charset="utf-8">
+
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            miniPage = layui.miniPage;
+
+    });
+    function demo(){
+        layer.closeAll()
+        business_id = parent.business_id
+        var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);
+        var openWH = miniPage.getOpenWidthHeight();
+        sindex = layer.open({
+            title: '商机列表/'+ parent.business_name +'的跟进记录',
+            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);
+        });
+    }
+</script>

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

@@ -0,0 +1,43 @@
+<div style="padding-left: 50px">
+        <button type="button" class="layui-btn" id="get_file"><i class="layui-icon"></i>选择文件</button>
+</div>
+<script>
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            upload = layui.upload,
+            request = layui.request,
+            $ = layui.$;
+        selectInput = layui.selectInput;
+
+        form.render();
+
+        //指定允许上传的文件类型
+        var business_id = parent.id
+        var renderObj = upload.render({
+            elem: '#get_file'
+            ,url: '/missions/upload_files?business_id='+business_id //此处配置你自己的上传接口即可
+            ,accept: 'file' //普通文件
+            ,headers: {
+                'X-CSRF-Token': $('meta[name=csrf-token]').attr('content')
+            }
+            ,before: function(obj){ //obj参数包含的信息，跟 choose回调完全一致，可参见上文。
+                layer.load(); //上传loading
+            }
+            ,done: function(res){
+                layer.msg('导入成功');
+                table.reload('file');
+                layer.closeAll('loading'); //关闭loading
+                layer.close(parent.import_index)
+            }
+            ,error: function(index, upload){
+                table.reload('file');
+                layer.closeAll('loading'); //关闭loading
+                layer.alert('导入失败，请检查文件格式')
+                layer.close(parent.import_index)
+            }
+        });
+    });
+</script>

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

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

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

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

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

@@ -1,7 +1,7 @@
-<form class="layui-form " action="">
+<form class="layui-form layuimini-form" action="">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
-      <label class="layui-form-label">月份</label>
+      <label class="layui-form-label required">月份</label>
       <div class="layui-input-inline">
         <input type="text" class="layui-input" id="edit_month_plan" autocomplete="off" name="month" placeholder="请选择" value="<%=@sale_plan.month.strftime("%Y-%m") %>">
 
@@ -9,22 +9,22 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">教师</label>
+      <label class="layui-form-label required">教师</label>
       <div class="layui-input-inline">
         <%= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">计划内容</label>
+      <label class="layui-form-label required">计划内容</label>
       <div class="layui-input-block">
-        <textarea name="content" placeholder="简要填写具体的营销计划，例如：
+        <textarea name="content" lay-verify="required" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
 3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">完成率</label>
+      <label class="layui-form-label required">完成率</label>
       <div class="layui-input-inline">
         <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
       </div>

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

@@ -1,7 +1,7 @@
-<form class="layui-form " action="">
+<form class="layui-form layuimini-form" action="">
   <div class="layui-form-item" style="padding: 25px">
     <div class="layui-inline">
-      <label class="layui-form-label">月份</label>
+      <label class="layui-form-label required">月份</label>
       <div class="layui-input-inline">
         <input type="text" class="layui-input" id="edit_week_plan" autocomplete="off" name="month" placeholder="请选择" value="<%=@sale_plan.month.strftime("%Y-%m") %>">
         <%#= select_tag "month", options_for_select(@months, @sale_plan.month.strftime("%Y-%m")), class: 'required' %>
@@ -9,7 +9,7 @@
     </div>
     <% if @sale_plan.weekly.present? %>
     <div class="layui-inline">
-      <label class="layui-form-label">周次</label>
+      <label class="layui-form-label required">周次</label>
       <div class="layui-input-inline">
         <%= select_tag "weekly", options_for_select(@weeks, @sale_plan.weekly), class: 'required' %>
       </div>
@@ -17,22 +17,22 @@
     <% end %>
 
     <div class="layui-inline">
-      <label class="layui-form-label">教师</label>
+      <label class="layui-form-label required">教师</label>
       <div class="layui-input-inline">
         <%= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">计划内容</label>
+      <label class="layui-form-label required">计划内容</label>
       <div class="layui-input-block">
-        <textarea name="content" placeholder="简要填写具体的营销计划，例如：
+        <textarea name="content" lay-verify="required" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
 3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">完成率</label>
+      <label class="layui-form-label required">完成率</label>
       <div class="layui-input-inline">
         <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
       </div>

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

@@ -3,13 +3,22 @@
     <div class="layui-inline">
       <label class="layui-form-label required">月份</label>
       <div class="layui-input-inline">
-        <input type="text" class="layui-input" id="new_month_plan" autocomplete="off" name="month" placeholder="请选择">
+        <input type="text" lay-verify="required" class="layui-input" id="new_month_plan" autocomplete="off" name="month" placeholder="请选择">
       </div>
     </div>
+    <%if @teacher.present? %>
+      <div class="layui-inline">
+        <label class="layui-form-label required">教师</label>
+        <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">计划内容</label>
       <div class="layui-input-block">
@@ -46,6 +55,7 @@
 </div>
 
 <script>
+  flag2 = false
     layui.use(['form', 'table', 'laytpl', 'request'], function () {
         var form = layui.form,
             layer = layui.layer,
@@ -81,6 +91,7 @@
         });
 
         add_teacher.on('itemSelect(add_teacher)', function (obj) {
+            flag2 = true
             teacher_id = obj.data;
             var name = obj.textContent
             add_teacher.setValue(name)
@@ -90,13 +101,17 @@
 
         laydate.render({
             elem: '#new_month_plan',
+            layVerify: 'required', //同layui form参数lay-verify
             type: 'month'
         });
 
         var parentIndex = layer.index;
 
         form.on('submit(add_month_plan)', function (data) {
-            data.field.teacher_id = teacher_id
+            console.log(flag2);
+            if(flag2){
+                data.field.teacher_id = 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_plans/new_week.html.erb

@@ -3,19 +3,28 @@
     <div class="layui-inline">
       <label class="layui-form-label required">月份</label>
       <div class="layui-input-inline">
-        <input type="text" class="layui-input" id="new_week_plan" autocomplete="off" name="month" placeholder="请选择">
+        <input type="text" lay-verify="required" class="layui-input" id="new_week_plan" autocomplete="off" name="month" placeholder="请选择">
       </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,@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

@@ -1,12 +1,12 @@
 <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
 <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
-  <div class="layui-form-item">
+  <div class="layui-form-item" style="margin-bottom: 0">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>负责区域:</label>
       <span><%= @area%></span>
     </div>
   </div>
-  <div class="layui-form-item">
+  <div class="layui-form-item" style="margin-bottom: 0">
     <div class="layui-inline" style="margin:18px; font-weight: bold">
       <label>完成率:</label>
       <span><%= @sale_report.finish_rate %>%</span>
@@ -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,6 +61,7 @@
       </div>
     </div>
     <div id="weekStar6" style="margin-bottom: 40px"></div>
+    <%end %>
     <br>
     <div class="layui-inline m-t-10">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="audit_weekly_report"
@@ -165,32 +171,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 +206,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,
                 },