educode_sales 0.7.0 → 0.7.3

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

@@ -75,7 +75,7 @@
 <script type="text/html" id="edit_plan">
   <a href="javascript:void(0);" lay-event="edit_plan" class="layui-table-link">{{ d.money_plans_count }}</a>
 </script>
-<!--未完成计划列表-->
+<!--计划回款计划列表-->
 <script type="text/html" id="unfinish_table_tabar">
   <div class="layui-btn-container">
     <span class="table-label">跟进计划列表</span>
@@ -163,26 +163,31 @@
                 width: 110,
                 title: '中标时间',
               },
-              {
-                field: 'signed_date',
-                width: 110,
-                title: '签单时间',
-              },
-              {
-                field: 'reception_at',
-                width: 110,
-                title: '验收时间',
-              },
-              {
-                field: 'total_amount',
-                width: 100,
-                title: '总额',
-              },
-              {
-                field: 'actual_amount',
-                width: 100,
-                title: '合同额',
-              },
+                {
+                    field: 'signed_date',
+                    width: 110,
+                    title: '签单时间',
+                },
+                {
+                    field: 'reception_at',
+                    width: 110,
+                    title: '验收时间',
+                },
+                {
+                    field: 'service_end_time',
+                    width: 200,
+                    title: '服务期',
+                },
+                {
+                    field: 'total_amount',
+                    width: 100,
+                    title: '总额',
+                },
+                {
+                    field: 'actual_amount',
+                    width: 100,
+                    title: '合同额',
+                },
               {
                 field: 'divide_amount',
                 width: 100,
@@ -196,9 +201,15 @@
 
               {
                 field: 'place',
-                width: 400,
+                width: 120,
                 title: '渠道',
               },
+              {
+                field: 'year',
+                width: 120,
+                title: '所属年度',
+                  sort: true
+              },
               {
                 title: '操作',
                 minWidth: 200,
@@ -349,10 +360,11 @@
                   layer.full(keyindex);
               });
           } else if (obj.event === 'edit_plan') {
-              content = miniPage.getHrefContent('/missions/businesses/edit_plan');
-              openWH = miniPage.getOpenWidthHeight();
               is_latest = obj.data.is_latest
               flag = obj.data.flag
+              follow_up_id = obj.data.id
+              content = miniPage.getHrefContent('/missions/businesses/edit_plan');
+              openWH = miniPage.getOpenWidthHeight();
               plan_index = layer.open({
                   title: '回款计划',
                   type: 1,
@@ -373,7 +385,7 @@
           }
         });
 
-       // 未完成计划
+       // 计划回款计划
          table.render({
             elem: '#unfinish_table',
             url: '/missions/businesses/' + parent.business_id + "/unfinish_plans",

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

@@ -9,6 +9,7 @@ json.data do
     json.reception_at d.reception_at&.to_s(:date)
     json.bidded_date d.bidded_date&.to_s(:date)
     json.signed_date d.signed_date&.to_s(:date)
+    json.service_end_time (d.service_start_time.present? && d.service_end_time.present?) ? (d.service_start_time&.to_s + "-" + d.service_end_time&.to_s) : ''
     json.total_amount d.total_amount
     json.actual_amount d.actual_amount
     json.divide_amount d.divide_amount ? d.divide_amount : ""
@@ -19,6 +20,7 @@ json.data do
     json.is_latest d.id == @latest&.id
     json.flag d.created_at.present? ? (Time.now - d.created_at).to_f/3600 < 24 : false
     json.description d.description
+    json.year d.year
     json.self_flag d.staff_id == @current_admin.id
   end
 end

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

@@ -49,7 +49,14 @@
     <div class="layui-inline">
       <label class="layui-form-label">验收时间：</label>
       <div class="layui-input-inline">
-         <%= @follow_up.reception_at.to_s %>
+        <%= @follow_up.reception_at.to_s %>
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">服务期：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.service_start_time.to_s + "-" + @follow_up.service_end_time.to_s %>
       </div>
     </div>
     <br>

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

@@ -140,7 +140,7 @@
                     {
                         field: 'name',
                         title: '客户名称',
-                        width: 100,
+                        width: 150,
                         templet: "#name"
                     },
                     {
@@ -150,7 +150,6 @@
                     },
                     {
                         field: 'property',
-                        width: 200,
                         title: '性质',
                     },
                     {

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/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/results/edit.html.erb

@@ -0,0 +1,111 @@
+<div class="layuimini-main" style="height: 100%;">
+
+  <div class="layui-form layuimini-form" lay-filter="common_edit">
+    <fieldset class="table-search-fieldset">
+      <legend>添加字典</legend>
+      <div class="layui-form-item">
+        <label class="layui-form-label required">字典名称</label>
+        <div class="layui-input-block">
+          <%= select_tag"clazz" ,
+              options_for_select(EducodeSales::Common.clazzs.map{|d| d },
+              EducodeSales::Common.clazzs[@common.clazz]), {'lay-filter': 'clazz',
+              disabled: true} %>
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <label class="layui-form-label required">选项名称</label>
+        <div class="layui-input-block">
+          <input type="text" name="name" autocomplete="off" lay-verify="required" lay-reqtext="选项名称不能为空" placeholder="请输入选项名称" value="" class="layui-input">
+        </div>
+      </div>
+      <hr>
+      <div class="layui-form-item">
+        <div class="layui-input-block">
+          <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确定添加</button>
+        </div>
+      </div>
+    </fieldset>
+    <h4 class="m-t-10">选项列表</h4>
+    <table class="layui-hide" id="edit_table" lay-filter="edit_table"></table>
+  </div>
+</div>
+<script type="text/html" id="edit_currentTableBar">
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">保存</a>
+</script>
+<script>
+  layui.use(['form', 'table', 'upload', 'laytpl', 'request'], function() {
+    var form = layui.form,
+      layer = layui.layer,
+      table = layui.table,
+      laytpl = layui.laytpl,
+      request = layui.request,
+      $ = layui.$;
+
+    form.render();
+
+    // 当前弹出层，防止ID被覆盖
+    var parentIndex = layer.index;
+
+    //监听提交
+    form.on('submit(saveBtn)', function(data) {
+
+      request.authPost("missions/commons", data.field, function(res) {
+        if (res.success == false) {
+          layer.alert(res.msg)
+        } else {
+          layer.alert('添加成功')
+          form.val('common_edit', {
+            'name': ''
+          })
+          parent.layer.close(parent.layer.getFrameIndex(window.name))
+          parent.table.reload('table')
+          table.reload('edit_table')
+        }
+      })
+      return false;
+    });
+
+    table.render({
+      elem: '#edit_table',
+      url: '/missions/commons/' + parent.commont_id,
+      cols: [
+        [{
+          field: 'id',
+          width: 80,
+          title:'序号',type: 'numbers',
+          sort: true
+        }, {
+          field: 'name',
+          width: 300,
+          title: '选项名称',
+          edit: true
+        }, {
+          field: 'position',
+          width: 100,
+          title: '位置',
+          edit: true
+        }, {
+          title: '操作',
+          minWidth: 150,
+          toolbar: '#edit_currentTableBar',
+        }]
+      ]
+    });
+
+    table.on('tool(edit_table)', function (obj) {
+      var data = obj.data;
+      if (obj.event === 'edit') {
+        request.authPut('missions/commons/' + data.id, data,
+          function(res) {
+            if (res.success) {
+              table.reload('edit_table')
+            } else {
+              layer.alert(res.msg)
+            }
+             
+          })
+      }
+    });
+
+  });
+</script>

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

@@ -0,0 +1,13 @@
+json.data do
+  i = 0
+  json.array! @commons do |d|
+    i += 1
+    json.i i
+    json.id d.id
+    json.name EducodeSales::Common.where(clazz: d.clazz).pluck(:name).join("、")
+    json.clazz d.clazz
+  end
+end
+
+json.code 0
+json.count @commons.total_count

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

@@ -0,0 +1,58 @@
+<div class="layuimini-main" style="height: 100%;">
+
+  <div class="layui-form layuimini-form">
+    <div class="layui-form-item">
+       <label class="layui-form-label required">字典名称</label>
+       <div class="layui-input-block">
+         <%= select_tag "clazz", options_for_select(EducodeSales::Common.clazzs.map{|d| d }), {'lay-filter': 'clazz'} %>
+       </div>
+     </div>
+    <div class="layui-form-item">
+      <label class="layui-form-label required">选项名称</label>
+      <div class="layui-input-block">
+        <input type="text" name="name" autocomplete="off" lay-verify="required" lay-reqtext="选项名称不能为空"
+          placeholder="请输入选项名称" value="" class="layui-input">
+      </div>
+    </div>
+    <hr>
+    <div class="layui-form-item">
+      <div class="layui-input-block">
+        <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+  layui.use(['form', 'table', 'upload', 'laytpl', 'request'], function () {
+    var form = layui.form,
+      layer = layui.layer,
+      table = layui.table,
+      laytpl = layui.laytpl,
+      request = layui.request,
+      $ = layui.$;
+
+    form.render();
+
+    // 当前弹出层，防止ID被覆盖
+    var parentIndex = layer.index;
+
+    //监听提交
+    form.on('submit(saveBtn)', function (data) {
+  
+    request.authPost("/missions/commons", data.field, function(res) {
+      if (res.success == false) {
+        alert(res.msg)
+      } else {
+        layer.close(parent.index);
+        parent.layer.close(parent.layer.getFrameIndex(window.name))
+        parent.table.reload('table')
+      }
+    })
+
+
+      return false;
+    });
+
+  });
+</script>

data/app/views/educode_sales/results/show.json.jbuilder

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @commons do |d|
+    json.id d.id
+    json.name d.name
+    json.position d.position
+  end
+end
+
+json.code 0

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

@@ -37,7 +37,7 @@
           </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}) %>

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/sales/index.html.erb

@@ -7,7 +7,7 @@
     <span style="float: right;padding-right: 10px">年度</span>
   </form>
   <hr>
-  <table class="layui-hide" id="table" lay-filter="table" ></table>
+  <table class="layui-hide" id="table" lay-filter="table"></table>
 </div>
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
@@ -16,32 +16,32 @@
 </script>
 <script type="text/html" id="business_a">
   <div class="layui-text">
-   <a href="/missions/businesses?clazz_id={{d.a_clazz_id}}&staff_id={{d.id}}">{{d.business_a}}</a>
+    <a href="/missions/businesses?clazz_id={{d.a_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_a}}</a>
   </div>
 </script>
 <script type="text/html" id="business_b">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.b_clazz_id}}&staff_id={{d.id}}">{{d.business_b}}</a>
