educode_sales 0.9.67 → 0.9.68

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

@@ -1,5 +1,5 @@
 <div style="margin: 10px 10px 10px 10px">
-  <form class="layui-form layui-form-pane" lay-filter="search_follows">
+  <form class="layui-form layui-form-pane">
     <div class="layui-form-item">
       <div class="layui-inline">
         <label class="layui-form-label">活动名称</label>
@@ -16,7 +16,7 @@
       <div class="layui-inline">
         <label class="layui-form-label">销售经理</label>
         <div class="layui-input-inline">
-          <%= select_tag "sales_id", options_for_select(EducodeSales::Staff.all.map{|d| [d.user&.real_name, d.id]}), { include_blank: true } %>
+          <%= select_tag "sales_id", options_for_select(@staffs), { include_blank: true } %>
         </div>
       </div>
 
@@ -33,19 +33,10 @@
   <table class="layui-hide" id="activity_followp_table" style="min-height: 300px;" lay-filter="activity_followp_table"></table>
 </div>
 <script type="text/html" id="currentTableBar_follows">
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
+<% if can? :advise, EducodeSales::ActivityFollowUp %>
+  <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="advise">团队建议</a>
+<% end %>
 </script>
-<script type="text/html" id="teacher_name">
-  {{# if (d.login) { }}
-    <a href="<%= base_url%>/users/{{d.login}}" class="layui-table-link" target="_blank">{{ d.teacher }}</a>
-  {{# } else {}}
-    <a href="javascript:;" class="">{{ d.teacher }}</a>
-  {{# }}}
-</script>
-<script type="text/html" id="school">
-  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
-</script>
-
 
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
@@ -56,20 +47,13 @@
         miniPage = layui.miniPage,
         laydate = layui.laydate;
 
-      var laydate = layui.laydate;
-
-        laydate.render({
-          elem: '#follows_date',
-          range: true
-        });
-
-        table = layui.table;
+        var table = layui.table;
         table.render({
             elem: '#activity_followp_table',
             url: '/missions/activities/follow_ups',
             defaultToolbar: ['filter'],
             initSort: {
-              field: 'created_at' ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
+              field: 'created_at' ,type: 'desc'
             },
             cols: [
                 [
@@ -117,22 +101,22 @@
                   {
                     field: 'created_at',
                     width: 180,
-                    title: '跟进时间',
+                    title: '最新跟进时间',
                     sort: true,
                   },
                   {
-                      field: 'advise',
-                      width: 120,
-                      title: '团队建议',
-                      templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
+                    field: 'advise',
+                    width: 300,
+                    title: '团队建议',
+                    templet:'<div><span title="{{d.advise}}">{{d.advise}}</span></div>'
                   },
-                //  {
-                 //     title: '操作',
-                  //    width: 80,
-                //      toolbar: '#currentTableBar_follows',
-                 //     align: "center",
-                 //     fixed: 'right'
-                //  }
+                  {
+                    title: '操作',
+                    width: 200,
+                    toolbar: '#currentTableBar_follows',
+                    align: "center",
+                    fixed: 'right'
+                 }
                 ]
             ],
             limit: 20,
@@ -196,6 +180,36 @@
             $(window).on("resize", function () {
               layer.full(index);
             });
+          } else if (obj.event == '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.authPost("/missions/activities/add_advise", {content: l.find("textarea").val().trim(), id: data.id}, function(res) {
+                        if (res.success == false) {
+                          layer.alert(res.msg);
+                        } else {
+                          layer.close(index);
+                          table.reload('activity_followp_table');
+                        }
+                      })
+                    }
+                    
+                    return false
+                  },
+                  btn2: function(index, l) {
+                    layer.close(index)
+                  }
+              });
           }
         });
 
@@ -203,6 +217,6 @@
 </script>
 <style>
     .layui-table-tool-temp{
-        padding-right: 30px; !important;
+       padding-right: 30px; !important;
     }
 </style>

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

@@ -8,7 +8,7 @@
   </div>
 </script>
 <div style="margin: 10px 10px 10px 10px">
