educode_sales 0.3.4 → 0.3.8

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

@@ -71,15 +71,11 @@
   </div>
 </script>
 <script type="text/html" id="currentTableBar">
-  <% if can? :create, EducodeSales::SalePlan %>
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addWeek">添加周计划</a>
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addMonth">添加月计划</a>
+  <% if can? :add_follow, EducodeSales::Business %>
+   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
   <% end %>
-  <% if can? :update, EducodeSales::Business %>
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
-  <% end %>
-  <% if can? :destroy, EducodeSales::SalePlan %>
-  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% if @more %>
+    <a class="layui-btn-xs data-count-edit more-btn" data-name={{d.name}} data-id={{d.id}}>更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
   <% end %>
 </script>
 <script type="text/html" id="show_keys">
@@ -91,22 +87,23 @@
 
 
 <script>
-    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
+    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate', 'dropdown'], function () {
       var $ = layui.jquery,
         form = layui.form,
         request = layui.request,
         miniPage = layui.miniPage,
+        dropdown = layui.dropdown,
         laydate = layui.laydate;
 
       laydate.render({
         elem: '#date',
-        range: true 
+        range: true
       });
 
       table = layui.table;
       table.render({
           elem: '#businesses_table',
-          url: '/educode_sales/businesses',
+          url: '/missions/businesses',
           where: {q: form.val('search_form')},
           toolbar: '#bussinessBar',
           defaultToolbar: [],
@@ -183,6 +180,11 @@
                 width: 110,
                 title: '渠道'
               },
+              {
+                field: 'source',
+                width: 110,
+                title: '商机来源'
+              },
               {
                 field: 'last_follow_person',
                 width: 120,
@@ -190,19 +192,115 @@
               },
               {
                 title: '操作',
-                minWidth: 300,
+                minWidth: 170,
                 toolbar: '#currentTableBar',
                 align: "center",
                 fixed: 'right'
               }
             ]
           ],
-          height: 600,
+
           limit: 20,
           page: true,
-          skin: 'line'
+          skin: 'line',
+          done: function (res) {
+            drowpdwonRender()
+          }
+
       });
 
