educode_sales 0.9.66 → 0.9.68

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

@@ -1,350 +1,14 @@
-<script type="text/html" id="activity_toolbar">
-  <div class="layui-btn-container">
-    <span class="table-label">活动列表</span>
-    <% if can? :create, EducodeSales::Activity %>
-      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import">导入数据</button>
-      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加活动</button>
-    <% 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 class="layui-tab" lay-filter="operation_tab">
+  <ul class="layui-tab-title">
+    <li class="layui-this follows_li">跟进动态</li>
+    <li class="businesses_list_li" >活动列表</li>
+  </ul>
+  <div class="layui-tab-content">
+    <div class="layui-tab-item  layui-show">
+      <%= render 'follows' %>
+    </div>
+    <div class="layui-tab-item follows_div">
+      <%= render 'index' %>
     </div>
-  </form>
-</div>
-<div class="min-height-table">
-<table class="layui-hide" id="activities_table" lay-filter="activities_table"></table>
-</div>
-
-<script type="text/html" id="currentTableBar">
-  <% 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? :destroy, 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="teachers">
-  <a href="javascript:void(0);" lay-event="teachers" class="layui-table-link">{{ d.name}}</a>
-</script>
-<script type="text/html" id="teachers_count">
-  <a href="javascript:void(0);" lay-event="teachers_count" class="layui-table-link">{{ d.teachers_count}}</a>
-</script>
-<script type="text/html" id="schools_count">
-  <a href="javascript:void(0);" lay-event="schools_count" class="layui-table-link">{{ d.schools_count}}</a>
-</script>
-<script>
-    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
-        var $ = layui.jquery,
-            form = layui.form,
-            table = layui.table,
-            request = layui.request,
-            miniPage = layui.miniPage;
-
-        table.render({
-            elem: '#activities_table',
-            url: '/missions/activities',
-            toolbar: '#activity_toolbar',
-            totalRow:true,
-            defaultToolbar: [],
-            cols: [
-              [
-                {
-                  field: 'id',
-                  title:'序号',type: 'numbers',
-                  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,
-                  title: '时间',
-                  sort: true,
-                },
-                {
-                  field: 'days',
-                  title: '天数',
-                  width: 200
-                },
-                {
-                  field: 'schools_count',
-                  title: '学校数',
-                  width: 200,
-                  totalRow: true,
-                  templet: '#schools_count'
-                },
-                {
-                  field: 'teachers_count',
-                  title: '教师数',
-                  width: 200,
-                  totalRow:true,
-                  templet: '#teachers_count'
-                },
-                {
-                  field: 'students_count',
-                  title: '学生数',
-                  totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
-                  width: 200
-                },
-                {
-                  title: '操作',
-                  width: 120,
-                  fixed: 'right',
-                  toolbar: '#currentTableBar',
-                  align: "center"
-                }
-              ]
-            ],
-            limit: 20,
-          limits: [10,15,20,30,40,50,60,70,80,90],
-            page: true
-        });
-
-      var sort = {};
-      table.on('sort(activities_table)', function (obj) {
-        sort.field = obj.field;
-        sort.order = obj.type;
-        table.reload('activities_table', {
-          initSort: obj,
-          where: {
-            sort: sort
-          }
-        });
-      })
-        // 监听搜索操作
-        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');
-            var 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) {
-                form.render('select');
-              }
-            });
-            $(window).on("resize", function () {
-              layer.full(index);
-            });
-          }
-          else if (obj.event === 'import') {  //
-              var content = miniPage.getHrefContent('/missions/teachers/import');
-              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(activities_table)', function (obj) {
-            var data = obj.data;
-            var id = data.id
-            if (obj.event === 'edit') {
-                var content = miniPage.getHrefContent('/missions/activities/' + id + '/edit');
-                var openWH = miniPage.getOpenWidthHeight();
-                var 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) {
-                        console.log(data);
-                        // $("#name").val(data.name);
-                        // 重新渲染弹层中的下拉选择框select
-                        form.render('select');
-                    },
-                });
-                $(window).on("resize", function () {
-                    layer.full(index);
-                });
-                return false;
-            } else if (obj.event === 'delete') {
-                layer.confirm('确定删除' + data.name, function (index) {
-                    request.delete('missions/activities/' + data.id, {}, function (res) {
-                        layer.close(index);
-                        table.reload("activities_table")
-                    })
-                });
-            } else if (obj.event === 'teachers') {
-                activity_id = obj.data.id
-                var content = miniPage.getHrefContent('/missions/activities/show_teachers');
-              openWH = miniPage.getOpenWidthHeight();
-              index = layer.open({
-                title: '活动列表/' + data.name,
-                type: 1,
-                shade: 0.2,
-                maxmin: true,
-                shadeClose: true,
-                area: [openWH[0] + 'px', openWH[1] + 'px'],
-                offset: [openWH[2] + 'px', openWH[3] + 'px'],
-                content: content,
-                success: function (layero, index) {
-                  form.render('select');
-                },
-              });
-              $(window).on("resize", function () {
-                layer.full(index);
-              });
-              return false;
-            }
-             else if (obj.event === 'teachers_count') {
-                activity_id = obj.data.id;
-                school_id = '';
-                content = miniPage.getHrefContent('/missions/activities/show_teachers');
-                openWH = miniPage.getOpenWidthHeight();
-                index2 = layer.open({
-                  title: '活动列表/' + data.name,
-                  type: 1,
-                  shade: 0.2,
-                  maxmin: true,
-                  shadeClose: true,
-                  area: [openWH[0] + 'px', openWH[1] + 'px'],
-                  offset: [openWH[2] + 'px', openWH[3] + 'px'],
-                  content: content,
-                  success: function (layero, index) {
-                    form.render('select');
-                  },
-                });
-                $(window).on("resize", function () {
-                  layer.full(index);
-                });
-                return false;
-            } else if (obj.event == 'schools_count') {
-              activity_id = obj.data.id;
-              activity_name = data.name;
-              school_id = '';
-              content = miniPage.getHrefContent('/missions/activities/' + obj.data.id +'/show_schools');
-              openWH = miniPage.getOpenWidthHeight();
-              index2 = layer.open({
-                title: '活动列表/' + data.name,
-                type: 1,
-                shade: 0.2,
-                maxmin: true,
-                shadeClose: true,
-                area: [openWH[0] + 'px', openWH[1] + 'px'],
-                offset: [openWH[2] + 'px', openWH[3] + 'px'],
-                content: content,
-                success: function (layero, index) {
-                  form.render('select');
-                },
-              });
-              $(window).on("resize", function () {
-                layer.full(index);
-              });
-              return false;
-            }
-        });
-
-    });
-</script>
-<style>
-    .layui-table-tool-temp{
-        padding-right: 30px; !important;
-    }
-
-</style>
+  </div>
+</div>

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