-  <form class="layui-form layui-form-pane" lay-filter="search_ideas">
+  <form class="layui-form layui-form-pane">
     <div class="layui-form-item">
       <div class="layui-inline ">
         <label class="layui-form-label">活动名称</label>
@@ -37,7 +37,7 @@
       <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 } %>
+          <%= select_tag "manage", options_for_select(@staff_manage, ""), { include_blank: true } %>
         </div>
       </div>
       <div class="layui-inline">
@@ -67,11 +67,19 @@
 
 <script type="text/html" id="currentTableBar">
   <% if can? :create, EducodeSales::ActivityFollowUp %>
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进记录</a>
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_event">添加跟进</a>
   <% end %>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_plan">添加计划</a>
+  <% if can? :advise, EducodeSales::ActivityFollowUp %>
+    <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="advise">建议</a>
+  <% end %>
+  
   <% if can? :update, EducodeSales::Activity %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
   <% end %>
+  <% if can? :show_file, EducodeSales::Activity %>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="file">附件</a>
+  <% end %>
  <% if can? :destroy, EducodeSales::Activity %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
   <% end %>
@@ -174,11 +182,6 @@
                   width: 180,
                   title: '邀请专家'
                 },
-                {
-                  field: 'expert',
-                  width: 180,
-                  title: '报告专家'
-                },
                 {
                   field: 'start_at',
                   width: 200,
@@ -212,7 +215,7 @@
                 },
                 {
                   title: '操作',
-                  width: 260,
+                  width: 380,
                   toolbar: '#currentTableBar',
                   align: "center",
                   fixed: 'right'
@@ -311,6 +314,26 @@
                     layer.full(index);
                 });
                 return false;
+            } else if (obj.event === 'add_plan') {
+              var content = miniPage.getHrefContent('/missions/operation_plans/new_week');
+              var openWH = miniPage.getOpenWidthHeight();
+              new_weelPlan_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 === 'delete') {
                 layer.confirm('确定删除' + data.name, function (index) {
                     request.delete('missions/activities/' + data.id, {}, function (res) {
@@ -405,6 +428,56 @@
                 $(window).on("resize", function () {
                  layer.full(followup_index);
                });
+            } else if (obj.event == '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/activities/" + 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('activity_followp_table');
+                          }
+                        })
+                      }
+                      
+                      return false
+                    },
+                    btn2: function(index, l) {
+                      layer.close(index)
+                    }
+                });
+            } else if (obj.event == 'file') {
+              activity_id = data.id
+              var content = miniPage.getHrefContent('/missions/activities/' + data.id + "/files");
+              var openWH = miniPage.getOpenWidthHeight();
+              followup_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(followup_index);
+              });
             }
         });
 

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

@@ -4,88 +4,81 @@
   <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"
-               class="layui-input" value="<%= @activity.name %>">
+      <div class="layui-input-block" style="width: 200px;">
+        <input type="text" name="name" required lay-verify="required" class="layui-input" value="<%= @activity.name %>">
       </div>
     </div>
     <div class="layui-inline">
     <label class="layui-form-label required">活动类型</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <%= select_tag "clazz_id", options_for_select(@clazz, @activity.clazz_id), { 'lay-filter': 'clazz_id', class: 'required' } %>
     </div>
   </div>
   <div class="layui-inline">
     <label class="layui-form-label required">活动状态</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <%= select_tag "state_id", options_for_select(EducodeSales::Activity.state_ids.keys, @activity.state_id), { 'lay-filter': 'clazz_id', class: 'required' } %>
     </div>
   </div>
     <div class="layui-inline">
       <label class="layui-form-label required">活动时间</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="start_at" required lay-verify="required" class="layui-input" id="time" placeholder="请选择时间"
                value="<%= @activity.start_at&.to_s(:date) %>">
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">活动天数</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="days" required lay-verify="required"
                class="layui-input" value="<%= @activity.days %>">
       </div>
     </div>
     <div class="layui-inline">
     <label class="layui-form-label">销售经理</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <div id="sales_list" style="width: 163px;"></div>
     </div>
   </div>
     <div class="layui-inline">
       <label class="layui-form-label">生态经理</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <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 class="layui-input-block" style="width: 200px;">
       <input type="text" name="sponsor" class="layui-input" value="<%= @activity.sponsor %>">
     </div>
   </div>
   <div class="layui-inline">
     <label class="layui-form-label">联系人</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <input type="text" name="linkman" class="layui-input" value="<%= @activity.linkman %>">
     </div>
   </div>
   <div class="layui-inline">
     <label class="layui-form-label">联系电话</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <input type="text" name="phone" class="layui-input" value="<%= @activity.phone %>">
     </div>
   </div>
   <div class="layui-inline">
     <label class="layui-form-label">规模</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <input type="text" name="scale" class="layui-input" value="<%= @activity.scale %>">
     </div>
   </div>
   <div class="layui-inline">
     <label class="layui-form-label">会议地点</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <input type="text" name="address" class="layui-input" value="<%= @activity.address %>">
     </div>
   </div>
   <div class="layui-inline">
     <label class="layui-form-label">会议形式</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <input type="text" name="meeting_form" class="layui-input" value="<%= @activity.meeting_form %>">
     </div>
   </div>
