educode_sales 1.10.49 → 1.10.58

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

@@ -7,25 +7,25 @@
       <div id="businesses_id" style="width: 50%;"></div>
     </div>
   </div>
+<!--  <div class="layui-form-item">-->
+<!--    <label class="layui-form-label" >交付单位:<span style="color: red"> *</span></label>-->
+<!--    <div class="layui-input-block">-->
+<!--      <div id="school_id" style="width: 50%;"></div>-->
+<!--    </div>-->
+<!--  </div>-->
   <div class="layui-form-item">
-    <label class="layui-form-label" style="width: 80px">交付单位:<span style="color: red"> *</span></label>
+    <label class="layui-form-label" style="width: 102px">实践课程名称:<span style="color: red"> *</span></label>
     <div class="layui-input-block">
-      <div id="school_id" style="width: 50%;"></div>
-    </div>
-  </div>
-  <div class="layui-form-item">
-    <label class="layui-form-label" style="width: 90px">实践课程名称:</label>
-    <div class="layui-input-block">
-      <div id="subject_ids" style="width: 50%"></div>
+      <div id="subject_ids" style="width: 49%;margin-left: 12px"></div>
     </div>
   </div>
 
-  <div class="layui-form-item">
-    <label class="layui-form-label">交付时间:</label>
-    <div class="layui-input-block">
-      <input type="text" name="deliver_date" style="width: 50%;" class="layui-input" id="ID-laydate-demo" placeholder="- -">
-    </div>
-  </div>
+<!--  <div class="layui-form-item">-->
+<!--    <label class="layui-form-label">交付时间:</label>-->
+<!--    <div class="layui-input-block">-->
+<!--      <input type="text" name="deliver_date" style="width: 50%;" class="layui-input" id="ID-laydate-demo" placeholder="- -">-->
+<!--    </div>-->
+<!--  </div>-->
 
   <div class="layui-form-item">
     <label class="layui-form-label">交付状态:<span style="color: red"> *</span></label>
@@ -39,7 +39,7 @@
     </div>
   </div>
   <div class="layui-form-item">
-    <label class="layui-form-label">课程经理:</label>
+    <label class="layui-form-label">课程经理:<span style="color: red"> *</span></label>
     <div class="layui-input-block">
       <div id="manage_id" style="width: 50%"></div>
     </div>
@@ -64,9 +64,9 @@
         // 解决form表单中select不渲染的问题
         form.render();
         form.render('select', 'test')
-        laydate.render({
-            elem: '#ID-laydate-demo'
-        });
+        // laydate.render({
+        //     elem: '#ID-laydate-demo'
+        // });
 
         // 交付单位
         var school_id = xmSelect.render({
@@ -96,9 +96,9 @@
                         disabled: true,
                         selected: true
                     }]
-                    school_id.setValue(school)
+                    // school_id.setValue(school)
                 }else{
-                    school_id.setValue([])
+                    // school_id.setValue([])
                 }
 
             },
@@ -180,10 +180,33 @@
             multiple: true
         })
 
+        function isNull(str){
+            return str === "" || str === null
+        }
+
         form.on('submit(saveBtn)', function (data) {
+
             console.log(form.val())
             let new_data = form.val();
 
+            if(isNull(new_data.business_id)){
+                layer.msg('请选商机');
+                return false
+            }
+            if(isNull(new_data.subject_ids)){
+                layer.msg('请选实践课程');
+                return false
+            }
+            if(isNull(new_data.manage_id)){
+                layer.msg('请选课堂经理');
+                return false
+            }
+            if(isNull(new_data.state)){
+                layer.msg('请选状态');
+                return false
+            }
+
+
             $.ajax('/missions/business_courses/', {
                 method: 'POST',
                 data: {
@@ -208,5 +231,7 @@
             })
             return false;
         });
+
+
     });
 </script>

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

@@ -800,15 +800,13 @@
         dropdown.render({
           elem: '.export_more-btn',
           data: export_dropmenu,
-          click: function(data, othis){
-            var elem = $(this.elem);
-            id = elem.data('id');
+          click: function(data){
             switch (data.event) {
             case 'export_csv':
-               export_bussiness('csv')
+               export_bussiness('csv');
               break;
             case 'export_excel':
-                export_bussiness('xls')
+                export_bussiness('xls');
               break;
             case 'export_records':
                 export_records();
@@ -818,17 +816,17 @@
 
           }
         });
-      }
+      };
         function export_bussiness(type) {
             var data = form.val("search_form");
             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.place_id = index_place_list.getValue('valueStr');
             data.business_type = business_type.toString();
             data.business_step = business_step.toString();
@@ -855,8 +853,12 @@
                 year: data.year,
                 mine: search['clazz'] == 'me' ? true : '',
                 is_follow: search['clazz'] == 'followes' ? true : '',
+                special: search['clazz'] == 'special' ? true : '',
+                is_area: search['clazz'] == 'area' ? true : '',
+                delete_list: search['clazz'] == 'delete_list' ? true : '',
+                plan_year: search['clazz'] == 'plan_year' ? true : ''
             }, function (res) {
-                data = res.data
+                data = res.data;
                 table.exportFile(business_table.config.id,data, type);
                 layer.closeAll('loading');
                 request.get('missions/businesses/add_export_records?type=' + type, {}, function (res) {

data/app/views/educode_sales/contracts/_list.html.erb

@@ -486,7 +486,7 @@
     });
       var contract_table = table.render({
         elem: '#contact_table',
-        url: '/missions/contracts',
+       // url: '/missions/contracts',
         autoSort: false,
         where: {q: data},
         defaultToolbar: ['filter'],
@@ -500,6 +500,21 @@
         skin: 'line',
     });
 
+    if (gon.bidded_date) {
+      table.reload('contact_table', {
+          url: '/missions/contracts',
+          where: {
+              q: {
+                bidded_date: gon.bidded_date,
+              }
+          }
+      });
+  } else {
+      table.reload('contact_table', {
+          url: '/missions/contracts'
+      });
+  }
+
 
     var sort = {}, search = data;
 

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

@@ -2,7 +2,7 @@
 <div class="layui-tab" lay-filter="contract_tab">
     <ul class="layui-tab-title">
         <li class="layui-this follows_li">跟进动态</li>
-        <li class="contracts_list_li">合同列表</li>
+        <li class="contracts_list_li" lay-id="contract">合同列表</li>
         <% if can? :read_sales_detail, EducodeSales::Business %>
         <li class="sales_list_li">销售明细</li>
         <% end %>
@@ -29,9 +29,9 @@
             request = layui.request,
             dropdown = layui.dropdown,
             miniPage = layui.miniPage,
-            element = layui.element,
             laydate = layui.laydate;
         var laydate = layui.laydate;
+        element = layui.element;
 
 
 
@@ -44,6 +44,9 @@
           }
         });
 
+        <% if params[:date_at].present? %>
+         loadPage("/missions/contracts/list?date_at=<%= params[:date_at] %>");
+        <% end %>
 
         function loadPage(url) {
           var layer_index = layer.load(0, {shade: [0.1, '#fff']});

data/app/views/educode_sales/contracts/list.js.erb

@@ -1 +1,4 @@
-$("#contract_list_wraper").html("<%= j render 'list' %>");
+$("#contract_list_wraper").html("<%= j render 'list' %>");
+<% if params[:date_at].present? %>
+element.tabChange('contract_tab', 'contract');
+<% end %>

data/app/views/educode_sales/money_plan_records/_index.html.erb

@@ -17,7 +17,7 @@
             <div class="layui-inline">
                 <label class="layui-form-label">回款日期</label>
                 <div class="layui-input-inline">
-                    <input type="text" name="date_at" class="layui-input" id="date">
+                    <input type="text" name="date_at" class="layui-input" id="return_date">
                 </div>
             </div>
             <div class="layui-inline">
@@ -35,7 +35,7 @@
             <div class="layui-inline">
                 <label class="layui-form-label required">匹配状态</label>
                 <div class="layui-input-inline">
-                    <%= select_tag "state", options_for_select(['已认领', '待认领', '无对应合同', '无对应应收款']), { 'lay-filter': 'state',  include_blank: true,  "lay-search": "" } %>
+                    <%= select_tag "state", options_for_select(['已认领', '待认领', '无对应合同', '无对应应收款'], params[:date_at].present? ? "已认领" : ""), { 'lay-filter': 'state',  include_blank: true,  "lay-search": "" } %>
                 </div>
             </div>
             <div class="layui-inline show_item">
@@ -92,13 +92,14 @@
         laydate = layui.laydate;
         table = layui.table;
         laydate.render({
-            elem: '#date',
-            range: true
+            elem: '#return_date',
+            range: true,
+            value: gon.date
         });
         form.render();
         var money_plan_record_table = table.render({
             elem: '#money_plan_record_table',
-            url: '/missions/money_plan_records',
+          //  url: '/missions/money_plan_records',
             title: '回款记录列表',
             toolbar: '#toolbar_money_plan_record',
             defaultToolbar: ['filter'],
@@ -182,6 +183,21 @@
             filterable: true,
             radio: true,
         });
+        if (gon.date) {
+            table.reload('money_plan_record_table', {
+                url: '/missions/money_plan_records',
+                where: {
+                    q: {
+                        date_at: gon.date,
+                        state: '已认领'
+                    }
+                }
+            });
+        } else {
+            table.reload('money_plan_record_table', {
+                url: '/missions/money_plan_records'
+            });
+        }
 
         var sort = {},
             search = {};

data/app/views/educode_sales/money_plan_records/index.js.erb

@@ -1 +1,4 @@
-$("#monley_plan_record_wraper").html("<%= j render 'index' %>");
+$("#monley_plan_record_wraper").html("<%= j render 'index' %>");
+<% if params[:date_at].present? %>
+element.tabChange('money_plan_tab', 'money_record');
+<% end %>

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

@@ -3,7 +3,7 @@
     <ul class="layui-tab-title">
         <li class="layui-this">回款计划</li>
         <% if can? :record, EducodeSales::MoneyPlan %>
-        <li class="">回款记录</li>
+        <li class="" lay-id="money_record">回款记录</li>
         <% end %>
         <li class="">开票记录</li>
     </ul>
@@ -29,9 +29,10 @@
             request = layui.request,
             dropdown = layui.dropdown,
             miniPage = layui.miniPage,
-            element = layui.element,
+           
             laydate = layui.laydate;
         var laydate = layui.laydate;
+        element = layui.element;
 
 
 
@@ -44,6 +45,9 @@
               loadPage('/missions/invoices/apply_records')
             }
           });
+          <% if params[:date_at].present? %>
+           loadPage("/missions/money_plan_records?date_at=<%= params[:date_at] %>");
+          <% end %>
         <% else %>
           element.on('tab(money_plan_tab)', function(data) {
             if (data.index == 1 && $("#invoice_apply").length == 0) {

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

@@ -1,4 +1,4 @@
-<div id="tab_9">
+<div id="tab_7">
   <div class="" style="padding-right: 50px">
     <div style="margin: 10px 10px 10px 10px">
       <form class="layui-form layui-form-pane" lay-filter="search_form">

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

@@ -1,5 +1,5 @@
 <%= Gon::Base.render_data %>
-  <div id="tab_7" lay-filter="test7">
+  <div id="tab_8" lay-filter="test7">
     <div class="" style="padding-right: 50px">
       <table class="layui-hide" id="table_7_year"></table>
     </div>

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

@@ -1,4 +1,4 @@
-<div id="tab_8">
+<div id="tab_9">
   <div class="" style="padding-right: 50px">
     <div style="margin: 10px 10px 10px 10px">
       <form class="layui-form layui-form-pane" lay-filter="search_visit_form">

data/app/views/educode_sales/sale_trends/return_money_forecast.js.erb

@@ -1 +1 @@
-$("#page_9").html("<%= j render 'return_money_forecast' %>");
+$("#page_7").html("<%= j render 'return_money_forecast' %>");

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

@@ -6,9 +6,9 @@
     <li class="">商机区域分布</li>
     <li class="">销售人员跟进分析</li>
     <li class="">中标预测图</li>
+    <li class="">回款预测图</li>
     <li class="">用户分析</li>
     <li class="">拜访分析</li>
-    <li class="">回款预测图</li>
   </ul>
   <div class="layui-tab-content">
     <div class="layui-tab-item layui-show">
@@ -141,7 +141,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>已回款<a href="/missions/businesses?name=(销售态势-<%=@year %>-已回款商机)&date_at=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>已回款<a href="/missions/money_plans/list?date_at=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @return_amount %>万</h1>
@@ -192,7 +192,7 @@
                     <div class="panel layui-bg-number">
                       <div class="panel-body">
                         <div class="panel-title">
-                          <h5>应收款<a href="/missions/businesses?name=(销售态势-<%=@year %>-应收款商机)&step=应收款&bidded_date_year=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
+                          <h5>应收款<a href="/missions/contracts?date_at=<%= @year %>"  style="color: #0000FF;float: right">查看商机</a></h5>
                         </div>
                         <div class="panel-content y-t-10">
                           <h1 class="no-margins"><%= @receivable_amount.round(2) %>万</h1>
@@ -271,11 +271,11 @@
             } else if (data.index == 5 && $("#tab_6").length == 0) {
                 loadPage('/missions/sale_trends/goal_forecast')
             } else if (data.index == 6 && $("#tab_7").length == 0) {
-                loadPage('/missions/sale_trends/user_stat')
+                loadPage('/missions/sale_trends/return_money_forecast')
             } else if (data.index == 7 && $("#tab_8").length == 0) {
-                loadPage('/missions/sale_trends/visit_analysis')
+                loadPage('/missions/sale_trends/user_stat')
             } else if (data.index == 8 && $("#tab_9").length == 0) {
-                loadPage('/missions/sale_trends/return_money_forecast')
+                loadPage('/missions/sale_trends/visit_analysis')
             }
         });
 

data/app/views/educode_sales/sale_trends/user_stat.js.erb

@@ -1 +1 @@
-$("#page_7").html("<%= j render 'user_stat' %>");
+$("#page_8").html("<%= j render 'user_stat' %>");

data/app/views/educode_sales/sale_trends/visit_analysis.js.erb

@@ -1 +1 @@
-$("#page_8").html("<%= j render 'visit_analysis' %>");
+$("#page_9").html("<%= j render 'visit_analysis' %>");