educode_sales 0.9.59 → 0.9.61

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

@@ -7,6 +7,54 @@
     <% end %>
   </div>
 </script>
+<div style="margin: 10px 10px 10px 10px">
+  <form class="layui-form layui-form-pane" lay-filter="search_ideas">
+    <div class="layui-form-item">
+      <div class="layui-inline ">
+        <label class="layui-form-label">活动名称</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" name="name" autocomplete="off">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">会议类型</label>
+        <div class="layui-input-inline">
+          <%= select_tag "clazz_id", options_for_select(['全国会议', '区域会议', '单校会议', '国赛', '省赛', '夏令营'], ""), { include_blank: true } %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">销售经理</label>
+        <div class="layui-input-inline">
+          <%= select_tag "staff_id", options_for_select(@staffs, ""), { include_blank: true } %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">生态经理</label>
+        <div class="layui-input-inline">
+          <%= select_tag "manage", options_for_select(@staffs, ""), { include_blank: true } %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">协助人员</label>
+        <div class="layui-input-inline">
+          <%= select_tag "assists", options_for_select(@staffs, ""), { include_blank: true } %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">报告专家</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" name="expert" autocomplete="off">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_activity_search">重置
+        </button>
+        <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_activity">搜 索
+        </button>
+      </div>
+    </div>
+  </form>
+</div>
 <div class="min-height-table">
 <table class="layui-hide" id="activities_table" lay-filter="activities_table"></table>
 </div>
@@ -46,14 +94,40 @@
                 {
                   field: 'id',
                   title:'序号',type: 'numbers',
-                    totalRowText:'合计',
+                  totalRowText:'合计',
                   width: 60
                 },
                 {
                   field: 'name',
                   title: '活动名称',
+                  width: 180,
                   templet: '#teachers'
                 },
+                {
+                  field: 'clazz_id',
+                  width: 120,
+                  title: '会议类型'
+                },
+                {
+                  field: 'staff',
+                  width: 120,
+                  title: '销售经理'
+                },
+                {
+                  field: 'staff_manage',
+                  width: 180,
+                  title: '生态经理'
+                },
+                {
+                  field: 'staff_assist',
+                  width: 180,
+                  title: '协助人员'
+                },
+                {
+                  field: 'expert',
+                  width: 180,
+                  title: '报告专家'
+                },
                 {
                   field: 'start_at',
                   width: 200,
@@ -103,6 +177,17 @@
           }
         });
       })
