educode_sales 0.1.1 → 0.1.5

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

@@ -4,7 +4,7 @@ json.data do
     json.staff d.staff.user.real_name
     json.client d.client
     json.amount d.amount
-    json.content d.content.truncate(30)
+    json.content d.content.truncate(40)
     json.finish_rate "#{d.finish_rate}%"
     json.level1_score d.level1_score || 0
     json.level2_score d.level2_score || 0
@@ -14,4 +14,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_reports.count
+json.count @sale_reports.total_count

data/app/views/educode_sales/sale_reports/plans.json.jbuilder

@@ -16,4 +16,4 @@ json.data do
 end
 
 json.code 0
-json.count @sale_plans.count
+json.count @sale_plans.total_count

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

@@ -29,7 +29,8 @@
       cols: [
         [{
             field: 'id',
-            title: 'ID'
+            title: 'ID',
+            width: 80
           }, {
             field: 'name',
             title: '姓名'

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

@@ -14,4 +14,4 @@ json.data do
 end
 
 json.code 0
-json.count @staffs.count
+json.count @staffs.total_count

data/app/views/educode_sales/sales/operations.html.erb

@@ -35,13 +35,16 @@
             cols: [
                 [{
                     field: 'id',
-                    title: 'ID'
+                    title: 'ID',
+                    width: 80
                 }, {
                     field: 'name',
-                    title: '姓名'
+                    title: '姓名',
+                    width: 150
                 }, {
                     field: 'job_type',
                     title: '岗位类型',
+                    width: 120
                 }, {
                     field: 'area',
                     title: '负责区域',

data/app/views/educode_sales/sales/operations.json.jbuilder

@@ -11,4 +11,4 @@ json.data do
 end
 
 json.code 0
-json.count @staffs.count
+json.count @staffs.total_count

data/app/views/educode_sales/sessions/login.html.erb

@@ -8,7 +8,7 @@
     <div class="center">
       <div class="item">
         <span class="icon icon-2"></span>
-        <input type="text" name="username" lay-verify="required" placeholder="请输入头歌平台上登录账号" maxlength="24" />
+        <input type="text" name="username" lay-verify="required" placeholder="请输入头歌平台上登录账号/手机号/邮箱" maxlength="24" />
       </div>
 
       <div class="item">

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

@@ -33,7 +33,7 @@
     <div class="layui-form-item">
       <label class="layui-form-label required">生效日期</label>
       <div class="layui-input-block">
-        <input type="text" id="day" class="layui-input" lay-verify="required" lay-reqtext="生效日期不能为空"
+        <input type="text" id="day" autocomplete="off" class="layui-input" lay-verify="required" lay-reqtext="生效日期不能为空"
                name="enabled_at" value="<%= @staff.enabled_at&.to_s(:date) %>" placeholder="">
       </div>
     </div>
@@ -97,7 +97,6 @@
                 return false;
             }
             data.field['area_ids'] = area_ids;
-            console.log(data.field);
             request.authPut("educode_sales/staffs/" + parent.staff_id, data.field, function (res) {
                 console.log(res.success == false)
                 if (res.success == false) {
@@ -105,7 +104,7 @@
                 } else {
                     layer.close(parent.index);
                     parent.layer.close(parent.layer.getFrameIndex(window.name))
-                    parent.table.reload('staff')
+                    parent.table.reload('staff_filter')
                 }
             })
             return false;

data/app/views/educode_sales/staffs/follow_up_departments.json.jbuilder

@@ -10,4 +10,4 @@ json.data do
 end
 
 json.code 0
-json.count @schools.count
+json.count @schools.total_count

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

@@ -5,7 +5,7 @@
   </div>
 </script>
 
-<table class="layui-hide" id="staff" lay-filter="staff_filter"></table>
+<table class="layui-hide" id="staff_filter" lay-filter="staff_filter"></table>
 
 <script type="text/html" id="staff_bar">
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
@@ -23,7 +23,7 @@
 
     table = layui.table
     table.render({
-      elem: '#staff',
+      elem: '#staff_filter',
       url: '/educode_sales/staffs',
       toolbar: '#staff_topbar',
       defaultToolbar: [],
@@ -124,14 +124,14 @@
         layer.confirm('确定禁用' + data.name, function (index) {
           request.delete('educode_sales/staffs/'+ data.id + "/disable", {}, function(res) {
             layer.close(index);
-            table.reload("staff")
+            table.reload("staff_filter")
           })
         });
       } else if (obj.event === 'delete') {
         layer.confirm('确定删除' + data.name, function (index) {
           request.delete('educode_sales/staffs/'+ data.id, {}, function(res) {
             layer.close(index);
-            table.reload("staff")
+            table.reload("staff_filter")
           })
         });
       }

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

@@ -12,4 +12,4 @@ json.data do
 end
 
 json.code 0
-json.count @staffs.count
+json.count @staffs.total_count

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

@@ -64,7 +64,7 @@
                 } else {
                     layer.close(parent.index);
                     parent.layer.close(parent.layer.getFrameIndex(window.name))
-                    parent.table.reload('table')
+                    parent.table.reload('staff_filter')
                 }
             })
             return false;

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

@@ -1,53 +1,134 @@
-<table class="layui-hide" id="coursesTable" lay-filter="courses_filter"></table>
+<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">
+          <input type="text" name="name" autocomplete="off" class="layui-input" placeholder="请输入" required lay-verify="required">
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <label class="layui-form-label required" >教学角色</label>
+        <div class="layui-input-block">
+          <input type="text" name="role_name" autocomplete="off" class="layui-input" placeholder="请输入" required lay-verify="required">
+        </div>
+      </div>
+      <hr>
+      <div class="layui-form-item">
+        <div class="layui-input-block">
+          <button class="layui-btn layui-btn-normal" lay-submit lay-filter="add_course">确定添加</button>
+        </div>
+      </div>
+    </fieldset>
+    <h4 class="m-t-10">课程方向列表</h4>
+    <table class="layui-hide" id="coursesTable" lay-filter="coursesTable"></table>
+  </div>
+</div>
 
-<script type="text/html" id="courses_bar">
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+<script type="text/html" id="courses_bar1">
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">保存</a>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
 </script>
 
 <script>
-    layui.use('element', function () {
-        var element = layui.element;
-    });
     layui.use(['table', 'element'], function () {
-        var $ = layui.jquery,
-            form = layui.form,
+        var form = layui.form,
+            layer = layui.layer,
             table = layui.table,
-            element = layui.element,
-            miniPage = layui.miniPage;
+            laytpl = layui.laytpl,
+            request = layui.request,
+            $ = layui.$;
+
+        form.render();
+
+        // 当前弹出层，防止ID被覆盖
+        var parentIndex = layer.index;
+
+
+        //监听提交
+        form.on('submit(add_course)', function (data) {
+            console.log(data.field)
+            request.authPost('educode_sales/teachers/'+parent.teacher_id +'/create_course', data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    table.reload('teachers_table');
+                    table.reload('coursesTable');
+                    form.val('common_edit', {
+                        'name': '',
+                        'role_name':''
+                    })
+                }
+            })
+            return false;
+        });
+
+
+
         table.render({
             elem: '#coursesTable',
+            url: '/educode_sales/teachers/' + parent.id + "/course_subject",
             defaultToolbar: [],
             cols: [
                 [
                     {
                         field: 'id',
+                        width:100,
                         title: '序号'
                     },
                     {
-                        field: 'username',
-                        title: '课程名称'
+                        field: 'name',
+                        title: '课程名称',
+                        width:300,
+                        edit: true
                     },
                     {
-                        field: 'zhi',
+                        field: 'role_name',
                         title: '教学角色',
+                        width:300,
+                        edit: true
                     },
                     {
                         title: '操作',
-                        toolbar: '#courses_bar',
+                        toolbar: '#courses_bar1',
                         align: "center"
                     }
                 ]
             ],
-            data: [{
-                "id": "1",
-                "username": "大数据导论",
-                "zhi": "主讲教师",
-            }],
             // limits: [10, 15, 20, 25, 50, 100],
             // limit: 15,
             // page: true,
             skin: 'line'
         });
+
+
+
+        table.on('tool(coursesTable)', function (obj) {
+            var data = obj.data;
+            if (obj.event === 'edit') {
+                console.log(data);
+                request.authPut('educode_sales/teachers/' + data.id + '/update_course/', data,
+                    function(res) {
+                        if (res.success) {
+                            table.reload('coursesTable');
+                        } else {
+                            layer.alert(res.msg)
+                        }
+
+                    })
+            } else if (obj.event === 'delete') {
+                console.log(data);
+                layer.confirm('确定删除' + data.name, function (index) {
+                    request.delete('educode_sales/teachers/' + data.id + '/delete_course/', {}, function (res) {
+                        layer.close(index);
+                        table.reload("teachers_table")
+                        table.reload('coursesTable');
+                    })
+                });
+            }
+        });
+
+
     });
 </script>

data/app/views/educode_sales/teachers/course_subject.json.jbuilder

@@ -0,0 +1,10 @@
+json.data do
+  json.array! @courses do |d|
+    json.id d.id
+    json.name d.name
+    json.role_name d.role_name
+    json.teacher_id d.teacher_id
+  end
+end
+json.code 0
+json.count @courses.total_count

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

@@ -18,14 +18,14 @@
     <div class="layui-inline">
       <label class="layui-form-label required">职务</label>
       <div class="layui-input-block">
-        <input type="text" name="name" autocomplete="off" lay-verify="required"
+        <input type="text" name="job" autocomplete="off" lay-verify="required"
                class="layui-input" placeholder="请输入" value="<%= @teacher.job %>">
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">来源</label>
       <div class="layui-input-block">
-        <%= select_tag "teacher_source", options_for_select(EducodeSales::Common.where(clazz: 'teacher_source').pluck(:name, :id), @teacher.source_id), { include_blank: true } %>
+        <%= select_tag "source_id", options_for_select(EducodeSales::Common.where(clazz: 'teacher_source').pluck(:name, :id), @teacher.source_id), { include_blank: true } %>
       </div>
     </div>
     <br>
@@ -37,13 +37,15 @@
     </div>
     <br>
     <div class="layui-inline">
-      <label class="layui-form-label ">账号</label>
-      <div class="layui-input-block" id="add_department" style="width: 300px;"></div>
-    </div>
-    <div class="layui-inline">
-      <button class="layui-btn layui-btn-normal" lay-submit lay-filter="create_business">提交</button>
-      <button class="layui-btn layui-btn-normal" lay-submit lay-filter="create_business">取消</button>
+      <label class="layui-form-label">平台账号</label>
+      <div class="layui-input-block" id="user_search" style="width: 300px;"></div>
     </div>
+     <div class="layui-form-item m-t-20">
+       <div class="layui-input-block">
+         <button class="layui-btn layui-btn-normal" lay-submit lay-filter="create_teacher_btn">提交</button>
+         </button>
+       </div>
+     </div>
   </div>
 </div>
 <script>
@@ -65,7 +67,7 @@
             layVerify: 'required', //同layui form参数lay-verify
             layVerType: 'tips', // 同layui form参数lay-verType
             layReqText: '请填写文本', //同layui form参数lay-ReqText
-            initValue: '', // 渲染初始化默认值
+            initValue: "<%= @teacher.department_id %>", // 渲染初始化默认值
             hasSelectIcon: false,
             placeholder: '请输入教师注册头歌平台的手机号或邮箱', // 渲染的inputplaceholder值
             data: [gon.department],
@@ -80,24 +82,58 @@
             }
         });
 
