app/views/educode_sales/customers/index.html.erb in educode_sales-0.9.42 vs app/views/educode_sales/customers/index.html.erb in educode_sales-0.9.43

- old
+ new

@@ -14,29 +14,30 @@ </div> </div> <div class="layui-inline"> <label class="layui-form-label">负责人</label> <div class="layui-input-inline"> - <%= select_tag "staff_id", options_for_select(@staffs,params[:staff_id]), { include_blank: true } %> + <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { include_blank: true } %> </div> </div> -<!-- <div class="layui-inline">--> -<!-- <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">--> + <!-- <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"> <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> - <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜 索 + <button type="submit" class="layui-btn layui-btn-primary" id="search_bt" lay-submit lay-filter="search_teachers">搜 + 索 </button> </div> </div> </form> </div> @@ -46,11 +47,11 @@ <span class="table-label">客户列表</span> <% if can? :create, EducodeSales::Customer %> <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加客户</button> <% end %> <% if can? :give, EducodeSales::Customer %> - <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="give">分配/移交</button> + <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="give">分配/移交</button> <% end %> </button> </div> </script> <div class=""> @@ -59,21 +60,21 @@ <script type="text/html" id="currentTableBar"> <% if can? :create_department, EducodeSales::Customer %> <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_department">添加部门</a> <% end %> <% if can? :create_follow, EducodeSales::Customer %> -<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_follow">添加跟进记录</a> + <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="add_follow">添加跟进记录</a> <% end %> <% if can? :update, EducodeSales::Customer %> -<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a> + <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a> <% end %> </script> <script type="text/html" id="business"> - <a href="/missions/businesses?school={{d.name}}" class="layui-table-link">{{ d.business }}</a> + <a href="/missions/businesses?school={{d.name}}" class="layui-table-link">{{ d.business }}</a> </script> <script type="text/html" id="name"> - <a href="<%= base_url%>/colleges/{{d.id}}/statistics" class="layui-table-link" target="_blank">{{ d.name }}</a> + <a href="<%= base_url %>/colleges/{{d.id}}/statistics" class="layui-table-link" target="_blank">{{ d.name }}</a> </script> <script type="text/html" id="department"> <a href="javascript:void(0);" lay-event="department" class="layui-table-link">{{ d.department }}</a> </script> <script type="text/html" id="follow"> @@ -100,17 +101,20 @@ // }); var property_list = xmSelect.render({ el: '#property', data: [ - {value: 0, name: '985工程'}, - {value: 1, name: '211工程'}, + // {value: 0, name: '985工程'}, + // {value: 1, name: '211工程'}, {value: 2, name: '本科院校'}, - {value: 3, name: '大专院校'}, - {value: 4, name: '中专学校'}, {value: 5, name: '军事院校'}, - {value: 6, name: '企业'} + {value: 3, name: '高职院校'}, + {value: 4, name: '中职院校'}, + {value: 7, name: '中学'}, + {value: 8, name: '小学'}, + {value: 6, name: '企业'}, + {value: 9, name: '其他'}, ] }) laydate.render({ elem: '#date', @@ -189,20 +193,19 @@ } ] ], limit: 20, - limits: [10,15,20,30,40,50,60,70,80,90], + limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90], page: true, }); //监听表格复选框选择 table.on('checkbox(customers_table)', function (obj) { }); - function edit(id) { var content = miniPage.getHrefContent('/missions/teachers/' + id + '/edit'); var openWH = miniPage.getOpenWidthHeight(); sindex = layer.open({ title: '编辑', @@ -260,11 +263,11 @@ }) // 监听搜索操作 form.on('submit(search_teachers)', function (data) { var property = []; - property_list.getValue().forEach(function(d) { + property_list.getValue().forEach(function (d) { property.push(d.value); }) data.field.property = property.toString(); search = data.field table.reload('customers_table', { @@ -312,19 +315,19 @@ content: content, }); $(window).on("resize", function () { layer.full(index); }); - }else if (obj.event === 'give') { // + } else if (obj.event === 'give') { // var school_ids = [] var checkStatus = table.checkStatus('customers_table') - ,data = checkStatus.data; - for (var i=0,len=data.length; i<len; i++){ + , data = checkStatus.data; + for (var i = 0, len = data.length; i < len; i++) { school_ids.push(data[i].id) } ids = school_ids - if(ids.length == 0){ + if (ids.length == 0) { layer.msg('请选择客户') return } content = miniPage.getHrefContent('/missions/customers/give'); openWH = miniPage.getOpenWidthHeight(); @@ -359,11 +362,10 @@ }); } }); - table.on('tool(customers_table)', function (obj) { var data = obj.data; id = data.id if (obj.event === 'edit') { // 监听添加操作 var content = miniPage.getHrefContent('/missions/customers/' + data.id + '/edit'); @@ -425,11 +427,11 @@ layer.full(sindex); }); } else if (obj.event === 'courses') { teacher_id = data.id - content = miniPage.getHrefContent('/missions/teachers/add_courses?id='+data.id); + content = miniPage.getHrefContent('/missions/teachers/add_courses?id=' + data.id); openWH = miniPage.getOpenWidthHeight(); index = layer.open({ title: '课程方向', type: 1, shade: 0.2, @@ -485,11 +487,11 @@ } }); $(window).on("resize", function () { layer.full(index); }); - } else if (obj.event === 'follow' || obj.event === 'name' ||obj.event === 'department' ) { + } else if (obj.event === 'follow' || obj.event === 'name' || obj.event === 'department') { id = data.id time = data.last_follow_time || '' content = miniPage.getHrefContent('/missions/customers/show_follow?id=' + data.id); openWH = miniPage.getOpenWidthHeight(); index = layer.open({ @@ -513,9 +515,10 @@ }); }); </script> <style> - .layui-table-tool-temp{ - padding-right: 30px; !important; + .layui-table-tool-temp { + padding-right: 30px; + !important; } </style> \ No newline at end of file