+        // 监听搜索操作
+        form.on('submit(search_activity)', function (data) {
+          search = data.field
+          table.reload('activities_table', {
+              page: {
+                  curr: 1
+              },
+              where: {q: search, sort: sort}
+          }, 'data');
+          return false;
+        });
         table.on('toolbar(activities_table)', function (obj) {
           if (obj.event === 'add') { // 监听添加操作
             var content = miniPage.getHrefContent('/missions/activities/new');

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

@@ -10,6 +10,11 @@ json.data do
     json.students_count d.students_count || 0
     json.course_rate d.course_rate
     json.start_at d.start_at ? d.start_at.to_s(:date) : ''
+    json.clazz_id d.clazz_id
+    json.staff d.staff&.user&.real_name
+    json.staff_manage d.manages.map { |d| d.staff.user.real_name}.uniq.join("、")
+    json.staff_assist d.assists.map { |d| d.staff.user.real_name}.uniq.join("、")
+    json.expert d.experts.pluck(:name).join("、")
   end
 end
 

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

@@ -1,12 +1,17 @@
-<%#= Gon::Base.render_data %>
+<%= Gon::Base.render_data %>
 <div class="layuimini-main">
-<form class="layui-form  layuimini-form" action="">
-  <div class="layui-form-item" style="padding: 25px">
+<div class="layui-form  layuimini-form">
+  <div class="layui-form-item">
     <div class="layui-inline">
       <label class="layui-form-label required">活动名称</label>
       <div class="layui-input-block">
-        <input type="text" name="name" required lay-verify="required" placeholder="请输入"
-               class="layui-input" id="inputFocus">
+        <input type="text" name="name" required lay-verify="required" placeholder="请输入" class="layui-input" id="inputFocus">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label required">活动类型</label>
+      <div class="layui-input-block">
+        <%= select_tag "clazz_id", options_for_select(@clazz), { 'lay-filter': 'clazz_id', class: 'required' } %>
       </div>
     </div>
     <div class="layui-inline">
@@ -18,22 +23,49 @@
     <div class="layui-inline">
       <label class="layui-form-label required">活动天数</label>
       <div class="layui-input-block">
-        <input type="text" name="days" required lay-verify="required"
-               class="layui-input">
+        <input type="text" name="days" required lay-verify="required" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">生态经理</label>
+      <div class="layui-input-block">
+        <div id="staff_manage_list" style="width: 163px;"></div>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">协助人员</label>
+      <div class="layui-input-block">
+        <div id="staff_assist_list" style="width: 193px;"></div>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">报告专家</label>
+      <div class="layui-input-block">
+        <div id="expert_list" style="width: 600px;"></div>
+      </div>
+    </div>
+  </div>
+  <div class="layui-form-item">
+    <div class="layui-inline">
+      <label class="layui-form-label">上传附件</label>
+      <div class="layui-input-block">
+        <%= hidden_field_tag 'attachment_id' %>
+        <span id="attachment">
+        </span>
+        <button type="button" class="layui-btn" id="upload_file">上传文件</button>
       </div>
     </div>
     <div class="layui-inline" style="padding-left: 30px">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
-      </button>
+      <button class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交 </button>
     </div>
   </div>
-</form>
+</div>
 </div>
 
 <script>
     document.getElementById("inputFocus").focus();
 
-    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
+    layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer', 'xmSelect'], function () {
         var form = layui.form,
             layer = layui.layer,
             table = layui.table,
@@ -41,6 +73,9 @@
             laytpl = layui.laytpl,
             request = layui.request,
             laydate = layui.laydate,
+            xmSelect = layui.xmSelect,
+            upload = layui.upload,
+            selectInput = layui.selectInput
             $ = layui.$;
 
         //常规用法
@@ -48,7 +83,55 @@
             elem: '#new_time'
         });
 
+        var staff_manage = xmSelect.render({
+          el: '#staff_manage_list',
+          data: gon.staff_manage,
+          filterable: true,
+        })
+
+        var staff_assist = xmSelect.render({
+          el: '#staff_assist_list',
+          data: gon.staff_manage,
+          filterable: true,
+        })
+        var expert = xmSelect.render({
+          el: '#expert_list', 
+          filterable: true,
+          name: 'expert_ids',
+          remoteSearch: true,
+          remoteMethod: function(val, cb, show){
+            if(!val){
+              return cb([]);
+            }
+            request.get('missions/search_edu_user?q=' + val, {}, function (res) {
+              if (res.data.length == 0) {
+                 cb([{value: val, name: val}])
+              } else {
+                cb(res.data);
+              }
+              
+            })
+          },
+          data: []
+        })
 
+
+        upload.render({
+          elem: '#upload_file', 
+          url: '/missions/upload_files',
+          auto: true,
+          accept: 'file', 
+          done: function (res) {
+            layer.msg('上传成功');
+            $("#attachment_id").val(res.attachment_id);
+            document.getElementById("attachment").innerHTML = '<a target="_blank" href="' + res.url+ '">' + res.filename + '</a><a href="javascript:;" style="color:red;" id="delete">删除</a>';
+          }
+       });
+      
+        $(body).on("click", "#delete", function() {
+          document.getElementById("attachment").innerHTML = "";
+          $("#attachment_id").val('');
+        })
         form.render();
 
         // 当前弹出层，防止ID被覆盖
@@ -69,15 +152,27 @@
 
         //监听提交
         form.on('submit(data-reset-btn)', function (data) {
+            data.field.staff_manage_id = staff_manage.getValue('value');
+            data.field.staff_assist_id = staff_assist.getValue('value');
+            var expertids = [];
+            expert.getValue().forEach(function(d) {
+              if (typeof(d.value) == 'number') {
+                expertids.push([d.value, d.name]);
+              } else {
+                expertids.push(['', d.name]);
+               
+              }
+            })
+            data.field.expert_ids = expertids;
             request.authPost("missions/activities", data.field, function (res) {
                 if (res.success === false) {
-                    layer.alert(res.msg)
+                  layer.alert(res.msg)
                 } else {
-                    layer.closeAll(); //关闭所有层
-                    table.reload('activities_table')
+                  layer.closeAll(); //关闭所有层
+                  table.reload('activities_table')
                 }
             })
-            return false;
-        });
+           return false;
+      });
     });
 </script>

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

@@ -58,6 +58,9 @@
 </script>
 <script type="text/html" id="currentTableBar_follows">
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">详情</a>
+    <% if can?(:advise, EducodeSales::Business) %>
+      <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="add_advise">团队建议</a>
+    <% end %>
 </script>
 <script type="text/html" id="business">
   <a href="javascript:void(0);" lay-event="business" class="layui-table-link">{{ d.business }}</a>
@@ -163,7 +166,7 @@
                     },
                     {
                         title: '操作',
-                        width: 80,
+                        width: 160,
                         toolbar: '#currentTableBar_follows',
                         align: "center",
                         fixed: 'right'
@@ -280,6 +283,36 @@
                 $(window).on("resize", function () {
                     layer.full(index);
                 });
+            } else if (obj.event == 'add_advise') {
+              layer.open({
+                title: '添加团队建议',
+                closeBtn: 0,
+                type: 1,
+                area: '400px;',
+                id: 'LAY_layuipro',
+                content: '<div class="layui-form" lay-filter="edit_project" style="padding: 20px;"><textarea autocomplete="off" type="text" name="name" lay-verify="required" class="layui-textarea">' + data.advise + '</textarea></div>' ,
+                btn: ['保存', '取消'],
+                  btn1: function(index, l) {
+                    if (l.find("textarea").val().trim() == '') {
+                      layer.msg('内容不能为空')
+                      return false;
+                    } else {
+                      request.authPut("/missions/follow_ups/" + data.id + "/update_advise", {content: l.find("textarea").val().trim()}, function(res) {
+                        if (res.success == false) {
+                          layer.alert(res.msg);
+                        } else {
+                          layer.close(index);
+                          table.reload('teachers_table');
+                        }
+                      })
+                    }
+                    
+                    return false
+                  },
+                  btn2: function(index, l) {
+                    layer.close(index)
+                  }
+              });
             }
         });
 

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

@@ -172,31 +172,35 @@
 </script>
 <script type="text/html" id="currentTableBar">
   <%unless !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business) %>