+         var add_teacher = selectInput.render({
+            elem: '#user_search',
+            name: 'user_id', // 渲染的input的name值
+            layFilter: 'user_id', //同layui form参数lay-filter
+            // layVerify: 'required', //同layui form参数lay-verify
+            layVerType: 'tips', // 同layui form参数lay-verType
+            layReqText: '请填写文本', //同layui form参数lay-ReqText
+            initValue: '', // 渲染初始化默认值
+            hasSelectIcon: false,
+            placeholder: '支持姓名/手机号/邮箱搜索', // 渲染的inputplaceholder值
+            data: [],
+            remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
+            remoteMethod: function (value, cb) { // 远程搜索的回调函数
+              if (!value) {
+                return cb([]);
+              }
+              request.get('educode_sales/search_edu_teacher?q=' + value, {}, function (res) {
+                  console.log(res);
+                  return cb(res)
+              })
+            }
+        });
+        var user_id = "<%= @teacher.user_id || '' %>";
+
+        add_teacher.on('itemSelect(user_search)', function (obj) {
+          user_id = obj.data;
+        })
+
         // 当前弹出层，防止ID被覆盖
         var parentIndex = layer.index;
+        var department_id = "<%= @teacher.department_id %>";
+        add_department.on('itemInput(add_department2)', function (obj) {
+          department_id = '';
+        });
+        add_department.on('itemSelect(add_department2)', function (obj) {
+          department_id = obj.data;
+        })
 
         //监听提交