@@ -12,10 +12,18 @@ json.data do
     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 d.sales&.user&.real_name || 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("、")
+    json.staff_assist d.assists.pluck(:name).join("、")
+    json.invitations d.invitations.pluck(:name).join("、")
+    json.sponsor d.sponsor
+    json.linkman d.linkman
+    json.phone d.phone
+    json.scale d.scale
+    json.address d.address
+    json.meeting_form d.meeting_form
+    json.state_id d.state_id
+    json.advise d.last_follow_up&.advise || ''
  
     json.schools_count EducodeSales::ActivityTeacher.joins(teacher: :department).where(activity_id: d.id).select("distinct(school_id)").count
     schools_count +=  EducodeSales::ActivityTeacher.joins(teacher: :department).where(activity_id: d.id).select("distinct(school_id)").count

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

@@ -4,57 +4,90 @@
   <div class="layui-form-item">
     <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="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">
+      <div class="layui-input-block" style="width: 200px;">
         <%= select_tag "clazz_id", options_for_select(@clazz), { 'lay-filter': 'clazz_id', class: 'required' } %>
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label required">活动状态</label>
+      <div class="layui-input-block" style="width: 200px;">
+        <%= select_tag "state_id", options_for_select(EducodeSales::Activity.state_ids.keys), { '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" autocomplete="off" required lay-verify="required" class="layui-input" id="new_time" placeholder="请选择时间">
       </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">
       </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 id="staff_manage_list" style="width: 200px;"></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>
+      <label class="layui-form-label">主办方</label>
+      <div class="layui-input-block" style="width: 200px;">
+        <input type="text" name="sponsor" class="layui-input">
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">报告专家</label>
+      <label class="layui-form-label">联系人</label>
+      <div class="layui-input-block" style="width: 200px;">
+        <input type="text" name="linkman" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">联系电话</label>
+      <div class="layui-input-block" style="width: 200px;">
+        <input type="text" name="phone" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">规模</label>
+      <div class="layui-input-block" style="width: 200px;">
+        <input type="text" name="scale" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">会议地点</label>
+      <div class="layui-input-block" style="width: 200px;">
+        <input type="text" name="address" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">会议形式</label>
+      <div class="layui-input-block" style="width: 200px;">
+        <input type="text" name="meeting_form" class="layui-input">
+      </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 id="invitation_list" style="width: 600px;"></div>
       </div>
     </div>
-  </div>
-  <div class="layui-form-item">
     <div class="layui-inline">
-      <label class="layui-form-label">上传附件</label>
+      <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 id="staff_assist_list" style="width: 600px;"></div>
       </div>
     </div>
+  </div>
+  <div class="layui-form-item">
     <div class="layui-inline" style="padding-left: 30px">
       <button class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交 </button>
     </div>
@@ -88,16 +121,31 @@
           data: gon.staff_manage,
           filterable: true,
         })
