educode_sales 0.4.8 → 0.4.9

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

@@ -14,6 +14,8 @@ json.data do
     json.stage d.last_follow_up&.stage&.name
     json.invitation_at d.last_follow_up&.invitation_at.to_s
     json.reception_at d.last_follow_up&.reception_at.to_s
+    json.bidded_date d.last_follow_up&.bidded_date.to_s
+    json.signed_date d.last_follow_up&.signed_date.to_s
     json.total_amount d.last_follow_up&.total_amount
     json.return_money d.return_money
     json.place d.last_follow_up&.place&.name
@@ -22,7 +24,7 @@ json.data do
     json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
     json.current_staff_id @current_admin.id
     json.staff_id d.staff_id
-    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : d.created_at.to_s
   end
 end
 

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

@@ -42,6 +42,23 @@
           placeholder="请选择日期">
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">中标时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="bidded_date" autocomplete="off" id="invitation_at_add"
+          value="<%= @last_follow_up&.bidded_date%>"
+          placeholder="请选择日期">
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">签单时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="signed_date" autocomplete="off" id="invitation_at_add"
+          value="<%= @last_follow_up&.signed_date%>"
+          placeholder="请选择日期">
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label">验收时间</label>
       <div class="layui-input-inline">

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

@@ -1,6 +1,7 @@
 <script type="text/html" id="toolbarDemo_follow">
   <div class="layui-btn-container">
     <span class="table-label">跟进记录</span>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="time_line"> 时间线视图>></button>
     <% if can? :add_follow, EducodeSales::Business %>
       <% if @current_admin.is_admin %>
         <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加跟进记录</button>
@@ -109,11 +110,27 @@
                 title: '关键人',
                 templet: '#add_keys'
               },
+                {
+                    field: 'money_plans_count',
+                    width: 120,
+                    title: '回款计划',
+                    templet: '#edit_plan'
+                },
               {
                 field: 'invitation_at',
                 width: 110,
                 title: '招标时间',
               },
+              {
+                field: 'bidded_date',
+                width: 110,
+                title: '中标时间',
+              },
+              {
+                field: 'signed_date',
+                width: 110,
+                title: '签单时间',
+              },
               {
                 field: 'reception_at',
                 width: 110,
@@ -139,12 +156,7 @@
                 width: 100,
                 title: '已回款',
               },
-              {
-                field: 'money_plans_count',
-                width: 120,
-                title: '回款计划',
-                templet: '#edit_plan'
-              },
+
               {
                 field: 'place',
                 width: 200,
@@ -203,6 +215,25 @@
           $(window).on("resize", function () {
               layer.full(index);
           });
+        } else if (obj.event === 'time_line') { // 监听添加操作
+            layer.closeAll()
+            business_id = parent.business_id
+            business_name = parent.business_name
+            var content = miniPage.getHrefContent('/missions/businesses/time_line?business_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);
+            });
         }
       });
 
@@ -221,7 +252,7 @@
           } else if (obj.event === 'show') { // 监听添加操作
               var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + data.id);
               var openWH = miniPage.getOpenWidthHeight();
-              var index = layer.open({
+               show_index = layer.open({
                 title: '查看商机跟进记录',
                 type: 1,
                 shade: 0.2,

data/app/views/educode_sales/businesses/show_follow.json.jbuilder

@@ -7,6 +7,8 @@ json.data do
     json.teachers_count d.key_people_count
     json.invitation_at d.invitation_at&.to_s(:date)
     json.reception_at d.reception_at&.to_s(:date)
+    json.bidded_date d.bidded_date&.to_s(:date)
+    json.signed_date d.signed_date&.to_s(:date)
     json.total_amount d.total_amount
     json.actual_amount d.actual_amount
     json.divide_amount d.divide_amount ? d.divide_amount : ""

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

@@ -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,58 @@
+<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">
+  <%@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 %>
+</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="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: '#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('place');
+                layer.closeAll('loading'); //关闭loading
+                layer.close(parent.import_index)
+            }
+            ,error: function(index, upload){
+                table.reload('place');
+                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/new_month.html.erb

@@ -6,10 +6,19 @@
         <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)
@@ -97,7 +108,10 @@
         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

@@ -12,10 +12,19 @@
         <%= select_tag "weekly", options_for_select(@weeks), 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

@@ -165,32 +165,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 +200,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,
             },