educode_sales 0.3.5 → 0.3.6
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.
- checksums.yaml +5 -5
- data/app/controllers/educode_sales/businesses_controller.rb +2 -1
- data/app/controllers/educode_sales/sale_trends_controller.rb +6 -6
- data/app/controllers/educode_sales/teachers_controller.rb +1 -1
- data/app/views/educode_sales/activities/edit.html.erb +1 -1
- data/app/views/educode_sales/activities/index.html.erb +6 -7
- data/app/views/educode_sales/activities/new.html.erb +1 -1
- data/app/views/educode_sales/activities/show_teachers.html.erb +12 -12
- data/app/views/educode_sales/businesses/edit.html.erb +2 -2
- data/app/views/educode_sales/businesses/edit_follow_record.html.erb +2 -2
- data/app/views/educode_sales/businesses/edit_plan.html.erb +4 -4
- data/app/views/educode_sales/businesses/index.html.erb +9 -9
- data/app/views/educode_sales/businesses/new.html.erb +2 -2
- data/app/views/educode_sales/businesses/new_follow_record.html.erb +3 -3
- data/app/views/educode_sales/businesses/show_follow.html.erb +13 -14
- data/app/views/educode_sales/businesses/show_follow_record.html.erb +1 -1
- data/app/views/educode_sales/businesses/show_keys.html.erb +1 -1
- data/app/views/educode_sales/commons/edit.html.erb +3 -3
- data/app/views/educode_sales/commons/index.html.erb +3 -4
- data/app/views/educode_sales/commons/new.html.erb +1 -1
- data/app/views/educode_sales/operation_plans/_monthPlan.html.erb +7 -7
- data/app/views/educode_sales/operation_plans/_monthly.html.erb +7 -7
- data/app/views/educode_sales/operation_plans/_weekPlan.html.erb +7 -7
- data/app/views/educode_sales/operation_plans/_weekly.html.erb +7 -7
- data/app/views/educode_sales/operation_plans/edit_month.html.erb +1 -1
- data/app/views/educode_sales/operation_plans/edit_week.html.erb +1 -1
- data/app/views/educode_sales/operation_plans/new_month.html.erb +1 -1
- data/app/views/educode_sales/operation_plans/new_monthly.html.erb +7 -7
- data/app/views/educode_sales/operation_plans/new_week.html.erb +1 -1
- data/app/views/educode_sales/operation_plans/new_weekly.html.erb +7 -7
- data/app/views/educode_sales/operation_reports/audit.html.erb +3 -3
- data/app/views/educode_sales/operation_reports/edit.html.erb +7 -7
- data/app/views/educode_sales/operation_reports/show.html.erb +6 -6
- data/app/views/educode_sales/operations/trends.html.erb +2 -2
- data/app/views/educode_sales/places/edit.html.erb +1 -1
- data/app/views/educode_sales/places/index.html.erb +5 -6
- data/app/views/educode_sales/places/index.json.jbuilder +1 -1
- data/app/views/educode_sales/places/new.html.erb +1 -1
- data/app/views/educode_sales/plans/_monthPlan.html.erb +7 -7
- data/app/views/educode_sales/plans/_monthly.html.erb +7 -7
- data/app/views/educode_sales/plans/_weekPlan.html.erb +7 -7
- data/app/views/educode_sales/plans/_weekly.html.erb +7 -7
- data/app/views/educode_sales/plans/edit_month.html.erb +1 -1
- data/app/views/educode_sales/plans/edit_week.html.erb +1 -1
- data/app/views/educode_sales/plans/edit_weekly.html.erb +7 -7
- data/app/views/educode_sales/plans/new_month.html.erb +1 -1
- data/app/views/educode_sales/plans/new_monthly.html.erb +7 -7
- data/app/views/educode_sales/plans/new_week.html.erb +1 -1
- data/app/views/educode_sales/plans/new_weekly.html.erb +7 -7
- data/app/views/educode_sales/roles/edit.html.erb +2 -2
- data/app/views/educode_sales/roles/index.html.erb +5 -6
- data/app/views/educode_sales/roles/new.html.erb +1 -1
- data/app/views/educode_sales/sale_reports/audit.html.erb +3 -3
- data/app/views/educode_sales/sale_reports/edit.html.erb +7 -7
- data/app/views/educode_sales/sale_reports/show.html.erb +2 -2
- data/app/views/educode_sales/sale_trends/trends.html.erb +2 -2
- data/app/views/educode_sales/sales/index.html.erb +3 -4
- data/app/views/educode_sales/sales/index.json.jbuilder +1 -1
- data/app/views/educode_sales/sales/operations.html.erb +3 -4
- data/app/views/educode_sales/sales/school.html.erb +1 -1
- data/app/views/educode_sales/sales/trends.html.erb +2 -2
- data/app/views/educode_sales/sales/xschool.html.erb +1 -1
- data/app/views/educode_sales/sessions/login.html.erb +2 -2
- data/app/views/educode_sales/staffs/edit.html.erb +1 -1
- data/app/views/educode_sales/staffs/index.html.erb +5 -6
- data/app/views/educode_sales/staffs/new.html.erb +2 -2
- data/app/views/educode_sales/teachers/add_courses.html.erb +4 -4
- data/app/views/educode_sales/teachers/add_event.html.erb +1 -1
- data/app/views/educode_sales/teachers/add_keys.html.erb +5 -5
- data/app/views/educode_sales/teachers/edit.html.erb +3 -3
- data/app/views/educode_sales/teachers/edit_follow_record.html.erb +1 -1
- data/app/views/educode_sales/teachers/index.html.erb +12 -12
- data/app/views/educode_sales/teachers/new.html.erb +3 -3
- data/app/views/educode_sales/teachers/new_follow_record.html.erb +1 -1
- data/app/views/educode_sales/teachers/search_new.html.erb +1 -1
- data/app/views/educode_sales/teachers/show_class.html.erb +1 -1
- data/app/views/educode_sales/teachers/show_follow.html.erb +14 -14
- data/app/views/layouts/educode_sales/application.html.erb +14 -14
- data/lib/educode_sales/version.rb +1 -1
- metadata +7 -8
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA256:
|
3
|
+
metadata.gz: 0dad803de8e5c346726374b62fff7d15ed441d7393beb39268ae2746ab65ea3b
|
4
|
+
data.tar.gz: cd2a06c5f56011854313af1a525dee5735ef238c04da6889d0bf445834fe54e3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f0f970f1540da457f572d3718a3b1faf9e98647b77cd72eeee88a051e67bbee56e4122291298aa17558bb23ed39b7cef20de569f9d5d2003a26a6a5aebe9dd61
|
7
|
+
data.tar.gz: 620d7e7a384d8aaa2da76570ab1c471ee5d49700dd85ae68d10ea3920e836e28526021c595d87e8fb47c4c47ebcb66b43009f931ed89736fb96bd58549f39ff6
|
@@ -54,10 +54,11 @@ module EducodeSales
|
|
54
54
|
end
|
55
55
|
|
56
56
|
if params[:q].present? && params[:q][:area].present?
|
57
|
+
p = EducodeSales::Common.find(params[:q][:area]).name
|
57
58
|
@businesses = @businesses.joins("
|
58
59
|
JOIN departments ON educode_sales_businesses.department_id = departments.id
|
59
60
|
JOIN schools ON departments.school_id = schools.id
|
60
|
-
").where("province = ?",
|
61
|
+
").where("province = ?", p)
|
61
62
|
end
|
62
63
|
|
63
64
|
if params[:q].present? && params[:q][:date].present?
|
@@ -10,16 +10,16 @@ module EducodeSales
|
|
10
10
|
@years = (1..(Time.now.year - 2020)).map { |d| 2020 + d }
|
11
11
|
year_time = "#{@year}-01-01 00:00:00"
|
12
12
|
@sale_trend = SaleTrend.find_or_create_by(year: @year)
|
13
|
-
@business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ?", year_time).sum(:total_amount)
|
13
|
+
@business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ?", year_time).sum(:total_amount).round(2)
|
14
14
|
stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
|
15
|
-
@goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, stage_ids).sum(:total_amount)
|
15
|
+
@goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, stage_ids).sum(:total_amount).round(2)
|
16
16
|
s_stage_ids = Common.where(clazz: '商机阶段', name: ['已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
|
17
|
-
@service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, s_stage_ids).sum(:total_amount)
|
18
|
-
@return_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ?", year_time).sum(:return_money)
|
17
|
+
@service_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.stage_id IN (?)", year_time, s_stage_ids).sum(:total_amount).round(2)
|
18
|
+
@return_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ?", year_time).sum(:return_money).round(2)
|
19
19
|
a = Common.where(clazz: '商机类型', name: 'A类').pluck(:id)
|
20
|
-
@a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.clazz_id IN (?)", year_time, a).sum(:total_amount)
|
20
|
+
@a_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.clazz_id IN (?)", year_time, a).sum(:total_amount).round(2)
|
21
21
|
b = Common.where(clazz: '商机类型', name: 'B类').pluck(:id)
|
22
|
-
@b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.clazz_id IN (?)", year_time, b).sum(:total_amount)
|
22
|
+
@b_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.created_at >= ? AND educode_sales_follow_ups.clazz_id IN (?)", year_time, b).sum(:total_amount).round(2)
|
23
23
|
end
|
24
24
|
|
25
25
|
def sale_trends
|
@@ -59,7 +59,7 @@ module EducodeSales
|
|
59
59
|
@teachers = @teachers.joins(:department).where("departments.id in (?)", departments_ids)
|
60
60
|
end
|
61
61
|
if params[:q].present? && params[:q][:area].present?
|
62
|
-
p = EducodeSales::Common.
|
62
|
+
p = EducodeSales::Common.find(params[:q][:area]).name
|
63
63
|
@teachers = @teachers.joins("
|
64
64
|
JOIN departments ON educode_sales_teachers.department_id = departments.id
|
65
65
|
JOIN schools ON departments.school_id = schools.id
|
@@ -68,7 +68,7 @@
|
|
68
68
|
//监听提交
|
69
69
|
form.on('submit(data-reset-btn)', function (data) {
|
70
70
|
console.log(data.field);
|
71
|
-
request.authPut("
|
71
|
+
request.authPut("missions/activities/" + <%= @activity.id %>, data.field, function (res) {
|
72
72
|
if (res.success === false) {
|
73
73
|
layer.alert(res.msg)
|
74
74
|
} else {
|
@@ -35,7 +35,7 @@
|
|
35
35
|
|
36
36
|
table.render({
|
37
37
|
elem: '#activities_table',
|
38
|
-
url: '/
|
38
|
+
url: '/missions/activities',
|
39
39
|
toolbar: '#activity_toolbar',
|
40
40
|
defaultToolbar: [],
|
41
41
|
cols: [
|
@@ -81,7 +81,6 @@
|
|
81
81
|
}
|
82
82
|
]
|
83
83
|
],
|
84
|
-
height: 700,
|
85
84
|
limit: 20,
|
86
85
|
page: true
|
87
86
|
});
|
@@ -99,7 +98,7 @@
|
|
99
98
|
})
|
100
99
|
table.on('toolbar(activities_table)', function (obj) {
|
101
100
|
if (obj.event === 'add') { // 监听添加操作
|
102
|
-
var content = miniPage.getHrefContent('/
|
101
|
+
var content = miniPage.getHrefContent('/missions/activities/new');
|
103
102
|
var openWH = miniPage.getOpenWidthHeight();
|
104
103
|
index = layer.open({
|
105
104
|
title: '添加活动',
|
@@ -124,7 +123,7 @@
|
|
124
123
|
var data = obj.data;
|
125
124
|
var id = data.id
|
126
125
|
if (obj.event === 'edit') {
|
127
|
-
var content = miniPage.getHrefContent('/
|
126
|
+
var content = miniPage.getHrefContent('/missions/activities/' + id + '/edit');
|
128
127
|
var openWH = miniPage.getOpenWidthHeight();
|
129
128
|
var index = layer.open({
|
130
129
|
title: '编辑',
|
@@ -148,14 +147,14 @@
|
|
148
147
|
return false;
|
149
148
|
} else if (obj.event === 'delete') {
|
150
149
|
layer.confirm('确定删除' + data.name, function (index) {
|
151
|
-
request.delete('
|
150
|
+
request.delete('missions/activities/' + data.id, {}, function (res) {
|
152
151
|
layer.close(index);
|
153
152
|
table.reload("activities_table")
|
154
153
|
})
|
155
154
|
});
|
156
155
|
} else if (obj.event === 'teachers') {
|
157
156
|
activity_id = obj.data.id
|
158
|
-
var content = miniPage.getHrefContent('/
|
157
|
+
var content = miniPage.getHrefContent('/missions/activities/show_teachers');
|
159
158
|
openWH = miniPage.getOpenWidthHeight();
|
160
159
|
index = layer.open({
|
161
160
|
title: '活动列表/' + data.name,
|
@@ -177,7 +176,7 @@
|
|
177
176
|
}
|
178
177
|
else if (obj.event === 'teachers_count') {
|
179
178
|
activity_id = obj.data.id
|
180
|
-
content = miniPage.getHrefContent('/
|
179
|
+
content = miniPage.getHrefContent('/missions/activities/show_teachers');
|
181
180
|
openWH = miniPage.getOpenWidthHeight();
|
182
181
|
index2 = layer.open({
|
183
182
|
title: '活动列表/' + data.name,
|
@@ -69,7 +69,7 @@
|
|
69
69
|
|
70
70
|
//监听提交
|
71
71
|
form.on('submit(data-reset-btn)', function (data) {
|
72
|
-
request.authPost("
|
72
|
+
request.authPost("missions/activities", data.field, function (res) {
|
73
73
|
if (res.success === false) {
|
74
74
|
layer.alert(res.msg)
|
75
75
|
} else {
|
@@ -51,7 +51,7 @@
|
|
51
51
|
table = layui.table;
|
52
52
|
table.render({
|
53
53
|
elem: '#show_teachers_table',
|
54
|
-
url: '/
|
54
|
+
url: '/missions/teachers?activity_id=' + parent.activity_id,
|
55
55
|
toolbar: '#teacher_toolbar',
|
56
56
|
defaultToolbar: [],
|
57
57
|
cols: [
|
@@ -176,7 +176,7 @@
|
|
176
176
|
*/
|
177
177
|
table.on('toolbar(teachers_table)', function (obj) {
|
178
178
|
if (obj.event === 'add') { // 手动添加
|
179
|
-
var content = miniPage.getHrefContent('/
|
179
|
+
var content = miniPage.getHrefContent('/missions/teachers/new');
|
180
180
|
var openWH = miniPage.getOpenWidthHeight();
|
181
181
|
index = layer.open({
|
182
182
|
title: '手动添加',
|
@@ -192,8 +192,8 @@
|
|
192
192
|
layer.full(index);
|
193
193
|
});
|
194
194
|
} else if (obj.event === 'search_new') { // 搜索添加
|
195
|
-
var content = miniPage.getHrefContent('/
|
196
|
-
// var content = miniPage.getHrefContent('/
|
195
|
+
var content = miniPage.getHrefContent('/missions/teachers/new');
|
196
|
+
// var content = miniPage.getHrefContent('/missions/teachers/search_new');
|
197
197
|
var openWH = miniPage.getOpenWidthHeight();
|
198
198
|
activity_id = parent.activity_id;
|
199
199
|
index = layer.open({
|
@@ -221,7 +221,7 @@
|
|
221
221
|
var data = obj.data;
|
222
222
|
id = data.id
|
223
223
|
if (obj.event === 'edit') { //编辑
|
224
|
-
var content = miniPage.getHrefContent('/
|
224
|
+
var content = miniPage.getHrefContent('/missions/teachers/' + id + '/edit');
|
225
225
|
var openWH = miniPage.getOpenWidthHeight();
|
226
226
|
sindex = layer.open({
|
227
227
|
title: '编辑',
|
@@ -245,14 +245,14 @@
|
|
245
245
|
} else if (obj.event === 'delete') {
|
246
246
|
console.log(data);
|
247
247
|
layer.confirm('确定删除' + data.name, function (index) {
|
248
|
-
request.delete('
|
248
|
+
request.delete('missions/teachers/' + data.id, {activity_id: activity_id}, function (res) {
|
249
249
|
layer.close(index);
|
250
250
|
table.reload("activities_table")
|
251
251
|
table.reload("show_teachers_table")
|
252
252
|
})
|
253
253
|
});
|
254
254
|
} else if (obj.event === 'addWeek') {
|
255
|
-
var content = miniPage.getHrefContent('/
|
255
|
+
var content = miniPage.getHrefContent('/missions/operation_plans/new_week');
|
256
256
|
var openWH = miniPage.getOpenWidthHeight();
|
257
257
|
|
258
258
|
sindex = layer.open({
|
@@ -269,7 +269,7 @@
|
|
269
269
|
layer.full(sindex);
|
270
270
|
});
|
271
271
|
} else if (obj.event === 'addMonth') {
|
272
|
-
var content = miniPage.getHrefContent('/
|
272
|
+
var content = miniPage.getHrefContent('/missions/operation_plans/new_month');
|
273
273
|
var openWH = miniPage.getOpenWidthHeight();
|
274
274
|
sindex = layer.open({
|
275
275
|
title: '添加月计划',
|
@@ -287,7 +287,7 @@
|
|
287
287
|
|
288
288
|
} else if (obj.event === 'courses') {
|
289
289
|
teacher_id = data.id
|
290
|
-
content = miniPage.getHrefContent('/
|
290
|
+
content = miniPage.getHrefContent('/missions/teachers/add_courses?id='+data.id);
|
291
291
|
openWH = miniPage.getOpenWidthHeight();
|
292
292
|
index = layer.open({
|
293
293
|
title: '课程方向',
|
@@ -307,7 +307,7 @@
|
|
307
307
|
layer.full(index);
|
308
308
|
});
|
309
309
|
}else if (obj.event === 'event') {
|
310
|
-
content = miniPage.getHrefContent('/
|
310
|
+
content = miniPage.getHrefContent('/missions/teachers/add_event');
|
311
311
|
openWH = miniPage.getOpenWidthHeight();
|
312
312
|
teacher_id = obj.data.id
|
313
313
|
index = layer.open({
|
@@ -324,7 +324,7 @@
|
|
324
324
|
layer.full(index);
|
325
325
|
});
|
326
326
|
} else if (obj.event === 'class') {
|
327
|
-
content = miniPage.getHrefContent('/
|
327
|
+
content = miniPage.getHrefContent('/missions/teachers/show_class');
|
328
328
|
openWH = miniPage.getOpenWidthHeight();
|
329
329
|
user_id = obj.data.user_id
|
330
330
|
index = layer.open({
|
@@ -345,7 +345,7 @@
|
|
345
345
|
layer.full(index);
|
346
346
|
});
|
347
347
|
} else if (obj.event === 'follow') {
|
348
|
-
content = miniPage.getHrefContent('/
|
348
|
+
content = miniPage.getHrefContent('/missions/teachers/show_follow?id=' + data.id);
|
349
349
|
openWH = miniPage.getOpenWidthHeight();
|
350
350
|
index = layer.open({
|
351
351
|
title: '跟进记录',
|
@@ -47,7 +47,7 @@
|
|
47
47
|
department_id = "";
|
48
48
|
return cb([]);
|
49
49
|
}
|
50
|
-
request.get('
|
50
|
+
request.get('missions/search?type=department&q=' + value, {}, function (res) {
|
51
51
|
return cb(res)
|
52
52
|
})
|
53
53
|
}
|
@@ -62,7 +62,7 @@
|
|
62
62
|
layer.alert("请选择单位部门")
|
63
63
|
return false;
|
64
64
|
} else {
|
65
|
-
request.authPut("
|
65
|
+
request.authPut("missions/businesses/" + parent.id, {
|
66
66
|
department_id: department.getValue() || department_id,
|
67
67
|
name: data.field.name
|
68
68
|
}, function (res) {
|
@@ -69,7 +69,7 @@
|
|
69
69
|
<span style="margin-top: 10px; float:left;">%</span>
|
70
70
|
</div>
|
71
71
|
<div class="layui-form-item layui-form-text">
|
72
|
-
<label class="layui-form-label required"
|
72
|
+
<label class="layui-form-label required">商机说明</label>
|
73
73
|
<div class="layui-input-block">
|
74
74
|
<textarea name="description" lay-verify="required" placeholder="此处可以填写:
|
75
75
|
1、有无预算;
|
@@ -120,7 +120,7 @@
|
|
120
120
|
|
121
121
|
form.render();
|
122
122
|
form.on('submit(update_follow_up)', function (data) {
|
123
|
-
request.authPut("
|
123
|
+
request.authPut("missions/follow_ups/<%= @follow_up.id%>", data.field, function (res) {
|
124
124
|
if (res.success == false) {
|
125
125
|
layer.alert(res.msg)
|
126
126
|
} else {
|
@@ -81,7 +81,7 @@
|
|
81
81
|
|
82
82
|
//监听提交
|
83
83
|
form.on('submit(add_return_money)', function (data) {
|
84
|
-
request.authPost("
|
84
|
+
request.authPost("missions/follow_ups/" + parent.follow_up_id + "/add_money", data.field, function (
|
85
85
|
res) {
|
86
86
|
if (res.success == false) {
|
87
87
|
layer.alert(res.msg)
|
@@ -97,7 +97,7 @@
|
|
97
97
|
|
98
98
|
table.render({
|
99
99
|
elem: '#return_money_list',
|
100
|
-
url: '/
|
100
|
+
url: '/missions/follow_ups/' + parent.follow_up_id + '/money_plans',
|
101
101
|
cols: [
|
102
102
|
[{
|
103
103
|
field: 'id',
|
@@ -155,7 +155,7 @@
|
|
155
155
|
data.clazz = clazz ? clazz : obj.data.clazz;
|
156
156
|
data.plan_id = obj.data.id
|
157
157
|
if (obj.event === 'edit') {
|
158
|
-
request.authPut('
|
158
|
+
request.authPut('missions/follow_ups/' + parent.follow_up_id + "/update_money", data,
|
159
159
|
function (res) {
|
160
160
|
if (res.success) {
|
161
161
|
layer.alert('保存成功');
|
@@ -168,7 +168,7 @@
|
|
168
168
|
})
|
169
169
|
} else if (obj.event == 'delete') {
|
170
170
|
layer.confirm('确定删除回款金额为' + data.amount + "的计划", function (index) {
|
171
|
-
request.delete('
|
171
|
+
request.delete('missions/follow_ups/' + parent.follow_up_id + "/delete_money?plan_id=" + data.id, {}, function (res) {
|
172
172
|
layer.close(index);
|
173
173
|
table.reload("return_money_list");
|
174
174
|
table.reload("sale_plan_follow_table");
|
@@ -106,7 +106,7 @@
|
|
106
106
|
table = layui.table;
|
107
107
|
table.render({
|
108
108
|
elem: '#businesses_table',
|
109
|
-
url: '/
|
109
|
+
url: '/missions/businesses',
|
110
110
|
where: {q: form.val('search_form')},
|
111
111
|
toolbar: '#bussinessBar',
|
112
112
|
defaultToolbar: [],
|
@@ -197,7 +197,7 @@
|
|
197
197
|
}
|
198
198
|
]
|
199
199
|
],
|
200
|
-
|
200
|
+
|
201
201
|
limit: 20,
|
202
202
|
page: true,
|
203
203
|
skin: 'line'
|
@@ -240,7 +240,7 @@
|
|
240
240
|
|
241
241
|
table.on('toolbar(businesses_table)', function (obj) {
|
242
242
|
if (obj.event === 'add') { // 监听添加操作
|
243
|
-
var content = miniPage.getHrefContent('/
|
243
|
+
var content = miniPage.getHrefContent('/missions/businesses/new');
|
244
244
|
var openWH = miniPage.getOpenWidthHeight();
|
245
245
|
index = layer.open({
|
246
246
|
title: '添加商机',
|
@@ -266,7 +266,7 @@
|
|
266
266
|
var data = obj.data;
|
267
267
|
id = data.id
|
268
268
|
if (obj.event === 'edit') {
|
269
|
-
var content = miniPage.getHrefContent('/
|
269
|
+
var content = miniPage.getHrefContent('/missions/businesses/' + id + '/edit');
|
270
270
|
var openWH = miniPage.getOpenWidthHeight();
|
271
271
|
sindex = layer.open({
|
272
272
|
title: '编辑',
|
@@ -284,13 +284,13 @@
|
|
284
284
|
return false;
|
285
285
|
} else if (obj.event === 'delete') {
|
286
286
|
layer.confirm('确定删除' + data.name, function (index) {
|
287
|
-
request.delete('
|
287
|
+
request.delete('missions/businesses/' + data.id, {}, function (res) {
|
288
288
|
layer.close(index);
|
289
289
|
table.reload("businesses_table")
|
290
290
|
})
|
291
291
|
});
|
292
292
|
} else if (obj.event === 'addWeek') {
|
293
|
-
var content = miniPage.getHrefContent('/
|
293
|
+
var content = miniPage.getHrefContent('/missions/plans/new_week?business_id=' + obj.data.id);
|
294
294
|
var openWH = miniPage.getOpenWidthHeight();
|
295
295
|
|
296
296
|
sindex = layer.open({
|
@@ -307,7 +307,7 @@
|
|
307
307
|
layer.full(sindex);
|
308
308
|
});
|
309
309
|
} else if (obj.event === 'addMonth') {
|
310
|
-
var content = miniPage.getHrefContent('/
|
310
|
+
var content = miniPage.getHrefContent('/missions/plans/new_month?business_id=' + obj.data.id);
|
311
311
|
var openWH = miniPage.getOpenWidthHeight();
|
312
312
|
sindex = layer.open({
|
313
313
|
title: '添加月计划',
|
@@ -326,7 +326,7 @@
|
|
326
326
|
} else if (obj.event === 'show_keys') {
|
327
327
|
business_id = obj.data.id
|
328
328
|
follow_up_id = obj.data.follow_up_id;
|
329
|
-
content = miniPage.getHrefContent('/
|
329
|
+
content = miniPage.getHrefContent('/missions/businesses/show_keys');
|
330
330
|
openWH = miniPage.getOpenWidthHeight();
|
331
331
|
index = layer.open({
|
332
332
|
title: '关键人',
|
@@ -347,7 +347,7 @@
|
|
347
347
|
});
|
348
348
|
} else if (obj.event === 'show_follow') {
|
349
349
|
business_id = obj.data.id
|
350
|
-
content = miniPage.getHrefContent('/
|
350
|
+
content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + id);
|
351
351
|
openWH = miniPage.getOpenWidthHeight();
|
352
352
|
index = layer.open({
|
353
353
|
title: '商机列表/' + data.name + '的跟进记录',
|
@@ -46,7 +46,7 @@
|
|
46
46
|
if (!value) {
|
47
47
|
return cb([]);
|
48
48
|
}
|
49
|
-
request.get('
|
49
|
+
request.get('missions/search?type=department&q=' + value, {}, function (res) {
|
50
50
|
return cb(res)
|
51
51
|
})
|
52
52
|
}
|
@@ -60,7 +60,7 @@
|
|
60
60
|
if (add_department.getValue() == "") {
|
61
61
|
return layer.alert("请选择单位部门")
|
62
62
|
}
|
63
|
-
request.authPost("
|
63
|
+
request.authPost("missions/businesses", {
|
64
64
|
department_id: add_department.getValue(),
|
65
65
|
name: data.field.name
|
66
66
|
}, function (res) {
|
@@ -73,7 +73,7 @@
|
|
73
73
|
<span style="margin-top: 10px; float:left;">%</span>
|
74
74
|
</div>
|
75
75
|
<div class="layui-form-item layui-form-text">
|
76
|
-
<label class="layui-form-label required"
|
76
|
+
<label class="layui-form-label required">商机说明</label>
|
77
77
|
<div class="layui-input-block">
|
78
78
|
<textarea name="description" lay-verify="required" placeholder="此处可以填写:
|
79
79
|
1、有无预算;
|
@@ -127,7 +127,7 @@
|
|
127
127
|
console.log(data);
|
128
128
|
data.field.business_id = "<%= @business.id %>";
|
129
129
|
console.log(data.field.business_id);
|
130
|
-
// request.authPut("
|
130
|
+
// request.authPut("missions/businesses/" + data.field.business_id +"/updateMoney/", {
|
131
131
|
// return_money: 0
|
132
132
|
// }, function (res) {
|
133
133
|
// if (res.success == false) {
|
@@ -135,7 +135,7 @@
|
|
135
135
|
// } else {
|
136
136
|
// }
|
137
137
|
// })
|
138
|
-
request.authPost("
|
138
|
+
request.authPost("missions/follow_ups", data.field, function (res) {
|
139
139
|
if (res.success == false) {
|
140
140
|
layer.alert(res.msg)
|
141
141
|
} else {
|
@@ -62,7 +62,7 @@
|
|
62
62
|
|
63
63
|
table.render({
|
64
64
|
elem: '#sale_plan_follow_table',
|
65
|
-
url: '/
|
65
|
+
url: '/missions/businesses/show_follow?id=' + parent.id ,
|
66
66
|
toolbar: '#toolbarDemo_follow',
|
67
67
|
defaultToolbar: [],
|
68
68
|
cols: [
|
@@ -149,7 +149,6 @@
|
|
149
149
|
}
|
150
150
|
]
|
151
151
|
],
|
152
|
-
height: 520,
|
153
152
|
limit: 20,
|
154
153
|
page: true,
|
155
154
|
skin: 'line',
|
@@ -176,7 +175,7 @@
|
|
176
175
|
if (obj.event === 'add') { // 监听添加操作
|
177
176
|
console.log(parent.business_id);
|
178
177
|
business_id = parent.business_id
|
179
|
-
var content = miniPage.getHrefContent('/
|
178
|
+
var content = miniPage.getHrefContent('/missions/businesses/new_follow_record?id=' + parent.id);
|
180
179
|
var openWH = miniPage.getOpenWidthHeight();
|
181
180
|
sale_plan_index = layer.open({
|
182
181
|
title: '添加商机跟进记录',
|
@@ -203,7 +202,7 @@
|
|
203
202
|
if (obj.event === 'delete') {
|
204
203
|
console.log(data);
|
205
204
|
layer.confirm('确定删除ID为' + data.id + "的跟进记录", function (index) {
|
206
|
-
request.authDelete("
|
205
|
+
request.authDelete("missions/follow_ups/" + data.id, {}, function() {
|
207
206
|
obj.del();
|
208
207
|
layer.close(index);
|
209
208
|
table.reload("businesses_table");
|
@@ -211,7 +210,7 @@
|
|
211
210
|
})
|
212
211
|
});
|
213
212
|
} else if (obj.event === 'show') { // 监听添加操作
|
214
|
-
var content = miniPage.getHrefContent('/
|
213
|
+
var content = miniPage.getHrefContent('/missions/businesses/show_follow_record?follow_up_id=' + data.id);
|
215
214
|
var openWH = miniPage.getOpenWidthHeight();
|
216
215
|
var index = layer.open({
|
217
216
|
title: '查看商机跟进记录',
|
@@ -227,7 +226,7 @@
|
|
227
226
|
layer.full(index);
|
228
227
|
});
|
229
228
|
} else if (obj.event === 'edit') { // 监听添加操作
|
230
|
-
var content = miniPage.getHrefContent('/
|
229
|
+
var content = miniPage.getHrefContent('/missions/businesses/edit_follow_record?follow_up_id=' + data.id);
|
231
230
|
var openWH = miniPage.getOpenWidthHeight();
|
232
231
|
sale_plan_edit_open = layer.open({
|
233
232
|
title: '编辑商机跟进记录',
|
@@ -246,7 +245,7 @@
|
|
246
245
|
layer.full(sale_plan_edit_open);
|
247
246
|
});
|
248
247
|
} else if (obj.event === 'add_keys') { // 监听添加操作
|
249
|
-
content = miniPage.getHrefContent('/
|
248
|
+
content = miniPage.getHrefContent('/missions/teachers/add_keys?follow_up_id=' + obj.data.id);
|
250
249
|
openWH = miniPage.getOpenWidthHeight();
|
251
250
|
is_latest = obj.data.is_latest
|
252
251
|
keyindex = layer.open({
|
@@ -267,7 +266,7 @@
|
|
267
266
|
layer.full(keyindex);
|
268
267
|
});
|
269
268
|
} else if (obj.event === 'edit_plan') {
|
270
|
-
content = miniPage.getHrefContent('/
|
269
|
+
content = miniPage.getHrefContent('/missions/businesses/edit_plan');
|
271
270
|
openWH = miniPage.getOpenWidthHeight();
|
272
271
|
is_latest = obj.data.is_latest
|
273
272
|
plan_index = layer.open({
|
@@ -293,7 +292,7 @@
|
|
293
292
|
// 未完成计划
|
294
293
|
table.render({
|
295
294
|
elem: '#unfinish_table',
|
296
|
-
url: '/
|
295
|
+
url: '/missions/businesses/' + parent.id + "/unfinish_plans",
|
297
296
|
toolbar: '#unfinish_table_tabar',
|
298
297
|
defaultToolbar: [],
|
299
298
|
cols: [
|
@@ -371,7 +370,7 @@
|
|
371
370
|
*/
|
372
371
|
table.on('toolbar(unfinish_table)', function (obj) {
|
373
372
|
if (obj.event === 'addWeekPlan') { // 监听添加操作
|
374
|
-
var content = miniPage.getHrefContent('/
|
373
|
+
var content = miniPage.getHrefContent('/missions/plans/new_week?business_id=' + parent.id);
|
375
374
|
var openWH = miniPage.getOpenWidthHeight();
|
376
375
|
var index = layer.open({
|
377
376
|
title: '添加周计划',
|
@@ -391,7 +390,7 @@
|
|
391
390
|
layer.full(index);
|
392
391
|
});
|
393
392
|
} else if (obj.event === 'addMonthPlan') { // 监听添加操作
|
394
|
-
var content = miniPage.getHrefContent('/
|
393
|
+
var content = miniPage.getHrefContent('/missions/plans/new_month?business_id=' + parent.id)
|
395
394
|
var openWH = miniPage.getOpenWidthHeight();
|
396
395
|
var index = layer.open({
|
397
396
|
title: '添加月计划',
|
@@ -418,14 +417,14 @@
|
|
418
417
|
plan_id = data.id;
|
419
418
|
if (obj.event === 'delete') {
|
420
419
|
layer.confirm('确定删除ID为' + data.id + "的计划", function (index) {
|
421
|
-
request.authDelete("
|
420
|
+
request.authDelete("missions/plans/" + data.id, {}, function() {
|
422
421
|
obj.del();
|
423
422
|
layer.close(index);
|
424
423
|
})
|
425
424
|
|
426
425
|
});
|
427
426
|
} else if (obj.event === 'show') {
|
428
|
-
content = miniPage.getHrefContent('/
|
427
|
+
content = miniPage.getHrefContent('/missions/plans/show_week?id=' + data.id);
|
429
428
|
openWH = miniPage.getOpenWidthHeight();
|
430
429
|
index = layer.open({
|
431
430
|
title: data.week ? '查看周计划' : '查看月计划',
|
@@ -442,7 +441,7 @@
|
|
442
441
|
});
|
443
442
|
return false;
|
444
443
|
} else if (obj.event === 'edit') {
|
445
|
-
content = miniPage.getHrefContent('/
|
444
|
+
content = miniPage.getHrefContent('/missions/plans/edit_week?id=' + data.id);
|
446
445
|
openWH = miniPage.getOpenWidthHeight();
|
447
446
|
sindex = layer.open({
|
448
447
|
title: '编辑',
|
@@ -66,7 +66,7 @@
|
|
66
66
|
</div>
|
67
67
|
</div>
|
68
68
|
<div class="layui-form-item layui-form-text">
|
69
|
-
<label class="layui-form-label"
|
69
|
+
<label class="layui-form-label">商机说明:</label>
|
70
70
|
<div class="layui-input-block" style="padding-right: 20px;">
|
71
71
|
<pre><%= @follow_up.description %></pre>
|
72
72
|
</div>
|
@@ -49,7 +49,7 @@
|
|
49
49
|
//监听提交
|
50
50
|
form.on('submit(saveBtn)', function(data) {
|
51
51
|
|
52
|
-
request.authPost("
|
52
|
+
request.authPost("missions/commons", data.field, function(res) {
|
53
53
|
console.log(res.success == false)
|
54
54
|
if (res.success == false) {
|
55
55
|
layer.alert(res.msg)
|
@@ -68,7 +68,7 @@
|
|
68
68
|
|
69
69
|
table.render({
|
70
70
|
elem: '#edit_table',
|
71
|
-
url: '/
|
71
|
+
url: '/missions/commons/' + parent.commont_id,
|
72
72
|
cols: [
|
73
73
|
[{
|
74
74
|
field: 'id',
|
@@ -96,7 +96,7 @@
|
|
96
96
|
table.on('tool(edit_table)', function (obj) {
|
97
97
|
var data = obj.data;
|
98
98
|
if (obj.event === 'edit') {
|
99
|
-
request.authPut('
|
99
|
+
request.authPut('missions/commons/' + data.id, data,
|
100
100
|
function(res) {
|
101
101
|
if (res.success) {
|
102
102
|
table.reload('edit_table')
|
@@ -21,7 +21,7 @@
|
|
21
21
|
|
22
22
|
table.render({
|
23
23
|
elem: '#table',
|
24
|
-
url: '/
|
24
|
+
url: '/missions/commons',
|
25
25
|
toolbar: '#toolbarDemo',
|
26
26
|
defaultToolbar: [],
|
27
27
|
cols: [
|
@@ -49,7 +49,6 @@
|
|
49
49
|
}
|
50
50
|
]
|
51
51
|
],
|
52
|
-
height: 700,
|
53
52
|
limit: 20,
|
54
53
|
page: true,
|
55
54
|
skin: 'line'
|
@@ -80,7 +79,7 @@
|
|
80
79
|
*/
|
81
80
|
table.on('toolbar(table)', function (obj) {
|
82
81
|
if (obj.event === 'add') { // 监听添加操作
|
83
|
-
var content = miniPage.getHrefContent('/
|
82
|
+
var content = miniPage.getHrefContent('/missions/commons/new');
|
84
83
|
var openWH = miniPage.getOpenWidthHeight();
|
85
84
|
|
86
85
|
index = layer.open({
|
@@ -104,7 +103,7 @@
|
|
104
103
|
var data = obj.data;
|
105
104
|
commont_id = data.id;
|
106
105
|
if (obj.event === 'edit') {
|
107
|
-
var content = miniPage.getHrefContent('/
|
106
|
+
var content = miniPage.getHrefContent('/missions/commons/' + data.id + '/edit');
|
108
107
|
var openWH = miniPage.getOpenWidthHeight();
|
109
108
|
var index = layer.open({
|
110
109
|
title: '编辑字典',
|