educode_sales 0.9.67 → 0.9.68

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

@@ -6,7 +6,7 @@ json.data do
     json.info_id d.info_id
     json.clazz_id d.activity.clazz_id
     json.staff d.activity.sales&.user&.real_name || d.activity.staff&.user&.real_name
-    json.staff_manage d.activity.manages.map { |d| d.activity.staff.user.real_name}.uniq.join("、")
+    json.staff_manage d.activity.manages.map { |d| d.staff.user.real_name}.uniq.join("、")
     json.follow_up d.staff.user.real_name
     json.created_at d.created_at.to_s
     json.state_id d.activity.state_id

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

@@ -14,8 +14,7 @@ json.data do
     json.clazz_id d.clazz_id
     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
@@ -24,6 +23,7 @@ json.data do
     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,79 +4,73 @@
   <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">
+      <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>
-    </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 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 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>
-      <div class="layui-input-block">
+      <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">
+      <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">
+      <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">
+      <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">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="meeting_form" class="layui-input">
       </div>
     </div>
@@ -87,22 +81,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' %>
-        <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 class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交 </button>
     </div>
@@ -136,16 +121,10 @@
           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', 
+          el: '#staff_assist_list', 
           filterable: true,
-          name: 'expert_ids',
+          name: 'staff_assist_id',
           remoteSearch: true,
           remoteMethod: function(val, cb, show){
             if(!val){
@@ -184,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被覆盖
@@ -222,13 +184,12 @@
         //监听提交
         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]);
                
               }
             })
@@ -243,7 +204,7 @@
               }
             })
             data.field.invitation_ids = invitation_ids;
-            data.field.expert_ids = expertids;
+            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/upload_file.html.erb

@@ -0,0 +1,43 @@
+<div style="padding-left: 50px">
+        <button type="button" class="layui-btn" id="get_file"><i class="layui-icon"></i>选择文件</button>
+</div>
+<script>
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            upload = layui.upload,
+            request = layui.request,
+            $ = layui.$;
+        selectInput = layui.selectInput;
+
+        form.render();
+
+        //指定允许上传的文件类型
+        var activity_id = parent.activity_id
+        var renderObj = upload.render({
+            elem: '#get_file'
+            ,url: '/missions/upload_files?activity_id='+activity_id //此处配置你自己的上传接口即可
+            ,accept: 'file' //普通文件
+            ,headers: {
+                'X-CSRF-Token': $('meta[name=csrf-token]').attr('content')
+            }
+            ,before: function(obj){ //obj参数包含的信息，跟 choose回调完全一致，可参见上文。
+                layer.load(); //上传loading
+            }
+            ,done: function(res){
+                layer.msg('导入成功');
+                table.reload('file');
+                layer.closeAll('loading'); //关闭loading
+                layer.close(parent.import_index)
+            }
+            ,error: function(index, upload){
+                table.reload('file');
+                layer.closeAll('loading'); //关闭loading
+                layer.alert('导入失败，请检查文件格式')
+                layer.close(parent.import_index)
+            }
+        });
+    });
+</script>

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

@@ -24,6 +24,9 @@ json.data do
       end
     end
 