-        form.on('submit(create_business)', function (data) {
-            if (add_department.getValue() == "") {
-                return layer.alert("请选择单位部门")
+        form.on('submit(create_teacher_btn)', function (data) {
+            if (department_id == '') {
+              return layer.alert("请选择单位部门")
             }
-            request.authPost("educode_sales/businesses", {
-                department_id: add_department.getValue(),
-                name: data.field.name
-            }, function (res) {
+            data.field.department_id = department_id;
+            data.field.user_id = user_id;
+            request.authPut("educode_sales/teachers/"+ parent.teacher_id, data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)
                 } else {
-                    layer.close(parent.index);
+                    layer.close(parent.sindex);
                     parent.layer.close(parent.layer.getFrameIndex(window.name))
-                    parent.table.reload('businesses_table')
+                    parent.table.reload('teachers_table')
                 }
             })
 

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

@@ -3,65 +3,84 @@
     <div class="layui-inline">
       <label class="layui-form-label">教师态度</label>
       <div class="layui-input-inline">
-        <select name="quiz">
-          <option value="">请选择</option>
-          <option value="010">北京</option>
-          <option value="021">上海</option>
-          <option value="0571">杭州</option>
-        </select>
+        <%= select_tag "attitude_id",options_for_select(EducodeSales::Common.where(clazz: "teacher_attitude").pluck(:name, :id), @follow_up.attitude_id)%>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">开课计划</label>
       <div class="layui-input-inline">
-        <select name="quiz">
-          <option value="">请选择</option>
-          <option value="010">北京</option>
-          <option value="021">上海</option>
-          <option value="0571">杭州</option>
-        </select>
+        <%= select_tag "course_plan_id",options_for_select(EducodeSales::Common.where(clazz: "course_plan").pluck(:name, :id), @follow_up.course_plan_id)%>
       </div>
     </div>
     <br>
     <div class="layui-inline">
       <label class="layui-form-label">课堂建设</label>
       <div class="layui-input-inline">
-        <select name="quiz">
-          <option value="">请选择</option>
-          <option value="010">北京</option>
-          <option value="021">上海</option>
-          <option value="0571">杭州</option>
-        </select>
+        <%= select_tag "course_build_id",options_for_select(EducodeSales::Common.where(clazz: "course_build").pluck(:name, :id), @follow_up.course_build_id)%>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">跟进手段</label>
       <div class="layui-input-inline">
-        <select name="quiz">
-          <option value="">请选择</option>
-          <option value="010">北京</option>
-          <option value="021">上海</option>
-          <option value="0571">杭州</option>
-        </select>
+        <%= select_tag "follow_id",options_for_select(EducodeSales::Common.where(clazz: "contact").pluck(:name, :id), @follow_up.follow_id)%>
       </div>
     </div>
     <br>
     <div class="layui-form-item layui-form-text">
       <label class="layui-form-label">跟进小结</label>
       <div class="layui-input-block">
-        <textarea name="desc" placeholder="此处可以填写：
+        <textarea name="description" placeholder="此处可以填写：
 1、教师关注的痛点问题；
 2、教师关注的教学项目、教学成果类型；
 3、其他个性化需求，以及应对情况说明；
 4、目前态度的产生原因等。
-" class="layui-textarea"></textarea>
+" class="layui-textarea"><%= @follow_up.description %></textarea>
       </div>
     </div>
     <div class="layui-inline" style="padding-left: 50px">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
-      </button>
-      <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-search-btn">取消
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit_follow_up">提交
       </button>
     </div>
   </div>
-</form>
+</form>
+
+<script>
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            laydate = layui.laydate,
+            $ = layui.$;
+
+        // laydate.render({
+        //     elem: '#invitation_at_add'
+        // })
+        //
+        // laydate.render({
+        //     elem: '#reception_at_add'
+        // });
+
+        form.render();
+
+        form.on('submit(edit_follow_up)', function (data) {
+            request.authPut("educode_sales/teacher_follows/<%= @follow_up.id%>", data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.edit_index1);
+                    parent.layer.close(parent.layer.getFrameIndex(window.name))
+                    parent.table.reload('followTable')
+                    parent.table.reload('teachers_table')
+                    parent.table.reload('weekPlanTable1')
+                    parent.table.reload('monthPlanTable')
+                }
+            })
+
+
+            return false;
+        });
+
+    });
+</script>