+    <a href="/missions/businesses?clazz_id={{d.b_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_b}}</a>
   </div>
 </script>
 <script type="text/html" id="business_c">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.c_clazz_id}}&staff_id={{d.id}}">{{d.business_c}}</a>
+    <a href="/missions/businesses?clazz_id={{d.c_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_c}}</a>
   </div>
 </script>
 <script type="text/html" id="business_d">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.d_clazz_id}}&staff_id={{d.id}}">{{d.business_d}}</a>
+    <a href="/missions/businesses?clazz_id={{d.d_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_d}}</a>
   </div>
 </script>
 <script type="text/html" id="business_e">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.e_clazz_id}}&staff_id={{d.id}}">{{d.business_e}}</a>
+    <a href="/missions/businesses?clazz_id={{d.e_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_e}}</a>
   </div>
 </script>
 <script type="text/html" id="business_o">
   <div class="layui-text">
-    <a href="/missions/businesses?clazz_id={{d.o_clazz_id}}&staff_id={{d.id}}">{{d.business_o}}</a>
+    <a href="/missions/businesses?clazz_id={{d.o_clazz_id}}&staff_id={{d.id}}&business_year=<%= @year %>">{{d.business_o}}</a>
   </div>
 </script>
 <script type="text/html" id="school_count">

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

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