educode_sales 1.10.23 → 1.10.25

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

@@ -218,9 +218,9 @@
   <% end %>
   <% if @more %>
     {{# if(d.followed==0){}}
-    <a class="layui-btn-xs data-count-edit more-btn more-btn1" data-name={{d.name}} data-id={{d.id}} data-clazz="{{d.extras_clazz}}">更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
+    <a class="layui-btn-xs data-count-edit more-btn more-btn1" data-name={{d.name}} lay-event="more" data-id={{d.id}} data-clazz="{{d.extras_clazz}}">更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
     {{# }else{}}
-    <a class="layui-btn-xs data-count-edit more-btn more-btn2" data-name={{d.name}} data-id={{d.id}} data-clazz="{{d.extras_clazz}}">更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
+    <a class="layui-btn-xs data-count-edit more-btn more-btn2" data-name={{d.name}} lay-event="more" data-id={{d.id}} data-clazz="{{d.extras_clazz}}">更多<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
     {{# }}}
   <% end %>
  
@@ -635,7 +635,7 @@
           skin: 'line',
           done: function (res, curr, coun) {
             exportData=res.data;
-            drowpdwonRender();
+            // drowpdwonRender();
             export_drowpdwonRender();
             // let headerTop = $('.layui-table-header').offset().top; //获取表格头到文档顶部的距离
             // $(".layuimini-content-page").scroll(function () {
@@ -654,84 +654,85 @@
       dropmenu2[dropmenu2.findIndex(function (elem)
       {return elem.title.includes("关注")})].title="取消关注";
 
-      drowpdwonRender = function() {
-        dropdown.render({
-          elem: '.more-btn1',
-          data: dropmenu,//dropmenu,
-          click: function(data, othis){
-            var elem = $(this.elem);
-            id = elem.data('id');
+      // 删除，不需要重复定义两次一样的下拉菜单
+      // drowpdwonRender = function(is) {
+      //   dropdown.render({
+      //     elem: '.more-btn1',
+      //     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 'year':
-              year(id);
-              break;
-            case 'edit':
-              edit(id);
-              break;
-            case 'file':
-              file(id, elem.data('name'));
-              break;
-            case 'time_line':
-              time_line(id, elem.data('name'));
-              break;
-            case 'delete':
-              deleteBusiness(id, elem.data('name'), elem.data('clazz'));
-              break;
-            case 'following':
-               following(id);
-                break;
-            case 'money_plan':
-                    money_plan(id);
-                    break;
-            }
-          }
-        });
-          dropdown.render({
-              elem: '.more-btn2',
-              data: dropmenu2,//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 'year':
+      //         year(id);
+      //         break;
+      //       case 'edit':
+      //         edit(id);
+      //         break;
+      //       case 'file':
+      //         file(id, elem.data('name'));
+      //         break;
+      //       case 'time_line':
+      //         time_line(id, elem.data('name'));
+      //         break;
+      //       case 'delete':
+      //         deleteBusiness(id, elem.data('name'), elem.data('clazz'));
+      //         break;
+      //       case 'following':
+      //          following(id);
+      //           break;
+      //       case 'money_plan':
+      //               money_plan(id);
+      //               break;
+      //       }
+      //     }
+      //   });
+      //   dropdown.render({
+      //       elem: '.more-btn2',
+      //       data: dropmenu2,//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 'year':
-                         year(id);
-                         break;
-                      case 'edit':
-                          edit(id);
-                          break;
-                      case 'file':
-                          file(id, elem.data('name'));
-                          break;
-                      case 'time_line':
-                          time_line(id, elem.data('name'));
-                          break;
-                      case 'delete':
-                          deleteBusiness(id, elem.data('name'), elem.data('clazz'));
-                          break;
-                      case 'following':
-                          following(id);
-                          break;
-                      case 'money_plan':
-                        money_plan(id);
-                        break;
-                  }
-              }
-          });
-      }
+      //           switch (data.event) {
+      //               case 'week':
+      //                   week(id);
+      //                   break;
+      //               case 'month':
+      //                   month(id);
+      //                   break;
+      //               case 'year':
+      //                   year(id);
+      //                   break;
+      //               case 'edit':
+      //                   edit(id);
+      //                   break;
+      //               case 'file':
+      //                   file(id, elem.data('name'));
+      //                   break;
+      //               case 'time_line':
+      //                   time_line(id, elem.data('name'));
+      //                   break;
+      //               case 'delete':
+      //                   deleteBusiness(id, elem.data('name'), elem.data('clazz'));
+      //                   break;
+      //               case 'following':
+      //                   following(id);
+      //                   break;
+      //               case 'money_plan':
+      //                 money_plan(id);
+      //                 break;
+        //         }
+        //     }
+        // });
+      // }
 
       export_drowpdwonRender = function() {
         dropdown.render({
@@ -1257,6 +1258,7 @@
 
         table.on('tool(businesses_table)', function (obj) {
             var data = obj.data;
+            var that = this;
             id = data.id
              if (obj.event === 'add_event') { // 监听添加操作
               business_id = data.id
@@ -1454,8 +1456,49 @@
                     layer.close(index)
                   }
               });
+            } else if (obj.event == 'more') {
+              dropdown.render({
+                elem: that,
+                show: true,
+                data: data.staff_id == data.current_staff_id ? dropmenu2 : gon.assign_menus,//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 'year':
+                            year(id);
+                            break;
+                        case 'edit':
+                            edit(id);
+                            break;
+                        case 'file':
+                            file(id, elem.data('name'));
+                            break;
+                        case 'time_line':
+                            time_line(id, elem.data('name'));
+                            break;
+                        case 'delete':
+                            deleteBusiness(id, elem.data('name'), elem.data('clazz'));
+                            break;
+                        case 'following':
+                            following(id);
+                            break;
+                        case 'money_plan':
+                          money_plan(id);
+                          break;
+                    }
+                }
+              });
+              // drowpdwonRender(data.staff_id == data.current_staff_id)
             }
-            drowpdwonRender()
+           
         });
     });
 </script>

data/app/views/educode_sales/ideas/_follows.html.erb

@@ -54,6 +54,7 @@
   <% if can? :advise, EducodeSales::Idea %>
     <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="advise">团队建议</a>
   <% end %>
+  <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="detail">详情</a>
 </script>
 
 <script>
@@ -195,9 +196,9 @@
 
         table.on('tool(activity_followp_table)', function (obj) {
             var data = obj.data;
-            id = data.teacher_id;
+            idea_id = data.idea_id;
             if (obj.event === 'detail') { // 监听添加操作
-                content = miniPage.getHrefContent('/missions/teachers/show_follow?id=' + data.teacher_id);
+                var content = miniPage.getHrefContent('/missions/ideas/show_follow?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '跟进记录',

data/app/views/educode_sales/ideas/_index.html.erb

@@ -97,7 +97,7 @@
 </div>
 <script type="text/html" id="currentTableBar">
   {{# if(d.is_deleted){}}
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>
+  <!--  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>-->
   <% if can? :recycle, EducodeSales::Idea %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_recycle_s">恢复</a>
   <% end %>
@@ -107,7 +107,7 @@
   <% if can? :add_follow, EducodeSales::Idea %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-add_follow" lay-event="add_follows">添加跟进</a>
   <% end %>
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>
+  <!--  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>-->
   <% if can? :update, EducodeSales::Idea %>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_edit">编辑</a>
   <% end %>
@@ -132,14 +132,18 @@
   {{# } }}
 </script>
 
+<script type="text/html" id="follow">
+  <a href="javascript:void(0);" lay-event="follow" class="layui-table-link">{{ d.idea_follows_count }}</a>
+</script>
+
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
         var $ = layui.jquery,
-            form = layui.form,
-            request = layui.request,
-            dropdown = layui.dropdown,
-            miniPage = layui.miniPage,
-            laydate = layui.laydate;
+          form = layui.form,
+          request = layui.request,
+          dropdown = layui.dropdown,
+          miniPage = layui.miniPage,
+          laydate = layui.laydate;
 
         var laydate = layui.laydate;
 
@@ -175,6 +179,11 @@
                     title: '销售经理',
                     width: 100
                 },
+                {
+                    field: 'assist_staffs',
+                    title: '协助人',
+                    width: 200
+                },
                 {
                     field: 'status',
                     width: 100,
@@ -195,6 +204,7 @@
                     field: 'idea_follows_count',
                     width: 100,
                     title: '跟进',
+                    templet: '#follow',
                 },
                 {
                     field: 'f_staff',
@@ -553,6 +563,26 @@
                         layer.close(index)
                     }
                 });
+            } else if (obj.event === 'follow') {
+                content = miniPage.getHrefContent('/missions/ideas/follow_list?id=' + data.id);
+                openWH = miniPage.getOpenWidthHeight();
+                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) {
+                        // 重新渲染弹层中的下拉选择框select
+                        // form.render('select');
+                    }
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
             } else if (obj.event === 'idea_edit') { // 监听添加操作
                 var content = miniPage.getHrefContent('/missions/ideas/' + id + '/edit');
                 var openWH = miniPage.getOpenWidthHeight();

data/app/views/educode_sales/ideas/edit_follow_record.html.erb

@@ -1,48 +1,59 @@
-<form class="layui-form " action="">
+<%= Gon::Base.render_data %>
+<div class="layui-form layuimini-form">
   <div class="layui-form-item" style="padding: 25px">
-    <div class="layui-inline">
-      <label class="layui-form-label">教师态度</label>
-      <div class="layui-input-inline">
-        <%= select_tag "attitude_id",options_for_select(EducodeSales::Common.where(clazz: "teacher_attitude").pluck(:name, :id), @follow_up.attitude_id)%>
-      </div>
+    <div class="layui-row">
+      <h2 style="padding-left: 25px">跟进</h2>
     </div>
-    <div class="layui-inline">
-      <label class="layui-form-label">开课计划</label>
-      <div class="layui-input-inline">
-        <%= select_tag "course_plan_id",options_for_select(EducodeSales::Common.where(clazz: "course_plan").pluck(:name, :id), @follow_up.course_plan_id)%>
+    <div class="layui-row" style="padding-top: 15px">
+      <div class="layui-col-md6">
+        <labeL class="layui-form-label required">销售经理:</labeL>
+        <div class="layui-input-block">
+          <div id="new_sale_staff_id"></div>
+        </div>
+      </div>
+      <div class="layui-col-md6">
+        <labeL class="layui-form-label">方案经理:</labeL>
+        <div class="layui-input-block">
+          <div id="new_idea_staff_id"></div>
+        </div>
       </div>
     </div>
-    <br>
-    <div class="layui-inline">
-      <label class="layui-form-label">课堂建设</label>
-      <div class="layui-input-inline">
-        <%= select_tag "course_build_id",options_for_select(EducodeSales::Common.where(clazz: "course_build").pluck(:name, :id), @follow_up.course_build_id)%>
+    <div class="layui-row" style="padding-top: 15px">
+      <div class="layui-col-md6">
+        <labeL class="layui-form-label">预算:</labeL>
+        <div class="layui-input-block">
+          <input type="number" name="money" autocomplete="off" placeholder="请输入硬件规模" value="<%= @idea_follow&.money %>" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-col-md6">
+        <labeL class="layui-form-label">状态:</labeL>
+        <div class="layui-input-block">
+          <%= select_tag "status", options_for_select(EducodeSales::IdeaFollow.statuses.keys, @idea_follow&.status), { 'lay-filter': 'status', include_blank: false } %>
+        </div>
       </div>
     </div>
-    <div class="layui-inline">
-      <label class="layui-form-label">跟进手段</label>
-      <div class="layui-input-inline">
-        <%= select_tag "follow_id",options_for_select(EducodeSales::Common.where(clazz: "contact").pluck(:name, :id), @follow_up.follow_id)%>
+    <div class="layui-row" style="padding-top: 15px">
+      <labeL class="layui-form-label">团队建议:</labeL>
+      <div class="layui-input-block">
+        <textarea name="content" placeholder="团队建议" class="layui-textarea"><%= @idea_follow&.content.to_s %></textarea>
       </div>
     </div>
-    <br>
-    <div class="layui-form-item layui-form-text">
-      <label class="layui-form-label">跟进小结</label>
+    <div class="layui-row" style="padding-top: 15px">
+      <labeL class="layui-form-label">最新进展:</labeL>
       <div class="layui-input-block">
-        <textarea name="description" placeholder="此处可以填写：
-1、教师关注的痛点问题；
-2、教师关注的教学项目、教学成果类型；
-3、其他个性化需求，以及应对情况说明；
-4、目前态度的产生原因等。
-" class="layui-textarea"><%= @follow_up.description %></textarea>
+        <textarea name="content" placeholder="团队建议" class="layui-textarea"><%= @idea_follow&.content.to_s %></textarea>
       </div>
     </div>
-    <div class="layui-inline" style="padding-left: 50px">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit_follow_up">提交
-      </button>
+    <div class="layui-row" style="padding-top: 30px; float: left">
+      <div class="layui-input-block">
+        <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn_follow">确认保存</button>
+      </div>
     </div>
   </div>
-</form>
+</div>
+
+
+
 
 <script>
     layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate'], function () {
@@ -54,34 +65,41 @@
             laydate = layui.laydate,
             $ = layui.$;
 
-        // laydate.render({
-        //     elem: '#invitation_at_add'
-        // })
-        //
-        // laydate.render({
-        //     elem: '#reception_at_add'
-        // });
-
         form.render();
 
-        form.on('submit(edit_follow_up)', function (data) {
-            request.authPut("missions/teacher_follows/<%= @follow_up.id%>", data.field, function (res) {
+
+        var staff_list = xmSelect.render({
+            el: '#new_idea_staff_id',
+            data: gon.idea_staffs,
+            filterable: true,
+            radio: true,
+        })
+        var sale_staff_list = xmSelect.render({
+            el: '#new_sale_staff_id',
+            data: gon.sale_staffs,
+            filterable: true,
+            radio: true,
+        })
+
+
+        //监听提交
+        form.on('submit(saveBtn_follow)', function (data) {
+            data.field.idea_staff_id = staff_list.getValue('valueStr');
+            data.field.sale_staff_id = sale_staff_list.getValue('valueStr');
+            request.authPut("missions/idea_follows/<%= @idea_follow.id%>", data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {
                     layer.close(parent.edit_index1);
                     parent.layer.close(parent.layer.getFrameIndex(window.name))
-                    parent.table.reload('followTable')
-                    parent.table.reload('teachers_table')
-                    parent.table.reload('weekPlanTable1')
-                    parent.table.reload('monthPlanTable')
-                    parent.table.reload('sale_plan_follow_table')
+                    table.reload('activity_followp_table')
+                    table.reload('ideas_table')
+                    table.reload('sale_plan_follow_table')
                 }
             })
-
-
             return false;
         });
 
+
     });
 </script>