educode_sales 0.4.6 → 0.5.0

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 (61) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/educode_sales/businesses_controller.rb +74 -2
  3. data/app/controllers/educode_sales/follow_ups_controller.rb +1 -1
  4. data/app/controllers/educode_sales/home_controller.rb +4 -0
  5. data/app/controllers/educode_sales/operation_plans_controller.rb +16 -4
  6. data/app/controllers/educode_sales/operation_reports_controller.rb +6 -0
  7. data/app/controllers/educode_sales/operations_controller.rb +1 -1
  8. data/app/controllers/educode_sales/plans_controller.rb +29 -13
  9. data/app/controllers/educode_sales/sale_reports_controller.rb +6 -0
  10. data/app/controllers/educode_sales/sale_trends_controller.rb +8 -7
  11. data/app/controllers/educode_sales/sales_controller.rb +2 -2
  12. data/app/controllers/educode_sales/upload_files_controller.rb +105 -0
  13. data/app/models/educode_sales/common.rb +4 -0
  14. data/app/models/educode_sales/sale_plan.rb +1 -0
  15. data/app/views/educode_sales/activities/show_teachers.html.erb +16 -16
  16. data/app/views/educode_sales/businesses/edit_follow_record.html.erb +15 -0
  17. data/app/views/educode_sales/businesses/file.html.erb +154 -0
  18. data/app/views/educode_sales/businesses/index.html.erb +62 -10
  19. data/app/views/educode_sales/businesses/index.json.jbuilder +3 -1
  20. data/app/views/educode_sales/businesses/new_follow_record.html.erb +17 -0
  21. data/app/views/educode_sales/businesses/show_follow.html.erb +49 -12
  22. data/app/views/educode_sales/businesses/show_follow.json.jbuilder +3 -0
  23. data/app/views/educode_sales/businesses/show_follow_record.html.erb +80 -2
  24. data/app/views/educode_sales/businesses/time_line.html.erb +62 -0
  25. data/app/views/educode_sales/businesses/upload_file.html.erb +43 -0
  26. data/app/views/educode_sales/home/search_operation_teacher.json.jbuilder +12 -0
  27. data/app/views/educode_sales/operation_plans/_monthPlan.html.erb +7 -7
  28. data/app/views/educode_sales/operation_plans/_monthly.html.erb +8 -8
  29. data/app/views/educode_sales/operation_plans/_weekPlan.html.erb +8 -8
  30. data/app/views/educode_sales/operation_plans/_weekly.html.erb +9 -9
  31. data/app/views/educode_sales/operation_plans/edit_month.html.erb +6 -6
  32. data/app/views/educode_sales/operation_plans/edit_week.html.erb +7 -7
  33. data/app/views/educode_sales/operation_plans/new_month.html.erb +50 -4
  34. data/app/views/educode_sales/operation_plans/new_monthly.html.erb +12 -0
  35. data/app/views/educode_sales/operation_plans/new_week.html.erb +48 -5
  36. data/app/views/educode_sales/operation_plans/new_weekly.html.erb +12 -0
  37. data/app/views/educode_sales/operation_reports/audit.html.erb +22 -10
  38. data/app/views/educode_sales/operation_reports/edit.html.erb +22 -10
  39. data/app/views/educode_sales/operation_reports/show.html.erb +22 -10
  40. data/app/views/educode_sales/plans/_monthPlan.html.erb +8 -8
  41. data/app/views/educode_sales/plans/_monthly.html.erb +7 -7
  42. data/app/views/educode_sales/plans/_weekPlan.html.erb +7 -7
  43. data/app/views/educode_sales/plans/_weekly.html.erb +8 -8
  44. data/app/views/educode_sales/plans/edit_month.html.erb +7 -7
  45. data/app/views/educode_sales/plans/edit_week.html.erb +8 -8
  46. data/app/views/educode_sales/plans/new_month.html.erb +2 -2
  47. data/app/views/educode_sales/plans/new_monthly.html.erb +18 -6
  48. data/app/views/educode_sales/plans/new_week.html.erb +3 -3
  49. data/app/views/educode_sales/plans/new_weekly.html.erb +19 -7
  50. data/app/views/educode_sales/sale_reports/audit.html.erb +20 -8
  51. data/app/views/educode_sales/sale_reports/edit.html.erb +20 -8
  52. data/app/views/educode_sales/sale_reports/show.html.erb +15 -3
  53. data/app/views/educode_sales/sale_trends/trends.html.erb +6 -6
  54. data/app/views/educode_sales/teachers/index.html.erb +2 -2
  55. data/app/views/educode_sales/teachers/show_follow.html.erb +10 -4
  56. data/app/views/educode_sales/upload_files/index.json.jbuilder +13 -0
  57. data/app/views/layouts/educode_sales/application.html.erb +4 -1
  58. data/config/routes.rb +13 -0
  59. data/db/migrate/20211102085743_add_bidded_date_educode_sales_follow_ups.rb +6 -0
  60. data/lib/educode_sales/version.rb +1 -1
  61. metadata +9 -2
data/app/views/educode_sales/businesses/upload_file.html.erb ADDED
@@ -0,0 +1,43 @@
1
+ <div style="padding-left: 50px">
2
+ <button type="button" class="layui-btn" id="file"><i class="layui-icon"></i>选择文件</button>
3
+ </div>
4
+ <script>
5
+ layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
6
+ var form = layui.form,
7
+ layer = layui.layer,
8
+ table = layui.table,
9
+ laytpl = layui.laytpl,
10
+ upload = layui.upload,
11
+ request = layui.request,
12
+ $ = layui.$;
13
+ selectInput = layui.selectInput;
14
+
15
+ form.render();
16
+
17
+ //指定允许上传的文件类型
18
+ var business_id = parent.id
19
+ var renderObj = upload.render({
20
+ elem: '#file'
21
+ ,url: '/missions/upload_files?business_id='+business_id //此处配置你自己的上传接口即可
22
+ ,accept: 'file' //普通文件
23
+ ,headers: {
24
+ 'X-CSRF-Token': $('meta[name=csrf-token]').attr('content')
25
+ }
26
+ ,before: function(obj){ //obj参数包含的信息，跟 choose回调完全一致，可参见上文。
27
+ layer.load(); //上传loading
28
+ }
29
+ ,done: function(res){
30
+ layer.msg('导入成功');
31
+ table.reload('place');
32
+ layer.closeAll('loading'); //关闭loading
33
+ layer.close(parent.import_index)
34
+ }
35
+ ,error: function(index, upload){
36
+ table.reload('place');
37
+ layer.closeAll('loading'); //关闭loading
38
+ layer.alert('导入失败，请检查文件格式')
39
+ layer.close(parent.import_index)
40
+ }
41
+ });
42
+ });
43
+ </script>
data/app/views/educode_sales/home/search_operation_teacher.json.jbuilder ADDED
@@ -0,0 +1,12 @@
1
+ json.data do
2
+ json.array! @data do |d|
3
+ json.value d.id
4
+ if d.department.present?
5
+ json.name "#{d.name}(#{d.department&.school&.name}-#{d.department&.name})"
6
+ else
7
+ json.name "#{d.name}"
8
+ end
9
+ end
10
+ end
11
+ json.code 0
12
+ json.msg 'succcess'
data/app/views/educode_sales/operation_plans/_monthPlan.html.erb CHANGED
@@ -78,33 +78,33 @@
78
78
  url: '/missions/operation_plans?clazz=month',
79
79
  toolbar: '#monthPlanToolbar',
80
80
  totalRow:true,
81
- defaultToolbar: [],
81
+ defaultToolbar: ['filter'],
82
82
  cols: [
83
83
  [
84
84
  {
85
85
  field: 'id',
86
- width: 80,
86
+ width: 60,
87
87
  title:'序号',type: 'numbers',
88
88
  totalRowText:"合计",
89
89
  },
90
90
  {
91
91
  field: 'staff',
92
- width: 100,
92
+ width: 90,
93
93
  title: '姓名'
94
94
  },
95
95
  {
96
96
  field: 'teacher_name',
97
- width: 100,
97
+ width: 120,
98
98
  title: '教师姓名',
99
99
  },
100
100
  {
101
101
  field: 'school',
102
- width: 190,
102
+ width: 170,
103
103
  title: '单位'
104
104
  },
105
105
  {
106
106
  field: 'department',
107
- width: 190,
107
+ width: 170,
108
108
  title: '部门'
109
109
  },
110
110
  {
@@ -114,7 +114,7 @@
114
114
  },
115
115
  {
116
116
  field: 'count',
117
- width: 100,
117
+ width: 80,
118
118
  title: '跟进',
119
119
  totalRow:true,
120
120
  templet: '#show_follow2'
data/app/views/educode_sales/operation_plans/_monthly.html.erb CHANGED
@@ -78,19 +78,19 @@
78
78
  elem: '#monthlyTable',
79
79
  url: '/missions/operation_reports?clazz=month',
80
80
  toolbar: '#monthlyToolbar',
81
- defaultToolbar: [],
81
+ defaultToolbar: ['filter'],
82
82
  totalRow:true,
83
83
  cols: [
84
84
  [
85
85
  {
86
86
  field: 'id',
87
- width: 80,
87
+ width: 60,
88
88
  title:'序号',type: 'numbers',
89
89
  totalRowText:"合计",
90
90
  },
91
91
  {
92
92
  field: 'staff',
93
- width: 100,
93
+ width: 90,
94
94
  title: '姓名'
95
95
  },
96
96
  {
@@ -100,7 +100,7 @@
100
100
  },
101
101
  {
102
102
  field: 'finish_rate',
103
- width: 100,
103
+ width: 80,
104
104
  title: '完成率',
105
105
  totalRow:true,
106
106
  },
@@ -117,7 +117,7 @@
117
117
  },
118
118
  {
119
119
  field: 'level1_score',
120
- width: 180,
120
+ width: 120,
121
121
  title: '大区',
122
122
  templet: function (d) {
123
123
  return '<div class="star1"></div>'
@@ -125,7 +125,7 @@
125
125
  },
126
126
  {
127
127
  field: 'level2_score',
128
- width: 180,
128
+ width: 120,
129
129
  title: '总监',
130
130
  templet: function (d) {
131
131
  return '<div class="star2"></div>'
@@ -133,7 +133,7 @@
133
133
  },
134
134
  {
135
135
  field: 'level3_score',
136
- width: 180,
136
+ width: 120,
137
137
  title: '副总',
138
138
  templet: function (d) {
139
139
  return '<div class="star3"></div>'
@@ -141,7 +141,7 @@
141
141
  },
142
142
  {
143
143
  field: 'created_at',
144
- width: 300,
144
+ width: 200,
145
145
  title: '提交时间',
146
146
  },
147
147
  {
data/app/views/educode_sales/operation_plans/_weekPlan.html.erb CHANGED
@@ -79,33 +79,33 @@
79
79
  url: '/missions/operation_plans?clazz=week',
80
80
  toolbar: '#weekPlanToolbar',
81
81
  totalRow:true,
82
- defaultToolbar: [],
82
+ defaultToolbar: ['filter'],
83
83
  cols: [
84
84
  [
85
85
  {
86
86
  field: 'id',
87
- width: 80,
87
+ width: 60,
88
88
  title:'序号',type: 'numbers',
89
89
  totalRowText:"合计",
90
90
  },
91
91
  {
92
92
  field: 'staff',
93
- width: 100,
93
+ width: 80,
94
94
  title: '姓名'
95
95
  },
96
96
  {
97
97
  field: 'teacher_name',
98
- width: 100,
98
+ width: 120,
99
99
  title: '教师姓名',
100
100
  },
101
101
  {
102
102
  field: 'school',
103
- width: 190,
103
+ width: 170,
104
104
  title: '单位'
105
105
  },
106
106
  {
107
107
  field: 'department',
108
- width: 190,
108
+ width: 170,
109
109
  title: '部门'
110
110
  },
111
111
  {
@@ -115,7 +115,7 @@
115
115
  },
116
116
  {
117
117
  field: 'week',
118
- width: 100,
118
+ width: 80,
119
119
  title: '周次',
120
120
  },
121
121
  {
@@ -125,7 +125,7 @@
125
125
  },
126
126
  {
127
127
  field: 'count',
128
- width: 100,
128
+ width: 80,
129
129
  title: '跟进',
130
130
  totalRow:true,
131
131
  templet: '#show_follow1'
data/app/views/educode_sales/operation_plans/_weekly.html.erb CHANGED
@@ -80,28 +80,28 @@
80
80
  url: '/missions/operation_reports?clazz=week',
81
81
  toolbar: '#weeklyToolbar',
82
82
  totalRow:true,
83
- defaultToolbar: [],
83
+ defaultToolbar: ['filter'],
84
84
  cols: [
85
85
  [
86
86
  {
87
87
  field: 'id',
88
- width: 80,
88
+ width: 60,
89
89
  title:'序号',type: 'numbers',
90
90
  totalRowText:"合计",
91
91
  },
92
92
  {
93
93
  field: 'staff',
94
- width: 100,
94
+ width: 90,
95
95
  title: '姓名'
96
96
  },
97
97
  {
98
98
  field: 'weekly',
99
- width: 100,
99
+ width: 60,
100
100
  title: '周次'
101
101
  },
102
102
  {
103
103
  field: 'finish_rate',
104
- width: 100,
104
+ width: 80,
105
105
  title: '完成率',
106
106
  totalRow:true,
107
107
  },
@@ -118,7 +118,7 @@
118
118
  },
119
119
  {
120
120
  field: 'level1_score',
121
- width: 180,
121
+ width: 120,
122
122
  title: '大区',
123
123
  templet: function (d) {
124
124
  return '<div class="star1"></div>'
@@ -126,7 +126,7 @@
126
126
  },
127
127
  {
128
128
  field: 'level2_score',
129
- width: 180,
129
+ width: 120,
130
130
  title: '总监',
131
131
  templet: function (d) {
132
132
  return '<div class="star2"></div>'
@@ -134,7 +134,7 @@
134
134
  },
135
135
  {
136
136
  field: 'level3_score',
137
- width: 180,
137
+ width: 120,
138
138
  title: '副总',
139
139
  templet: function (d) {
140
140
  return '<div class="star3"></div>'
@@ -142,7 +142,7 @@
142
142
  },
143
143
  {
144
144
  field: 'created_at',
145
- width: 300,
145
+ width: 200,
146
146
  title: '提交时间',
147
147
  },
148
148
  {
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,15 +3,22 @@
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
+ <%if @teacher.present? %>
10
+ <div class="layui-inline">
11
+ <label class="layui-form-label required">教师</label>
12
+ <div class="layui-input-inline">
13
+ <%= select_tag "teacher_id", options_for_select(@teachers, @teacher&.id), {"lay-verify": "required", include_blank: true} %>
14
+ </div>
15
+ </div>
16
+ <%else %>
9
17
  <div class="layui-inline">
10
18
  <label class="layui-form-label required">教师</label>
11
- <div class="layui-input-inline">
12
- <%= select_tag "teacher_id", options_for_select(@teachers, @teacher&.id), {"lay-verify": "required", include_blank: true} %>
13
- </div>
19
+ <div class="layui-input-block" id="add_teacher" style="width: 400px"></div>
14
20
  </div>
21
+ <%end %>
15
22
  <div class="layui-form-item layui-form-text">
16
23
  <label class="layui-form-label">计划内容</label>
17
24
  <div class="layui-input-block">
@@ -48,6 +55,7 @@
48
55
  </div>
49
56
 
50
57
  <script>
58
+ flag2 = false
51
59
  layui.use(['form', 'table', 'laytpl', 'request'], function () {
52
60
  var form = layui.form,
53
61
  layer = layui.layer,
@@ -55,17 +63,55 @@
55
63
  request = layui.request,
56
64
  laydate = layui.laydate,
57
65
  $ = layui.$;
66
+ selectInput = layui.selectInput;
67
+
58
68
 
59
69
  form.render();
60
70
 
71
+ var add_teacher = selectInput.render({
72
+ elem: '#add_teacher',
73
+ name: 'teacher_id', // 渲染的input的name值
74
+ layFilter: 'teacher_id', //同layui form参数lay-filter
75
+ layVerify: 'required', //同layui form参数lay-verify
76
+ layVerType: 'tips', // 同layui form参数lay-verType
77
+ layReqText: '请填写文本', //同layui form参数lay-ReqText
78
+ initValue: '', // 渲染初始化默认值
79
+ hasSelectIcon: false,
80
+ placeholder: '支持姓名搜索', // 渲染的inputplaceholder值
81
+ data: [],
82
+ remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
83
+ remoteMethod: function (value, cb) { // 远程搜索的回调函数
84
+ if (!value) {
85
+ return cb([]);
86
+ }
87
+ request.get('missions/search_operation_teacher?q=' + value, {}, function (res) {
88
+ return cb(res)
89
+ })
90
+ }
91
+ });
92
+
93
+ add_teacher.on('itemSelect(add_teacher)', function (obj) {
94
+ flag2 = true
95
+ teacher_id = obj.data;
96
+ var name = obj.textContent
97
+ add_teacher.setValue(name)
98
+ });
99
+
100
+
101
+
61
102
  laydate.render({
62
103
  elem: '#new_month_plan',
104
+ layVerify: 'required', //同layui form参数lay-verify
63
105
  type: 'month'
64
106
  });
65
107
 
66
108
  var parentIndex = layer.index;
67
109
 
68
110
  form.on('submit(add_month_plan)', function (data) {
111
+ console.log(flag2);
112
+ if(flag2){
113
+ data.field.teacher_id = teacher_id
114
+ }
69
115
  request.authPost("missions/operation_plans", data.field, function (res) {
70
116
  if (res.success == false) {
71
117
  layer.alert(res.msg)
data/app/views/educode_sales/operation_plans/new_monthly.html.erb CHANGED
@@ -4,7 +4,14 @@
4
4
  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
5
5
  </div>
6
6
  </script>
7
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
7
8
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
9
+ <div class="layui-form-item">
10
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
11
+ <label>负责区域:</label>
12
+ <span><%= @area %></span>
13
+ </div>
14
+ </div>
8
15
  <div class="layui-form-item">
9
16
  <div class="layui-inline" style="margin:18px; font-weight: bold">
10
17
  <label>完成率:</label>
@@ -16,6 +23,11 @@
16
23
  <span><%= @departments_count%></span>
17
24
  <%= hidden_field_tag 'client', @departments_count, {id: 'monthly_client_hide'} %>
18
25
  </div>
26
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
27
+ <label style="margin-left: 100px">提交时间:</label>
28
+ <span><%= Time.now %></span>
29
+ <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
30
+ </div>
19
31
  </div>
20
32
  <div class="layui-form-item" style="margin-left: 18px">
21
33
  <div class="layui-form-item layui-form-text">
data/app/views/educode_sales/operation_plans/new_week.html.erb CHANGED
@@ -3,22 +3,28 @@
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">
10
10
  <label class="layui-form-label required">周次</label>
11
11
  <div class="layui-input-inline">
12
- <%= select_tag "weekly", options_for_select(@weeks), class: 'required' %>
12
+ <%= select_tag "weekly", options_for_select(@weeks,@week), class: 'required' %>
13
13
  </div>
14
14
  </div>
15
- <div class="layui-inline">
15
+ <%if @teacher.present? %>
16
+ <div class="layui-inline">
16
17
  <label class="layui-form-label required">教师</label>
17
18
  <div class="layui-input-inline">
18
-
19
19
  <%= select_tag "teacher_id", options_for_select(@teachers, @teacher&.id), {"lay-verify": "required", include_blank: true} %>
20
20
  </div>
21
- </div>
21
+ </div>
22
+ <%else %>
23
+ <div class="layui-inline">
24
+ <label class="layui-form-label required">教师</label>
25
+ <div class="layui-input-block" id="add_teacher" style="width: 400px"></div>
26
+ </div>
27
+ <%end %>
22
28
  <div class="layui-form-item layui-form-text">
23
29
  <label class="layui-form-label required">计划内容</label>
24
30
  <div class="layui-input-block">
@@ -55,6 +61,7 @@
55
61
  </div>
56
62
 
57
63
  <script>
64
+ flag = false
58
65
  layui.use(['form', 'table', 'laytpl', 'request'], function () {
59
66
  var form = layui.form,
60
67
  layer = layui.layer,
@@ -62,9 +69,40 @@
62
69
  request = layui.request,
63
70
  laydate = layui.laydate,
64
71
  $ = layui.$;
72
+ selectInput = layui.selectInput;
65
73
 
66
74
  form.render();
67
75
 
76
+ var add_teacher = selectInput.render({
77
+ elem: '#add_teacher',
78
+ name: 'teacher_id', // 渲染的input的name值
79
+ layFilter: 'teacher_id', //同layui form参数lay-filter
80
+ layVerify: 'required', //同layui form参数lay-verify
81
+ layVerType: 'tips', // 同layui form参数lay-verType
82
+ layReqText: '请填写文本', //同layui form参数lay-ReqText
83
+ initValue: '', // 渲染初始化默认值
84
+ hasSelectIcon: false,
85
+ placeholder: '支持姓名搜索', // 渲染的inputplaceholder值
86
+ data: [],
87
+ remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
88
+ remoteMethod: function (value, cb) { // 远程搜索的回调函数
89
+ if (!value) {
90
+ return cb([]);
91
+ }
92
+ request.get('missions/search_operation_teacher?q=' + value, {}, function (res) {
93
+ return cb(res)
94
+ })
95
+ }
96
+ });
97
+
98
+ add_teacher.on('itemSelect(add_teacher)', function (obj) {
99
+ flag = true
100
+ teacher_id = obj.data;
101
+ var name = obj.textContent
102
+ add_teacher.setValue(name)
103
+ });
104
+
105
+
68
106
  laydate.render({
69
107
  elem: '#new_week_plan',
70
108
  type: 'month'
@@ -72,6 +110,11 @@
72
110
 
73
111
 
74
112
  form.on('submit(add_week_plan)', function (data) {
113
+ console.log(flag);
114
+ if (flag){
115
+ data.field.teacher_id = teacher_id
116
+ }
117
+ console.log(data.field.teacher_id);
75
118
  request.authPost("missions/operation_plans", data.field, function (res) {
76
119
  if (res.success == false) {
77
120
  layer.alert(res.msg)
data/app/views/educode_sales/operation_plans/new_weekly.html.erb CHANGED
@@ -4,7 +4,14 @@
4
4
  <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加计划</button>
5
5
  </div>
6
6
  </script>
7
+ <h1 class="m-t-20 text-center">报告人员：<%=@name %></h1>
7
8
  <form class="layui-form layui-form-pane" action="" style="padding-right: 20px">
9
+ <div class="layui-form-item">
10
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
11
+ <label>负责区域:</label>
12
+ <span><%= @area %></span>
13
+ </div>
14
+ </div>
8
15
  <div class="layui-form-item">
9
16
  <div class="layui-inline" style="margin:18px; font-weight: bold">
10
17
  <label>完成率:</label>
@@ -16,6 +23,11 @@
16
23
  <span><%= @departments_count%></span>
17
24
  <%= hidden_field_tag 'client', @departments_count, {id: 'weekly_client_hide'} %>
18
25
  </div>
26
+ <div class="layui-inline" style="margin:18px; font-weight: bold">
27
+ <label style="margin-left: 100px">提交时间:</label>
28
+ <span><%= Time.now %></span>
29
+ <%= hidden_field_tag 'amount', @total_amount, {id: 'monthly_amount_hide'} %>
30
+ </div>
19
31
  </div>
20
32
  <div class="layui-form-item" style="margin-left: 18px">
21
33
  <div class="layui-form-item layui-form-text">