+    json.created_at d.created_at.to_s
+    json.no_followup_days (d['latest_time'] ? DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d['latest_time'].strftime("%Y-%m-%d")) : DateTime.parse(Time.now.strftime("%Y-%m-%d")) - DateTime.parse(d.created_at.strftime("%Y-%m-%d"))).to_i
+    
     json.staff_manages d.last_follow_up&.assign_follow_ups.present? ? (d.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.staff&.user&.real_name
     json.divide_rate d.divide_rate
     json.divide_money d.divide_amount

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

@@ -25,7 +25,7 @@
       <div class="layui-inline" style="padding-top: 20px">
         <label class="layui-form-label required">项目类型</label>
         <div class="layui-input-inline">
-          <%= select_tag "clazz_id", options_for_select(@clazz), { 'lay-filter': 'clazz_id', class: 'required' } %>
+          <%= select_tag "clazz_id", options_for_select(@clazz), { 'lay-filter': 'clazz_id', class: 'required', include_blank: true } %>
         </div>
       </div>
     <div class="layui-form-item m-t-20">

data/app/views/educode_sales/plans/_yearPlan.html.erb

@@ -0,0 +1,234 @@
+<script type="text/html" id="yearPlanToolbar">
+  <div class="layui-btn-container">
+    <span class="table-label">年计划列表</span>
+    <% if can? :create, EducodeSales::SalePlan %>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加年计划</button>
+    <% end %>
+  </div>
+</script>
+<!--搜索-->
+<div class="layuimini-main  min-height-table" id="year_table_wraper">
+<form class="layui-form layui-form-pane" lay-filter="month_plan_search_form">
+  <div class="layui-form-item">
+     <div class="layui-inline">
+       <label class="layui-form-label">人员</label>
+       <div class="layui-input-inline large-select">
+         <%= select_tag "staff_id", options_for_select(@staffs), { id: 'month_plan_staff_id', 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" id="year_plan_date" autocomplete="off" name="year">
+       </div>
+     </div>
+    <div class="layui-inline">
+      <button type="reseet" class="layui-btn layui-btn-primary" lay-submit lay-filter="month_plan_reset_btn">重置
+      </button>
+      <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="month_plan_seach_btn">检索
+      </button>
+    </div>
+  </div>
+</form>
+<table class="layui-hide" id="yearPlanTable" lay-filter="yearPlanTable"></table>
+</div>
+<script type="text/html" id="currentYearTableBar">
+  <% if can? :update, EducodeSales::SalePlan %>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% end %>
+  <% if can? :destroy, EducodeSales::SalePlan %>
+  <a class="layui-btn layui-btn-danger layui-btn-xs data-count-delete" lay-event="delete">删除</a>
+  <% end %>
+</script>
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'rate', 'laydate', 'request'], function () {
+      var $ = layui.jquery,
+        form = layui.form,
+        request = layui.request,
+        laydate = layui.laydate,
+        table = layui.table,
+        rate = layui.rate,
+        miniPage = layui.miniPage;
+
+       laydate.render({
+          elem: '#year_plan_date',
+          type: 'year'
+        });
+        table.render({
+            elem: '#yearPlanTable',
+            url: '/missions/plans/years_plan',
+            toolbar: '#yearPlanToolbar',
+            defaultToolbar: ['filter'],
+            initSort: {
+              field: 'updated_at',
+              type: 'desc'
+            },
+            cols: [
+              [
+              {
+                field: 'id',
+                width: 60,
+                title:'序号',
+                type: 'numbers',
+                fixed: 'left'
+              },
+              {
+                field: 'staff',
+                width: 120,
+                title: '姓名',
+                fixed: 'left'
+              },
+              {
+                field: 'clazz',
+                width: 160,
+                title: '目标类型',
+              },
+              {
+                field: 'year',
+                width: 120,
+                title: '年份'
+              },
+              {
+                field: 'target_money',
+                width: 120,
+                title: '目标额'
+              },
+              {
+                field: 'plan_money',
+                width: 120,
+                title: '计划额',
+              },
+              {
+                field: 'minimum_money',
+                width: 120,
+                title: '保底额',
+              },
+              {
+                field: 'finish_money',
+                width: 120,
+                title: '完成额',
+              },
+              {
+                field: 'finish_rate',
+                width: 120,
+                title: '完成率',
+              },
+              {
+                field: 'updated_at',
+                width: 170,
+                title: '更新时间',
+                sort: true,
+              },
+              {
+                title: '操作',
+                width: 200,
+                toolbar: '#currentYearTableBar',
+                align: "center",
+                fixed: 'right'
+              }
+              ]
+            ],
+
+            limit: 20,
+          limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true,
+        });
+
+        var sort = {}, search = {};
+        table.on('sort(yearPlanTable)', function(obj) {
+          sort.field = obj.field;
+          sort.order = obj.type;
+          table.reload('yearPlanTable', {
+            initSort: obj,
+            where: {
+              sort: sort,
+              q: search
+            }
+          });
+        })
+
+        // 监听搜索操作
+        form.on('submit(month_plan_seach_btn)', function (data) {
+          search = data.field
+          table.reload('yearPlanTable', {
+            page: {
+              curr: 1
+            },
+            where: {q: search, sort : sort}
+          }, 'data');
+
+          return false;
+        });
+
+        form.on('submit(month_plan_reset_btn)', function(data){
+          var field = data.field;
+            form.val('month_plan_search_form', {  staff_id: '', year: '', month: '', year: ''})
+           return false;
+        });
+
+
+        table.on('toolbar(yearPlanTable)', function (obj) {
+          if (obj.event === 'add') { // 监听添加操作
+              var content = miniPage.getHrefContent('/missions/plans/new_year');
+              var openWH = miniPage.getOpenWidthHeight();
+              from_sales = true
+              yindex = 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(sindex);
+              });
+          }
+        });
+
+        table.on('tool(yearPlanTable)', function (obj) {
+            var data = obj.data;
+           if (obj.event === 'edit') {
+              year = data.year;
+              content = miniPage.getHrefContent('/missions/plans/edit_year_plan?id=' + data.id);
+              openWH = miniPage.getOpenWidthHeight();
+              from_sales = true;
+              plan_id = data.id
+              sindex = 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
+              });
+              $(window).on("resize", function () {
+                  layer.full(sindex);
+              });
+              return false;
+            } else if (obj.event === 'delete') {
+             layer.confirm('确定删除' + data.staff + data.clazz, function (index) {
+                request.delete('missions/plans/' + data.id, {year: data.year, clazz: data.clazz}, function (res) {
+                  layer.close(index);
+                  table.reload("yearPlanTable")
+                })
+            });
+          }
+        });
+
+    });
+</script>
+<style>
+    .layui-table-fixed .layui-table-body {
+        height: auto!important;
+    }
+</style>

