educode_sales 0.9.78 → 0.9.79

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7b22a3361ca68bbfaa0704aa28aeecb7f2906973b836971183936c3c13910fbe
4
- data.tar.gz: 35b7435979cecacdc00bae4b28bf3112e8e6cb5a1b36cd2a8035e91fc817d36b
3
+ metadata.gz: e35598f2024ca7c1f138093b0fcd9dce947d35d35ebb6a96f4b943c808c52c85
4
+ data.tar.gz: a7e7602b92b9050a05fba0e97904ba1689fe0becb716ce81a9593db50c7668f9
5
5
  SHA512:
6
- metadata.gz: 18719f022f0e3d7d1d91f4f111ecd8b234b450e5244874bf21fce753220e2a7c8e0bb02341c88ac8e6d2f9a5dd4f6540d72c41b1db9f0b1a76025654b8c006d0
7
- data.tar.gz: 5a6d3f438a743d0004351c9d2361c60b2b79da3d468a4776954fc577f263bcd784022bca5c3ba2cddb094dfba9a66be609ef7614469ba5b6b66461183f8decbe
6
+ metadata.gz: b765e6ce6015e1253d0352cda77169bc34c1b43d60fd6eac60975099a15d9459eee2fae17f1f81adbd52cb50f99c6ef40b619426e1b9c5b7df769da6c6b87ba0
7
+ data.tar.gz: e4df5cae9dfe1a18e38ad5a8fade16aa9e73d710d31515c8ec8faa24253a07a4d9aaba78c76ce2732d297577caa0aaab58d3d350736834cec467dfe4d426be49
@@ -322,9 +322,11 @@ module EducodeSales
322
322
  end
323
323
 
324
324
  @business = Business.find(params[:business_id])
325
- follow_up = @business.follow_ups.build(follow_up_params)
326
- follow_up.stage = @business.last_follow_up.stage
327
- follow_up.clazz = @business.last_follow_up.clazz
325
+ last_follow_up = @business.last_follow_up
326
+
327
+ follow_up = last_follow_up.dup
328
+ follow_up.assign_attributes(follow_up_params)
329
+ follow_up.description = params[:content]
328
330
  if params[:service_time].present?
329
331
  date = params[:service_time].split(" - ")
330
332
  follow_up.service_start_time = date[0]
@@ -333,8 +335,6 @@ module EducodeSales
333
335
  end
334
336
  follow_up.staff = @current_admin
335
337
 
336
- last_follow_up = @business.last_follow_up
337
-
338
338
  if follow_up.save!
339
339
  contract_lists = EducodeSales::ContractDateList.clazzs.invert
340
340
  data.each_with_index do |s, i|
@@ -21,22 +21,6 @@
21
21
  <%= select_tag "staff_id", options_for_select(@staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true , "lay-search": "" } %>
22
22
  </div>
23
23
  </div>
24
- <div class="layui-inline">
25
- <label class="layui-form-label">商机变化</label>
26
- <div class="layui-input-inline">
27
- <select name="clazz_changes">
28
- <option value=""></option>
29
- <option value="1">商机降级</option>
30
- <option value="2">商机晋级</option>
31
- <option value="3">商机降级 A-X</option>
32
- <option value="4">商机降级 AB-X</option>
33
- <option value="5">商机降级 ABC-X</option>
34
- <option value="6">商机晋级 B-A</option>
35
- <option value="7">商机晋级 BC-A</option>
36
- <option value="8">商机晋级 BCD-A</option>
37
- </select>
38
- </div>
39
- </div>
40
24
  <div class="layui-inline">
41
25
  <label class="layui-form-label">销售经理</label>
42
26
  <div class="layui-input-inline">
@@ -49,12 +33,6 @@
49
33
  <%= select_tag "after_sales_staff_id", options_for_select(@after_sales_staffs, params[:staff_id]), { 'lay-filter': 'staff_id', include_blank: true , "lay-search": "" } %>
50
34
  </div>
51
35
  </div>
52
- <div class="layui-inline show_item_contract" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
53
- <label class="layui-form-label">项目类型</label>
54
- <div class="layui-input-inline">
55
- <div id="contract_business_type" style="width: 190px;"></div>
56
- </div>
57
- </div>
58
36
  <div class="layui-inline show_item_contract" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
59
37
  <label class="layui-form-label">项目阶段</label>
60
38
  <div class="layui-input-inline">
@@ -79,12 +57,7 @@
79
57
  <%= select_tag "business_year", options_for_select((2015..Time.now.year).to_a.reverse, params[:business_year]), { include_blank: true } %>
80
58
  </div>
81
59
  </div>
82
- <div class="layui-inline show_item_contract" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
83
- <label class="layui-form-label">招标时间</label>
84
- <div class="layui-input-inline">
85
- <input type="text" class="layui-input" id="invitation_at" name="invitation_at" placeholder=" - " autocomplete="off">
86
- </div>
87
- </div>
60
+
88
61
  <div class="layui-inline show_item_contract" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
89
62
  <label class="layui-form-label">中标时间</label>
90
63
  <div class="layui-input-inline">
@@ -103,12 +76,6 @@
103
76
  <input type="text" class="layui-input" id="date_at" name="date_at" placeholder=" - " autocomplete="off">
104
77
  </div>
105
78
  </div>
106
- <div class="layui-inline show_item_contract" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
107
- <label class="layui-form-label">创建时间</label>
108
- <div class="layui-input-inline">
109
- <input type="text" class="layui-input" id="date" name="date" placeholder=" - " autocomplete="off">
110
- </div>
111
- </div>
112
79
  <div class="layui-inline show_item_contract" style="<%= params[:name] || params[:type] ? '' : 'display:none;' %>">
113
80
  <label class="layui-form-label">部署类型</label>
114
81
  <div class="layui-input-inline">
@@ -185,12 +152,6 @@
185
152
  });
186
153
 
187
154
 
188
- var business_type_list = xmSelect.render({
189
- el: '#contract_business_type',
190
- data: gon.business_type
191
- })
192
-
193
-
194
155
  var business_step_list = xmSelect.render({
195
156
  el: '#contract_business_step',
196
157
  data: gon.business_step
@@ -316,22 +316,22 @@
316
316
  <div class="layui-inline">
317
317
  <label class="layui-form-label">约定服务期:</label>
318
318
  <div class="layui-input-inline" style="line-height: 38px;">
319
- <input type="text" class="layui-input date" name="service_start_time" autocomplete="off">
319
+ <input type="text" class="layui-input date" name="service_start_time" autocomplete="off" value="<%= @last_follow_up&.service_start_time %>">
320
320
  </div>
321
321
  <div class="layui-input-inline" style="line-height: 38px;text-align:center;width:30px;">-</div>
322
322
  <div class="layui-input-inline" style="line-height: 38px;">
323
- <input type="text" class="layui-input date" name="service_end_time" autocomplete="off">
323
+ <input type="text" class="layui-input date" name="service_end_time" autocomplete="off" value="<%= @last_follow_up&.service_end_time %>">
324
324
  </div>
325
325
  </div>
326
326
  <div class="layui-inline">
327
327
  <label class="layui-form-label" style="width:100px;">验收后:</label>
328
328
  <div class="layui-input-inline" style="line-height: 38px;width:60px;">
329
- <input type="text" class="layui-input" name="service_years" autocomplete="off">
329
+ <input type="text" class="layui-input" name="service_years" autocomplete="off" value="<%= @last_follow_up&.service_years %>">
330
330
  </div>
331
331
  <div class="layui-form-mid layui-word-aux">年</div>
332
332
  </div>
333
- <div class="layui-form-item layui-form-text required" style="margin-top:25px;">
334
- <label class="layui-form-label">最新根据记录:</label>
333
+ <div class="layui-form-item layui-form-text" style="margin-top:25px;">
334
+ <label class="layui-form-label required">最新跟进记录:</label>
335
335
  <div class="layui-input-block">
336
336
  <textarea name="content" placeholder=" " class="layui-textarea" lay-verify="required"></textarea>
337
337
  </div>
@@ -1,3 +1,3 @@
1
1
  module EducodeSales
2
- VERSION = '0.9.78'
2
+ VERSION = '0.9.79'
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.9.78
4
+ version: 0.9.79
5
5
  platform: ruby
6
6
  authors:
7
7
  - anke1460
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-05-05 00:00:00.000000000 Z
11
+ date: 2023-05-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails