educode_sales 0.4.7 → 0.4.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/educode_sales/plans_controller.rb +9 -9
  3. data/app/controllers/educode_sales/sale_trends_controller.rb +3 -3
  4. data/app/controllers/educode_sales/sales_controller.rb +2 -2
  5. data/app/models/educode_sales/sale_plan.rb +1 -0
  6. data/app/views/educode_sales/businesses/show_follow.html.erb +8 -3
  7. data/app/views/educode_sales/operation_plans/edit_month.html.erb +6 -6
  8. data/app/views/educode_sales/operation_plans/edit_week.html.erb +7 -7
  9. data/app/views/educode_sales/operation_plans/new_month.html.erb +2 -1
  10. data/app/views/educode_sales/operation_plans/new_week.html.erb +1 -1
  11. data/app/views/educode_sales/operation_reports/audit.html.erb +2 -2
  12. data/app/views/educode_sales/operation_reports/edit.html.erb +2 -2
  13. data/app/views/educode_sales/operation_reports/show.html.erb +2 -2
  14. data/app/views/educode_sales/plans/edit_month.html.erb +6 -6
  15. data/app/views/educode_sales/plans/edit_week.html.erb +7 -7
  16. data/app/views/educode_sales/plans/new_month.html.erb +1 -1
  17. data/app/views/educode_sales/plans/new_week.html.erb +1 -1
  18. data/app/views/educode_sales/sale_reports/audit.html.erb +2 -2
  19. data/app/views/educode_sales/sale_reports/edit.html.erb +2 -2
  20. data/app/views/educode_sales/sale_reports/show.html.erb +2 -2
  21. data/app/views/educode_sales/teachers/show_follow.html.erb +9 -3
  22. data/lib/educode_sales/version.rb +1 -1
  23. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 2e609ed864a33df3f8398ab53416e7652333965a094df7965414cd93058e0965
4
- data.tar.gz: b506ac92b247f3bbdebb03ffa7e5d7e4c5bd48d0ac4e68a01919d81137cf175d
3
+ metadata.gz: '09889c1d05306828a3d6dba9b149cdd6600ada4a043c545bfb6914521fdbfe43'
4
+ data.tar.gz: 9ee3dfb7975c1270ea5adfd43b3cc0bee417a0cb7c544628486465037afd4166
5
5
  SHA512:
6
- metadata.gz: 5ef7c7f3635c83459308d71cc80e89a6f1e45b38e0fec1c65d53fe469f4fb4d75a5b1c2982cd04c7cf4fc66299742275b8fe1f655f6f656f525fb40abceac5b0
7
- data.tar.gz: 943c29ffb564e3cc318c3bc55ce6daf4dd08e5986039f463abac740d6626d6e6b062300280e0b015cc4ce31114ffe913350e0ec95540cdf70add0ee000ac0bc2
6
+ metadata.gz: 6acf74a3a544e7cc6fc44809976f549fe4f0ca55cc9e96e91044daf2a0b0acddf4807deda3967cb00310c8403fab92930f5f01fb7d17125ca904746a93b30e3d
7
+ data.tar.gz: 480ec2fc713a76af3cf6207805ee11c805cdeeaa50daefae6b148c70b976140b0ab01ba29aa4bc263b8b6fe9a6ef077c5dae8035acbbc219c5a32c2449cee336
data/app/controllers/educode_sales/plans_controller.rb CHANGED
@@ -59,7 +59,7 @@ module EducodeSales
59
59
  def create
60
60
  plan = @current_admin.sale_plans.build(plan_params)
61
61
  plan.month = params["month"] + "-1"
62
- plan.business = @current_admin.businesses.find_by(id: params[:business_id])
62
+ plan.business = Business.find_by(id: params[:business_id])
63
63
  if plan.save
64
64
  render_success
65
65
  else
@@ -78,9 +78,8 @@ module EducodeSales
78
78
  else
79
79
  @weeks = [week]
80
80
  end
81
- ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
82
- ids1 = FollowUp.where(id: ids).pluck(:business_id)
83
- @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
81
+ business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
82
+ @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id)
84
83
  @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
85
84
  render layout: false
86
85
  end
@@ -97,9 +96,8 @@ module EducodeSales
97
96
 
98
97
  def new_month
99
98
  @business = Business.find_by(id: params[:business_id])
