educode_sales 0.6.4 → 0.6.8

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

@@ -69,25 +69,29 @@
       <div class="layui-input-inline">
         <input name="total_amount" type="number" class="layui-input" value="<%= @follow_up.total_amount %>">
       </div>
-    </div>
+      客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。    </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
          <input name="actual_amount" type="number" class="layui-input" placeholder="本单位的签单金额" value="<%= @follow_up.actual_amount %>">
       </div>
+      客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
     <br>
     <div class="layui-inline place_select">
       <label class="layui-form-label">渠道</label>
-      <div class="layui-input-inline" style="z-index: 101">
+      <div class="layui-input-inline" style="">
         <div id="edit_place" style="width: 190px;"></div>
       </div>
     </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
         <input name="divide_amount" class="layui-input" value="<%= @follow_up.divide_amount%>">
       </div>
+      总额里，渠道拿到的部分。
     </div>
     <div class="layui-form-item">
       <div class="layui-inline">
@@ -95,14 +99,19 @@
         <div class="layui-input-inline">
           <input type="text" class="layui-input" name="year"  lay-verify="required" autocomplete="off" id="edit_year"
                  value="<%= @follow_up&.year%>"
-                 placeholder="请选择年度">      </div>
+                 placeholder="请选择年度">
+        </div>
       </div>
     </div>
     <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
-      <div class="layui-input-inline">
+      <div class="layui-input-inline" style="">
         <div id="edit_assign_follow" style="width: 512px;"></div>
       </div>
+      <div class="layui-inline" style="padding: 9px 15px;z-index: -1">
+        <label class="layui-form-label" style="padding-left: 220px"></label>
+        指定跟进人和商机创建者，同时拥有对该商机的管理权限
+      </div>
     </div>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label required">最新进展</label>

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

@@ -12,12 +12,15 @@
           </div>
         </div>
         <div class="layui-input-inline" style="width: 300px;">
-          <label class="layui-form-label required">回款金额(万)</label>
+          <label class="layui-form-label required">回款金额</label>
           <div class="layui-input-block">
             <input type="number" name="amount" autocomplete="off" lay-verify="required" lay-reqtext="回款金额不能为空"
               placeholder="请输入回款金额" value="" class="layui-input" id="return_money_amount">
           </div>
         </div>
+        <div class="layui-input-inline" style="width: 0;!important;">
+          <label class="layui-form-label" style="padding-left: 0;width: 10px;!important;">万</label>
+        </div>
         <div class="layui-input-inline" style="width: 300px;" id="professional_title_div">
           <label class="layui-form-label required">状态</label>
           <div class="layui-input-block">
@@ -115,7 +118,7 @@
         }, {
           field: 'amount',
           width: 200,
-          title: '回款金额',
+          title: '回款金额(万)',
           edit: true
         },  {
           field: 'clazz',

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

@@ -0,0 +1,53 @@
+<script type="text/html" id="activity_toolbar">
+  <div class="layui-btn-container">
+    <span class="table-label">导出记录</span>
+  </div>
+</script>
+<div class="min-height-table">
+  <table class="layui-hide" id="activities_table" lay-filter="activities_table"></table>
+</div>
+
+<script type="text/html" id="currentTableBar">
+</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/businesses/export_records',
+            toolbar: '#activity_toolbar',
+            defaultToolbar: [],
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        title:'序号',type: 'numbers',
+                    },
+                    {
+                        field: 'name',
+                        title: '文件名',
+                    },
+                    {
+                        field: 'staff',
+                        title: '导出人',
+                    },
+                    {
+                        field: 'created_at',
+                        title: '导出时间',
+                    },
+                ]
+            ],
+            limit: 20,
+            limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true
+        });
+
+
+    });
+</script>

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

@@ -0,0 +1,11 @@
+json.data do
+  json.array! @records do |d|
+    json.id d.id
+    json.name d.name
+    json.staff d.staff&.user&.real_name
+    json.created_at d.created_at.to_s
+  end
+end
+json.code 0
+json.count @records.total_count
+json.msg 'succcess'

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

@@ -2,9 +2,9 @@
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">附件信息</span>
-    <%# if can? :create, EducodeSales::file %>
+    <% if can? :upload_file, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="upload_file">上传文件</button>
-    <%# end %>
+    <% end %>
   </div>
 </script>
 
@@ -12,8 +12,12 @@
 
 <script type="text/html" id="currentTableBar_file">
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="preview">预览</a>
-  <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>
-    <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% if can? :download_file, EducodeSales::Business %>
+<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::Business %>
+<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">

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

@@ -33,34 +33,40 @@
                   <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true } %>
                 </div>
               </div>
-              <div class="layui-inline">
+              <div class="layui-inline show_item" style="display:none;">
                 <label class="layui-form-label">项目类型</label>
                 <div class="layui-input-inline">
-                  <%= select_tag "business_type", options_for_select(EducodeSales::Common.where(clazz: 'business_type').pluck(:name, :id), params[:clazz_id]), { 'lay-filter': 'clazz_id', include_blank: true } %>
+                  <div id="business_type" style="width: 190px;"></div>
                 </div>
               </div>
-              <div class="layui-inline">
+              <div class="layui-inline show_item" style="display:none;">
                 <label class="layui-form-label">项目阶段</label>
                 <div class="layui-input-inline">
-                  <%= select_tag "business_step", options_for_select(EducodeSales::Common.where(clazz: 'business_step').pluck(:name, :id)), { include_blank: true } %>
+                  <div id="business_step" style="width: 190px;"></div>
                 </div>
               </div>
-              <div class="layui-inline">
+              <div class="layui-inline show_item" style="display:none;">
                 <label class="layui-form-label">渠道名称</label>
                 <div class="layui-input-inline">
                   <div id="index_place" style="width: 190px;"></div>
                 </div>
               </div>
-              <div class="layui-inline">
+              <div class="layui-inline show_item" style="display:none;">
                 <label class="layui-form-label">区域</label>
                 <div class="layui-input-inline">
                   <%= select_tag "area", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name, :id)), { include_blank: true } %>
                 </div>
               </div>
-              <div class="layui-inline">
+              <div class="layui-inline show_item" style="display:none;">
                 <label class="layui-form-label">创建时间</label>
                 <div class="layui-input-inline">
-                  <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">
+                  <input type="text" class="layui-input" id="date" name="date" placeholder=" - " autocomplete="off">
+                </div>
+              </div>
+              <div class="layui-inline show_item" style="display:none;">
+                <label class="layui-form-label">招标时间</label>
+                <div class="layui-input-inline">
+                  <input type="text" class="layui-input" id="invitation_at" name="invitation_at" placeholder=" - " autocomplete="off">
                 </div>
               </div>
               <div class="layui-inline">
@@ -68,6 +74,8 @@
                 </button>
                 <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">搜索
                 </button>
+                <a style="padding-left: 20px;color: #0000FF"  href="javascript:;" type="submit" class="" lay-submit lay-filter="show_hide">高级搜索
+                </a>
               </div>
             </div>
           </form>
@@ -80,6 +88,7 @@
 <script type="text/html" id="bussinessBar">
   <div class="layui-btn-container">
     <span class="table-label">商机列表</span>
+    <a class="layui-btn-xs data-count-edit export_more-btn pull-right" style="color: #0000FF;" data-name="export" data-id="export">导出<i class="layui-icon layui-icon-down layui-nav-more"></i></a>
     <% if can? :create, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加商机</button>
     <% end %>
@@ -126,6 +135,10 @@
         elem: '#date',
         range: true
       });
+      laydate.render({
+        elem: '#invitation_at',
+        range: true
+      });
 
          var is_show = <%=params[:name].present? || params[:clazz_id].present? || params[:place_id].present? || params[:school].present? %>
       if(is_show){
@@ -135,6 +148,15 @@
           $('.businesses_list_div').addClass('layui-show');
       }
 
+        var business_type_list = xmSelect.render({
+            el: '#business_type',
+            data: gon.business_type
+        })
+        business_type_list.setValue(gon.type)
+        var business_step_list = xmSelect.render({
+            el: '#business_step',
+            data: gon.business_step
+        })
         var index_place_list = xmSelect.render({
             el: '#index_place',
             model: {
@@ -182,17 +204,14 @@
 
 
       table = layui.table;
-      table.render({
+      var business_table = table.render({
           elem: '#businesses_table',
           url: '/missions/businesses',
           where: {q: form.val('search_form')},
           defaultToolbar: ['filter'],
           toolbar: '#bussinessBar',
+          title: '商机数据表',
           totalRow: true,//开启合并行
-          initSort: {
-              field: 'latest_time' //排序字段，对应 cols 设定的各字段名
-              ,type: 'desc' //排序方式  asc: 升序、desc: 降序、null: 默认排序
-          },
           cols: [
             [
               {
@@ -304,6 +323,18 @@
                 sort: true,
                   totalRow: true
               },
+              {
+                field: 'wait_return_money',
+                width: 100,
+                title: '待回款',
+                sort: true,
+                  totalRow: true
+              },
+              {
+                field: 'return_money_days',
+                width: 120,
+                title: '首次回款周期(天)',
+              },
               {
                 field: 'place',
                 width: 160,
@@ -324,12 +355,16 @@
           page: true,
           skin: 'line',
           done: function (res) {
-            drowpdwonRender()
+              exportData=res.data1;
+              console.log(exportData);
+              drowpdwonRender()
+            export_drowpdwonRender()
           }
 
       });
 
       var dropmenu = gon.menus;
+      var export_dropmenu = gon.export_menus;
 
       drowpdwonRender = function() {
         dropdown.render({
@@ -362,6 +397,56 @@
         });
       }
 
+        export_drowpdwonRender = function() {
+        dropdown.render({
+          elem: '.export_more-btn',
+          data: export_dropmenu,
+          click: function(data, othis){
+            var elem = $(this.elem);
+            id = elem.data('id');
+            switch (data.event) {
+            case 'export_csv':
+                export_csv();
+              break;
+            case 'export_excel':
+                export_excel();
+              break;
+            case 'export_records':
+                export_records();
+              break;
+            }
+          }
+        });
+      }
+
+        function export_csv() {
+                table.exportFile(business_table.config.id,exportData, 'csv');
+            request.get('/missions/businesses/add_export_records?type=csv', {}, function (res) {
+            })
+        }
+        function export_excel() {
+                table.exportFile(business_table.config.id,exportData, 'xls');
+            request.get('/missions/businesses/add_export_records?type=excel', {}, function (res) {
+            })
+        }
+        function export_records() {
+            var content = miniPage.getHrefContent('/missions/businesses/export_records')
+            var openWH = miniPage.getOpenWidthHeight();
+            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);
+            });
+        }
+
       function week(id) {
         var content = miniPage.getHrefContent('/missions/plans/new_week?business_id=' + id);
         var openWH = miniPage.getOpenWidthHeight();
@@ -485,7 +570,17 @@
 
         // 监听搜索操作
         form.on('submit(search_bussiness)', function (data) {
+            var business_type = [];
+            business_type_list.getValue().forEach(function(d) {
+                business_type.push(d.value);
+            })
+            var business_step = [];
+            business_step_list.getValue().forEach(function(d) {
+                business_step.push(d.value);
+            })
             data.field.place_id = index_place_list.getValue('valueStr');
+            data.field.business_type = business_type.toString();
+            data.field.business_step = business_step.toString();
             search = data.field
             console.log(search);
             table.reload('businesses_table', {
@@ -507,13 +602,21 @@
           return false;
         });
 
+        form.on('submit(show_hide)', function (data) {
+            $(".show_item").toggle()
+            return false;
+        });
         form.on('submit(reset_business_search)', function (data) {
           var field = data.field;
           form.val('search_form', {
               name: '', department: '', staff_id: '', business_type: '', business_step: '',
-              place_id: '', date: '', area: ''
+              place_id: '', date: '', area: '', invitation_at: ''
           })
-          return false;
+            business_type_list.setValue([])
+            business_step_list.setValue([])
+            index_place_list.setValue([])
+
+            return false;
         });
 
         table.on('toolbar(businesses_table)', function (obj) {

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

@@ -1,4 +1,4 @@
-follow_ups_count = 0
+follow_count = 0
 json.data do
   json.array! @businesses do |d|
     json.id d.id
@@ -6,11 +6,10 @@ json.data do
     json.department d.department.name
     json.school d.department.school.name
     json.school_id d.department.school.id
-    json.follow_ups_count d.follow_ups_count
-    follow_ups_count += d.follow_ups_count
+    follow_ups_count = d.follow_ups.where(deleted_at: nil).size
+    json.follow_ups_count follow_ups_count
+    follow_count += follow_ups_count
     json.follow_up_id d.last_follow_up_id
-    # json.teachers_count d.follow_ups.sum(:key_people_count)
-    # json.teachers_count EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).present? ? EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).key_people_count : 0
     json.clazz d.last_follow_up&.clazz&.name || ""
     json.stage d.last_follow_up&.stage&.name
     json.invitation_at d.last_follow_up&.invitation_at.to_s
@@ -20,18 +19,49 @@ json.data do
     json.total_amount d.last_follow_up&.total_amount
     json.actual_amount d.last_follow_up&.actual_amount
     json.return_money d.return_money
+    json.wait_return_money d.wait_return_money.to_i.round(2)
+    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '已完成').present? ? (d.last_follow_up.money_plans.where(clazz: '已完成').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
     json.place d.last_follow_up&.place&.name
     json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
     json.source d.source
     json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
     json.current_staff_id @current_admin.id
     json.staff_id d.staff_id
-    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : d.created_at.to_s
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
+  end
+end
+json.data1 do
+  json.array! @businesses_exports do |d|
+    json.id d.id
+    json.name d.name
+    json.department d.department.name
+    json.school d.department.school.name
+    json.school_id d.department.school.id
+    json.follow_ups_count d.follow_ups.where(deleted_at: nil).size
+    json.follow_up_id d.last_follow_up_id
+    json.clazz d.last_follow_up&.clazz&.name || ""
+    json.stage d.last_follow_up&.stage&.name
+    json.invitation_at d.last_follow_up&.invitation_at.to_s
+    json.reception_at d.last_follow_up&.reception_at.to_s
+    json.bidded_date d.last_follow_up&.bidded_date.to_s
+    json.signed_date d.last_follow_up&.signed_date.to_s
+    json.total_amount d.last_follow_up&.total_amount
+    json.actual_amount d.last_follow_up&.actual_amount
+    json.return_money d.return_money
+    json.wait_return_money d.wait_return_money.to_i.round(2)
+    json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '已完成').present? ? (d.last_follow_up.money_plans.where(clazz: '已完成').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''
+    json.place d.last_follow_up&.place&.name
+    json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
+    json.source d.source
+    json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
+    json.current_staff_id @current_admin.id
+    json.staff_id d.staff_id
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
   end
 end
 
 json.totalRow do
-  json.follow_ups_count follow_ups_count.to_s
+  json.follow_ups_count follow_count.to_i.to_s
 end
 json.code 0
 json.count @businesses.total_count

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

@@ -74,26 +74,30 @@
         <input name="total_amount" type="number" class="layui-input" autocomplete="off"
           value="<%= @last_follow_up&.total_amount%>">
       </div>
-    </div>
+      客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。    </div>
+    <br>
     <div class="layui-inline">
       <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
         <input name="actual_amount" type="number" class="layui-input" autocomplete="off" placeholder="本单位的签单金额"
           value="<%= @last_follow_up&.actual_amount%>">
       </div>
+      客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
     <br>
     <div class="layui-inline new_place_select">
       <label class="layui-form-label">渠道</label>
-      <div class="layui-input-inline" style="z-index: 101">
+      <div class="layui-input-inline" style="">
         <div id="place" style="width: 190px;"></div>
       </div>
     </div>
+  <br>
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
         <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount%>">
       </div>
+      总额里，渠道拿到的部分。
     </div>
     <div class="layui-form-item">
     <div class="layui-inline">
@@ -106,10 +110,10 @@
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
-      <div class="layui-input-inline" style="z-index: 100">
+      <div class="layui-input-inline" style="">
        <div id="assign_follow" style="width: 512px;"></div>
       </div>
-       <div class="layui-inline" style="padding: 9px 15px">
+       <div class="layui-inline" style="padding: 9px 15px;z-index: -1;">
          <label class="layui-form-label" style="padding-left: 220px"></label>
            指定跟进人和商机创建者，同时拥有对该商机的管理权限
        </div>
@@ -139,7 +143,7 @@
     </div>
     <div class="layui-form-item m-t-20">
       <div class="layui-input-block">
-        <button class="layui-btn layui-btn-normal" lay-submit lay-filter="add_follow_up">提交</button>
+        <button class="layui-btn layui-btn-normal submit-btn" lay-submit lay-filter="add_follow_up">提交</button>
       </div>
     </div>
   </div>
@@ -244,6 +248,7 @@
       form.render();
 
       form.on('submit(add_follow_up)', function (data) {
+          $(".submit-btn").addClass("layui-hide");
           var assign_follow = [];
         sales_list.getValue().forEach(function(d) {
           assign_follow.push(d.value);

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

@@ -129,4 +129,10 @@
     });
 
   });
-</script>
+</script>
+<style>
+    .layui-table-tool-temp{
+        padding-right: 0px; !important;
+    }
+
+</style>

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

@@ -767,4 +767,7 @@
     .layui-form .city_input .city  {
         display: block;
     }
+    .layui-edge{
+        display: none;!important;
+    }
 </style>

data/app/views/educode_sales/customers/edit_follow_record.html.erb

@@ -12,7 +12,7 @@
       <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id),@follow_up.department_id)%>
     </div>
   </div>
-  <div class="layui-form-item " style="padding-left: 110px">
+  <div class="layui-form-item " style="padding-left: 150px">
     <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit_follow_up">提交
     </button>
   </div>

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

@@ -769,4 +769,7 @@
     .layui-form .city_input .city  {
         display: block;
     }
+    .layui-edge{
+        display: none;!important;
+    }
 </style>

data/app/views/educode_sales/customers/new_follow_record.html.erb

@@ -12,7 +12,7 @@
         <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id)), { include_blank: true}%>
       </div>
     </div>
-  <div class="layui-form-item " style="padding-left: 110px">
+  <div class="layui-form-item " style="padding-left: 150px">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="add_follow_up">提交
       </button>
     </div>

data/app/views/educode_sales/customers/show_follow.html.erb

@@ -393,7 +393,7 @@
                 content = miniPage.getHrefContent('/missions/customers/edit_follow_record?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 editFollowIndex = layer.open({
-                    title: '编辑',
+                    title: '编辑跟进记录',
                     type: 1,
                     shade: 0.2,
                     maxmin: true,