educode_sales 0.9.66 → 0.9.67

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.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.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

@@ -14,6 +14,12 @@
         <%= 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">
+        <%= 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">
@@ -38,6 +44,48 @@
         <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">
+        <input type="text" name="sponsor" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">联系人</label>
+      <div class="layui-input-block">
+        <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">
+        <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">
+        <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">
+        <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">
+        <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="invitation_list" style="width: 600px;"></div>
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label">报告专家</label>
       <div class="layui-input-block">
@@ -115,6 +163,27 @@
           data: []
         })
 
+        var invitation_select = xmSelect.render({
+          el: '#invitation_list', 
+          filterable: true,
+          name: 'invitation_list',
+          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', 
@@ -163,6 +232,17 @@
                
               }
             })
+            
+            var invitation_ids = [];
+            invitation_select.getValue().forEach(function(d) {
+              if (typeof(d.value) == 'number') {
+                invitation_ids.push([d.value, d.name]);
+              } else {
+                invitation_ids.push(['', d.name]);
+               
+              }
+            })
+            data.field.invitation_ids = invitation_ids;
             data.field.expert_ids = expertids;
             request.authPost("missions/activities", data.field, function (res) {
                 if (res.success === false) {

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>

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

@@ -33,6 +33,20 @@
         </div>
       </div>
     <% end %>
+    <% if @current_admin.is_admin? %>
+      <div class="layui-form-item m-t-20">
+        <label class="layui-form-label">商机等级</label>
+        <div class="layui-input-inline">
+          <div id="levels" style="width: 300px;"></div>
+        </div>
+      </div>
+      <div class="layui-form-item m-t-20 layui-hide" id="watch_ids_wraper">
+        <label class="layui-form-label">指定查看人员</label>
+        <div class="layui-input-inline">
+          <div id="watch_ids" style="width: 300px;"></div>
+        </div>
+    </div>
+  <% end %>
     <div class="layui-form-item m-t-20">
       <div class="layui-input-block">
         <button class="layui-btn layui-btn-normal" lay-submit lay-filter="edit_business">提交</button>
@@ -51,6 +65,35 @@
       $ = layui.$;
     selectInput = layui.selectInput;
 
+    var levels_select = xmSelect.render({
+      el: '#levels',
+      name: 'level_ids',
+      data: gon.levels,
+      on: function(data) {
+        var is_secret = false;
+        data.arr.forEach(function(i) {
+          if (i.name == '战略型' || i.name == '保密型') {
+            is_secret = true;
+          }
+        })
+        if (is_secret) {
+          $("#watch_ids_wraper").removeClass('layui-hide')
+        } else {
+          $("#watch_ids_wraper").addClass('layui-hide')
+        }
+      }
+    })
+
+    var watch_id_select = xmSelect.render({
+      el: '#watch_ids',
+      name: 'watch_ids',
+      data: gon.watche_ids,
+      filterable: true,
+    })
+    if (gon.is_secret) {
+      $("#watch_ids_wraper").removeClass("layui-hide")
+    }
+
     form.render();
     var department_id = gon.value;
     var department = selectInput.render({
@@ -99,12 +142,11 @@
         layer.alert("请选择单位部门")
         return false;
       } else {
-      request.authPut("missions/businesses/" + parent.id, {
-        department_id: department.getValue() || department_id,
-        name: data.field.name,
-        source: data.field.source,
-        merge_business_ids: data.field.merge_business_ids,
-      }, function (res) {
+      var field = data.field;
+      console.log('field', field)
+      field.department_id = department.getValue() || department_id;
+      field.merge_business_ids = data.field.merge_business_ids;
+      request.authPut("missions/businesses/" + parent.id, field, function (res) {
         if (res.success == false) {
           layer.alert(res.msg)
         } else {

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

@@ -120,6 +120,16 @@
                   </select>
                 </div>
               </div>
+              <div class="layui-inline show_item" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
+                <label class="layui-form-label">商机等级</label>
+                <div class="layui-input-inline">
+                  <select name="level_id">
+                    <option value=""></option>
+                    <option value="1">保密型</option>
+                    <option value="2">战略型</option>
+                  </select>
+                </div>
+              </div>
               <div class="layui-inline">
                 <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
                 </button>

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

@@ -0,0 +1,2 @@
+            
+<h1 class="layui-timeline-title" style="text-align: center; margin-top: 100px;">商机保密，无权查看</h1>

data/config/routes.rb

@@ -265,9 +265,12 @@ EducodeSales::Engine.routes.draw do
   resources :activities do
     collection do
       get :show_teachers
+      get :new_follow_up
+      get :follow_ups
     end
     member do
       get :show_schools
+      post :follow_up
     end
   end
 

data/db/migrate/20230329135141_create_educode_sales_business_watches.rb

@@ -0,0 +1,17 @@
+class CreateEducodeSalesBusinessWatches < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_business_watches do |t|
+      t.references :business
+      t.references :staff
+
+      t.timestamps
+    end
+
+    create_table :educode_sales_business_levels do |t|
+      t.references :business
+      t.integer :level_id
+
+      t.timestamps
+    end
+  end
+end