educode_sales 1.10.29 → 1.10.30

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: b133a8fca27810c1c165bdab01c812af7c4ee76a0f80b02be3fcc064a353e4f9
4
- data.tar.gz: 3631d821e73722d263dc9f724f09b19abd7dc0a9559a114f41f5bf204a334cb2
3
+ metadata.gz: 2b8cf3a691cad00390dd20d6bdf65d8e8370d421e7cfc13b955d0ca48bdd60a0
4
+ data.tar.gz: 1a9b038833e3c4352f719c92bbf17e457fc9e636af8ae7257fed0e501316146e
5
5
  SHA512:
6
- metadata.gz: b3f72cb4af3f4f343fefc8438d08bc041d3f3526e639a0714196fbd63c91b9a322e03d2fc2548632b97aeed7cd6a7425a2bc5c9e798563b10be870124e504539
7
- data.tar.gz: 40fbf3c2c51e50c8eaac57940279e8ec16708b1bfddc6d3673aed16033aa07aaadfaa8f69a28f9f527987afe515e77f565272298ac1f915deeb883535d27a048
6
+ metadata.gz: 70957af70e5376cf26fa3bb8e85c23eb648b28266e7f714a5c889c7f3f42cc9658e3d0fdb4ac1e8dca1edc7a4888b2ee0bd03997a6f33fe0944d677ea05fa502
7
+ data.tar.gz: 608d5517bb583e5a927e8f85e6f85d9b896e084b444d31edda31ce0ff960433bc74e4dd8f5b955979bf9f61343e6edd8691a2a7f566fd060163a05fa60df72af
@@ -189,7 +189,7 @@ module EducodeSales
189
189
  end
190
190
  business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '实际回款', follow_up_id: business.follow_ups.last&.id).sum(:amount))
191
191
  # 合同里签到日期全同步到最新跟进
192
- follow_up.contract_date_lists.update_all(follow_up: business.follow_ups.last) if business.follow_ups.last.present?
192
+ follow_up.contract_date_lists.update_all(follow_up_id: business.follow_ups.last.id) if business.follow_ups.last.present?
193
193
  end
194
194
  render_success
195
195
  else
@@ -34,6 +34,21 @@
34
34
  </div>
35
35
  </div>
36
36
  <br>
37
+ <div class="layui-inline">
38
+ <label class="layui-form-label">计划A类时间</label>
39
+ <div class="layui-input-inline">
40
+ <input type="text" class="layui-input" name="plan_a_date" autocomplete="off" id="plan_a_date"
41
+ value="<%= @follow_up&.plan_a_date %>"
42
+ placeholder="请选择日期">
43
+ </div>
44
+ </div>
45
+ <div class="layui-inline">
46
+ <label class="layui-form-label">计划A类金额(万)</label>
47
+ <div class="layui-input-inline">
48
+ <input name="plan_a_money" class="layui-input" value="<%= @follow_up&.plan_a_money.to_f.round(6) %>">
49
+ </div>
50
+ </div>
51
+ <br>
37
52
  <div class="layui-inline">
38
53
  <label class="layui-form-label">计划投标时间</label>
39
54
  <div class="layui-input-inline">
@@ -41,6 +56,28 @@
41
56
  id="invitation_at_edit" placeholder="请选择日期">
42
57
  </div>
43
58
  </div>
59
+ <div class="layui-inline">
60
+ <label class="layui-form-label">计划投标金额(万)</label>
61
+ <div class="layui-input-inline">
62
+ <input name="invitation_money" class="layui-input" value="<%= @follow_up&.invitation_money.to_f.round(6) %>">
63
+ </div>
64
+ </div>
65
+ </br>
66
+ <div class="layui-inline">
67
+ <label class="layui-form-label">计划回款时间</label>
68
+ <div class="layui-input-inline">
69
+ <input type="text" class="layui-input" name="plan_return_date" autocomplete="off" id="plan_return_date"
70
+ value="<%= @follow_up&.plan_return_date %>"
71
+ placeholder="请选择日期">
72
+ </div>
73
+ </div>
74
+ <div class="layui-inline">
75
+ <label class="layui-form-label">计划回款金额(万)</label>
76
+ <div class="layui-input-inline">
77
+ <input name="plan_return_money" class="layui-input" value="<%= @follow_up&.plan_return_money.to_f.round(6) %>">
78
+ </div>
79
+ </div>
80
+ </br>
44
81
  <div class="layui-inline">
45
82
  <label class="layui-form-label">中标时间</label>
46
83
  <div class="layui-input-inline">
@@ -237,6 +274,14 @@
237
274
  type: 'year'
238
275
  })
239
276
 
277
+ laydate.render({
278
+ elem: '#plan_a_date'
279
+ })
280
+
281
+ laydate.render({
282
+ elem: '#plan_return_date'
283
+ })
284
+
240
285
  laydate.render({
241
286
  elem: '#reception_at_edit'
242
287
  });
@@ -354,4 +399,7 @@
354
399
  width: 300px;
355
400
  !important;
356
401
  }
402
+ .layui-form-label {
403
+ width: 120px;
404
+ }
357
405
  </style>
@@ -82,9 +82,6 @@
82
82
  <input name="plan_return_money" class="layui-input" value="<%= @last_follow_up&.plan_return_money.to_f.round(6) %>">
83
83
  </div>
84
84
  </div>
85
-
86
-
87
- <br>
88
85
  <!--
89
86
  <div class="layui-inline">
90
87
  <label class="layui-form-label">签单时间</label>
@@ -1,3 +1,3 @@
1
1
  module EducodeSales
2
- VERSION = '1.10.29'
2
+ VERSION = '1.10.30'
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: 1.10.29
4
+ version: 1.10.30
5
5
  platform: ruby
6
6
  authors:
7
7
  - anke1460
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-07-07 00:00:00.000000000 Z
11
+ date: 2023-07-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -105,7 +105,6 @@ files:
105
105
  - app/assets/images/educode_sales/icon-login.png
106
106
  - app/assets/images/educode_sales/icon.png
107
107
  - app/assets/images/educode_sales/indexLogo.png
108
- - app/assets/images/educode_sales/indexlogo.png
109
108
  - app/assets/images/educode_sales/loading-0.gif
110
109
  - app/assets/images/educode_sales/loading-1.gif
111
110
  - app/assets/images/educode_sales/loading-2.gif
@@ -758,7 +757,7 @@ homepage: https://www.educoder.net
758
757
  licenses:
759
758
  - MIT
760
759
  metadata: {}
761
- post_install_message:
760
+ post_install_message:
762
761
  rdoc_options: []
763
762
  require_paths:
764
763
  - lib
@@ -774,7 +773,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
774
773
  version: '0'
775
774
  requirements: []
776
775
  rubygems_version: 3.0.9
777
- signing_key:
776
+ signing_key:
778
777
  specification_version: 4
779
778
  summary: Summary of EducodeSales.
780
779
  test_files: []