educode_sales 0.8.3 → 0.8.4
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 +4 -4
- data/app/controllers/educode_sales/businesses_controller.rb +1 -1
- data/app/models/educode_sales/follow_up.rb +1 -0
- data/app/views/educode_sales/assessments/_setup.html.erb +1 -1
- data/app/views/educode_sales/businesses/edit_follow_record.html.erb +4 -0
- data/app/views/educode_sales/businesses/index.json.jbuilder +1 -3
- data/app/views/educode_sales/businesses/new_follow_record.html.erb +5 -1
- data/lib/educode_sales/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e81ffa1210f4f5cf1b6a1fbed46e14c1e2b48ceadf4d3ddbd783e99105d6f0c5
|
|
4
|
+
data.tar.gz: 2a72d7ccfbdc57d17da213dfd434413d240db5f875e7dbe93ee4c39999fb3060
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d41222b3cb5afb884164c80fd17f5ce9c2babd2fd8130a21099388d8bfe891972d76519216d06d7be6aad9ec459490ad1bd6c17353c077ad242980557833f42a
|
|
7
|
+
data.tar.gz: aec876dddf899182e2f5e43fa5adb136d55e9db1864842ce7da6d151b73e99c7325098d6388044fe50648dfa5da0c3f14818917b49a7233c7027bd93fd77f8b2
|
|
@@ -350,7 +350,7 @@ module EducodeSales
|
|
|
350
350
|
size = ids.size
|
|
351
351
|
ids = ids.reverse
|
|
352
352
|
index = ids.index(id)
|
|
353
|
-
EducodeSales::FollowUp::BUSINESS_DEPLOYMENT.each do |m|
|
|
353
|
+
EducodeSales::FollowUp::BUSINESS_DEPLOYMENT[1..-1].each do |m|
|
|
354
354
|
if @follow_up.o_business_deployment == m[1]
|
|
355
355
|
@show_follow_recored_deployment = m[0]
|
|
356
356
|
break
|
|
@@ -285,6 +285,10 @@
|
|
|
285
285
|
layer.msg('请选择服务期', {time: 2000, icon: 2, shade: 0.01});
|
|
286
286
|
return false;
|
|
287
287
|
}
|
|
288
|
+
if (data.field.o_business_deployment === ''){
|
|
289
|
+
layer.msg('请选择部署类型');
|
|
290
|
+
return false // 退出添加该条记录
|
|
291
|
+
}
|
|
288
292
|
}
|
|
289
293
|
var assign_follow = [];
|
|
290
294
|
sales_list.getValue().forEach(function (d) {
|
|
@@ -18,12 +18,10 @@ json.data do
|
|
|
18
18
|
json.bidded_date d.last_follow_up&.bidded_date.to_s
|
|
19
19
|
json.signed_date d.last_follow_up&.signed_date.to_s
|
|
20
20
|
json.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
|
|
21
|
-
EducodeSales::FollowUp::BUSINESS_DEPLOYMENT.each do |m|
|
|
21
|
+
EducodeSales::FollowUp::BUSINESS_DEPLOYMENT[1..-1].each do |m|
|
|
22
22
|
if d.last_follow_up&.o_business_deployment == m[1]
|
|
23
23
|
json.o_business_deployment m[0]
|
|
24
24
|
break
|
|
25
|
-
else
|
|
26
|
-
json.o_business_deployment ''
|
|
27
25
|
end
|
|
28
26
|
end
|
|
29
27
|
json.year d.last_follow_up&.year.to_s
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
<div class="layui-inline deployment_type layui-hide">
|
|
78
78
|
<label class="layui-form-label required">部署类型</label>
|
|
79
79
|
<div class="layui-input-inline">
|
|
80
|
-
<%= select_tag "o_business_deployment", options_for_select(@deployment_type,
|
|
80
|
+
<%= select_tag "o_business_deployment", options_for_select(@deployment_type, nil ), class: 'required' %>
|
|
81
81
|
</div>
|
|
82
82
|
</div>
|
|
83
83
|
<br class="service_show layui-hide">
|
|
@@ -291,6 +291,10 @@
|
|
|
291
291
|
layer.msg('请选择服务期', {time: 2000, icon: 2, shade: 0.01});
|
|
292
292
|
return false;
|
|
293
293
|
}
|
|
294
|
+
if (data.field.o_business_deployment === ''){
|
|
295
|
+
layer.msg('请选择部署类型');
|
|
296
|
+
return false // 退出添加该条记录
|
|
297
|
+
}
|
|
294
298
|
}
|
|
295
299
|
$(".submit-btn").addClass("layui-hide");
|
|
296
300
|
var assign_follow = [];
|