educode_sales 0.9.68 → 0.9.69

data/app/views/educode_sales/activities/show_teachers.html.erb

@@ -65,7 +65,7 @@
                 {
                     field: 'name',
                     width: 90,
-                    title: '姓名',
+                    title: '用户名',
                     templet: "#name"
                 },
                 {

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

@@ -416,6 +416,11 @@
                     templet: '<div><span title="{{d.department}}">{{d.department}}</span></div>',
                     hide: gon.filter.department
                 },
+                {
+                  field: 'majors',
+                  width: 160,
+                  title: '专业',
+                },
                 {
                     field: 'follow_ups_count',
                     title: '跟进',

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

@@ -31,6 +31,9 @@ json.data do
     json.divide_money d.divide_amount.to_f.round(2)
     json.budget_amount d.budget_amount.to_f.round(2)  #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
     json.area d.department&.school&.province
+
+    json.majors d.department&.department_majors&.pluck(:name).present? ? d.department&.department_majors&.pluck(:name).join("，") : ""
+
     # school_property = d.department.school.school_property
     # property = []
 

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

@@ -24,7 +24,7 @@
               <a href="javascript:;" class="add_key" data-is_latest="<%= f.id == @latest&.id %>" data-id=<%= f.id %> data-flag="<%= f.created_at.present? ? (Time.now - f.created_at).to_f/3600 < 24 : false %>">添加关键人</a>
             <% end %>
         <br/>
-        评论: <span></span> <a href="javascript:;" class="add_comment" data-id=<%= f.id %>>评论</a> 
+        评论: <span><%= f.comment %></span> <a href="javascript:;" class="add_comment" data-id=<%= f.id %>>评论</a> 
       </p>
     </div>
   </li>
@@ -44,7 +44,7 @@
       miniPage = layui.miniPage;
       form = layui.form;
 
-    });
+
     $(".add_key").on("click", function(e) {
       var data = e.currentTarget.dataset;
       follow_up_id = data.id;
@@ -86,9 +86,12 @@
           if (l.find("textarea").val().trim() == '') {
             layer.msg('内容不能为空')
             return false;
-          } else {
-            e.currentTarget.previousElementSibling.innerHTML = l.find("textarea").val().trim();
-            layer.close(index);
+          } else { 
+            var comment = l.find("textarea").val().trim();
+            request.put('missions/follow_ups/' + follow_up_id + "/comment", {comment: comment}, function (res) {
+              e.currentTarget.previousElementSibling.innerHTML = comment;
+              layer.close(index);
+            })
           }
           return false
         },
@@ -117,4 +120,5 @@
             layer.full(sindex);
         });
     }
+    });
 </script>