educode_sales 0.9.68 → 0.9.70

data/app/models/educode_sales/project.rb

@@ -0,0 +1,53 @@
+module EducodeSales
+  class Project < ApplicationRecord
+    self.table_name = "educode_sales_businesses"
+
+    enum p_stage: %w[合同阶段 验收阶段 回款阶段]
+    enum p_difficulty: %w[困难 适中 容易]
+    enum p_special: %w[是 否]
+    enum p_status: %w[未完成 已完成]
+
+    def self.save_history(attr, old_value, new_value)
+      # old_value = St.find_by(id: old_value)&.name
+      # new_value = Department.find_by(id: new_value)&.name
+      case attr
+      when "p_stage"
+        "项目阶段由“#{old_value}”变更为“#{new_value}”"
+      when "p_difficulty"
+        "项目难度由“#{old_value}”变更为“#{new_value}”"
+      when "p_special"
+        "定制由“#{old_value}”变更为“#{new_value}”"
+      when "p_status"
+        "交付由“#{old_value}”变更为“#{new_value}”"
+      when "p_staff_id"
+        old_value = Staff.find_by(id: old_value)&.user&.real_name
+        new_value = Staff.find_by(id: new_value)&.user&.real_name
+        "指派人由“#{old_value}”变更为“#{new_value}”"
+      when "p_sale_staff_id"
+        old_value = Staff.find_by(id: old_value)&.user&.real_name
+        new_value = Staff.find_by(id: new_value)&.user&.real_name
+        "销售经理由“#{old_value}”变更为“#{new_value}”"
+      when "p_course_time"
+        "课程交付时间由“#{old_value}”变更为“#{new_value}”"
+      when "p_platform_time"
+        "平台交付时间由“#{old_value}”变更为“#{new_value}”"
+      when "p_deploy_time"
+        "现场部署时间由“#{old_value}”变更为“#{new_value}”"
+      when "p_accept_time"
+        "实际验收时间由“#{old_value}”变更为“#{new_value}”"
+      when "p_pre_money_time"
+        "拟定回款时间由“#{old_value}”变更为“#{new_value}”"
+      when "p_actual_money_time"
+        "实际回款时间由“#{old_value}”变更为“#{new_value}”"
+      when "p_money"
+        "回款由“#{old_value}”变更为“#{new_value}”"
+      when "p_content"
+        "问题备注由“#{old_value}”变更为“#{new_value}”"
+      when "p_pre_accept_time"
+        "预计验收时间由“#{old_value}”变更为“#{new_value}”"
+      else
+        nil
+      end
+    end
+  end
+end

data/app/models/educode_sales/role_area.rb

@@ -11,7 +11,8 @@ module EducodeSales
       '客户管理': 'Customer',
       '回款管理': 'MoneyPlan',
       '绩效考核': 'AssessmentsSetting',
-      '方案管理': 'Idea'
+      '方案管理': 'Idea',
+      '项目管理': 'Project'
     }
   end
 end

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: '跟进',
@@ -523,6 +528,14 @@
                     sort: true,
                     hide: gon.filter.o_business_deployment
                 },
+                {
+                    field: 'p_deploy_time',
+                    width: 150,
+                    title: '部署时间',
+                    sort: true,
+                    hide: gon.filter.p_deploy_time
+                },
+                
                 {
                     field: 'budget_amount',
                     width: 105,

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 = []
 
@@ -64,7 +67,8 @@ json.data do
     json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
     json.self_flag (d.staff_id == @current_admin.id) || (d.last_follow_up_id.in? follow_up_ids)
     json.followed  d.users.pluck(:user_id).include?(@current_admin.user.id) ? 1 : 0 # d.users.where(user_id:@current_admin.user.id).first ? 1 : 0
-    end
+    json.p_deploy_time d.p_deploy_time
+  end
 end
 
 json.totalRow do

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
         },
@@ -98,6 +101,7 @@
       });
      
     })
+    });
     function demo(){
         layer.closeAll()
         business_id = parent.business_id
@@ -117,4 +121,5 @@
             layer.full(sindex);
         });
     }
+
 </script>