-<% if can? :add_follow, EducodeSales::Business %>
-  <% if @current_admin.is_admin %>
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
-  <% else %>
-  {{# if ( d.assign_follow_ups.length > 0 && d.assign_follow_ups.indexOf(d.current_staff_id) >=0 || (d.assign_follow_ups.length == 0) || (d.current_staff_id == d.staff_id) ) {}}
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
-  {{# }}}
-<% end %>
-  <% end %>
+    <% if can? :add_follow, EducodeSales::Business %>
+      <% if @current_admin.is_admin %>
+        <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
+      <% else %>
+        {{# if ( d.assign_follow_ups.length > 0 && d.assign_follow_ups.indexOf(d.current_staff_id) >=0 || (d.assign_follow_ups.length == 0) || (d.current_staff_id == d.staff_id) ) {}}
+          <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
+          {{# }}}
+        <% end %>
+      <% end %>
   <% end %>
   <%if !can?(:add_follow, EducodeSales::Business) && can?(:self_add_follow, EducodeSales::Business)%>
     {{# if (d.self_flag) {}}
-  <% if @current_admin.is_admin %>
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
-  <% else %>
-  {{# if ( d.assign_follow_ups.length > 0 && d.assign_follow_ups.indexOf(d.current_staff_id) >=0 || (d.assign_follow_ups.length == 0) || (d.current_staff_id == d.staff_id) ) {}}
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
-  {{# }}}
-<% end %>
+    <% if @current_admin.is_admin %>
+      <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
+    <% else %>
+      {{# if ( d.assign_follow_ups.length > 0 && d.assign_follow_ups.indexOf(d.current_staff_id) >=0 || (d.assign_follow_ups.length == 0) || (d.current_staff_id == d.staff_id) ) {}}
+      <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
+      {{# }}}
+    <% end %>
     {{# }}}
   <% end %>
-  <%if can?(:update, EducodeSales::Business)%>
-  <%unless !can?(:update, EducodeSales::Business) && can?(:self_edit_business, EducodeSales::Business)%>
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% if can?(:advise, EducodeSales::Business) %>
+    <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="add_advise">建议</a>
   <% end %>
+
+  <%if can?(:update, EducodeSales::Business)%>
+    <%unless !can?(:update, EducodeSales::Business) && can?(:self_edit_business, EducodeSales::Business)%>
+      <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    <% end %>
   <% end %>
   <%if !can?(:update, EducodeSales::Business) && can?(:self_edit_business, EducodeSales::Business)%>
     {{# if (d.self_flag) {}}
@@ -210,6 +214,7 @@
     <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>
     {{# }}}
   <% end %>
+ 
 </script>
 
 <script type="text/html" id="show_keys">
@@ -603,7 +608,7 @@
                 },
                 {
                     title: '操作',
-                    minWidth: 220,
+                    minWidth: 270,
                     toolbar: '#currentTableBar',
                     align: "center",
                     fixed: 'right'
@@ -1379,6 +1384,36 @@
                 ,cancel: function(){
                 }
               });
+            } else if (obj.event == 'add_advise') {
+              layer.open({
+                title: '添加团队建议',
+                closeBtn: 0,
+                type: 1,
+                area: '400px;',
+                id: 'LAY_layuipro',
+                content: '<div class="layui-form" lay-filter="edit_project" style="padding: 20px;"><textarea autocomplete="off" type="text" name="name" lay-verify="required" class="layui-textarea">' + data.advise + '</textarea></div>' ,
+                btn: ['保存', '取消'],
+                  btn1: function(index, l) {
+                    if (l.find("textarea").val().trim() == '') {
+                      layer.msg('内容不能为空')
+                      return false;
+                    } else {
+                      request.authPut("/missions/businesses/" + data.id + "/update_advise", {content: l.find("textarea").val().trim()}, function(res) {
+                        if (res.success == false) {
+                          layer.alert(res.msg);
+                        } else {
+                          layer.close(index);
+                          table.reload("businesses_table",{url: '/missions/businesses',  cols: cols_table})
+                        }
+                      })
+                    }
+                    
+                    return false
+                  },
+                  btn2: function(index, l) {
+                    layer.close(index)
+                  }
+              });
             }
             drowpdwonRender()
         });

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

@@ -20,6 +20,7 @@ json.data do
     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.advise d.last_follow_up&.advise.to_s
     json.o_business_deployment  EducodeSales::FollowUp::BUSINESS_DEPLOYMENT[1..-1].to_h.invert[d.last_follow_up&.o_business_deployment]
     json.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
     json.created_at d.created_at.to_s

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

@@ -23,6 +23,8 @@
             <% if f.id == @latest&.id && (f.created_at.present? ? (Time.now - f.created_at).to_f/3600 < 24 : false) %>
               <a href="javascript:;" class="add_key" data-is_latest="<%= f.id == @latest&.id %>" data-id=<%= f.id %> data-flag="<%= f.created_at.present? ? (Time.now - f.created_at).to_f/3600 < 24 : false %>">添加关键人</a>
             <% end %>
+        <br/>
+        评论: <span></span> <a href="javascript:;" class="add_comment" data-id=<%= f.id %>>评论</a> 
       </p>
     </div>
   </li>
@@ -68,6 +70,34 @@
           layer.full(keyindex);
       });
     })
+    $(".add_comment").on("click", function(e) {
+      var data = e.currentTarget.dataset;
+      follow_up_id = data.id;
+      var content = e.currentTarget.previousElementSibling.innerHTML;
+      layer.open({
+        title: '评论',
+        closeBtn: 0,
+        type: 1,
+        area: '400px;',
+        id: 'LAY_layuipro_new',
+        content: '<div class="layui-form" lay-filter="comment" style="padding: 20px;"><textarea autocomplete="off" type="text" name="name" lay-verify="required" class="layui-textarea">' + content + '</textarea></div>' ,
+        btn: ['保存', '取消'],
+        btn1: function(index, l) {
+          if (l.find("textarea").val().trim() == '') {
+            layer.msg('内容不能为空')
+            return false;
+          } else {
+            e.currentTarget.previousElementSibling.innerHTML = l.find("textarea").val().trim();
+            layer.close(index);
+          }
+          return false
+        },
+        btn2: function(index, l) {
+          layer.close(index)
+        },
+      });
+     
+    })
     function demo(){
         layer.closeAll()
         business_id = parent.business_id

data/app/views/educode_sales/home/search_edu_user.json.jbuilder

@@ -0,0 +1,13 @@
+json.data do
+  json.array! @data do |d|
+    json.value d.id
+    if d.department_id.present?
+      json.name "#{d.real_name}--(#{d.user_extension.department&.school&.name})[头歌]"
+    else
+      json.name "#{d.real_name}[头歌]"
+      json.extras ""
+    end
+  end
+end
+json.code 0
+json.msg 'succcess'

data/app/views/educode_sales/idea_recycles/detail.html.erb

@@ -18,13 +18,13 @@
       <div class="layui-inline">
         <label class="layui-form-label" style="width: 100px">学校/单位：</label>
         <div class="layui-input-inline">
-          <%= idea.school&.name %>
+          <%= idea.school_name %>
         </div>
       </div>
       <div class="layui-inline">
         <label class="layui-form-label" style="width: 100px">院系/部门：</label>
         <div class="layui-input-inline">
-          <%= idea.department&.name %>
+          <%= idea.department_name %>
         </div>
       </div>
       <div class="layui-inline">
@@ -47,12 +47,33 @@
         </div>
       </div>
       <div class="layui-inline">
-        <label class="layui-form-label" style="width: 100px">指派人：</label>
+        <label class="layui-form-label" style="width: 100px">方案指派人：</label>
         <div class="layui-input-inline">
           <%= idea.staff&.user&.real_name %>
         </div>
       </div>
       <br>
+      <div class="layui-inline">
+        <label class="layui-form-label" style="width: 100px">销售负责人：</label>
+        <div class="layui-input-inline">
+          <%= idea.sale_staff&.user&.real_name %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label" style="width: 100px">协作者：</label>
+        <div class="layui-input-inline">
+          <%= idea.assist_staffs.map { |d| d&.user&.real_name }.reject(&:blank?).join("、") %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label" style="width: 100px">方案材料：</label>
+        <div class="layui-input-inline">
+          <%= link_to "/missions/upload_files/download?id=#{idea.attachment_id}", target: '_blank' do %>
+            <%= idea.attachment&.filename.to_s %>
+          <% end %>
+        </div>
+      </div>
+      <br>
       <div class="layui-inline">
         <label class="layui-form-label" style="width: 100px">优先级：</label>
         <div class="layui-input-inline">
@@ -92,7 +113,7 @@
       </div>
       <br>
       <div class="layui-inline">
-        <label class="layui-form-label" style="width: 100px">项目规模(人)：</label>
+        <label class="layui-form-label" style="width: 100px">并发规模(人)：</label>
         <div class="layui-input-inline">
           <%= idea.project.to_i %>
         </div>

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

@@ -14,7 +14,7 @@
         </div>
       </div>
       <div class="layui-inline">
-        <label class="layui-form-label">指派人</label>
+        <label class="layui-form-label">方案指派人</label>
         <div class="layui-input-inline">
           <%= select_tag "staff_id", options_for_select(@staff_arr, ""), { include_blank: true } %>
         </div>
@@ -129,7 +129,7 @@
                     },
                     {
                         field: 'staff',
-                        title: '指派人',
+                        title: '方案指派人',
                         width: 100
                     },
                     {
@@ -155,7 +155,7 @@
                     {
                         field: 'project',
                         width: 150,
-                        title: '项目规模(人)'
+                        title: '并发规模(人)'
                     },
                     {
                         field: 'money',

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

@@ -1,7 +1,7 @@
 json.data do
   json.array! @ideas do |d|
     json.(d, :id, :name, :level, :status, :types, :model, :content)
-    json.school d.school&.name
+    json.school d.school_name
     json.staff d.staff&.user&.real_name
     json.hardware d.hardware.to_f.round(2)
     json.project d.project.to_i