@@ -96,26 +89,13 @@
     </div>
   </div>
     <div class="layui-inline">
-      <label class="layui-form-label">报告专家</label>
+      <label class="layui-form-label">协助人员</label>
       <div class="layui-input-block">
-        <div id="expert_list" style="width: 600px;"></div>
+        <div id="staff_assist_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', @activity.attachment&.id %>
-        <span id="attachment">
-          <% if @activity.attachment %>
-            <%= link_to @activity.attachment&.filename.to_s, "/missions/upload_files/download?id=#{@activity.attachment&.id}", target: '_blank'  %>
-            <a href="javascript:;" style="color:red;" id="delete">删除</a>
-          <% end %>
-        </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>
@@ -159,17 +139,6 @@
             }
         })
 
-        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>';
-          }
-       });
 
         var staff_manage = xmSelect.render({
           el: '#staff_manage_list',
@@ -184,17 +153,11 @@
           filterable: true,
         })
 
-        
 
         var staff_assist = xmSelect.render({
-          el: '#staff_assist_list',
-          data: gon.assists,
-          filterable: true,
-        })
-        var expert = xmSelect.render({
-          el: '#expert_list', 
+          el: '#staff_assist_list', 
           filterable: true,
-          name: 'expert_ids',
+          name: 'staff_assist_id',
           remoteSearch: true,
           remoteMethod: function(val, cb, show){
             if(!val){
@@ -208,13 +171,13 @@
               }
             })
           },
-          data: gon.experts
+          data: gon.assistss
         })
 
         var invitation_select = xmSelect.render({
           el: '#invitation_list', 
           filterable: true,
-          name: 'expert_ids',
+          name: 'invitation_ids',
           remoteSearch: true,
           remoteMethod: function(val, cb, show){
             if(!val){
@@ -231,21 +194,15 @@
           data: gon.invitation_list
         })
 
-        $(body).on("click", "#delete", function() {
-          document.getElementById("attachment").innerHTML = "";
-          $("#attachment_id").val('');
-        })
-
         //监听提交
         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) {
+          var staff_assist_id = [];
+          staff_assist.getValue().forEach(function(d) {
             if (typeof(d.value) == 'number') {
-              expertids.push([d.value, d.name]);
+              staff_assist_id.push([d.value, d.name]);
             } else {
-              expertids.push(['', d.name]);
+              staff_assist_id.push(['', d.name]);
             }
           })
           var invitation_ids = [];
@@ -258,7 +215,7 @@
             }
           })
           data.field.invitation_ids = invitation_ids;