-
         var staff_assist = xmSelect.render({
-          el: '#staff_assist_list',
-          data: gon.staff_manage,
+          el: '#staff_assist_list', 
           filterable: true,
+          name: 'staff_assist_id',
+          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: []
         })
-        var expert = xmSelect.render({
-          el: '#expert_list', 
+
+        var invitation_select = xmSelect.render({
+          el: '#invitation_list', 
           filterable: true,
-          name: 'expert_ids',
+          name: 'invitation_list',
           remoteSearch: true,
           remoteMethod: function(val, cb, show){
             if(!val){
@@ -115,23 +163,6 @@
           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被覆盖
@@ -153,17 +184,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) {
+            var staff_assist_id = [];
+            staff_assist.getValue().forEach(function(d) {
+              if (typeof(d.value) == 'number') {
+                staff_assist_id.push([d.value, d.name]);
+              } else {
+                staff_assist_id.push(['', d.name]);
+               
+              }
+            })
+            
+            var invitation_ids = [];
+            invitation_select.getValue().forEach(function(d) {
               if (typeof(d.value) == 'number') {
-                expertids.push([d.value, d.name]);
+                invitation_ids.push([d.value, d.name]);
               } else {
-                expertids.push(['', d.name]);
+                invitation_ids.push(['', d.name]);
                
               }
             })
-            data.field.expert_ids = expertids;
+            data.field.invitation_ids = invitation_ids;
+            data.field.staff_assist_id = staff_assist_id;
             request.authPost("missions/activities", data.field, function (res) {
                 if (res.success === false) {
                   layer.alert(res.msg)

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

@@ -0,0 +1,56 @@
+<form class="layui-form " action="">
+  <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 "info_id",options_for_select(EducodeSales::ActivityFollowUp.info_ids.keys)%>
+      </div>
+    </div>
+    <br>
+    <div class="layui-form-item layui-form-text">
+      <label class="layui-form-label">最新进展</label>
+      <div class="layui-input-block">
+        <textarea name="description" placeholder="填写最新进展：" class="layui-textarea"></textarea>
+      </div>
+    </div>
+    <div class="layui-inline" style="padding-left: 50px">
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_follow_up">提交
+      </button>
+    </div>
+  </div>
+</form>
+
+
+
+
+<script>
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            laydate = layui.laydate,
+            $ = layui.$;
+
+        form.render();
+
+        form.on('submit(add_follow_up)', function (data) {
+            data.field.activity_id = "<%= @activity.id %>";
+            request.authPost("missions/activities/" + data.field.activity_id + "/follow_up", data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.followup_index);
+                    parent.layer.close(parent.layer.getFrameIndex(window.name))
+                    table.reload('activity_followp_table');
+                    table.reload('activities_table')
+                }
+            })
+
+
+            return false;
+        });
+
+    });
+</script>