educode_sales 0.6.1 → 0.6.5

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

@@ -18,6 +18,7 @@
                 <label class="layui-form-label">商机名称</label>
                 <div class="layui-input-inline">
                   <input type="text" name="name" autocomplete="off" class="layui-input" value="<%=params[:name] %>">
+                  <input type="text" style="display: none" name="place_id" autocomplete="off" class="layui-input" value="<%=params[:place_id] %>">
                 </div>
               </div>
               <div class="layui-inline">
@@ -27,46 +28,54 @@
                 </div>
               </div>
               <div class="layui-inline">
-                <label class="layui-form-label">销售人员</label>
+                <label class="layui-form-label">最新跟进人</label>
                 <div class="layui-input-inline">
                   <%= 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">
-                <label class="layui-form-label">起止时间</label>
+              <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=" - ">
                 </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=" - ">
+                </div>
+              </div>
               <div class="layui-inline">
                 <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
                 </button>
                 <button type="submit" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_bussiness">搜索
                 </button>
+                <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="show_hide">展开/收起
+                </button>
               </div>
             </div>
           </form>
@@ -107,6 +116,9 @@
 <script type="text/html" id="show_follow">
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>
+<script type="text/html" id="school_name">
+  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
+</script>
 
 
 <script>
@@ -122,6 +134,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){
@@ -131,6 +147,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: {
@@ -203,7 +228,7 @@
                 field: 'school',
                 width: 150,
                 title: '单位',
-                  templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
+                  templet:'#school_name'
               },
               {
                 field: 'department',
@@ -235,6 +260,22 @@
                 width: 90,
                 title: '阶段'
               },
+                {
+                    field: 'source',
+                    width: 90,
+                    title: '商机来源'
+                },
+                {
+                    field: 'last_follow_person',
+                    width: 100,
+                    title: '最新跟进人'
+                },
+                {
+                    field: 'latest_time',
+                    width: 200,
+                    title: '最新跟进时间',
+                    sort: true
+                },
               {
                 field: 'invitation_at',
                 width: 105,
@@ -281,24 +322,16 @@
                   totalRow: true
               },
               {
-                field: 'place',
-                width: 160,
-                title: '渠道',
-              },
-              {
-                field: 'source',
-                width: 90,
-                title: '商机来源'
-              },
-              {
-                field: 'last_follow_person',
+                field: 'wait_return_money',
                 width: 100,
-                title: '最新跟进人'
+                title: '待回款',
+                sort: true,
+                  totalRow: true
               },
               {
-                field: 'latest_time',
-                width: 200,
-                title: '最新跟进时间'
+                field: 'place',
+                width: 160,
+                title: '渠道',
               },
               {
                 title: '操作',
@@ -390,6 +423,7 @@
         });
       }
       function time_line(id,name) {
+          business_id = id
         var content = miniPage.getHrefContent('/missions/businesses/time_line?business_id=' + id);
         var openWH = miniPage.getOpenWidthHeight();
         sindex = layer.open({
@@ -475,7 +509,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', {
@@ -497,12 +541,59 @@
           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: ''
           })
+            var index_place_list = xmSelect.render({
+                el: '#index_place',
+                model: {
+                    icon: 'hidden',
+                    label: {
+                        type: 'text',
+                        text: {
+                            //左边拼接的字符
+                            left: '',
+                            //右边拼接的字符
+                            right: '',
+                            //中间的分隔符
+                            separator: ', ',
+                        },
+                    }
+                },
+                remoteSearch: true,
+                clickClose: true,
+                delay: 1000,
+                paging: true,
+                radio: true,
+                pageRemote: true,
+                filterable: true,
+                remoteMethod: function (val, cb, show, pageIndex) {
+                    $.ajax( '/missions/sales_place', {
+                        method: 'get',
+                        data: {
+                            q: val,
+                            page: pageIndex
+                        },
+                        dataType: 'json',
+                        success: function (res) {
+                            var data = res.data;
+                            if (res.code == 0) {
+                                cb(res.data, res.count);
+                            } else {
+                                layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                            }
+
+                        }
+                    })
+                }
+            })
           return false;
         });
 

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

@@ -5,7 +5,8 @@ json.data do
     json.name d.name
     json.department d.department.name
     json.school d.department.school.name
-    json.follow_ups_count d.follow_ups_count
+    json.school_id d.department.school.id
+    json.follow_ups_count d.follow_ups.where(deleted_at: nil).size
     follow_ups_count += d.follow_ups_count
     json.follow_up_id d.last_follow_up_id
     # json.teachers_count d.follow_ups.sum(:key_people_count)
@@ -19,13 +20,14 @@ 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
     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
 

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

@@ -74,13 +74,15 @@
         <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">
@@ -88,7 +90,9 @@
       <div class="layui-input-inline" style="z-index: 101">
         <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">
@@ -106,7 +110,7 @@
     </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" >
        <div id="assign_follow" style="width: 512px;"></div>
       </div>
        <div class="layui-inline" style="padding: 9px 15px">
@@ -144,6 +148,7 @@
     </div>
   </div>
 </div>
+</div>
 
 <script>
   layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {

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

@@ -12,7 +12,7 @@
     <span class="table-label pull-right" style="padding-right: 20px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
   </div>
 </script>
-<div class="edit-table tool">
+<div class=" tool">
   <div class="z-index">
     <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
   </div>
@@ -121,6 +121,7 @@
                     field: 'description',
                     width: 120,
                     title: '最新进展',
+                    templet:'<div><span title="{{d.description}}">{{d.description}}</span></div>'
                 },
               {
                 field: 'invitation_at',

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

@@ -43,7 +43,7 @@
     function demo(){
         layer.closeAll()
         business_id = parent.business_id
-        var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + parent.business_id);
+        var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + business_id);
         var openWH = miniPage.getOpenWidthHeight();
         sindex = layer.open({
             title: '商机列表/'+ parent.business_name +'的跟进记录',