educode_sales 1.10.48 → 1.10.58

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

@@ -0,0 +1,212 @@
+<div class="min-height-table" style="margin:20px">
+  <div>
+    <form class="layui-form layui-form-pane " id="list_subject_search"  lay-filter="search_form">
+      <!--      <div class="layui-row">-->
+      <!--        <h2 style="padding-left: 25px">商机名称-实践课程列表</h2>-->
+      <!--      </div>-->
+      <div class="layui-inline show_item_contract borders">
+        <label class="layui-form-label">课程状态</label>
+        <div class="layui-input-block">
+          <%= select_tag "p_state", options_for_select(
+            [["全部", -1], ["已发布", 2], ["编辑中", 0], ["待审核", 1], ["已公开", 3]]
+          ), { include_blank: true } %>
+        </div>
+      </div>
+      <div class="layui-inline borders">
+        <label class="layui-form-label" style="width: 130px">实践课程名称</label>
+        <div class="layui-input-inline">
+          <input type="text" name="name" class="layui-input" value="">
+        </div>
+      </div>
+<!--      <div class="layui-inline borders">-->
+<!--        <label class="layui-form-label">交付单位</label>-->
+<!--        <div class="layui-input-inline">-->
+<!--          <div id="school_id" style="width: 300px;"></div>-->
+<!--        </div>-->
+<!--      </div>-->
+      <div class="layui-inline borders">
+        <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_contract">搜索
+        </button>
+      </div>
+    </form>
+  </div>
+
+  <div id="contact_table_wraper">
+    <table class="layui-hide" id="subjects_table" lay-filter="subjects_table"></table>
+  </div>
+
+</div>
+<script type="text/html" id="show_list_shixun">
+  <a lay-event="show_list_shixun" style="color: deepskyblue">{{= d.shixuns_completed_progress }}</a>
+</script>
+<script id="show_state_course" type="text/html">
+  {{# if(d.status === 2 && d.public !== 1 && d.public !== 2){ }}
+  <span>已发布</span>
+  {{# } else if( d.status === 0 ){ }}
+  <span>编辑中</span>
+  {{# }else if(d.public === 1 && d.status === 2){ }}
+  <span>审核中</span>
+  {{# } else if(d.public === 2 &&  d.status === 2){ }}
+  <span>已公开</span>
+  {{# } }}
+</script>
+<script id="educode_link" type="text/html">
+  <a href="<%= @url %>/paths/{{= d.identifier}}" target="_blank" style="color: #1E9FFF">{{= d.name}}</a>
+</script>
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'laydate', 'dropdown'], function () {
+        var laydate = layui.laydate,
+            form = layui.form,
+            table = layui.table,
+            miniPage = layui.miniPage
+
+
+        laydate.render({
+            elem: '#ID-laydate-demo'
+        });
+
+        var school_id = xmSelect.render({
+            el: '#school_id',
+            remoteSearch: true,
+            autoRow: true,
+            delay: 1000,
+            radio: true,
+            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 data = form.val("search_form");
+        var cols_table = [
+            [
+                {
+                    field: 'id',
+                    width: 60,
+                    title: '序号', type: 'numbers',
+                    align: 'center'
+                },
+                {
+                    field: 'name',
+                    title: '实践课程名称',
+                    align: 'center',
+                    templet: '#educode_link'
+                },
+                {
+                    field: 'shixuns_completed_progress',
+                    templet: '#show_list_shixun',
+                    title: '实践项目数（已完成数）',
+                    align: 'center'
+                },
+                {
+                    title: '状态',
+                    align: 'center',
+                    field: 'shixun_status'
+                    // templet: "#show_state_course"
+                },
+                {
+                    field: 'deliver_date',
+                    title: '交付时间',
+                    align: 'center'
+                }
+            ]
+        ]
+
+
+        var id = localStorage.getItem("business_delvier_subject_id")
+        var subjects_table = table.render({
+            elem: '#subjects_table',
+            url: '/missions/business_courses/list_subjects?id=' + id,
+            autoSort: false,
+            where: {q: data},
+            defaultToolbar: [],
+            title: '实践课程列表',
+            totalRow: true,//开启合并行
+            cols: cols_table,
+            limit: 20,
+            limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
+            page: true,
+            skin: 'line'
+        });
+        // 重置
+        form.on('submit(reset_business_search)', function (data) {
+            table.reload('subjects_table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: {}}
+            }, 'data');
+            document.getElementById("list_subject_search").reset();
+            form.render()
+            return false;
+        });
+        var sort = {}, search = {};
+        // 监听搜索操作
+        form.on('submit(search_bussiness_contract)', function (data) {
+            search = data.field
+            console.log(search)
+            table.reload('subjects_table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: search, sort: sort}
+            }, 'data');
+            return false;
+        });
+
+        table.on('tool(subjects_table)', function (obj) {
+            var data = obj.data;
+            // 编辑按钮监听
+            if (obj.event === 'show_list_shixun') {
+                localStorage.setItem("subject_id", data.id)
+                var content = miniPage.getHrefContent('/missions/business_courses/list_shixuns');
+                var openWH = miniPage.getOpenWidthHeight();
+                list_projects = layer.open({
+                    title: data.name + '-实践项目列表',
+                    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 () {
+                });
+                return false;
+            }
+
+        });
+
+
+    });
+</script>
+
+<style>
+    .borders {
+        margin: 10px;
+    }
+</style>

data/app/views/educode_sales/business_courses/list_subjects.json.jbuilder

@@ -0,0 +1,17 @@
+json.data do
+  json.array! @subjects do |item|
+    json.identifier item.identifier
+    json.name item.name
+    # p item.status, item.public
+    # json.status item.status
+    p status item
+    json.shixun_status status item
+    json.public item.public
+    json.id item.id
+    json.shixuns_completed_progress item.shixun_compeled_count
+    json.deliver_date item.reception_at
+
+  end
+end
+json.code 0
+json.count @subjects.total_count

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

@@ -0,0 +1,237 @@
+<%= Gon::Base.render_data %>
+<form class="layui-form" action="" style="width: 90%;margin-top: 20px">
+
+  <div class="layui-form-item">
+    <label class="layui-form-label">商机名称:<span style="color: red"> *</span></label>
+    <div class="layui-input-block">
+      <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: 102px">实践课程名称:<span style="color: red"> *</span></label>
+    <div class="layui-input-block">
+      <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">交付状态:<span style="color: red"> *</span></label>
+    <div class="layui-input-block">
+      <div class="layui-col-md6">
+        <%= select_tag "p_state", options_for_select(
+          [["待建设", "constructed"], ["已签协议", "signed"], ["建设中", "construction"],
+           ["已完成", "completed"], ["已交付", "delivered"], ["已验收", "accepted"]], selected: "constructed"
+        ) %>
+      </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="manage_id" style="width: 50%"></div>
+    </div>
+  </div>
+
+  <div class="layui-form-item">
+    <label class="layui-form-label"></label>
+    <div class="layui-input-block">
+      <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+    </div>
+  </div>
+</form>
+<script>
+    layui.use(['form', 'request', 'xmSelect', 'table'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            laydate = layui.laydate,
+            table = layui.table,
+            xmSelect = layui.xmSelect,
+            $ = layui.$;
+
+        // 解决form表单中select不渲染的问题
+        form.render();
+        form.render('select', 'test')
+        // laydate.render({
+        //     elem: '#ID-laydate-demo'
+        // });
+
+        // 交付单位
+        var school_id = xmSelect.render({
+            el: '#school_id',
+            name:"school_id",
+            radio: true,
+        })
+        // 商机
+        var businesses_id = xmSelect.render({
+            el: '#businesses_id',
+            radio: true,
+            remoteSearch: true,
+            autoRow: true,
+            delay: 1000,
+            tips: '- -',
+            name: "business_id",
+            searchTips: '支持名称搜索,请至少输入一个字符',
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            on: function (data) {
+                //修改交付单位
+                if (data.arr.length > 0) {
+                    var school = [{
+                        value: data.arr[0].s_id,
+                        name: data.arr[0].s_name,
+                        disabled: true,
+                        selected: true
+                    }]
+                    // school_id.setValue(school)
+                }else{
+                    // school_id.setValue([])
+                }
+
+            },
+            remoteMethod: function (val, cb, show, pageIndex) {
+                if (!val) {
+                    return cb([]);
+                }
+                var data = val
+                $.ajax('/missions/business_courses/select_business', {
+                    method: 'get',
+                    data: {
+                        q: data,
+                        page: pageIndex
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        console.log(res)
+                        if (res.code === 0) {
+                            res.data.forEach((item)=>{
+                                item.value = item.id
+                            })
+                            cb(res.data, res.count);
+                        } else {
+                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                        }
+                    },
+
+                })
+            }
+        })
+
+
+        // 实践课程
+        var subject_ids = xmSelect.render({
+            el: '#subject_ids',
+            name: "subject_ids",
+            remoteSearch: true,
+            autoRow: true,
+            delay: 1000,
+            tips: '- -',
+            searchTips: '支持名称搜索,请至少输入一个字符',
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                if (!val) {
+                    return cb([]);
+                }
+                $.ajax('/missions/business_courses/subjects', {
+                    method: 'get',
+                    data: {
+                        q: val,
+                        page: pageIndex
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        console.log(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 manage_id = xmSelect.render({
+            el: '#manage_id',
+            name: "manage_id",
+            data: gon.staffs,
+            filterable: true,
+            tips: "- -",
+            tips: "- -",
+            paging: true,
+            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: {
+                    business:new_data
+                },
+                dataType: 'json',
+                success: function (res) {
+                    console.log(res)
+                    if (res.success) {
+                        layer.closeAll();
+                        table.reload('table', {
+                            done: function () {
+                            }
+                        });
+                    } else {
+                        layer.msg('商机已存在', {time: 2000, icon: 2, shade: 0.01});
+                    }
+                },
+                error:function (res) {
+                    layer.msg('商机已存在');
+                }
+            })
+            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) {