100
- ids = AssignFollowUp.where(staff_id: @current_admin.id).pluck(:follow_up_id)
101
- ids1 = FollowUp.where(id: ids).pluck(:business_id)
102
- @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", ids1, @current_admin.id)
99
+ business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
100
+ @businesses =Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id)
103
101
  @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
104
102
  render layout: false
105
103
  end
@@ -133,7 +131,8 @@ module EducodeSales
133
131
  end
134
132
 
135
133
  def edit_week
136
- @businesses = @current_admin.businesses
134
+ business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
135
+ @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id)
137
136
  @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
138
137
  @sale_plan = SalePlan.find(params[:id])
139
138
  if @sale_plan.weekly.present?
@@ -180,7 +179,8 @@ module EducodeSales
180
179
  end
181
180
 
182
181
  def edit_month
183
- @businesses = @current_admin.businesses
182
+ business_ids = EducodeSales::AssignFollowUp.joins(:follow_up).where(staff_id: @current_admin.id).pluck :business_id
183
+ @businesses = Business.includes(:department, :last_follow_up).where("educode_sales_businesses.id in (?) or educode_sales_businesses.staff_id = ?", business_ids, @current_admin.id)
184
184
  @businesses = @businesses.map { |b| [b.name + "(" + b.department.school.name + ")" + "---" + "最新跟进:" + (b.last_follow_up.present? ? b.last_follow_up.created_at.to_s : '无'), b.id] }
185
185
  @sale_plan = SalePlan.find(params[:id])
186
186
  @finish_rates = []
data/app/controllers/educode_sales/sale_trends_controller.rb CHANGED
@@ -18,10 +18,10 @@ module EducodeSales
18
18
  @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.created_at <= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, year_over_time, stage_ids).sum(:total_amount).round(2)
19
19
  s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
20
20
  @service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.created_at <= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, year_over_time, s_stage_ids).sum(:total_amount).round(2)
21
- @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ? AND educode_sales_follow_ups.created_at <= ? ", year_time, year_over_time).sum(:amount).round(2)
22
- a = Common.where(clazz: '商机类型', name: 'A类').pluck(:id)
21
+ @return_amount = Business.joins(last_follow_up: :money_plans).where("educode_sales_follow_ups.clazz_id != ?", x).where.not("educode_sales_money_plans.clazz!= ?", 1).where("educode_sales_money_plans.date_at >= ? AND educode_sales_money_plans.date_at <= ? ", year_time, year_over_time).sum(:amount).round(2)
22
+ a = Common.where(clazz: '商机类型', name: 'A类-有预算主推').pluck(:id)
23
23
  @a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", a).sum(:total_amount).round(2)
24
- b = Common.where(clazz: '商机类型', name: 'B类').pluck(:id)
24
+ b = Common.where(clazz: '商机类型', name: 'B类-有预算不主推').pluck(:id)
25
25
  @b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id IN (?)", b).sum(:total_amount).round(2)
26
26
  end
27
27
 
data/app/controllers/educode_sales/sales_controller.rb CHANGED
@@ -12,8 +12,8 @@ module EducodeSales
12
12
  end
13
13
  format.json do
14
14
  common = Common.find_by(clazz: 'staff_type', name: '销售')
15
- @a_clazz = Common.find_by(clazz: 'business_type', name: 'A类')
16
- @b_clazz = Common.find_by(clazz: 'business_type', name: 'B类')
15
+ @a_clazz = Common.find_by(clazz: 'business_type', name: 'A类-有预算主推')
16
+ @b_clazz = Common.find_by(clazz: 'business_type', name: 'B类-有预算不主推')
17
17
  @x = Common.find_by(extras: EducodeSales::Common::XTYPE)
18
18
  @step_ids = Common.where(name: %w(已中标 已签单 已验收 回款中 服务中 已结束), clazz: 'business_step').pluck(:id)
19
19
 
data/app/models/educode_sales/sale_plan.rb CHANGED
@@ -2,6 +2,7 @@ module EducodeSales
2
2
  class SalePlan < ApplicationRecord
3
3
  belongs_to :business
4
4
  belongs_to :staff
5
+ validates :business_id, presence: true
5
6
 
6
7
  validates :month, presence: true
7
8
  end
data/app/views/educode_sales/businesses/show_follow.html.erb CHANGED
@@ -11,7 +11,9 @@
11
11
  </div>
12
12
  </script>
13
13
  <div class="edit-table">
14
- <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
14
+ <div class="z-index">
15
+ <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
16
+ </div>
15
17
  <table class="layui-hide" id="unfinish_table" lay-filter="unfinish_table" style="min-height: 300px;"></table>
16
18
  </div>
17
19
  <script type="text/html" id="currentTableBar_follow">
@@ -495,5 +497,8 @@
495
497
 
496
498
  });
497
499
  </script>
498
-
499
-
500
+ <style>
501
+ .z-index .layui-table-tool{
502
+ z-index: 10000; !important;
503
+ }
504
+ </style>
data/app/views/educode_sales/operation_plans/edit_month.html.erb CHANGED
@@ -1,7 +1,7 @@
1
- <form class="layui-form " action="">
1
+ <form class="layui-form layuimini-form" action="">
2
2
  <div class="layui-form-item" style="padding: 25px">
3
3
  <div class="layui-inline">
4
- <label class="layui-form-label">月份</label>
4
+ <label class="layui-form-label required">月份</label>
5
5
  <div class="layui-input-inline">
6
6
  <input type="text" class="layui-input" id="edit_month_plan" autocomplete="off" name="month" placeholder="请选择" value="<%=@sale_plan.month.strftime("%Y-%m") %>">
7
7
 
@@ -9,22 +9,22 @@
9
9
  </div>
10
10
  </div>
11
11
  <div class="layui-inline">
12
- <label class="layui-form-label">教师</label>
12
+ <label class="layui-form-label required">教师</label>
13
13
  <div class="layui-input-inline">
14
14
  <%= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
15
15
  </div>
16
16
  </div>
17
17
  <div class="layui-form-item layui-form-text">
18
- <label class="layui-form-label">计划内容</label>
18
+ <label class="layui-form-label required">计划内容</label>
19
19
  <div class="layui-input-block">
20
- <textarea name="content" placeholder="简要填写具体的营销计划，例如：
20
+ <textarea name="content" lay-verify="required" placeholder="简要填写具体的营销计划，例如：
21
21
  1、推动xx老师用起来；
22
22
  2、与xx老师介绍一下我们的方案；
23
23
  3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
24
24
  </div>
25
25
  </div>
26
26
  <div class="layui-inline">
27
- <label class="layui-form-label">完成率</label>
27
+ <label class="layui-form-label required">完成率</label>
28
28
  <div class="layui-input-inline">
29
29
  <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
30
30
  </div>
data/app/views/educode_sales/operation_plans/edit_week.html.erb CHANGED
@@ -1,7 +1,7 @@
1
- <form class="layui-form " action="">
1
+ <form class="layui-form layuimini-form" action="">
2
2
  <div class="layui-form-item" style="padding: 25px">
3
3
  <div class="layui-inline">
4
- <label class="layui-form-label">月份</label>
4
+ <label class="layui-form-label required">月份</label>
5
5
  <div class="layui-input-inline">
6
6
  <input type="text" class="layui-input" id="edit_week_plan" autocomplete="off" name="month" placeholder="请选择" value="<%=@sale_plan.month.strftime("%Y-%m") %>">
7
7
  <%#= select_tag "month", options_for_select(@months, @sale_plan.month.strftime("%Y-%m")), class: 'required' %>
@@ -9,7 +9,7 @@
9
9
  </div>
10
10
  <% if @sale_plan.weekly.present? %>
11
11
  <div class="layui-inline">
12
- <label class="layui-form-label">周次</label>
12
+ <label class="layui-form-label required">周次</label>
13
13
  <div class="layui-input-inline">
14
14
  <%= select_tag "weekly", options_for_select(@weeks, @sale_plan.weekly), class: 'required' %>
15
15
  </div>
@@ -17,22 +17,22 @@
17
17
  <% end %>
18
18
 
19
19
  <div class="layui-inline">
20
- <label class="layui-form-label">教师</label>
20
+ <label class="layui-form-label required">教师</label>
21
21
  <div class="layui-input-inline">
22
22
  <%= select_tag "teacher_id", options_for_select(@teachers, @sale_plan.teacher_id), class: 'required' %>
23
23
  </div>
24
24
  </div>
25
25
  <div class="layui-form-item layui-form-text">
26
- <label class="layui-form-label">计划内容</label>
26
+ <label class="layui-form-label required">计划内容</label>
27
27
  <div class="layui-input-block">
28
- <textarea name="content" placeholder="简要填写具体的营销计划，例如：
28
+ <textarea name="content" lay-verify="required" placeholder="简要填写具体的营销计划，例如：
29
29
  1、推动xx老师用起来；
30
30
  2、与xx老师介绍一下我们的方案；
31
31
  3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
32
32
  </div>
33
33
  </div>
34
34
  <div class="layui-inline">
35
- <label class="layui-form-label">完成率</label>
35
+ <label class="layui-form-label required">完成率</label>
36
36
  <div class="layui-input-inline">
37
37
  <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
38
38
  </div>
data/app/views/educode_sales/operation_plans/new_month.html.erb CHANGED
@@ -3,7 +3,7 @@
3
3
  <div class="layui-inline">
4
4
  <label class="layui-form-label required">月份</label>
5
5
  <div class="layui-input-inline">
6
- <input type="text" class="layui-input" id="new_month_plan" autocomplete="off" name="month" placeholder="请选择">
6
+ <input type="text" lay-verify="required" class="layui-input" id="new_month_plan" autocomplete="off" name="month" placeholder="请选择">
7
7
  </div>
8
8
  </div>
9
9
  <div class="layui-inline">
@@ -90,6 +90,7 @@
90
90
 
91
91
  laydate.render({
92
92
  elem: '#new_month_plan',
93
+ layVerify: 'required', //同layui form参数lay-verify
93
94
  type: 'month'
94
95
  });
95
96
 
data/app/views/educode_sales/operation_plans/new_week.html.erb CHANGED
@@ -3,7 +3,7 @@
3
3
  <div class="layui-inline">
4
4
  <label class="layui-form-label required">月份</label>
5
5
  <div class="layui-input-inline">
6
- <input type="text" class="layui-input" id="new_week_plan" autocomplete="off" name="month" placeholder="请选择">
6
+ <input type="text" lay-verify="required" class="layui-input" id="new_week_plan" autocomplete="off" name="month" placeholder="请选择">
7
7
  </div>
8
8
  </div>
9
9
  <div class="layui-inline">
data/app/views/educode_sales/operation_reports/audit.html.erb CHANGED
@@ -1,12 +1,12 @@
1
1
  <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
2
2
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
3
- <div class="layui-form-item">
3
+ <div class="layui-form-item" style="margin-bottom: 0">
4
4
  <div class="layui-inline" style="margin:18px; font-weight: bold">
5
5
  <label>负责区域:</label>
6
6
  <span><%= @area%></span>
7
7
  </div>
8
8
  </div>
9
- <div class="layui-form-item">
9
+ <div class="layui-form-item" style="margin-bottom: 0">
10
10
  <div class="layui-inline" style="margin:18px; font-weight: bold">
11
11
  <label>完成率:</label>
12
12
  <span><%= @sale_report.finish_rate %>%</span>
data/app/views/educode_sales/operation_reports/edit.html.erb CHANGED
@@ -11,13 +11,13 @@
11
11
  </script>
12
12
  <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
13
13
  <form class="layui-form layui-form-pane" style="padding-right: 20px">
14
- <div class="layui-form-item">
14
+ <div class="layui-form-item" style="margin-bottom: 0">
15
15
  <div class="layui-inline" style="margin:18px; font-weight: bold">
16
16
  <label>负责区域:</label>
17
17
  <span><%= @area%></span>
18
18
  </div>
19
19
  </div>
20
- <div class="layui-form-item">
20
+ <div class="layui-form-item" style="margin-bottom: 0">
21
21
  <div class="layui-inline" style="margin:18px; font-weight: bold">
22
22
  <label>完成率:</label>
23
23
  <span><%= @sale_report.finish_rate %>%</span>
data/app/views/educode_sales/operation_reports/show.html.erb CHANGED
@@ -1,12 +1,12 @@
1
1
  <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
2
2
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
3
- <div class="layui-form-item">
3
+ <div class="layui-form-item" style="margin-bottom: 0">
4
4
  <div class="layui-inline" style="margin:18px; font-weight: bold">
5
5
  <label>负责区域:</label>
6
6
  <span><%= @area%></span>
7
7
  </div>
8
8
  </div>
9
- <div class="layui-form-item">
9
+ <div class="layui-form-item" style="margin-bottom: 0">
10
10
  <div class="layui-inline" style="margin:18px; font-weight: bold">
11
11
  <label>完成率:</label>
12
12
  <span><%= @sale_report.finish_rate %>%</span>
data/app/views/educode_sales/plans/edit_month.html.erb CHANGED
@@ -1,28 +1,28 @@
1
1
  <form class="layui-form " action="">
2
2
  <div class="layui-form-item" style="padding: 25px">
3
3
  <div class="layui-inline">
4
- <label class="layui-form-label">月份</label>
4
+ <label class="layui-form-label required">月份</label>
5
5
  <div class="layui-input-inline">
6
6
  <input type="text" class="layui-input" id="edit_month_plan_month" autocomplete="off" name="month">
7
7
  </div>
8
8
  </div>
9
9
  <div class="layui-inline">
10
- <label class="layui-form-label">商机</label>
10
+ <label class="layui-form-label required">商机</label>
11
11
  <div class="layui-input-inline" style="width: 500px">
12
- <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), class: 'required' %>
12
+ <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), {"lay-verify": "required", include_blank: true} %>
13
13
  </div>
14
14
  </div>
15
15
  <div class="layui-form-item layui-form-text">
16
- <label class="layui-form-label">计划内容</label>
16
+ <label class="layui-form-label required">计划内容</label>
17
17
  <div class="layui-input-block">
18
- <textarea name="content" placeholder="简要填写具体的营销计划，例如：
18
+ <textarea name="content" lay-verify="required" placeholder="简要填写具体的营销计划，例如：
19
19
  1、推动xx老师用起来；
20
20
  2、与xx老师介绍一下我们的方案；
21
21
  3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
22
22
  </div>
23
23
  </div>
24
24
  <div class="layui-inline">
25
- <label class="layui-form-label">完成率</label>
25
+ <label class="layui-form-label required">完成率</label>
26
26
  <div class="layui-input-inline">
27
27
  <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
28
28
  </div>
data/app/views/educode_sales/plans/edit_week.html.erb CHANGED
@@ -1,36 +1,36 @@
1
1
  <div class="layui-form layuimini-form">
2
2
  <div class="layui-form-item" style="padding: 25px">
3
3
  <div class="layui-inline">
4
- <label class="layui-form-label">月份</label>
4
+ <label class="layui-form-label required">月份</label>
5
5
  <div class="layui-input-inline">
6
6
  <input type="text" class="layui-input" id="edit_week_plan_month" autocomplete="off" name="month">
7
7
  </div>
8
8
  </div>
9
9
  <% if @sale_plan.weekly.present? %>
10
10
  <div class="layui-inline">
11
- <label class="layui-form-label">周次</label>
11
+ <label class="layui-form-label required">周次</label>
12
12
  <div class="layui-input-inline">
13
13
  <%= select_tag "weekly", options_for_select(@weeks, @sale_plan.weekly), class: 'required' %>
14
14
  </div>
15
15
  </div>
16
16
  <% end %>
17
17
  <div class="layui-inline">
18
- <label class="layui-form-label">商机</label>
18
+ <label class="layui-form-label required">商机</label>
19
19
  <div class="layui-input-inline" style="width: 500px">
20
- <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), class: 'required' %>
20
+ <%= select_tag "business_id", options_for_select(@businesses, @sale_plan.business_id), {"lay-verify": "required", include_blank: true} %>
21
21
  </div>
22
22
  </div>
23
23
  <div class="layui-form-item layui-form-text">
24
- <label class="layui-form-label">计划内容</label>
24
+ <label class="layui-form-label required">计划内容</label>
25
25
  <div class="layui-input-block">
26
- <textarea name="content" placeholder="简要填写具体的营销计划，例如：
26
+ <textarea name="content" lay-verify="required" placeholder="简要填写具体的营销计划，例如：
27
27
  1、推动xx老师用起来；
28
28
  2、与xx老师介绍一下我们的方案；
29
29
  3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
30
30
  </div>
31
31
  </div>
32
32
  <div class="layui-inline">
33
- <label class="layui-form-label">完成率</label>
33
+ <label class="layui-form-label required">完成率</label>
34
34
  <div class="layui-input-inline">
35
35
  <%= select_tag "finish_rate", options_for_select(@finish_rates, @sale_plan.finish_rate) %>
36
36
  </div>
data/app/views/educode_sales/plans/new_month.html.erb CHANGED
@@ -3,7 +3,7 @@
3
3
  <div class="layui-inline">
4
4
  <label class="layui-form-label required">月份</label>
5
5
  <div class="layui-input-inline">
6
- <input type="text" class="layui-input" id="new_month_month" autocomplete="off" name="month">
6
+ <input type="text" lay-verify="required" class="layui-input" id="new_month_month" autocomplete="off" name="month">
7
7
  </div>
8
8
  </div>
9
9
  <div class="layui-inline">
data/app/views/educode_sales/plans/new_week.html.erb CHANGED
@@ -3,7 +3,7 @@
3
3
  <div class="layui-inline">
4
4
  <label class="layui-form-label required">月份</label>
5
5
  <div class="layui-input-inline">
6
- <input type="text" class="layui-input" id="new_week_month" autocomplete="off" name="month">
6
+ <input type="text" lay-verify="required" class="layui-input" id="new_week_month" autocomplete="off" name="month">
7
7
  </div>
8
8
  </div>
9
9
  <div class="layui-inline">
data/app/views/educode_sales/sale_reports/audit.html.erb CHANGED
@@ -1,12 +1,12 @@
1
1
  <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
2
2
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
3
- <div class="layui-form-item">
3
+ <div class="layui-form-item" style="margin-bottom: 0">
4
4
  <div class="layui-inline" style="margin:18px; font-weight: bold">
5
5
  <label>负责区域:</label>
6
6
  <span><%= @area%></span>
7
7
  </div>
8
8
  </div>
9
- <div class="layui-form-item">
9
+ <div class="layui-form-item" style="margin-bottom: 0">
10
10
  <div class="layui-inline" style="margin:18px; font-weight: bold">
11
11
  <label>完成率:</label>
12
12
  <span><%= @sale_report.finish_rate %>%</span>
data/app/views/educode_sales/sale_reports/edit.html.erb CHANGED
@@ -11,13 +11,13 @@
11
11
  </script>
12
12
  <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
13
13
  <form class="layui-form layui-form-pane" style="padding-right: 20px">
14
- <div class="layui-form-item">
14
+ <div class="layui-form-item" style="margin-bottom: 0">
15
15
  <div class="layui-inline" style="margin:18px; font-weight: bold">
16
16
  <label>负责区域:</label>
17
17
  <span><%= @area%></span>
18
18
  </div>
19
19
  </div>
20
- <div class="layui-form-item">
20
+ <div class="layui-form-item" style="margin-bottom: 0">
21
21
  <div class="layui-inline" style="margin:18px; font-weight: bold">
22
22
  <label>完成率:</label>
23
23
  <span><%= @sale_report.finish_rate %>%</span>
data/app/views/educode_sales/sale_reports/show.html.erb CHANGED
@@ -1,12 +1,12 @@
1
1
  <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
2
2
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
3
- <div class="layui-form-item">
3
+ <div class="layui-form-item" style="margin-bottom: 0">
4
4
  <div class="layui-inline" style="margin:18px; font-weight: bold">
5
5
  <label>负责区域:</label>
6
6
  <span><%= @area%></span>
7
7
  </div>
8
8
  </div>
9
- <div class="layui-form-item">
9
+ <div class="layui-form-item" style="margin-bottom: 0">
10
10
  <div class="layui-inline" style="margin:18px; font-weight: bold">
11
11
  <label>完成率:</label>
12
12
  <span><%= @sale_report.finish_rate %>%</span>
data/app/views/educode_sales/teachers/show_follow.html.erb CHANGED
@@ -6,8 +6,9 @@
6
6
  <% end %>
7
7
  </div>
8
8
  </script>
9
-
10
- <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
9
+ <div class="z-index">
10
+ <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
11
+ </div>
11
12
 
12
13
  <script type="text/html" id="currentTableBar_follow">
13
14
  <% if can? :read, EducodeSales::TeacherFollow %>
@@ -490,4 +491,9 @@
490
491
  });
491
492
 
492
493
  });
493
- </script>
494
+ </script>
495
+ <style>
496
+ .z-index .layui-table-tool{
497
+ z-index: 10000; !important;
498
+ }
499
+ </style>
data/lib/educode_sales/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EducodeSales
2
- VERSION = '0.4.7'
2
+ VERSION = '0.4.8'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: educode_sales
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.7
4
+ version: 0.4.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - anke1460
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-10-29 00:00:00.000000000 Z
11
+ date: 2021-11-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails