educode_sales 0.6.8 → 0.7.2

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

@@ -25,7 +25,12 @@
 <!--          <input type="text" class="layui-input" id="date" name="date" placeholder=" - ">-->
 <!--        </div>-->
 <!--      </div>-->
-
+      <div class="layui-inline">
+        <label class="layui-form-label">性质</label>
+        <div class="layui-input-inline">
+          <div id="property" style="width: 190px;"></div>
+        </div>
+      </div>
       <div class="layui-inline">
         <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
         </button>
@@ -94,6 +99,19 @@
         //     window.onload=hn;
         // });
 
+        var property_list = xmSelect.render({
+            el: '#property',
+            data: [
+                {value: 0, name: '985工程'},
+                {value: 1, name: '211工程'},
+                {value: 2, name: '本科院校'},
+                {value: 3, name: '大专院校'},
+                {value: 4, name: '中专学校'},
+                {value: 5, name: '军事院校'},
+                {value: 6, name: '企业'}
+            ]
+        })
+
         laydate.render({
             elem: '#date',
             range: true
@@ -122,6 +140,7 @@
                     {
                         field: 'name',
                         title: '客户名称',
+                        width: 150,
                         templet: "#name"
                     },
                     {
@@ -129,6 +148,10 @@
                         width: 100,
                         title: '区域',
                     },
+                    {
+                        field: 'property',
+                        title: '性质',
+                    },
                     {
                         field: 'department',
                         width: 100,
@@ -238,6 +261,11 @@
 
         // 监听搜索操作
         form.on('submit(search_teachers)', function (data) {
+            var property = [];
+            property_list.getValue().forEach(function(d) {
+                property.push(d.value);
+            })
+            data.field.property = property.toString();
             search = data.field
             table.reload('customers_table', {
                 page: {
@@ -263,6 +291,7 @@
                 assist: "",
                 teacher_source: ""
             });
+            property_list.setValue([])
             return false;
         });
         /**

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

@@ -14,6 +14,18 @@ json.data do
     json.id d.id
     json.name d.name
     json.area d.province
+    school_property = d.school_property
+    property = []
+    if school_property.present?
+    property << '985工程' if school_property.project_985
+    property << '211工程' if school_property.project_211
+    property << '本科院校' if school_property.regular_college
+    property << '大专院校' if school_property.junior_college
+    property << '中专学校' if school_property.secondary_school
+    property << '军事院校' if school_property.military_school
+    property << '企业' if school_property.enterprise
+    end
+    json.property property.join("、")
     json.department d.departments.size
     json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.school_id = ?", d.id).size
     json.follow follow_ups.size + customer_follows.size

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

@@ -1,53 +1,67 @@
+<!--<form class="layui-form  layuimini-form" id="custom_data" data-required="true" action="">-->
+<!--  <div class="layui-form-item" style="padding: 25px">-->
+<!--    <div class="layui-inline">-->
+<!--      <label class="layui-form-label required">客户：</label>-->
+<!--      <div class="layui-input-block" style="width: 500px;">-->
+<!--        <input type="text" name="name"  lay-verify="required"  placeholder="请输入客户" autocomplete="off"-->
+<!--               class="layui-input" id="inputFocus">-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <br>-->
+<!--    <div class="layui-inline city_input">-->
+<!--      <label class="layui-form-label ">省：</label>-->
+<!--      <div class="layui-input-block" style="width: 500px;">-->
+<!--        <select id="province" class="province layui-input"></select>-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <br>-->
+<!--    <div class="layui-inline city_input">-->
+<!--      <label class="layui-form-label ">市：</label>-->
+<!--      <div class="layui-input-block" style="width: 500px;">-->
+<!--        <select id="city" class="city layui-input"></select>-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <br>-->
+<!--    <div class="layui-inline">-->
+<!--      <label class="layui-form-label ">地址：</label>-->
+<!--      <div class="layui-input-block" style="width: 500px;">-->
+<!--        <input type="text" name="address"   autocomplete="off"-->
+<!--               class="layui-input" placeholder="请输入地址" >-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <br>-->
+<!--    <div class="layui-form-item">-->
+<!--      <label class="layui-form-label">学校性质：</label>-->
+<!--      <div class="layui-input-block">-->
+<!--        <input type="checkbox" name="project_985" lay-skin="primary" value="1"  title="985工程">-->
+<!--        <input type="checkbox" name="project_211" lay-skin="primary" value="1" title="211工程" >-->
+<!--        <input type="checkbox" name="regular_college" lay-skin="primary" value="1" title="本科院校">-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <div class="layui-form-item">-->
+<!--      <div class="layui-input-block">-->
+<!--        <input type="checkbox" name="junior_college" lay-skin="primary" value="1" title="大专院校">-->
+<!--        <input type="checkbox" name="secondary_school" lay-skin="primary" value="1" title="中专院校" >-->
+<!--        <input type="checkbox" name="military_school" lay-skin="primary" value="1" title="军事院校">-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <div class="layui-form-item">-->
+<!--      <div class="layui-input-block">-->
+<!--        <input type="checkbox" name="enterprise" lay-skin="primary" value="1" title="企业">-->
+<!--      </div>-->
+<!--    </div>-->
+<!--    <div class="layui-inline" style="padding-left: 120px">-->
+<!--      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交-->
+<!--      </button>-->
+<!--    </div>-->
+<!--  </div>-->
+<!--</form>-->
 <form class="layui-form  layuimini-form" id="custom_data" data-required="true" action="">
   <div class="layui-form-item" style="padding: 25px">
-    <div class="layui-inline">
-      <label class="layui-form-label required">客户：</label>
-      <div class="layui-input-block" style="width: 500px;">
-        <input type="text" name="name"  lay-verify="required"  placeholder="请输入客户" autocomplete="off"
-               class="layui-input" id="inputFocus">
-      </div>
-    </div>
-    <br>
-    <div class="layui-inline city_input">
-      <label class="layui-form-label ">省：</label>
-      <div class="layui-input-block" style="width: 500px;">
-        <select id="province" class="province layui-input"></select>
-      </div>
-    </div>
-    <br>
-    <div class="layui-inline city_input">
-      <label class="layui-form-label ">市：</label>
-      <div class="layui-input-block" style="width: 500px;">
-        <select id="city" class="city layui-input"></select>
-      </div>
-    </div>
-    <br>
-    <div class="layui-inline">
-      <label class="layui-form-label ">地址：</label>
-      <div class="layui-input-block" style="width: 500px;">
-        <input type="text" name="address"   autocomplete="off"
-               class="layui-input" placeholder="请输入地址" >
-      </div>
-    </div>
-    <br>
-    <div class="layui-form-item">
-      <label class="layui-form-label">学校性质：</label>
-      <div class="layui-input-block">
-        <input type="checkbox" name="project_985" lay-skin="primary" value="1"  title="985工程">
-        <input type="checkbox" name="project_211" lay-skin="primary" value="1" title="211工程" >
-        <input type="checkbox" name="regular_college" lay-skin="primary" value="1" title="本科院校">
-      </div>
-    </div>
-    <div class="layui-form-item">
-      <div class="layui-input-block">
-        <input type="checkbox" name="junior_college" lay-skin="primary" value="1" title="大专院校">
-        <input type="checkbox" name="secondary_school" lay-skin="primary" value="1" title="中专院校" >
-        <input type="checkbox" name="military_school" lay-skin="primary" value="1" title="军事院校">
-      </div>
-    </div>
-    <div class="layui-form-item">
-      <div class="layui-input-block">
-        <input type="checkbox" name="enterprise" lay-skin="primary" value="1" title="企业">
+    <div class="layui-form-item" >
+      <label class="layui-form-label">学校</label>
+      <div class="layui-input-inline" style="">
+        <div id="edit_assign_follow" style="width: 1140px;"></div>
       </div>
     </div>
     <div class="layui-inline" style="padding-left: 120px">
@@ -56,10 +70,7 @@
     </div>
   </div>
 </form>
-
-
 <script>
-    document.getElementById("inputFocus").focus();
 
     layui.use(['form', 'table', 'upload', 'laytpl', 'request', 'selectInput', 'transfer'], function () {
         var form = layui.form,
@@ -75,6 +86,39 @@
         // 当前弹出层，防止ID被覆盖
         var parentIndex = layer.index;
 
+        var sales_list = xmSelect.render({
+            el: '#edit_assign_follow',
+            remoteSearch: true,
+            autoRow: true,
+            // clickClose: true,
+            delay: 1000,
+            tips: '支持名称/省份搜索,请至少输入一个字符',
+            searchTips: '支持名称/省份搜索,请至少输入一个字符',
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                if(!val){
+                    return cb([]);
+                }
+                $.ajax( '/missions/staff_schools', {
+                    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});
+                        }
+                    }
+                })
+            }
+        })
 
         var dataCustom = [
             {
@@ -338,8 +382,17 @@
         });
         //监听提交
         form.on('submit(data-reset-btn)', function (data) {
-            data.field.province = $("#province option:selected").text(); //获取选中的项
-            data.field.city = $("#city option:selected").text(); //获取选中的项
+            var schools = [];
+            sales_list.getValue().forEach(function(d) {
+                schools.push(d.value);
+            })
+            if (schools.length == 0) {
+                layer.alert("请选择学校");
+                return false;
+            }
+            data.field['school_ids'] = schools;
+            // data.field.province = $("#province option:selected").text(); //获取选中的项
+            // data.field.city = $("#city option:selected").text(); //获取选中的项
             console.log(data.field);
             request.authPost("missions/customers", data.field, function (res) {
                 if (res.success === false) {

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

@@ -203,7 +203,7 @@
 
 
 
-<!--未完成计划列表-->
+<!--计划回款计划列表-->
 <script type="text/html" id="unfinish_toolbar">
   <div class="layui-btn-container">
     <span class="table-label">跟进记录</span>

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

@@ -12,7 +12,7 @@ json.data do
     json.business d.business.name
     json.business_id d.business.id
     teacher_ids = d.key_person.pluck(:teacher_id)
-    json.key_people EducodeSales::Teacher.where(id: teacher_ids).pluck(:name).join('、')
+    json.key_people key_people(teacher_ids)
 
   end
 end

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

@@ -1,9 +1,7 @@
 json.data do
   json.array! @money_plans do |d|
-    json.id d.id
-    json.amount d.amount
-    json.date_at d.date_at.to_s(:date)
-    json.clazz d.clazz
+    json.(d, :id, :amount, :clazz)
+    json.date_at d.date_at.present? ? d.date_at.to_s(:date) : ''
   end
 end
 

data/app/views/educode_sales/home/staff_schools.json.jbuilder

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @schools do |d|
+    json.value d.id
+    json.name "#{d.name}-#{d.province}"
+  end
+end
+json.count @schools.size
+json.code 0
+json.msg "success"

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

@@ -22,7 +22,7 @@
       <div class="layui-inline">
         <label class="layui-form-label">状态</label>
         <div class="layui-input-inline">
-          <%= select_tag "clazz", options_for_select(['已完成','未完成']), {  include_blank: true } %>
+          <%= select_tag "clazz", options_for_select(['实际回款','计划回款']), {  include_blank: true } %>
         </div>
       </div>
       <div class="layui-inline">

data/app/views/educode_sales/operation_plans/_monthPlan.html.erb

@@ -89,12 +89,12 @@
                         field: 'id',
                         width: 60,
                         title:'序号',type: 'numbers',
-                        totalRowText:"合计",
+                        totalRowText:'合计',fixed: 'left'
                     },
                     {
                         field: 'staff',
                         width: 90,
-                        title: '姓名'
+                        title: '姓名',fixed: 'left'
                     },
                     {
                         field: 'teacher_name',
@@ -289,4 +289,9 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-fixed .layui-table-body {
+        height: auto!important;
+    }
+</style>

data/app/views/educode_sales/operation_plans/_monthly.html.erb

@@ -86,12 +86,12 @@
                         field: 'id',
                         width: 60,
                         title:'序号',type: 'numbers',
-                        totalRowText:"合计",
+                        totalRowText:'合计',fixed: 'left'
                     },
                     {
                         field: 'staff',
                         width: 90,
-                        title: '姓名'
+                        title: '姓名',fixed: 'left'
                     },
                     {
                         field: 'month',

data/app/views/educode_sales/operation_plans/_weekPlan.html.erb

@@ -90,12 +90,12 @@
                         field: 'id',
                         width: 60,
                         title:'序号',type: 'numbers',
-                        totalRowText:"合计",
+                        totalRowText:'合计',fixed: 'left'
                     },
                     {
                         field: 'staff',
                         width: 80,
-                        title: '姓名'
+                        title: '姓名',fixed: 'left'
                     },
                     {
                         field: 'teacher_name',

data/app/views/educode_sales/operation_plans/_weekly.html.erb

@@ -87,12 +87,12 @@
                         field: 'id',
                         width: 60,
                         title:'序号',type: 'numbers',
-                        totalRowText:"合计",
+                        totalRowText:'合计',fixed: 'left'
                     },
                     {
                         field: 'staff',
                         width: 90,
-                        title: '姓名'
+                        title: '姓名',fixed: 'left'
                     },
                     {
                         field: 'weekly',

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

@@ -88,12 +88,12 @@
                 field: 'id',
                 width: 60,
                 title:'序号',type: 'numbers',
-                        totalRowText:"合计",
+                        totalRowText:'合计',fixed: 'left'
               },
               {
                 field: 'staff',
                 width: 90,
-                title: '姓名'
+                title: '姓名',fixed: 'left'
               },
               {
                 field: 'business_name',
@@ -277,4 +277,9 @@
         });
 
     });
-</script>
+</script>
+<style>
+    .layui-table-fixed .layui-table-body {
+        height: auto!important;
+    }
+</style>

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

@@ -85,12 +85,12 @@
             field: 'id',
             width: 60,
             title:'序号',type: 'numbers',
-            totalRowText:"合计",
+            totalRowText:'合计',fixed: 'left'
           },
           {
             field: 'staff',
             width: 90,
-            title: '姓名'
+            title: '姓名',fixed: 'left'
           },
             {
                 field: 'month',

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

@@ -88,12 +88,12 @@
                 field: 'id',
                 width: 60,
                 title:'序号',type: 'numbers',
-                  totalRowText: '合计'
+                  totalRowText: '合计',fixed: 'left'
               },
               {
                 field: 'staff',
                 width: 90,
-                title: '姓名'
+                title: '姓名',fixed: 'left'
               },
               {
                 field: 'business_name',

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

@@ -87,12 +87,12 @@
               field: 'id',
               width: 60,
               title:'序号',type: 'numbers',
-                totalRowText:"合计",
+                totalRowText:'合计',fixed: 'left'
             },
             {
               field: 'staff',
               width: 90,
-              title: '姓名'
+              title: '姓名',fixed: 'left'
             },
             {
               field: 'weekly',

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

@@ -3,9 +3,9 @@
     <li class="layui-this">操作权限</li>
     <li>数据浏览权限</li>
   </ul>
-  <div class="layui-tab-content">
-    <div class="layui-tab-item layui-show">
-      <form class="layui-form line" action="">
+  <div class="layui-tab-content caozuo">
+    <div class="layui-tab-item layui-show" style="height: 800px;!important;">
+      <form class="layui-form " action="">
         <% id = 0 %>
         <% EducodeSales::Permission.all.order(position: :asc).group_by{ |d| d.clazz}.each do |k, d| %>
          <div class="layui-form-item">
@@ -32,15 +32,15 @@
           <label class="layui-form-label">商机管理</label>
           <div class="layui-input-block">
             <%= radio_button_tag("business", "自己", @areas.include?("商机管理-自己"), {title: '本人创建列表', id: 1}) %>
-            <%= radio_button_tag("business", "区域", @areas.include?("商机管理-区域"), {title: '本人负责区域列表', id: 2}) %>
+            <%= radio_button_tag("business", "区域", @areas.include?("商机管理-区域"), {title: '本人负责区域及监管院校列表', id: 2}) %>
             <%= radio_button_tag("business", "全部", @areas.include?("商机管理-全部"), {title: '全部列表', id: 3}) %>
           </div>
         </div>
         <div class="layui-form-item" style="border-top: 1px solid #ddd;">
-          <label class="layui-form-label">回款管理</label>
+          <label class="layui-form-label">回款计划</label>
           <div class="layui-input-block">
             <%= radio_button_tag("money_plan", "自己", @areas.include?("回款管理-自己"), {title: '本人负责列表', id: 16}) %>
-            <%= radio_button_tag("money_plan", "区域", @areas.include?("回款管理-区域"), {title: '本人负责区域列表', id: 17}) %>
+            <%= radio_button_tag("money_plan", "区域", @areas.include?("回款管理-区域"), {title: '本人负责区域及监管院校列表', id: 17}) %>
             <%= radio_button_tag("money_plan", "全部", @areas.include?("回款管理-全部"), {title: '全部列表', id: 18}) %>
           </div>
         </div>
@@ -48,7 +48,7 @@
           <label class="layui-form-label">客户管理</label>
           <div class="layui-input-block">
             <%= radio_button_tag("customer", "自己", @areas.include?("客户管理-自己"), {title: '本人负责列表', id: 13}) %>
-            <%= radio_button_tag("customer", "区域", @areas.include?("客户管理-区域"), {title: '本人负责区域列表', id:14}) %>
+            <%= radio_button_tag("customer", "区域", @areas.include?("客户管理-区域"), {title: '本人负责区域及监管院校列表', id:14}) %>
             <%= radio_button_tag("customer", "全部", @areas.include?("客户管理-全部"), {title: '全部列表', id: 15}) %>
           </div>
         </div>
@@ -56,7 +56,7 @@
           <label class="layui-form-label">销售计划</label>
           <div class="layui-input-block">
             <%= radio_button_tag("sale_plan", "自己", @areas.include?("销售计划-自己"), {title: '本人创建列表', id: 4}) %>
-            <%= radio_button_tag("sale_plan", "区域", @areas.include?("销售计划-区域"), {title: '本人负责区域列表', id: 5}) %>
+            <%= radio_button_tag("sale_plan", "区域", @areas.include?("销售计划-区域"), {title: '本人负责区域及监管院校列表', id: 5}) %>
             <%= radio_button_tag("sale_plan", "全部", @areas.include?("销售计划-全部"), {title: '全部列表', id: 6}) %>
           </div>
         </div>
@@ -64,7 +64,7 @@
           <label class="layui-form-label">教师运营</label>
           <div class="layui-input-block">
             <%= radio_button_tag("teacher", "自己", @areas.include?("教师运营-自己"), {title: '本人创建列表', id: 7}) %>
-            <%= radio_button_tag("teacher", "区域", @areas.include?("教师运营-区域"), {title: '本人负责区域列表', id:8}) %>
+            <%= radio_button_tag("teacher", "区域", @areas.include?("教师运营-区域"), {title: '本人负责区域及监管院校列表', id:8}) %>
             <%= radio_button_tag("teacher", "全部", @areas.include?("教师运营-全部"), {title: '全部列表', id: 9}) %>
           </div>
         </div>
@@ -72,7 +72,7 @@
           <label class="layui-form-label">运营计划</label>
           <div class="layui-input-block">
             <%= radio_button_tag("operation", "自己", @areas.include?("运营计划-自己"), {title: '本人创建列表', id: 10}) %>
-            <%= radio_button_tag("operation", "区域", @areas.include?("运营计划-区域"), {title: '本人负责区域列表', id:11}) %>
+            <%= radio_button_tag("operation", "区域", @areas.include?("运营计划-区域"), {title: '本人负责区域及监管院校列表', id:11}) %>
             <%= radio_button_tag("operation", "全部", @areas.include?("运营计划-全部"), {title: '全部列表', id: 12}) %>
           </div>
         </div>
@@ -139,4 +139,10 @@
     })
     //…
   });
-</script>
+</script>
+<style>
+    .caozuo .layui-tab-item {
+        width: 100% !important;
+        height: 900px !important;
+    }
+</style>

data/app/views/educode_sales/sale_reports/audit.html.erb

@@ -151,6 +151,8 @@
     table.on('tool(showWeeklyTable)', function (obj) {
       var data = obj.data;
       if (obj.event === 'show_follow') {
+          business_id = obj.data.business_id
+          business_name = data.business_name
         id = data.business_id
         content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
         openWH = miniPage.getOpenWidthHeight();

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

@@ -257,6 +257,8 @@
         });
         return false;
       } else if (obj.event === 'show_follow') {
+          business_id = obj.data.business_id
+          business_name = data.business_name
         id = data.business_id
         content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
         openWH = miniPage.getOpenWidthHeight();

data/app/views/educode_sales/sale_reports/show.html.erb

@@ -102,6 +102,8 @@
     table.on('tool(showWeeklyTable)', function (obj) {
       var data = obj.data;
       if (obj.event === 'show_follow') {
+          business_id = obj.data.business_id
+          business_name = data.business_name
         id = data.business_id
         content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + data.business_id);
         openWH = miniPage.getOpenWidthHeight();

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -621,7 +621,7 @@
             });
             $(".customer_bt").click(function () {
                 layer.load(0, {});
-                $.get('/missions/sale_trends/trends.json?customer_count_type=' + $("#customer_count_type").val() + '&customer_time_range=' + $("#customer_time_range").val()).done(function(res) {
+                $.get('/missions/sale_trends/trends.json?customer_count_type=' + $("#customer_count_type").val() + '&customer_time_range=' + $("#customer_time_range").val() + '&customer_date=' + $("#customer_date").val()).done(function(res) {
                     layer.closeAll('loading');
                     var data4 = res.data4;
                     myChart4.data = data4