educode_sales 0.9.99 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d3b1f62cddc62c5e2d319320a0b53622d8c610a565923613fee6cf6cedcacb9
-  data.tar.gz: 882b25401c7319bed2b1de0eca8e331a58ed46976ea6d1fff5425758ddd6ced5
+  metadata.gz: a74ba09bc53597cf1bc110d4c32b29a405d7f4d25bb16287429327ac66799f49
+  data.tar.gz: 6a0969f7bb8afa5ea2e34670164d9fd81f45a7ca085d8987492d10643b91ca5e
 SHA512:
-  metadata.gz: 866d6f020e66dd334e039e2ac2cb67a059f03712c3ad92cd632a249d96f7076661238d7b418ca9eab87907954f81a01dea8508df86bf12169fe91f7540d151ae
-  data.tar.gz: e0559ef009cbf4b4e0b718d00783d2d513a0ef8722831065e7b42d654c48f143c1411f6617252aae4a8b20d681e6687061a771a58ddbc1fee01967159b897cea
+  metadata.gz: d522ae7272dc2de4f6c9d766b0f813a1e0812d7f455e0ec6ffc228887feb4647962e679c231c0f4c06b18ec87c44e09be95b9d5a77ddcd8e5abb2440272277e5
+  data.tar.gz: 459678b2f2f085ad8eb877701637dbb8e52a72deb8fba6682ad1a99625cf0f26c276ff1fd8620342abb0d0a65c1b148220a9da56061076ce9cea61b071cf0477

data/app/controllers/educode_sales/businesses_controller.rb

@@ -429,31 +429,24 @@ module EducodeSales
       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
+      if ['会议活动', '渠道代理', '客户'].include?(@business.source_way) && @business.sourcable.present?
+        if @business.source_way == '客户'
+          gon.sourcable = [{name: "#{@business.sourcable.school.name} #{@business.sourcable.name}", value: @business.sourcable_id}]
+        else
+          gon.sourcable = [{name: @business.sourcable.name, value: @business.sourcable_id}]
+        end
+       
+        gon.sourcable_id = @business.sourcable_id
+      elsif @business.sourcable_type.present?
+        gon.sourcable = [{value: @business.sourcable_type, name: @business.sourcable_type}]
+        gon.sourcable_id = @business.sourcable_type
       else
-        gon.customer = []
-        gon.customer_id = ''
+        gon.sourcable = []
+        gon.sourcable_id = ''
       end
+      gon.sourcable_type = @business.sourcable_type
+      gon.source_way = @business.source_way
+      
 
       render layout: false
     end
@@ -480,10 +473,23 @@ module EducodeSales
           end
         end
       end
+      if params[:sourcable_type].present?
+        if params[:source_way]  == '会议活动'
+          params[:sourcable_type] = 'EducodeSales::Activity'
+        elsif params[:source_way]  == '渠道代理'
+          params[:sourcable_type] = 'EducodeSales::Place'
+        elsif params[:source_way]  == '客户'
+          params[:sourcable_type] = 'EducodeSales::Department'
+        else
+          params[:sourcable_id] = ""
+        end
+      end
+      if params[:sourcable_type].blank?
+        params[:sourcable_id] = ""
+      end
 
       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]
+          sourcable_type: params[:sourcable_type], sourcable_id: params[:sourcable_id], source_way: params[:source_way]
         )
         if params[:merge_business_ids].present?
           merge_business =  Business.where(id: params[:merge_business_ids].split(","))

data/app/controllers/educode_sales/contracts_controller.rb

@@ -514,7 +514,7 @@ module EducodeSales
     end
 
     def sales_detail_params
-      params.permit(:amount, :price, :total_price, :custom_clazz, :delivery_date, :product_catalog_id, :business_id)
+      params.permit(:amount, :price, :total_price, :custom_clazz, :delivery_date, :product_catalog_id, :business_id, :proprietorship)
     end
     
   end

data/app/controllers/educode_sales/home_controller.rb

@@ -98,11 +98,17 @@ module EducodeSales
     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
