educode_sales 0.1.0 → 0.1.4

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.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>

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

@@ -25,8 +25,6 @@
           <%= select_tag "teacher_source", options_for_select(EducodeSales::Common.where(clazz: 'teacher_source').pluck(:name, :id)), { include_blank: true } %>
         </div>
       </div>
-      <br>
-      <br>
       <div class="layui-inline">
         <label class="layui-form-label">态度</label>
         <div class="layui-input-inline">
@@ -65,25 +63,33 @@
 <script type="text/html" id="toolbarDemo">
   <div class="layui-btn-container">
     <span class="table-label">教师列表</span>
+    <% if can? :create, EducodeSales::Teacher %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">添加</button>
+    <% end %>
     <!-- <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="search_new"> 搜索添加 -->
     </button>
   </div>
 </script>
-
-<table class="layui-hide" id="teachers_table" lay-filter="teachers_table"></table>
-
+<div class="edit-table">
+<table class="layui-hide" id="teachers_table" style="min-height: 300px;" lay-filter="teachers_table"></table>
+</div>
 <script type="text/html" id="currentTableBar">
+  <% if can? :create, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addWeek">添加周计划</a>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="addMonth">添加月计划</a>
+  <% end %>
+  <% if can? :update, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <% end %>
+  <% if can? :destroy, EducodeSales::OperationPlan %>
   <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+   <% end %>
 </script>
 <script type="text/html" id="name">
   {{# if (d.login) { }}
     <a href="/users/{{d.login}}" class="layui-table-link" target="_blank">{{ d.name }}</a>
   {{# } else {}}
-    <a href="/users/{{d.login}}" class="">{{ d.name }}</a>
+    <a href="javascript:;" class="">{{ d.name }}</a>
   {{# }}}
 </script>
 <script type="text/html" id="courses">
@@ -184,7 +190,7 @@
                     templet: "#follow"
                 },
                 {
-                    field: 'actives',
+                    field: 'teacher_used',
                     width: 120,
                     title: '学院渗透率',
                 },
@@ -212,14 +218,14 @@
                 },
                 {
                     title: '操作',
-                    minWidth: 350,
+                    minWidth: 300,
                     toolbar: '#currentTableBar',
                     align: "center",
                     fixed: 'right'
                 }
               ]
             ],
-            page: true
+            page: true,
         });
 
 
@@ -313,6 +319,7 @@
             if (obj.event === 'edit') { //编辑
                 content = miniPage.getHrefContent('/educode_sales/teachers/' + id + '/edit');
                 openWH = miniPage.getOpenWidthHeight();
+                teacher_id = id;
                 sindex = layer.open({
                     title: '编辑',
                     type: 1,
@@ -374,7 +381,8 @@
                 });
 
             } else if (obj.event === 'courses') {
-                content = miniPage.getHrefContent('/educode_sales/teachers/add_courses');
+                teacher_id = data.id
+                content = miniPage.getHrefContent('/educode_sales/teachers/add_courses?id='+data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '课程方向',
@@ -396,6 +404,7 @@
             } else if (obj.event === 'event') {
                 content = miniPage.getHrefContent('/educode_sales/teachers/add_event');
                 openWH = miniPage.getOpenWidthHeight();
+                teacher_id = obj.data.id;
                 index = layer.open({
                     title: '参与活动',
                     type: 1,
@@ -435,7 +444,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'follow') {
-                content = miniPage.getHrefContent('/educode_sales/teachers/show_follow');
+                content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '跟进记录',

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

@@ -17,7 +17,9 @@ json.data do
     json.actives d.actives
     json.students d.students
     json.regist_at d.regist_at ? d.regist_at.to_s(:date) : ''
+    json.teacher_used d.teacher_used_of_department
   end
 end
 json.code 0
+json.count @teachers.count
 json.msg 'succcess'

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

@@ -17,15 +17,19 @@
           <%= select_tag "professional_title", options_for_select(['教授', '研究员', '副教授', '副研究员', '讲师', '助理研究员', '助理教授'], @person&.professional_title), { include_blank: true, "lay-verify": "required"} %>
         </div>
       </div>
+      </div>
+      <div class="layui-block">
       <div class="layui-inline">
-        <label class="layui-form-label required" style="width: 40px;">职务</label>
-        <div class="layui-input-block" style="margin-left: 70px;">
+        <label class="layui-form-label required">职务</label>
+        <div class="layui-input-block" style="width: 188px;">
           <input type="text" name="job" autocomplete="off" lay-verify="required" class="layui-input" placeholder="请输入职务">
         </div>
       </div>
+      </div>
+      <div class="layui-block">
        <div class="layui-inline">
-         <label class="layui-form-label required" style="width: 40px;">来源</label>
-         <div class="layui-input-block" style="margin-left: 70px;">
+         <label class="layui-form-label required">来源</label>
+         <div class="layui-input-block">
            <%= select_tag "source_id", options_for_select(EducodeSales::Common.where(clazz: 'teacher_source').pluck(:name, :id)), { include_blank: true, "lay-verify": "required" } %>
          </div>
        </div>
@@ -108,7 +112,6 @@
         add_teacher.on('itemInput(add_teacher)', function (obj) {
           department_id = '';
           user_id = '';
-          
         });
 
         add_department.on('itemClear(add_department)', function() {
@@ -142,7 +145,6 @@
           data.field.user_id = user_id;
           data.field.department_id = department_id;
           data.field.activity_id = parent.activity_id;
-          console.log(data.field)
           if (department_id == "") {
             return layer.alert("请选择单位部门")
           }

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

@@ -3,53 +3,33 @@
     <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))%>
       </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))%>
       </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))%>
       </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))%>
       </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、其他个性化需求，以及应对情况说明；
@@ -58,10 +38,55 @@
       </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="add_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(add_follow_up)', function (data) {
+            data.field.teacher_id = "<%= @teacher.id %>";
+            request.authPost("educode_sales/teacher_follows", data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.sale_plan_index);
+                    parent.layer.close(parent.layer.getFrameIndex(window.name))
+                    parent.table.reload('sale_plan_follow_table')
+                    parent.table.reload('teachers_table')
+                    parent.table.reload('weekPlanTable1')
+                    parent.table.reload('monthPlanTable')
+                    parent.table.reload('monthlyTable')
+                    parent.table.reload('weeklyTable')
+                }
+            })
+
+
+            return false;
+        });
+
+    });
+</script>