educode_sales 0.9.97 → 0.9.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 312c157ed210ab8e0ada99a141e3ba4565e87d164cfa03efb3448b90227a113e
-  data.tar.gz: afd966def27af48056c7ece566a3fc6b87f47430ccbe848785d0d44303edbea8
+  metadata.gz: dc83991c421ec745be1b0b4e1b78bd38327b29c3463e1ed43e0253a602305ffa
+  data.tar.gz: 237c8dfda5375b0ca1fdf8672361890f2acbb2054fa974b089d41de26fbbb130
 SHA512:
-  metadata.gz: 9d88c0be318d3a494a792722ec2cc820f05d4ed9354a81da2e969f57194eebec448b779518f3911c5d4c102902f2cf995edfc2c0fb0781b69d360b460d4e22ff
-  data.tar.gz: 02f8787c4223c8e6950f7d7b8cc1f30ab914ed110bd2fb4186f56601b81e6d44ca0b5be4a7b05253a4de6d590d06a97a2c5d7a5f2a75c7abb3fb503188058d80
+  metadata.gz: 5798c8ef35a26bbd366b2ff2e5fcca79a16d55984ba9a13ae4a2d9b2161bdd1bd45bd285b914f8b9bfa11c1e10b3f4d1d7114fb18c086065562f85afe71cfbaf
+  data.tar.gz: 2469abce54faa1b52c5431a276ee01752829fb3e399c1831f6d33a84ef5b52aed43abb6980baf679afd3fd3d00dbc5a032ef4eb5157cf77469b7527c71de575b

data/app/controllers/educode_sales/businesses_controller.rb

@@ -428,6 +428,33 @@ module EducodeSales
       gon.watche_ids = Staff.all.map { |d| {name: d.user&.real_name, value: d.id, selected: staff_ids.include?(d.id)}}
       gon.department = {value: @business.department_id, name: "#{@business.department&.school&.name}-#{@business.department&.name}"}
       gon.value = @business.department_id
+
+
+
+      if @business.activity
+        gon.activity = [{value: @business.activity_id, name: @business.activity.name}]
+        gon.activity_id = @business.activity_id
+      else
+        gon.activity = []
+        gon.activity_id = ''
+      end
+
+      if @business.place
+        gon.place = [{value: @business.place_id, name: @business.place.name}]
+        gon.place_id = @business.place_id
+      else
+        gon.place = []
+        gon.place_id = ''
+      end
+
+      if @business.customer
+        gon.customer = [{value: @business.customer_id, name: "#{@business.customer.school.name} #{@business.customer.name}"}]
+        gon.customer_id = @business.customer_id
+      else
+        gon.customer = []
+        gon.customer_id = ''
+      end
+
       render layout: false
     end
 
@@ -454,7 +481,10 @@ module EducodeSales
         end
       end
 
-      if business.update(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)
+      if business.update(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id,
+          activity_id: params[:activity_id], place_id: params[:place_id], customer_id: params[:customer_id],
+          company_source: params[:company_source], phone: params[:phone], email: params[:email], partner: params[:partner], invite_info: params[:invite_info], friend: params[:friend]
+        )
         if params[:merge_business_ids].present?
           merge_business =  Business.where(id: params[:merge_business_ids].split(","))
           merge_business.each do |b|

data/app/controllers/educode_sales/home_controller.rb

@@ -92,5 +92,18 @@ module EducodeSales
       @places = @places.page(params[:page]).per(10)
     end
 
+
+    def search_activity
+      @data = Activity.where("name like ?", "%#{params[:q]}%").limit(20)
+    end
+
+    def search_customer
+      part_a_ids = EducodeSales::CustomerFollow.all.pluck(:school_id)
+      part_b_ids = EducodeSales::Business.pluck(:school_id)
+      school_ids = (part_a_ids + part_b_ids + EducodeSales::CustomerAdd.all.pluck(:school_id)).uniq
+      @data = Department.joins(:school).where("schools.name like ?", "%#{params[:q]}%").where("schools.id in (?)", school_ids).limit(20)
+      p @data
+    end
+
   end
 end

data/app/models/educode_sales/business.rb

@@ -12,6 +12,10 @@ module EducodeSales
     belongs_to :p_sale_staff, class_name: 'Staff', optional: true
     belongs_to :p_deleter, class_name: 'Staff', optional: true
 
+    belongs_to :place, class_name: 'Place', optional: true
+    belongs_to :customer, class_name: 'Department', optional: true
+    belongs_to :activity, class_name: 'Activity', optional: true
+
     has_many :sale_plans
     has_many :follow_ups
     has_many :business_clazz_changes

data/app/views/educode_sales/businesses/edit.html.erb

@@ -16,12 +16,68 @@
     </div>
     <br>
     <div class="layui-inline" style="padding-top: 20px">
-      <label class="layui-form-label ">商机来源</label>
-      <input id="source" type="text" name="source" autocomplete="off"  class="layui-input" value="<%=@business.source %>" style="width: 300px;" placeholder="请输入商机来源">
+      <label class="layui-form-label required">商机来源</label>
+      <input id="source" type="text" name="source" autocomplete="off" lay-verify="required" class="layui-input" value="<%=@business.source %>" style="width: 300px;" placeholder="请输入商机来源">
     </div>
     <div class="layui-inline" style="padding-top: 20px">
       <p style="padding-left: 40px">请填写提供本商机的人名（如‘张明’）；如果为非头歌用户，请增加单位信息（如‘张明，华为公司’）</p>
     </div>
+    <div class="layui-form-item" style="padding-top: 20px">
+      <label class="layui-form-label">会议活动</label>
+      <div class="layui-input-inline" style="line-height: 38px;">
+        <div id="activity" style="width: 300px"></div>
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <label class="layui-form-label">渠道代理：</label>
+      <div class="layui-input-inline" style="line-height: 38px;">
+        <div id="place" style="width: 300px"></div>
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <label class="layui-form-label">客户</label>
+      <div class="layui-input-inline" style="line-height: 38px;">
+        <div id="customer" style="width: 300px"></div>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">公司资源</label>
+      <div class="layui-input-block">
+        <input type="text" name="company_source" autocomplete="off" class="layui-input"  value="<%= @business.company_source %>">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">400电话</label>
+      <div class="layui-input-block">
+        <input type="text" name="phone" autocomplete="off" class="layui-input"  value="<%= @business.phone %>">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">商务邮箱</label>
+      <div class="layui-input-block">
+        <input type="text" name="email" autocomplete="off" class="layui-input"  value="<%= @business.email %>">
+      </div>
+    </div>
+    
+    <div class="layui-inline">
+      <label class="layui-form-label">合作伙伴</label>
+      <div class="layui-input-block">
+        <input type="text" name="partner" autocomplete="off" class="layui-input"  value="<%= @business.partner %>">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">招标信息</label>
+      <div class="layui-input-block">
+        <input type="text" name="invite_info" autocomplete="off" class="layui-input"  value="<%= @business.invite_info %>">
+      </div>
+    </div>
+  
+    <div class="layui-inline">
+      <label class="layui-form-label">朋友</label>
+      <div class="layui-input-block">
+        <input type="text" name="friend" autocomplete="off" class="layui-input"  value="<%= @business.friend %>">
+      </div>
+    </div>
     <% if can?(:merge_business, EducodeSales::Business) %>
       <div class="layui-inline-block" style="padding-top: 20px">
         <label class="layui-form-label ">合并商机</label>
@@ -133,6 +189,90 @@
       data: []
     })
 
+    var activity_id = gon.activity_id;
+    var activity_select = selectInput.render({
+       elem: '#activity',
+       name: 'activity_id', // 渲染的input的name值
+       layFilter: 'test', //同layui form参数lay-filter
+     //  layVerify: 'required', //同layui form参数lay-verify
+       layVerType: 'tips', // 同layui form参数lay-verType
+       layReqText: '请填写文本', //同layui form参数lay-ReqText
+       initValue: gon.activity_id, // 渲染初始化默认值
+       hasSelectIcon: false,
+       placeholder: '请输入会议活动', // 渲染的inputplaceholder值
+       data: gon.activity,
+       remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
+       remoteMethod: function (value, cb) { // 远程搜索的回调函数
+         if (!value) {
+          activity_id = "";
+           return cb([]);
+         }
+         request.get('missions/search_activity?q=' + value, {}, function (res) {
+          if (res.data.length == 0) {
+            activity_select.emptyValue();
+            return cb([])
+          }
+           return cb(res)
+         })
+       }
+     });
+
+     var place_id = gon.place_id;
+     var place_select = selectInput.render({
+        elem: '#place',
+        name: 'place_id', // 渲染的input的name值
+        layFilter: 'test', //同layui form参数lay-filter
+      //  layVerify: 'required', //同layui form参数lay-verify
+        layVerType: 'tips', // 同layui form参数lay-verType
+        layReqText: '请填写文本', //同layui form参数lay-ReqText
+        initValue: gon.place_id, // 渲染初始化默认值
+        hasSelectIcon: false,
+        placeholder: '请输入渠道代理', // 渲染的inputplaceholder值
+        data: gon.place,
+        remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
+        remoteMethod: function (value, cb) { // 远程搜索的回调函数
+          if (!value) {
+            place_id = "";
+            return cb([]);
+          }
+          request.get('missions/sales_place?q=' + value, {}, function (res) {
+            if (res.data.length == 0) {
+              place_select.emptyValue();
+              return cb([])
+            }
+            return cb(res)
+          })
+        }
+      });
+
+      var customer_id = gon.customer_id;
+      var customer_select = selectInput.render({
+         elem: '#customer',
+         name: 'customer_id', // 渲染的input的name值
+         layFilter: 'test', //同layui form参数lay-filter
+       //  layVerify: 'required', //同layui form参数lay-verify
+         layVerType: 'tips', // 同layui form参数lay-verType
+         layReqText: '请填写文本', //同layui form参数lay-ReqText
+         initValue: gon.customer_id, // 渲染初始化默认值
+         hasSelectIcon: false,
+         placeholder: '请输入客户', // 渲染的inputplaceholder值
+         data: gon.customer,
+         remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
+         remoteMethod: function (value, cb) { // 远程搜索的回调函数
+           if (!value) {
+            customer_id = "";
+             return cb([]);
+           }
+           request.get('missions/search_customer?q=' + value, {}, function (res) {
+            if (res.data.length == 0) {
+              customer_select.emptyValue();
+              return cb([])
+            }
+             return cb(res)
+           })
+         }
+       });
+
     // 当前弹出层，防止ID被覆盖
     var parentIndex = layer.index;
 
@@ -143,9 +283,11 @@
         return false;
       } else {
       var field = data.field;
-      console.log('field', field)
       field.department_id = department.getValue() || department_id;
       field.merge_business_ids = data.field.merge_business_ids;
+      field.activity_id = activity_select.getValue() || activity_id;
+      field.place_id = place_select.getValue() || place_id;
+      field.customer_id = customer_select.getValue() || customer_id;
       request.authPut("missions/businesses/" + parent.id, field, function (res) {
         if (res.success == false) {
           layer.alert(res.msg)

data/app/views/educode_sales/home/search_activity.json.jbuilder

@@ -0,0 +1,8 @@
+json.data do
+  json.array! @data do |d|
+    json.value d.id
+    json.name d.name
+  end
+end
+json.code 0
+json.msg 'succcess'

data/app/views/educode_sales/home/search_customer.json.jbuilder

@@ -0,0 +1,8 @@
+json.data do
+  json.array! @data do |d|
+    json.value d.id
+    json.name "#{d.school.name} #{d.name}"
+  end
+end
+json.code 0
+json.msg 'succcess'

data/config/routes.rb

@@ -17,6 +17,8 @@ EducodeSales::Engine.routes.draw do
   get :staff_business, to: "home#staff_business"
   get :staff_departments, to: "home#staff_departments"
   get :filter, to: "application#filter"
+  get :search_activity, to: "home#search_activity"
+  get :search_customer, to: "home#search_customer"
 
 
   resources :sessions do

data/db/migrate/20230520023902_add_activity_educode_sales_business.rb

@@ -0,0 +1,13 @@
+class AddActivityEducodeSalesBusiness < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_businesses, :activity_id, :integer
+    add_column :educode_sales_businesses, :place_id, :integer
+    add_column :educode_sales_businesses, :customer_id, :integer
+    add_column :educode_sales_businesses, :company_source, :string
+    add_column :educode_sales_businesses, :phone, :string
+    add_column :educode_sales_businesses, :email, :string
+    add_column :educode_sales_businesses, :partner, :string
+    add_column :educode_sales_businesses, :invite_info, :string
+    add_column :educode_sales_businesses, :friend, :string
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.97'
+  VERSION = '0.9.98'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.97
+  version: 0.9.98
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 2023-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -355,6 +355,8 @@ files:
 - app/views/educode_sales/home/sales_place.json.jbuilder
 - app/views/educode_sales/home/sales_staff.json.jbuilder
 - app/views/educode_sales/home/search.json.jbuilder
+- app/views/educode_sales/home/search_activity.json.jbuilder
+- app/views/educode_sales/home/search_customer.json.jbuilder
 - app/views/educode_sales/home/search_edu_teacher.json.jbuilder
 - app/views/educode_sales/home/search_edu_user.json.jbuilder
 - app/views/educode_sales/home/search_operation_teacher.json.jbuilder
@@ -679,6 +681,7 @@ files:
 - db/migrate/20230501034307_create_educode_sales_follow_up_trends.rb
 - db/migrate/20230502142912_create_educode_sales_product_catalogs.rb
 - db/migrate/20230510144317_create_educode_sales_sales_details.rb
+- db/migrate/20230520023902_add_activity_educode_sales_business.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -702,7 +705,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.