+      var dropmenu = gon.menus;
+
+      drowpdwonRender = function() {
+        dropdown.render({
+          elem: '.more-btn',
+          data: dropmenu,
+          click: function(data, othis){
+            var elem = $(this.elem);
+            id = elem.data('id');
+            switch (data.event) {
+            case 'week':
+              week(id);
+              break;
+            case 'month':
+              month(id);
+              break;
+            case 'edit':
+              edit(id);
+              break;
+            case 'delete':
+              deleteBusiness(id, elem.data['name']);
+              break;
+            }
+          }
+        });
+      }
+
+      function week(id) {
+        var content = miniPage.getHrefContent('/missions/plans/new_week?business_id=' + id);
+        var openWH = miniPage.getOpenWidthHeight();
+
+        sindex = 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(sindex);
+        });
+      }
+
+      function edit(id) {
+        var content = miniPage.getHrefContent('/missions/businesses/' + id + '/edit');
+        var openWH = miniPage.getOpenWidthHeight();
+        sindex = 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(sindex);
+        });
+      }
+
+      function month(id) {
+        var content = miniPage.getHrefContent('/missions/plans/new_month?business_id=' + id);
+        var openWH = miniPage.getOpenWidthHeight();
+        sindex = 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(sindex);
+        });
+      }
+
+      function deleteBusiness(id, name) {
+        layer.confirm('确定删除' + name, function (index) {
+          request.delete('missions/businesses/' + id, {}, function (res) {
+            layer.close(index);
+            table.reload("businesses_table")
+          })
+        });
+      }
+
+
       var sort = {}, search = {};
       table.on('sort(businesses_table)', function (obj) {
         sort.field = obj.field;
@@ -240,7 +338,7 @@
 
         table.on('toolbar(businesses_table)', function (obj) {
             if (obj.event === 'add') { // 监听添加操作
-                var content = miniPage.getHrefContent('/educode_sales/businesses/new');
+                var content = miniPage.getHrefContent('/missions/businesses/new');
                 var openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '添加商机',
@@ -265,8 +363,28 @@
         table.on('tool(businesses_table)', function (obj) {
             var data = obj.data;
             id = data.id
-            if (obj.event === 'edit') {
-                var content = miniPage.getHrefContent('/educode_sales/businesses/' + id + '/edit');
+             if (obj.event === 'add_event') { // 监听添加操作
+              business_id = data.id
+              var content = miniPage.getHrefContent('/missions/businesses/new_follow_record?id=' + data.id);
+              var openWH = miniPage.getOpenWidthHeight();
+              sale_plan_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,
+                success: function (layero, index) {
+                  form.render('select');
+                }
+              });
+              $(window).on("resize", function () {
+                  layer.full(sale_plan_index);
+              });
+            } else if (obj.event === 'edit') {
+                var content = miniPage.getHrefContent('/missions/businesses/' + id + '/edit');
                 var openWH = miniPage.getOpenWidthHeight();
                 sindex = layer.open({
                     title: '编辑',
@@ -284,13 +402,34 @@
                 return false;
             } else if (obj.event === 'delete') {
                 layer.confirm('确定删除' + data.name, function (index) {
-                    request.delete('educode_sales/businesses/' + data.id, {}, function (res) {
+                    request.delete('missions/businesses/' + data.id, {}, function (res) {
                         layer.close(index);
                         table.reload("businesses_table")
                     })
                 });
-            } else if (obj.event === 'addWeek') {
-                var content = miniPage.getHrefContent('/educode_sales/plans/new_week?business_id=' + obj.data.id);
+            }else if (obj.event === 'add_follow') { // 监听添加操作
+                console.log(parent.business_id);
+                business_id = parent.business_id
+                var content = miniPage.getHrefContent('/missions/businesses/new_follow_record?id=' + parent.id);
+                var openWH = miniPage.getOpenWidthHeight();
+                sale_plan_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,
+                    success: function (layero, index) {
+                        form.render('select');
+                    }
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }else if (obj.event === 'addWeek') {
+                var content = miniPage.getHrefContent('/missions/plans/new_week?business_id=' + obj.data.id);
                 var openWH = miniPage.getOpenWidthHeight();
 
                 sindex = layer.open({
@@ -307,7 +446,7 @@
                     layer.full(sindex);
                 });
             } else if (obj.event === 'addMonth') {
-                var content = miniPage.getHrefContent('/educode_sales/plans/new_month?business_id=' + obj.data.id);
+                var content = miniPage.getHrefContent('/missions/plans/new_month?business_id=' + obj.data.id);
                 var openWH = miniPage.getOpenWidthHeight();
                 sindex = layer.open({
                     title: '添加月计划',
@@ -326,7 +465,7 @@
             } else if (obj.event === 'show_keys') {
                 business_id = obj.data.id
                 follow_up_id = obj.data.follow_up_id;
-                content = miniPage.getHrefContent('/educode_sales/businesses/show_keys');
+                content = miniPage.getHrefContent('/missions/businesses/show_keys');
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '关键人',
@@ -347,7 +486,7 @@
                 });
             } else if (obj.event === 'show_follow') {
                 business_id = obj.data.id
-                content = miniPage.getHrefContent('/educode_sales/businesses/show_follow?id=' + id);
+                content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '商机列表/' + data.name + '的跟进记录',

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

@@ -16,6 +16,7 @@ json.data do
     json.return_money d.return_money
     json.place d.last_follow_up&.place&.name
     json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : ''
+    json.source d.source
   end
 end
 json.code 0

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

@@ -10,6 +10,14 @@
       <label class="layui-form-label required">单位部门</label>
       <div class="layui-input-block" id="add_department" style="width: 300px;"></div>
     </div>
+     <br>
+      <div class="layui-inline" style="padding-top: 20px">
+        <label class="layui-form-label ">商机来源</label>
+        <input  type="text" name="source" autocomplete="off" class="layui-input" style="width: 300px;" placeholder="请输入商机来源">
+      </div>
+      <div class="layui-inline" style="padding-top: 20px">
+        <p style="padding-left: 40px">请填写提供本商机的人名（如‘张明’）；如果为非头歌用户，请增加单位信息（如‘张明，华为公司’）</p>
+      </div>
     <div class="layui-form-item m-t-20">
       <div class="layui-input-block">
         <button class="layui-btn layui-btn-normal" lay-submit lay-filter="create_business">提交</button>
@@ -46,7 +54,7 @@
         if (!value) {
           return cb([]);
         }
-        request.get('educode_sales/search?type=department&q=' + value, {}, function (res) {
+        request.get('missions/search?type=department&q=' + value, {}, function (res) {
           return cb(res)
         })
       }
@@ -60,9 +68,11 @@
       if (add_department.getValue() == "") {
         return layer.alert("请选择单位部门")
       }
-      request.authPost("educode_sales/businesses", {
+      request.authPost("missions/businesses", {
         department_id: add_department.getValue(),
-        name: data.field.name
+        name: data.field.name,
+        source: data.field.source
+
       }, function (res) {
         if (res.success == false) {
           layer.alert(res.msg)

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

@@ -16,9 +16,15 @@
     <br>
     <div class="layui-inline">
       <label class="layui-form-label required">项目类型</label>
+      <%if @last_follow_up&.clazz&.name == "O类" %>
       <div class="layui-input-inline">
-        <%= select_tag "clazz_id", options_for_select(@clazz, @last_follow_up&.clazz_id), class: 'required' %>
+        <%= select_tag "clazz_id", options_for_select([['O类',EducodeSales::Common.find_by(name: "O类").id]]),:disabled => true, class: 'required' %>
       </div>
+        <%else %>
+        <div class="layui-input-inline">
+          <%= select_tag "clazz_id", options_for_select(@clazz, @last_follow_up&.clazz_id), class: 'required' %>
+        </div>
+        <%end %>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">项目阶段</label>
@@ -73,7 +79,7 @@
       <span style="margin-top: 10px; float:left;">%</span>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label required">自我小结</label>
+      <label class="layui-form-label required">商机说明</label>
       <div class="layui-input-block">
         <textarea name="description" lay-verify="required" placeholder="此处可以填写：
 1、有无预算；
@@ -112,7 +118,7 @@
       request = layui.request,
       laydate = layui.laydate,
       $ = layui.$;
-       
+
       laydate.render({
         elem: '#invitation_at_add'
       })
@@ -127,7 +133,7 @@
           console.log(data);
           data.field.business_id = "<%= @business.id %>";
           console.log(data.field.business_id);
-          // request.authPut("educode_sales/businesses/" + data.field.business_id +"/updateMoney/", {
+          // request.authPut("missions/businesses/" + data.field.business_id +"/updateMoney/", {
           //     return_money: 0
           // }, function (res) {
           //     if (res.success == false) {
@@ -135,7 +141,7 @@
           //     } else {
           //     }
           // })
-          request.authPost("educode_sales/follow_ups", data.field, function (res) {
+          request.authPost("missions/follow_ups", data.field, function (res) {
           if (res.success == false) {
             layer.alert(res.msg)
           } else {

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

@@ -62,7 +62,7 @@
 
       table.render({
           elem: '#sale_plan_follow_table',
-          url: '/educode_sales/businesses/show_follow?id=' + parent.id ,
+          url: '/missions/businesses/show_follow?id=' + parent.id ,
           toolbar: '#toolbarDemo_follow',
           defaultToolbar: [],
           cols: [
@@ -149,7 +149,6 @@
               }
             ]
           ],
-          height: 520,
           limit: 20,
           page: true,
           skin: 'line',
@@ -176,7 +175,7 @@
         if (obj.event === 'add') { // 监听添加操作
             console.log(parent.business_id);
             business_id = parent.business_id
-            var content = miniPage.getHrefContent('/educode_sales/businesses/new_follow_record?id=' + parent.id);
+            var content = miniPage.getHrefContent('/missions/businesses/new_follow_record?id=' + parent.id);
           var openWH = miniPage.getOpenWidthHeight();
           sale_plan_index = layer.open({
             title: '添加商机跟进记录',
@@ -203,7 +202,7 @@
           if (obj.event === 'delete') {
               console.log(data);
               layer.confirm('确定删除ID为' + data.id + "的跟进记录", function (index) {
-                request.authDelete("educode_sales/follow_ups/" + data.id, {}, function() {
+                request.authDelete("missions/follow_ups/" + data.id, {}, function() {
                   obj.del();
                   layer.close(index);
                     table.reload("businesses_table");
@@ -211,7 +210,7 @@
                 })
               });
           } else if (obj.event === 'show') { // 监听添加操作
-              var content = miniPage.getHrefContent('/educode_sales/businesses/show_follow_record?follow_up_id=' + data.id);
+              var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + data.id);
               var openWH = miniPage.getOpenWidthHeight();
               var index = layer.open({
                 title: '查看商机跟进记录',
@@ -227,7 +226,7 @@
                 layer.full(index);
               });
           } else if (obj.event === 'edit') { // 监听添加操作
-            var content = miniPage.getHrefContent('/educode_sales/businesses/edit_follow_record?follow_up_id=' + data.id);
+            var content = miniPage.getHrefContent('/missions/businesses/edit_follow_record?follow_up_id=' + data.id);
             var  openWH = miniPage.getOpenWidthHeight();
               sale_plan_edit_open = layer.open({
                 title: '编辑商机跟进记录',
@@ -246,7 +245,7 @@
                 layer.full(sale_plan_edit_open);
               });
           } else if (obj.event === 'add_keys') { // 监听添加操作
-              content = miniPage.getHrefContent('/educode_sales/teachers/add_keys?follow_up_id=' + obj.data.id);
+              content = miniPage.getHrefContent('/missions/teachers/add_keys?follow_up_id=' + obj.data.id);
               openWH = miniPage.getOpenWidthHeight();
               is_latest = obj.data.is_latest
               keyindex = layer.open({
@@ -267,7 +266,7 @@
                   layer.full(keyindex);
               });
           } else if (obj.event === 'edit_plan') {
-              content = miniPage.getHrefContent('/educode_sales/businesses/edit_plan');
+              content = miniPage.getHrefContent('/missions/businesses/edit_plan');
               openWH = miniPage.getOpenWidthHeight();
               is_latest = obj.data.is_latest
               plan_index = layer.open({
@@ -293,7 +292,7 @@
        // 未完成计划
          table.render({
             elem: '#unfinish_table',
-            url: '/educode_sales/businesses/' + parent.id + "/unfinish_plans",
+            url: '/missions/businesses/' + parent.id + "/unfinish_plans",
             toolbar: '#unfinish_table_tabar',
             defaultToolbar: [],
             cols: [
@@ -371,7 +370,7 @@
          */
         table.on('toolbar(unfinish_table)', function (obj) {
           if (obj.event === 'addWeekPlan') { // 监听添加操作
-            var content = miniPage.getHrefContent('/educode_sales/plans/new_week?business_id=' + parent.id);
+            var content = miniPage.getHrefContent('/missions/plans/new_week?business_id=' + parent.id);
             var openWH = miniPage.getOpenWidthHeight();
             var index = layer.open({
                 title: '添加周计划',
@@ -391,7 +390,7 @@
                 layer.full(index);
             });
             } else if (obj.event === 'addMonthPlan') { // 监听添加操作
-                var content = miniPage.getHrefContent('/educode_sales/plans/new_month?business_id=' + parent.id)
+                var content = miniPage.getHrefContent('/missions/plans/new_month?business_id=' + parent.id)
                 var openWH = miniPage.getOpenWidthHeight();
                 var index = layer.open({
                     title: '添加月计划',
@@ -418,14 +417,14 @@
           plan_id = data.id;
           if (obj.event === 'delete') {
             layer.confirm('确定删除ID为' + data.id + "的计划", function (index) {
-              request.authDelete("educode_sales/plans/" + data.id, {}, function() {
+              request.authDelete("missions/plans/" + data.id, {}, function() {
                 obj.del();
                 layer.close(index);
               })
               
             });
           } else if (obj.event === 'show') {
-            content = miniPage.getHrefContent('/educode_sales/plans/show_week?id=' + data.id);
+            content = miniPage.getHrefContent('/missions/plans/show_week?id=' + data.id);
             openWH = miniPage.getOpenWidthHeight();
             index = layer.open({
               title: data.week ? '查看周计划' : '查看月计划',
@@ -442,7 +441,7 @@
             });
               return false;
            } else if (obj.event === 'edit') {
-                content = miniPage.getHrefContent('/educode_sales/plans/edit_week?id=' + data.id);
+                content = miniPage.getHrefContent('/missions/plans/edit_week?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 sindex = layer.open({
                   title: '编辑',

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

@@ -66,7 +66,7 @@
       </div>
     </div>
     <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">自我小结：</label>
+      <label class="layui-form-label">商机说明：</label>
       <div class="layui-input-block" style="padding-right: 20px;">
         <pre><%= @follow_up.description %></pre>
       </div>

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

@@ -4,7 +4,7 @@
     var table = layui.table
     table.render({
       elem: '#keyTable',
-      url: '/educode_sales/follow_ups/' + parent.follow_up_id + "/teachers",
+      url: '/missions/follow_ups/' + parent.follow_up_id + "/teachers",
       defaultToolbar: [],
       cols: [
         [

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

@@ -49,7 +49,7 @@
     //监听提交
     form.on('submit(saveBtn)', function(data) {
 
-      request.authPost("educode_sales/commons", data.field, function(res) {
+      request.authPost("missions/commons", data.field, function(res) {
         console.log(res.success == false)
         if (res.success == false) {
           layer.alert(res.msg)
@@ -68,7 +68,7 @@
 
     table.render({
       elem: '#edit_table',
-      url: '/educode_sales/commons/' + parent.commont_id,
+      url: '/missions/commons/' + parent.commont_id,
       cols: [
         [{
           field: 'id',
@@ -96,7 +96,7 @@
     table.on('tool(edit_table)', function (obj) {
       var data = obj.data;
       if (obj.event === 'edit') {
-        request.authPut('educode_sales/commons/' + data.id, data,
+        request.authPut('missions/commons/' + data.id, data,
           function(res) {
             if (res.success) {
               table.reload('edit_table')

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

@@ -21,7 +21,7 @@
 
     table.render({
       elem: '#table',
-      url: '/educode_sales/commons',
+      url: '/missions/commons',
       toolbar: '#toolbarDemo',
       defaultToolbar: [],
       cols: [
@@ -49,7 +49,6 @@
           }
         ]
       ],
-      height: 700,
       limit: 20,
       page: true,
       skin: 'line'
@@ -80,7 +79,7 @@
      */
     table.on('toolbar(table)', function (obj) {
       if (obj.event === 'add') { // 监听添加操作
-        var content = miniPage.getHrefContent('/educode_sales/commons/new');
+        var content = miniPage.getHrefContent('/missions/commons/new');
         var openWH = miniPage.getOpenWidthHeight();
 
          index = layer.open({
@@ -104,7 +103,7 @@
       var data = obj.data;
       commont_id = data.id;
       if (obj.event === 'edit') {
-        var content = miniPage.getHrefContent('/educode_sales/commons/' +  data.id + '/edit');
+        var content = miniPage.getHrefContent('/missions/commons/' +  data.id + '/edit');
         var openWH = miniPage.getOpenWidthHeight();
         var index = layer.open({
           title: '编辑字典',

data/app/views/educode_sales/commons/new.html.erb

@@ -40,7 +40,7 @@
     //监听提交
     form.on('submit(saveBtn)', function (data) {
   
-    request.authPost("/educode_sales/commons", data.field, function(res) {
+    request.authPost("/missions/commons", data.field, function(res) {
       if (res.success == false) {
         alert(res.msg)
       } else {

data/app/views/educode_sales/follow_ups/teachers.json.jbuilder

@@ -4,11 +4,12 @@ json.data do
     json.name d.teacher.name
     json.professional_title d.professional_title
     json.job d.job
-    json.attitude_id d.attitude_id
-    json.attitude d.attitude.name
+    json.attitude_id d.attitude_id.present? ? d.attitude_id : ''
+    json.attitude d.attitude&.name
     json.sex d.sex
     json.birth_date d.birth_date
     json.remark d.remark
+    json.tel d.tel
   end
 end