-          data.field.expert_ids = expertids;
+          data.field.staff_assist_id = staff_assist_id;
             request.authPut("missions/activities/" + <%= @activity.id %>, data.field, function (res) {
                 if (res.success === false) {
                     layer.alert(res.msg)

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

@@ -0,0 +1,157 @@
+<%= Gon::Base.render_data %>
+<script type="text/html" id="toolbarDemo">
+  <div class="layui-btn-container">
+    <span class="table-label">附件信息</span>
+    <% if can? :upload_file, EducodeSales::Activity %>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="upload_file">上传文件</button>
+    <% end %>
+  </div>
+</script>
+
+<table class="layui-hide" id="file" lay-filter="file"></table>
+
+<script type="text/html" id="currentTableBar_file">
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="preview">预览</a>
+  <% if can? :download_file, EducodeSales::Activity %>
+<a href="/missions/upload_files/download?id={{d.id}}" class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="download">下载</a>
+  <% end %>
+  <% if can? :delete_file, EducodeSales::Activity %>
+<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
+</script>
+
+<script type="text/html" id="showchance">
+  <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}</a>
+</script>
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            upload = layui.upload;
+        miniPage = layui.miniPage;
+
+
+        var activity_id = parent.activity_id;
+        table.render({
+            elem: '#file',
+            url: '/missions/activities/' + activity_id +'/files',
+            toolbar: '#toolbarDemo',
+            defaultToolbar: [],
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        width: 80,
+                        title:'序号',type: 'numbers',
+                    },
+                    {
+                        field: 'name',
+                        title: '文件名'
+                    },
+                    {
+                        field: 'size',
+                        width: 100,
+                        title: '文件大小',
+                    },
+                    {
+                        field: 'created_on',
+                        width: 200,
+                        title: '上传时间',
+                        sort: true
+                    },
+                    {
+                        field: 'upload_person',
+                        width: 80,
+                        totalRow:true,
+                        title: '上传人',
+                    },
+                    {
+                        title: '操作',
+                        width: 200,
+                        toolbar: '#currentTableBar_file',
+                        align: "center"
+                    }
+                ]
+            ],
+            limit: 20,
+            limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true
+        });
+
+
+        var sort = {};
+        table.on('sort(file)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('file', {
+                initSort: obj,
+                where: {
+                    sort: sort
+                }
+            });
+        })
+
+
+        table.on('toolbar(file)', function (obj) {
+            if (obj.event === 'upload_file') {  //
+                activity_id = parent.activity_id;
+                var content = miniPage.getHrefContent('/missions/activities/upload_file');
+                var openWH = miniPage.getOpenWidthHeight();
+                import_index = layer.open({
+                    title: '上传文件',
+                    type: 1,
+                    shade: 0.2,
+                    shadeClose: true,
+                    area: ['200px', '100px'],
+                    offset: 'auto',
+                    closeBtn: 0,
+                    content: content,
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }
+        });
+
+
+        table.on('tool(file)', function (obj) {
+            var data = obj.data;
+            var id = data.id
+            name = data.disk_filename
+            folder = gon.folder
+            if (obj.event === 'preview') {
+                if (data.content_type.split("/")[0] === "image"){
+                    layer.photos({
+                        photos: { "data": [{"src": '/files/educode_sales/' + name}] }
+                        ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机
+                    });
+                }else if (data.content_type.split("/")[1] === "pdf"){
+                    var pdf = '/files/educode_sales/' + name;
+                    var openWH = miniPage.getOpenWidthHeight();
+                    layer.open({
+                        title: data.name,
+                        type: 2,
+                        area: ['1000px', '750px'],
+                        fixed: false, //不固定
+                        maxmin: true,
+                        content: pdf
+                    });
+                }else{
+                    layer.msg("附件不支持预览，请下载查看！")
+                }
+                return false;
+            }else if (obj.event === 'delete') {
+                layer.confirm('确定删除' + data.name, function (index) {
+                    request.delete('missions/upload_files/' + data.id + '?disk_filename=' + data.disk_filename, {}, function (res) {
+                        layer.close(index);
+                        table.reload("file")
+                    })
+                });
+            }
+        });
+
+    });
+</script>

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

@@ -0,0 +1,13 @@
+json.data do
+  json.array! @files do |d|
+    json.id d.id
+    json.name d.filename
+    json.size d.filesize < 1000000 ? (d.filesize.to_f / 1000).round(2).to_s + 'KB' : (d.filesize.to_f / 1000000).round(2).to_s + 'MB'
+    json.created_on d.created_on.to_s
+    json.upload_person d.author.real_name
+    json.disk_filename d.disk_filename
+    json.content_type d.content_type
+  end
+end
+json.code 0
+json.count @files.total_count