data/app/views/educode_sales/plans/business_infos.json.jbuilder

@@ -0,0 +1,23 @@
+json.data do
+  json.array! @data do |d|
+    json.id d.id
+    json.staff d.staff.user.real_name
+    json.clazz EducodeSales::SalePlan::CLAZZ_NAME.invert[d.clazz]
+    json.year d.year
+    json.business_name d.business.name
+    json.department d.business.department&.name
+    json.school d.business.department&.school&.name
+    json.stage d.business.last_follow_up&.stage&.name
+    json.staff_manages d.business.last_follow_up&.assign_follow_ups.present? ? (d.business.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.business.staff&.user&.real_name
+    json.created_at d.created_at.to_s
+    json.sale_way d.business.last_follow_up&.place&.name.present? ? '渠道' : '直销'
+    json.budget_amount d.business&.last_follow_up ? d.business.last_follow_up.budget_amount.to_f.round(2)  : 0
+    json.plan_bid_on d.plan_bid_on
+    json.plan_sign_on d.plan_sign_on
+    json.prepayment_plan_on d.prepayment_plan_on
+    json.prepayment_amount d.prepayment_amount
+  end
+end
+
+json.code 0
+json.count @data.total_count

data/app/views/educode_sales/plans/edit_bussiness_info.html.erb

@@ -0,0 +1,79 @@
+<form class="layui-form " action="">
+  <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-inline">
+      <label class="layui-form-label required" style="width: 180px;">计划投标时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" id="plan_bid_on" autocomplete="off" name="plan_bid_on">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label required" style="width: 180px;">计划签单时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" id="plan_sign_on" autocomplete="off" name="plan_sign_on">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label required" style="width: 180px;">计划回款时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" id="prepayment_plan_on" autocomplete="off" name="prepayment_plan_on">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label required"  style="width: 180px;">计划回款额</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input"  autocomplete="off" name="prepayment_amount" value="<%= @business_info.prepayment_amount %>">
+      </div>
+    </div>
+ 
+    <div class="layui-form-item m-t-20">
+      <div class="layui-input-block">
+        <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="update_bussiness_info">提交</button>
+      </div>
+    </div>
+  </div>
+</form>
+<script>
+  layui.use(['form', 'table', 'laytpl', 'request', 'laydate'], function () {
+    var form = layui.form,
+      layer = layui.layer,
+      laydate = layui.laydate,
+      table = layui.table,
+      request = layui.request,
+      $ = layui.$;
+
+    laydate.render({
+      elem: '#plan_bid_on',
+      value: "<%= @business_info.plan_bid_on.to_s %>",
+      type: 'date'
+    });
+
+    laydate.render({
+      elem: '#plan_sign_on',
+      value: "<%= @business_info.plan_sign_on.to_s %>",
+      type: 'date'
+    });
+    laydate.render({
+      elem: '#prepayment_plan_on',
+      value: "<%= @business_info.prepayment_plan_on.to_s %>",
+      type: 'date'
+    });
+   
+
+    form.render();
+
+    form.on('submit(update_bussiness_info)', function (data) {
+      request.authPost("missions/plans/update_business_info?id=" + parent.id, data.field, function (res) {
+        if (res.success == false) {
+          layer.alert(res.msg)
+        } else {
+          layer.close(parent.sindex);
+           parent.table.reload('yearTable', {
+            where: {year: parent.year }
+          })
+        }
+      })
+      return false;
+    });
+
+  });
+</script>