+      if params[:type] == '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)
+      elsif params[:type] == 'active'
+        @data = Activity.where("name like ?", "%#{params[:q]}%").limit(20)
+      elsif params[:type] == 'place'
+        @data = EducodeSales::Place
+        @data = @data.where("name like :q", q: "%#{params[:q].strip}%").limit(20)
+      end
     end
 
   end

data/app/controllers/educode_sales/recycles_controller.rb

@@ -9,7 +9,13 @@ module EducodeSales
       render_success
     end
 
-
+    def restore_follow_up
+      @recycle = Recycle.find(params[:id])
+      report_id = @recycle.source_id
+      EducodeSales::FollowUp.unscoped.find(report_id).update(deleted_at: nil)
+      @recycle.destroy
+      render_success
+    end
 
     def restore_reports
       @recycle = Recycle.find(params[:id])
@@ -52,6 +58,16 @@ module EducodeSales
       @businesses = @businesses.page(params[:page]).per(params[:limit])
     end
 
+    def follow_up
+      @data = Recycle.where(source_type:"EducodeSales::FollowUp")
+      if params[:sort].present? && params[:sort][:field]
+        @data = @data.order("created_at #{params[:sort][:order]}")
+      else
+        @data = @data.order("educode_sales_recycles.created_at desc")
+      end
+      @data = @data.page(params[:page]).per(params[:limit])
+    end
+
     def weekly
       @weekly = Recycle.where(source_type:"EducodeSales::SaleReport").order(created_at: :desc).page(params[:page]).per(params[:limit])
       if params[:sort].present? && params[:sort][:field]

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -456,7 +456,7 @@ module EducodeSales
           user_stat = EducodeSales::UserStatService.new
           gon.table_1 = user_stat.table_1
           gon.table_2 = user_stat.table_2(1)
-          gon.table_3 = user_stat.table_2(0)
+          gon.table_3 = user_stat.table_3
         end
       end
     end

data/app/controllers/educode_sales/sales_details_controller.rb

@@ -138,14 +138,15 @@ module EducodeSales
       rows.times do |r|  #行数
         next unless ods.row(r+2)[0]
         business = EducodeSales::Business.find_by(number: ods.row(r+2)[0].to_s.strip)
-        product_catalog = EducodeSales::ProductCatalog.find_by(item_clazz: ods.row(r+2)[7].to_s.strip, 
-        brand: ods.row(r+2)[8].to_s.strip, 
-        specification: ods.row(r+2)[9].to_s.strip, 
-        unit: ods.row(r+2)[10].to_s.strip,
-        source_method: ods.row(r+2)[14].to_s.strip,
-        supplier:  ods.row(r+2)[16].to_s.strip)
+        product_catalog = EducodeSales::ProductCatalog.find_by(name: ods.row(r+2)[5].to_s.strip,
+        item_clazz: ods.row(r+2)[6].to_s.strip, 
+        brand: ods.row(r+2)[7].to_s.strip, 
+        specification: ods.row(r+2)[8].to_s.strip, 
+        unit: ods.row(r+2)[9].to_s.strip,
+        source_method: ods.row(r+2)[13].to_s.strip,
+        supplier:  ods.row(r+2)[15].to_s.strip)
         if business.present? && product_catalog.present?
-          SalesDetail.create(staff_id: @current_admin.id, business_id: business.id, product_catalog_id: product_catalog.id, price: ods.row(r+2)[12].to_s.strip, amount: ods.row(r+2)[11].to_s.strip, total_price: ods.row(r+2)[13].to_s.strip, custom_clazz: ods.row(r+2)[15].to_s.strip, delivery_date: ods.row(r+2)[17].to_s.strip)
+          SalesDetail.create(staff_id: @current_admin.id, business_id: business.id, product_catalog_id: product_catalog.id, price: ods.row(r+2)[11].to_s.strip, amount: ods.row(r+2)[10].to_s.strip, total_price: ods.row(r+2)[12].to_s.strip, custom_clazz: ods.row(r+2)[14].to_s.strip, delivery_date: ods.row(r+2)[16].to_s.strip, proprietorship: ods.row(r+2)[17].to_s.strip)
         end
       end
       

data/app/helpers/educode_sales/sale_trends_helper.rb

@@ -46,7 +46,7 @@ module EducodeSales
         {
           type: type,
           label: select,
-          data: data,
+          data: data.map { |d| d.round(2)},
           backgroundColor:
             backgroundColor,
           borderColor:
@@ -114,7 +114,7 @@ module EducodeSales
         {
           type: type,
           label: select,
-          data: data,
+          data: data.map { |d| d.round(2)},
           backgroundColor:
             backgroundColor,
           borderColor:
@@ -179,7 +179,7 @@ module EducodeSales
         {
           type: type,
           label: select,
-          data: data,
+          data: data.map { |d| d.round(2)},
           backgroundColor:
             backgroundColor,
           borderColor:
@@ -228,7 +228,7 @@ module EducodeSales
         {
           type: type,
           label: select,
-          data: data,
+          data: data.map { |d| d.round(2)},
           backgroundColor:
             backgroundColor,
           borderColor:

data/app/models/educode_sales/business.rb

@@ -12,10 +12,6 @@ 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
@@ -23,8 +19,12 @@ module EducodeSales
     has_many :business_watches, dependent: :destroy
     has_many :business_histories, dependent: :destroy
 
+    belongs_to :sourcable, :polymorphic => true, optional: true
+
     has_many :assign_staffs, as: :sourcable, dependent: :destroy # 售后人员
 
+    enum source_way: ['会议活动', '公司资源', '400电话', '商务邮箱', '渠道代理', '合作伙伴', '招标信息', '客户', '朋友']
+
     # 关联关注
     has_many :users, :class_name => 'EducodeSales::BusinessRelationShip', foreign_key: 'business_id', :dependent => :destroy
 

data/app/models/educode_sales/sales_detail.rb

@@ -4,5 +4,6 @@ module EducodeSales
     belongs_to :product_catalog
     belongs_to :staff
     enum custom_clazz: ['非定制', '低定制', '高定制', '全定制']
+    enum proprietorship: ['头歌', '客户', '共有']
   end
 end

data/app/models/educode_sales/user_stat_service.rb

@@ -109,6 +109,87 @@ module EducodeSales
       end
     end
 
+    def table_3
+      users = {'1' => [0, 0, 0], '2-5' => [0, 0, 0], '6-10' => [0, 0, 0], '11-20' => [0, 0, 0], '21-50' => [0, 0, 0], '51-100' => [0, 0, 0] }
+      signed_users = {'1' => [0, 0, 0], '2-5' => [0, 0, 0], '6-10' => [0, 0, 0], '11-20' => [0, 0, 0], '21-50' => [0, 0, 0], '51-100' => [0, 0, 0] }
+      schools(0).each do |d|
+        if d[1] == 1
+          users['1'][0] += 1
+         elsif d[1] <= 5
+           users['2-5'][0] += 1
+         elsif d[1] <= 10
+           users['6-10'][0] += 1
+         elsif d[1] <= 20
+           users['11-20'][0] += 1
+         elsif d[1] <= 50
+           users['21-50'][0] += 1
+         elsif d[1] <= 100
+            users['51-100'][0] += 1
+         end
+      end
+
+      departments(0).each do |d|
+        if d[1] == 1
+          users['1'][1] += 1
+         elsif d[1] <= 5
+           users['2-5'][1] += 1
+         elsif d[1] <= 10
+           users['6-10'][1] += 1
+         elsif d[1] <= 20
+           users['11-20'][1] += 1
+         elsif d[1] <= 50
+           users['21-50'][1] += 1
+         elsif d[1] <= 100
+            users['51-100'][1] += 1
+         end
+      end
+
+      signed_schools(0).each do |d|
+        if d[1] == 1
+          signed_users['1'][0] += 1
+         elsif d[1] <= 5
+          signed_users['2-5'][0] += 1
+         elsif d[1] <= 10
+          signed_users['6-10'][0] += 1
+         elsif d[1] <= 20
+           signed_users['11-20'][0] += 1
+         elsif d[1] <= 50
+          signed_users['21-50'][0] += 1
+         elsif d[1] <= 100
+          signed_users['51-100'][0] += 1
+         end
+      end
+
+      signed_departments(0).each do |d|
+        if d[1] == 1
+          signed_users['1'][1] += 1
+         elsif d[1] <= 5
+          signed_users['2-5'][1] += 1
+         elsif d[1] <= 10
+          p "----#{d}"
+          signed_users['6-10'][1] += 1
+         elsif d[1] <= 20
+           signed_users['11-20'][1] += 1
+         elsif d[1] <= 50
+          signed_users['21-50'][1] += 1
+         elsif d[1] <= 100
+          signed_users['51-100'][1] += 1
+         end
+      end
+
+
+      ['1', '2-5', '6-10', '11-20', '21-50', '51-100'].map do |d|
+        {
+          'num' => d,
+          'schools' => users[d][0],
+          'departments' => users[d][1],
+          'majors' => 0,
+          'signed_schools' => signed_users[d][0],
+          'signed_departments' => signed_users[d][1],
+          'signed_majors' => 0,
+        }
+      end
+    end
 
     def public_user
       UserExtension.where(school_id: @school_ids).

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

@@ -17,67 +17,14 @@
     <br>
     <div class="layui-inline" style="padding-top: 20px">
       <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 class="layui-inline">
+      <%= select_tag "source_way", options_for_select(EducodeSales::Business.source_ways.keys, @business.source_way), { include_blank: true, "lay-filter": 'source_id', "lay-verify": "required" } %>
       </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 class="layui-inline" style="line-height: 38px;" id="source_wraper">
+        <div id="customer_id" style="width: 360px"></div>
       </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>
@@ -149,6 +96,46 @@
     if (gon.is_secret) {
       $("#watch_ids_wraper").removeClass("layui-hide")
     }
+    var source_way = gon.source_way;
+    form.on('select(source_id)', function(data){
+      source_way = data.value;
+      setSourceWay(data.value);
+      $("#" + customer_select._input)[0].value = "";
+    });
+
+ 
+    function setSourceWay(value) {
+      if (value == '400电话' || value == '商务邮箱') {
+        $("#source_wraper").hide()
+      } else {
+        $("#source_wraper").show()
+        var text = "";
+        switch (value) {
+          case '会议活动':
+            text = "请选择活动运营";
+            break;
+          case '公司资源':
+            text = "请填写公司领导、部门其他同事姓名";
+            break;
+          case '渠道代理':
+            text = "请选择渠道";
+            break;
+          case '合作伙伴':
+            text = "请填写合作伙伴公司名称";
+            break;
+          case '招标信息':
+            text = "请填写招标信息";
+            break;
+          case '客户':
+            text = "请选择客户";
+            break;
+          case '朋友':
+            text = "请填写姓名";
+            break;
+        }
+        $("#" + customer_select._input)[0].placeholder = text;
+      }
+    }
 
     form.render();
     var department_id = gon.value;
@@ -172,6 +159,7 @@
         request.get('missions/search?type=department&q=' + value, {}, function (res) {
           return cb(res)
         })
+        
       }
     });
 
@@ -189,90 +177,47 @@
       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 sourcable_id = gon.sourcable_id;
       var customer_select = selectInput.render({
-         elem: '#customer',
-         name: 'customer_id', // 渲染的input的name值
+         elem: '#customer_id',
+         name: 'sourcable_type', // 渲染的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, // 渲染初始化默认值
+         initValue: gon.sourcable_id, // 渲染初始化默认值
          hasSelectIcon: false,
-         placeholder: '请输入客户', // 渲染的inputplaceholder值
-         data: gon.customer,
+         placeholder: '请输入商机来源', // 渲染的inputplaceholder值
+         data: gon.sourcable,
          remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
          remoteMethod: function (value, cb) { // 远程搜索的回调函数
            if (!value) {
-            customer_id = "";
+            sourcable_id = "";
              return cb([]);
            }
-           request.get('missions/search_customer?q=' + value, {}, function (res) {
-            if (res.data.length == 0) {
-              customer_select.emptyValue();
-              return cb([])
+           if (['会议活动', '渠道代理', '客户'].includes(source_way)) {
+            var type = "";
+            if (source_way == '客户') {
+              type = 'customer';
+            } else if (source_way == '渠道代理') {
+              type = 'place';
+            } else if (source_way == '会议活动') {
+              type = 'active';
             }
-             return cb(res)
-           })
+            request.get('missions/search_customer?q=' + value + "&type=" + type, {}, function (res) {
+              if (res.data.length == 0) {
+                customer_select.emptyValue();
+                return cb([])
+              }
+              return cb(res)
+            })
+          }
          }
        });
 
+       setSourceWay(source_way);
+
     // 当前弹出层，防止ID被覆盖
     var parentIndex = layer.index;
 
@@ -285,9 +230,7 @@
       var field = data.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;
+      field.sourcable_id = customer_select.getValue() || sourcable_id;
       request.authPut("missions/businesses/" + parent.id, field, function (res) {
         if (res.success == false) {
           layer.alert(res.msg)

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

@@ -1,6 +1,7 @@
 json.data do
   json.array! @business do |d|
     json.value d.id
-    json.name d.name
+    staff_manage = d.last_follow_up&.assign_follow_ups.present? ? (d.last_follow_up.assign_follow_ups.map{ |d| d.staff.user.real_name}.join("、")) : d.staff&.user&.real_name
+    json.name d.name + " " + staff_manage + " " + d.created_at.to_s
   end
 end

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

@@ -44,6 +44,12 @@
             <input type="text" name="delivery_date" value="" class="layui-input" lay-verify="required" id="delivery_date">
           </div>
         </div>
+        <div class="layui-inline">
+        <label class="layui-form-label required">知识产权归属：</label>
+        <div class="layui-input-inline">
+          <%= select_tag "proprietorship", options_for_select(EducodeSales::SalesDetail.proprietorships.keys), { 'lay-filter': 'proprietorship', 'lay-verify': "required",  include_blank: true,  "lay-search": "" } %>
+        </div>
+      </div>
       </div>
       <div class="layui-form-item">
         <div class="layui-input-block">

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

@@ -1,7 +1,12 @@
 json.data do
   json.array! @data do |d|
-    json.value d.id
-    json.name "#{d.school.name} #{d.name}"
+    if params[:type] == 'customer'
+      json.value d.id
+      json.name "#{d.school.name} #{d.name}"
+    else
+      json.value d.id
+      json.name d.name
+    end
   end
 end
 json.code 0

data/app/views/educode_sales/recycles/_follow_up.html.erb

@@ -0,0 +1,143 @@
+<script type="text/html" id="toolbarfollowup">
+  <div class="layui-btn-container">
+    <span class="table-label">商机跟进列表</span>
+  </div>
+</script>
+
+<table class="layui-hide" id="follow_up" lay-filter="follow_up"></table>
+
+<script type="text/html" id="currentTable_followup">
+  <%# if can? :update, EducodeSales::business %>
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="restore">还原</a>
+  <%# end %>
+  <%# if can? :destroy, EducodeSales::business %>
+  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <%# end %>
+</script>
+
+<script type="text/html" id="showchance">
+  <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}</a>
+</script>
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            miniPage = layui.miniPage;
+
+        table.render({
+            elem: '#follow_up',
+            url: '/missions/recycles/follow_up',
+            toolbar: '#toolbarfollowup',
+            totalRow:true,
+            defaultToolbar: [],
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        title:'序号',type: 'numbers',
+                    },
+                    {
+                        field: 'name',
+                        width: 180,
+                        title: '商机名称'
+                    },
+                    {
+                        field: 'follow_up_content',
+                        width: 180,
+                        title: '内容'
+                    },
+                    {
+                        field: 'clazz',
+                        title: '商机类型'
+                    },
+                    {
+                        field: 'stage',
+                        title: '阶段'
+                    },
+                    {
+                        field: 'staff_manages',
+                        width: 150,
+                        title: '销售经理'
+                    },
+                    {
+                        field: 'school',
+                        title: '单位'
+                    },
+                    {
+                        field: 'department',
+                        title: '部门'
+                    },
+                    {
+                        field: 'last_follow_person',
+                        width: 150,
+                        title: '最新跟进人'
+                    },
+                    {
+                        field: 'latest_time',
+                        title: '最新跟进时间',
+                        width: 150,
+                    },
+                    {
+                        field: 'deleter',
+                        width: 90,
+                        title: '删除人',
+                    },
+                    {
+                        field: 'delete_time',
+                        title: '删除时间',
+                        width: 150,
+                        sort: true,
+
+                    },
+                    {
+                        title: '操作',
+                        width: 120,
+                        toolbar: '#currentTable_followup',
+                        align: "center"
+                    }
+                ]
+            ],
+            limit: 20,
+            limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true
+        });
+
+        var sort = {}, search = {};
+        table.on('sort(follow_up)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('follow_up', {
+                initSort: obj,
+                where: {
+                    sort: sort,
+                    q: search
+                }
+            });
+        })
+
+
+        table.on('tool(follow_up)', function (obj) {
+            var data = obj.data;
+            var id = data.id
+            if (obj.event === 'restore') {
+                layer.confirm('确定恢复' + data.name, function (index) {
+                    request.get('missions/recycles/' + data.id + '/restore_follow_up', {}, function (res) {
+                        layer.close(index);
+                        table.reload("follow_up")
+                    })
+                });
+            } else if (obj.event === 'delete') {
+                layer.confirm('确定删除' + data.name, function (index) {
+                    request.delete('missions/recycles/' + data.id, {}, function (res) {
+                        layer.close(index);
+                        table.reload("follow_up")
+                    })
+                });
+            }
+        });
+
+    });
+</script>

data/app/views/educode_sales/recycles/follow_up.json.jbuilder

@@ -0,0 +1,21 @@
+json.data do
+  json.array! @data do |d|
+    follow_up = EducodeSales::FollowUp.unscoped.find(d.source_id)
+    business = EducodeSales::Business.unscoped.find(follow_up.business_id)
+    json.id d.id
+    json.name business&.name
+    json.clazz business.clazz&.name
+    json.staff_manages follow_up.assign_follow_ups.present? ? (follow_up.assign_follow_ups.map{ |s| s.staff.user&.real_name}.join("、")) : business.staff&.user&.real_name
+    json.follow_up_content follow_up.description
+    json.school business.department&.school&.name
+    json.department business.department&.name
+    json.last_follow_person follow_up.staff.user&.real_name
+    json.latest_time follow_up.created_at.to_s
+    json.deleter EducodeSales::Staff.find(d.deleter_id).user&.real_name
+    json.delete_time d.created_at.to_s
+    json.stage follow_up.stage&.name
+  end
+end
+
+json.code 0
+json.count @data.total_count

data/app/views/educode_sales/recycles/index.html.erb

@@ -1,6 +1,7 @@
 <div class="layui-tab" lay-filter="sale_tab">
   <ul class="layui-tab-title">
     <li class="layui-this" data="business">商机</li>
+    <li  data="follow_up">商机跟进</li>
     <li  data="week">周计划</li>
     <li data="weekly">周报</li>
     <li data="month">月计划</li>
@@ -11,6 +12,9 @@
     <div class="layui-tab-item   layui-show">
       <%= render 'business' %>
     </div>
+    <div class="layui-tab-item">
+      <%= render 'follow_up' %>
+    </div>
     <div class="layui-tab-item">
       <%= render 'weekPlan' %>
     </div>

data/app/views/educode_sales/sale_trends/_user_stat.html.erb

@@ -25,7 +25,6 @@
               align: 'center',
               width: 150,
               rowspan: 2,
-              totalRowText:'合计',
             }
             , {
               title: '公有云',
@@ -47,59 +46,49 @@
             title: '用户数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }, {
             field: 'school_1',
             title: '学校数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }, {
             field: 'department_1',
             title: '学院数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           },{
             field: 'user_2',
             title: '用户数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }, {
             field: 'school_2',
             title: '学校数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }, {
             field: 'department_2',
             align: 'center',
             title: '学院数',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           },{
             field: 'user_2',
             title: '用户数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }, {
             field: 'school_2',
             title: '学校数',
             align: 'center',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }, {
             field: 'department_2',
             align: 'center',
             title: '学院数',
             width: 110,
-            totalRow: '{{ parseInt(d.TOTAL_NUMS) }}',
           }]
         ],
         data: gon.table_1,
-        totalRow: true,
         page: false
       });
 

data/app/views/educode_sales/sales_details/_index.html.erb

@@ -151,14 +151,20 @@
         field: 'majors',
         width: 150,
         title: '专业',
+        hide: true
       }, {
         field: 'signed_department',
         title: '签约单位',
         width: 280,
+        hide: true
       }, {
         field: 'actual_amount',
         width: 120,
         title: '合同金额',
+      }, {
+        field: 'project_name',
+        width: 100,
+        title: '产品名称',
       }, {
         field: 'item_clazz',
         width: 100,
@@ -204,7 +210,10 @@
         field: 'delivery_date',
         width: 120,
         title: '交货时间',
-        sort: true,
+      }, {
+        field: 'proprietorship',
+        width: 120,
+        title: '知识产权归属',
       }, {
         title: '操作',
         minWidth: 350,

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

@@ -26,6 +26,8 @@ json.data do
     json.custom_clazz d.custom_clazz
     json.supplier d.product_catalog.supplier
     json.delivery_date d.delivery_date
+    json.proprietorship d.proprietorship
+    json.project_name d.product_catalog.name
   end
 end
 

data/config/routes.rb

@@ -185,11 +185,13 @@ EducodeSales::Engine.routes.draw do
       get :weekPlan
       get :business
       get :yearPlan
+      get :follow_up
     end
     member do
       get :restore_plans
       get :restore_reports
       get :restore_businesses
+      get :restore_follow_up
     end
   end
 

data/db/migrate/20230523115007_add_proprietorship_educode_sales_sales_details.rb

@@ -0,0 +1,18 @@
+class AddProprietorshipEducodeSalesSalesDetails < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_sales_details, :proprietorship, :integer
+    add_column :educode_sales_businesses, :source_way, :integer
+    add_column :educode_sales_businesses, :sourcable_type, :string
+    add_column :educode_sales_businesses, :sourcable_id, :integer
+
+    remove_column :educode_sales_businesses, :activity_id, :integer
+    remove_column :educode_sales_businesses, :place_id, :integer
+    remove_column :educode_sales_businesses, :customer_id, :integer
+    remove_column :educode_sales_businesses, :company_source, :string
+    remove_column :educode_sales_businesses, :phone, :string
+    remove_column :educode_sales_businesses, :email, :string
+    remove_column :educode_sales_businesses, :partner, :string
+    remove_column :educode_sales_businesses, :invite_info, :string
+    remove_column :educode_sales_businesses, :friend, :string
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.99'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.99
+  version: 1.0.1
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -495,12 +495,14 @@ files:
 - app/views/educode_sales/projects/index.html.erb
 - app/views/educode_sales/projects/index.json.jbuilder
 - app/views/educode_sales/recycles/_business.html.erb
+- app/views/educode_sales/recycles/_follow_up.html.erb
 - app/views/educode_sales/recycles/_monthPlan.html.erb
 - app/views/educode_sales/recycles/_monthly.html.erb
 - app/views/educode_sales/recycles/_weekPlan.html.erb
 - app/views/educode_sales/recycles/_weekly.html.erb
 - app/views/educode_sales/recycles/_yearPlan.html.erb
 - app/views/educode_sales/recycles/business.json.jbuilder
+- app/views/educode_sales/recycles/follow_up.json.jbuilder
 - app/views/educode_sales/recycles/index.html.erb
 - app/views/educode_sales/recycles/monthPlan.json.jbuilder
 - app/views/educode_sales/recycles/monthly.json.jbuilder
@@ -682,6 +684,7 @@ files:
 - 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
+- db/migrate/20230523115007_add_proprietorship_educode_sales_sales_details.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb