educode_sales 1.10.71 → 1.10.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bb3032484ff8a665cb7f216b4a99850b3cf4d4fa863dd533102458ab865b603
-  data.tar.gz: 14451a898ca11a00b18c19604c471bb7d14acca2c5fd30ff2db13202bd38cc4b
+  metadata.gz: 15f942191d49adf14251131ca42b9b52f90632a87a66d39aec6fc35bc74003ff
+  data.tar.gz: 0bc063e437a008ac318812d7fed49b9c9e7536d4f0f5065685c90505ad3dd40b
 SHA512:
-  metadata.gz: a9c9a067531e4a5c6ea32d614206f962d042f5a876d0c0786bb654167f87e8a7dda940629aa63baaaf94be010bbbfb1a1ca3c1d1d4a321de41c3c7220574d1df
-  data.tar.gz: 2fc32f16d342cd16105de2faff7438fe16a6cf1496e2228fff2211ea4e99aa1b2bf35ec54265adfc5e5ddf8840c343f0a6114274ddad4b6f58e7721046808666
+  metadata.gz: 2c235442e8c83921301a06be4ea22a46bcd98acd1079691c8f1c0fd06da09e85529f3397e6d99af5b5390e68ee33c7c3a3822d684559686edb390f244b3d0b10
+  data.tar.gz: 6c519c179301c3f6b454fedc8149734d5f7e34a07b2e8e4c2ed6a19400d4431a42addae70ecf72a2ab6824867f74ea1070cfffbd48facb3628b2388fcd392da6

data/app/views/educode_sales/businesses/contract.json.jbuilder

@@ -39,11 +39,11 @@ json.data do
     #   property << '企业' if school_property.enterprise
     # end
     if d.department&.school
-      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
     else
       json.property ''
     end
-    # json.property d.school.school_property.school_tags.where(for_missions: true).pluck(:name).join("、")#property.join("、")
+    # json.property d.school.school_property.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")#property.join("、")
     json.sale_way d.last_follow_up&.place&.name.present? ? '渠道' : '直销'
     json.year d.last_follow_up&.year.to_s
     json.total_amount d.last_follow_up&.total_amount.to_f.round(2)

data/app/views/educode_sales/businesses/get_export_data.json.jbuilder

@@ -52,7 +52,7 @@ json.data do
     # end
     # json.property property.join("、")
     if d.department&.school
-      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
     else
       json.property ''
     end

data/app/views/educode_sales/businesses/index.json.jbuilder

@@ -47,13 +47,13 @@ json.data do
     #   property << '企业' if school_property.enterprise
     # end
     if d.department&.school
-      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
+      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.uniq.join("、")
     else
       json.property ''
     end
     json.delete_reason d.delete_reason
     json.state_id d.state_id
-    # json.property d.school.school_property.school_tags.where(for_missions: true).pluck(:name).join("、")#property.join("、")
+    # json.property d.school.school_property.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")#property.join("、")
     json.sale_way d.last_follow_up&.place&.name.present? ? '渠道' : '直销'
     json.year d.last_follow_up&.year.to_s
     json.total_amount d.last_follow_up&.total_amount.to_f.round(2)

data/app/views/educode_sales/contracts/index.json.jbuilder

@@ -38,7 +38,7 @@ json.data do
 
 
     if d.department&.school
-      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
     else
       json.property ''
     end

data/app/views/educode_sales/contracts/new_follow_up.html.erb

@@ -45,7 +45,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">项目联系人：</label>
       <div class="layui-input-inline" style="line-height: 38px;">
-      <%=  @last_follow_up&.key_person.present? ? @last_follow_up&.key_person.map { |d| d.teacher.name }.join("、") : '' %>
+        <%= @last_follow_up&.key_person.present? ? @last_follow_up&.key_person.map { |d| d.teacher&.name }.join("、") : '' %>
       </div>
     </div>
     <div class="layui-inline">
@@ -64,13 +64,13 @@
     <div class="layui-inline">
       <label class="layui-form-label">销售经理：</label>
       <div class="layui-input-inline" style="line-height: 38px;">
-       <%= @last_follow_up&.assign_follow_ups.present? ? ( @last_follow_up&.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : @business&.staff&.user&.real_name %>
+        <%= @last_follow_up&.assign_follow_ups.present? ? (@last_follow_up&.assign_follow_ups.map { |d| d.staff&.user&.real_name }.join("、")) : @business&.staff&.user&.real_name %>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">销售经理电话：</label>
       <div class="layui-input-inline" style="line-height: 38px;">
-        <%= @last_follow_up&.assign_follow_ups.present? ? ( @last_follow_up&.assign_follow_ups.map{ |d| d.staff.user.phone}.join("、")) : @business&.staff&.user&.phone %>
+        <%= @last_follow_up&.assign_follow_ups.present? ? (@last_follow_up&.assign_follow_ups.map { |d| d.staff&.user&.phone }.join("、")) : @business&.staff&.user&.phone %>
       </div>
     </div>
     <div class="layui-inline">

data/app/views/educode_sales/customers/index.json.jbuilder

@@ -15,7 +15,7 @@ json.data do
     json.id d.id
     json.name d.name
     json.area d.province
-    json.property d.school_tags.where(for_missions: true).pluck(:name).join("、")
+    json.property d.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
     json.department d.departments.size
     json.business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_businesses.school_id = ?", d.id).size
     json.o_business EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id = ?", o).where("educode_sales_businesses.school_id = ?", d.id).size

data/app/views/educode_sales/follow_ups/index.json.jbuilder

@@ -18,7 +18,7 @@ json.data do
     json.key_people d.key_person.map { |d| d.name }.join("、")# key_people(teacher_ids)
 
     if d.business.department&.school
-      json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+      json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
     else
       json.property ''
     end

data/app/views/educode_sales/money_plan_records/index.json.jbuilder

@@ -22,7 +22,7 @@ json.data do
       json.state '待认领'
     end
     if d.business&.department&.school
-      json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+      json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
     else
       json.property ''
     end

data/app/views/educode_sales/money_plans/index.json.jbuilder

@@ -35,7 +35,7 @@ json.data do
     json.claim_num d['claim_num']
 
     if d.business.department&.school
-      json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+      json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
     else
       json.property ''
     end

data/app/views/educode_sales/plans/business_infos.json.jbuilder

@@ -18,7 +18,7 @@ json.data do
     json.prepayment_amount d.prepayment_amount || ''
     json.business_clazz d.business.clazz&.name || ""
     if d.business&.department&.school
-      json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+      json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
     else
       json.property ''
     end

data/app/views/educode_sales/plans/plan_business_infos.json.jbuilder

@@ -37,7 +37,7 @@ json.data do
 
     json.business_clazz d.business.clazz&.name || ""
     if d.business&.department&.school
-      json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+      json.property d.business.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
     else
       json.property ''
     end

data/app/views/educode_sales/projects/index.json.jbuilder

@@ -37,7 +37,7 @@ json.data do
     json.budget_amount d.budget_amount.to_f.round(2)  #d.follow_ups.where(stage_id: @budget_stage_ids).order("created_at desc").first&.total_amount&.round(2) || 0
     json.area d.department&.school&.province
     if d.department&.school
-      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).join("、")
+      json.property d.department.school.school_tags.where(for_missions: true).pluck(:name).uniq.join("、")
     else
       json.property ''
     end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.71'
+  VERSION = '1.10.73'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.71
+  version: 1.10.73
 platform: ruby
 authors:
 - anke1460