educode_sales 0.5.9 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82398cf1df1cb40215b1632031edfd6b6ffa4dfed2ff1c8f86c624fa938c917c
-  data.tar.gz: b11d133013cc1dfe416f77b26255709fb24b33061568380abf625012b13b4ee0
+  metadata.gz: 49cd6d76f9cd164f4672b75479bacf2d6c6c2837a8bd100074d43a5ad687d08d
+  data.tar.gz: 503d5d4c354452464da72ef216f9ad9c9ddb7da20e450ada871bb813913f3fc7
 SHA512:
-  metadata.gz: ee3920c928e0d06ba4785d0a5ab091b9833d94c42eb881e879c378d36d71f6c75985299b225c198b9abf0f2d5d9a6e133a5afeb7147c87e6523bcde609f07f30
-  data.tar.gz: 14a4f1e5e7f23f94279b9023656d170fed8cf6b3d1a6a034b71cca658bc4d0ab13c27f8d82b589a747f02fca5f53fda1a224c7fb76d1a7f25db4552b2a9ac53d
+  metadata.gz: 8eead6ddaeb216468798a82db5f674a1582a5f641f4be378c8635e500c98d06e5297c9850a62477ddf644c895d9c10d5de5f287fd3dad7c22ae789768631d42c
+  data.tar.gz: 3d258a4889bc94043a6af1d20dc54520b01ac0593f357e38d590b70c77e0e6bfafb387a15530fed83fa1f3b4aa7040038f4f2de218e41bd43dcb0d282c9d50fb

data/app/controllers/educode_sales/businesses_controller.rb

@@ -76,7 +76,9 @@ module EducodeSales
             b_id = Common.find_by(extras: EducodeSales::Common::BTYPE)&.id
             c_id = Common.find_by(extras: EducodeSales::Common::CTYPE)&.id
             d_id = Common.find_by(extras: EducodeSales::Common::DTYPE)&.id
-            ids = [a_id ,b_id ,c_id ,d_id]
+            e_id = Common.find_by(extras: EducodeSales::Common::ETYPE)&.id
+            o_id = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
+            ids = [a_id ,b_id ,c_id ,d_id ,e_id ,o_id]
             @businesses = @businesses.joins("
               JOIN educode_sales_follow_ups ON educode_sales_businesses.last_follow_up_id = educode_sales_follow_ups.id
             ").where("educode_sales_follow_ups.clazz_id in (?)",ids)
@@ -172,7 +174,7 @@ module EducodeSales
 
           if params[:q].present? && params[:q][:date].present?
             date = params[:q][:date].split(" - ")
-            @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1])
+            @businesses = @businesses.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1] + '23:59:59')
           end
 
           if params[:sort].present? && params[:sort][:field]
@@ -191,6 +193,7 @@ module EducodeSales
             last_follow.reception_at,
             last_follow.bidded_date,
             last_follow.signed_date,
+            last_follow.created_at as latest_time,
             last_follow.actual_amount,
             last_follow.total_amount").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
@@ -201,7 +204,7 @@ module EducodeSales
 
     def create
       department = Department.find(params[:department_id])
-      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source])
+      business = @current_admin.businesses.build(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)
       if business.save
         render_success
       else
@@ -223,7 +226,7 @@ module EducodeSales
     def update
       business = Business.find(params[:id])
       department = Department.find(params[:department_id])
-      if business.update(name: params[:name], department_id: department.id, source: params[:source])
+      if business.update(name: params[:name], department_id: department.id, source: params[:source], school_id: department.school_id)
         render_success
       else
         render_failure business

data/app/controllers/educode_sales/customers_controller.rb

@@ -2,8 +2,6 @@ require_dependency "educode_sales/application_controller"
 
 module EducodeSales
   class CustomersController < ApplicationController
-    # before_action :find_school, only: [:edit, :update]
-    # before_action :must_admin!, only: [:destroy]
 
     def new_department
       render layout: false
@@ -43,7 +41,7 @@ module EducodeSales
         end
         format.json do
           if @current_admin.is_admin?
-            @customers = School
+            @customers = School.all
           else
             level = @current_admin.role.role_areas.find_by(clazz: '客户管理').level
             case level
@@ -56,7 +54,7 @@ module EducodeSales
               school_ids = a_school_ids + b_school_ids
               @customers = School.where(id: school_ids)
             else
-              @customers = School
+              @customers = School.all
             end
           end
 
@@ -71,21 +69,29 @@ module EducodeSales
             @customers = @customers.where(id: school_ids)
           end
 
-          # if params[:q].present? && params[:q][:date].present?
-          #   department_ids =
-          #   business_ids = EducodeSales::Business.where(department_id: department_ids).ids
-          #   follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
-          #   customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
-          #   a_last_follow_time = follow_ups.last&.created_at&.to_s(:date)
-          #   b_last_follow_time = customer_follows.last&.created_at&.to_s(:date)
-          #   if a_last_follow_time.present? && b_last_follow_time.present?
-          #     json.last_follow_time a_last_follow_time < b_last_follow_time ? b_last_follow_time : a_last_follow_time
-          #   else
-          #     json.last_follow_time a_last_follow_time || b_last_follow_time
-          #   end
-          #   date = params[:q][:date].split(" - ")
-          #   @customers = @customers.where("educode_sales_businesses.created_at > ? AND educode_sales_businesses.created_at < ?", date[0], date[1])
-          # end
+          if params[:q].present? && params[:q][:date].present?
+            ids = EducodeSales::CustomerFollow.all.pluck(:school_id)
+            @customers = @customers.where(id: ids)
+            school_ids =[]
+            date = params[:q][:date].split(" - ")
+            @customers.each do |d|
+              business_ids = EducodeSales::Business.where(school_id: d.id).ids
+              follow_ups = EducodeSales::FollowUp.where(business_id: business_ids)
+              customer_follows = EducodeSales::CustomerFollow.where(school_id: d.id)
+              next if follow_ups.blank? && customer_follows.blank?
+              a_last_follow_time = follow_ups.last&.created_at&.to_s
+              b_last_follow_time = customer_follows.last&.created_at&.to_s
+              if a_last_follow_time.present? && b_last_follow_time.present?
+                last_follow_time = ((a_last_follow_time < b_last_follow_time) ? b_last_follow_time : a_last_follow_time)
+              else
+                last_follow_time = (a_last_follow_time || b_last_follow_time)
+              end
+              if last_follow_time.present? && last_follow_time > date[0] && last_follow_time < date[1]
+                school_ids << d.id
+              end
+            end
+            @customers = @customers.where(id: school_ids)
+          end
 
           @customers = @customers.order(id: :desc).page(params[:page]).per(params[:limit])
         end
@@ -109,11 +115,6 @@ module EducodeSales
         format.json do
           @follow_ups = EducodeSales::CustomerFollow.where(school_id: params[:id])
           @latest = @follow_ups.order(created_at: :desc).first
-          # if params[:field]
-          #   @follow_ups = @follow_ups.order("#{params[:field]} #{params[:order]}")
-          # else
-          #   @follow_ups = @follow_ups.order("created_at desc")
-          # end
           @follow_ups = @follow_ups.order("created_at desc")
           @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
         end
@@ -122,11 +123,6 @@ module EducodeSales
 
     def show_department
       @departments = School.find(params[:id]).departments
-      # if params[:field]
-      #   @follow_ups = @follow_ups.order("#{params[:field]} #{params[:order]}")
-      # else
-      #   @follow_ups = @follow_ups.order("created_at desc")
-      # end
       @departments = @departments.order("created_at desc")
       @departments = @departments.page(params[:page]).per(params[:limit])
     end
@@ -154,40 +150,55 @@ module EducodeSales
     end
 
     def create
-      @school = School.find(params[:id])
       ActiveRecord::Base.transaction do
-        property = SchoolProperty.find_or_create_by!(school_property_params)
+        property = SchoolProperty.find_or_create_by!(project_985: params[:project_985].present? ? 1 : 0,
+                                                     project_211: params[:project_211].present? ? 1 : 0,
+                                                     regular_college: params[:regular_college].present? ? 1 : 0,
+                                                     junior_college: params[:junior_college].present? ? 1 : 0,
+                                                     secondary_school: params[:secondary_school].present? ? 1 : 0,
+                                                     military_school: params[:military_school].present? ? 1 : 0,
+                                                     enterprise: params[:enterprise].present? ? 1 : 0)
         @school = School.new
         @school.attributes = school_params
         @school.school_property = property
         @school.save!
+        EducodeSales::CustomerExtension.create(customer_staff_id: @current_admin.id, school_id: @school.id)
       end
+      render_success
     end
 
     def edit
       @school = School.find(params[:id])
+      @school_property = @school.school_property
       render layout: false
     end
 
     def update
       @school = School.find(params[:id])
       ActiveRecord::Base.transaction do
-        property = SchoolProperty.find_or_create_by!(school_property_params)
+        property = SchoolProperty.find_or_create_by!(project_985: params[:project_985].present? ? 1 : 0,
+                                                     project_211: params[:project_211].present? ? 1 : 0,
+                                                     regular_college: params[:regular_college].present? ? 1 : 0,
+                                                     junior_college: params[:junior_college].present? ? 1 : 0,
+                                                     secondary_school: params[:secondary_school].present? ? 1 : 0,
+                                                     military_school: params[:military_school].present? ? 1 : 0,
+                                                     enterprise: params[:enterprise].present? ? 1 : 0)
         @school.attributes = school_params
         @school.school_property = property
         @school.save!
       end
+      render_success
     end
 
     private
 
 
     def school_property_params
-      params.require(:school).permit(:project_985, :project_211, :regular_college, :junior_college, :secondary_school, :military_school, :enterprise)
+      params.permit(:project_985, :project_211, :regular_college, :junior_college, :secondary_school, :military_school, :enterprise)
     end
 
     def school_params
-      params.require(:school).permit(:name, :province, :city, :address)
+      params.permit(:name, :province, :city, :address)
     end
 
   end

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -34,7 +34,7 @@ module EducodeSales
           end
           if params[:q].present? && params[:q][:follows_date].present?
             date = params[:q][:follows_date].split(" - ")
-            @follow_ups = @follow_ups.where("educode_sales_follow_ups.created_at > ? AND educode_sales_follow_ups.created_at < ?", date[0], date[1])
+            @follow_ups = @follow_ups.where("educode_sales_follow_ups.created_at > ? AND educode_sales_follow_ups.created_at < ?", date[0], date[1] + '23:59:59')
           end
           if params[:q].present? && params[:q][:staff_id].present?
             @follow_ups = @follow_ups.where(staff_id: params[:q][:staff_id])

data/app/controllers/educode_sales/places_controller.rb

@@ -8,7 +8,11 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @places = Place.page(params[:page]).per(params[:limit])
+          @places = EducodeSales::Place.all
+          if params[:q].present? && params[:q][:name].present?
+            @places = @places.where("name like ?", "%#{params[:q][:name]}%")
+          end
+          @places = @places.page(params[:page]).per(params[:limit])
           @x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
           @stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
         end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -13,7 +13,7 @@ module EducodeSales
       x = Common.find_by(extras: EducodeSales::Common::XTYPE)&.id
       o = Common.find_by(extras: EducodeSales::Common::OTYPE)&.id
       @sale_trend = SaleTrend.find_or_create_by(year: @year)
-      @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ? AND educode_sales_follow_ups.clazz_id != ?", x, o).sum(:total_amount).round(2)
+      @business_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).sum(:total_amount).round(2)
       stage_ids = Common.where(clazz: '商机阶段', name: ['已中标','已签单','已验收','回款中', '服务中','已结束']).pluck(:id)
       @goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).sum(:total_amount).round(2)
       @actual_goal_amount = Business.joins(:last_follow_up).where("educode_sales_follow_ups.clazz_id != ?", x).where("educode_sales_follow_ups.bidded_date >= ? AND educode_sales_follow_ups.bidded_date <= ? AND educode_sales_follow_ups.stage_id IN (?)", "#{@year}-01-01", "#{@year}-12-31", stage_ids).sum(:actual_amount).round(2)
@@ -72,6 +72,21 @@ module EducodeSales
         end
       end
 
+      #商机区域分布图表
+      provinces = EducodeSales::Common.where(clazz: 'area').pluck(:name)
+      @business_data =  {
+        labels: provinces,
+        datasets:[
+          {
+            label: "商机总额",
+            data: provinces.map{|province| Business.joins(:last_follow_up).where("educode_sales_businesses.department_id in (?)", School.joins(:departments).where(province: province).pluck("departments.id")).where("educode_sales_follow_ups.clazz_id != ?", x).sum(:total_amount).round(2)},
+            backgroundColor: colors[0],
+            borderColor: colors[0],
+            borderWidth: 1
+          }
+        ]
+      }
+
 
       # 已中标图表
       goal_default_dates = ("#{Time.now.year}-01".."#{Time.now.year}-#{Time.now.month}").to_a

data/app/controllers/educode_sales/staffs_controller.rb

@@ -68,8 +68,8 @@ module EducodeSales
     def follow_up_schools
       staff = Staff.find(params[:id])
       # @schools = EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at").page(params[:page]).per(params[:limit])
-      @schools = EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_teacher_follows.updated_at) AS updated_at")+EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").select("school_id, max(educode_sales_follow_ups.updated_at) AS updated_at")
-      @count =  EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("school_id").count
+      @schools = EducodeSales::Teacher.joins(:follow_up, :department).where("educode_sales_teacher_follows.staff_id = #{staff.id}").group("departments.school_id").select("departments.school_id, max(educode_sales_teacher_follows.updated_at) AS updated_at")+EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("departments.school_id").select("departments.school_id, max(educode_sales_follow_ups.updated_at) AS updated_at")
+      @count =  EducodeSales::Business.joins(:last_follow_up, :department).where("educode_sales_follow_ups.staff_id = #{staff.id}").group("departments.school_id").count
     end
 
     def follow_up_departments

data/app/controllers/educode_sales/teachers_controller.rb

@@ -113,10 +113,21 @@ module EducodeSales
             @teachers = @teachers.where("educode_sales_teachers.created_at > ? AND educode_sales_teachers.created_at < ?", date[0], date[1])
           end
 
-          @teachers = @teachers.order("educode_sales_teachers.created_at desc").page(params[:page]).per(params[:limit])
+          @teachers = @teachers.select("
+            educode_sales_teachers.*,
+            users.created_on,
+            users.last_login_on").joins("
+            LEFT JOIN users ON educode_sales_teachers.user_id = users.id
+          ")
+          if params[:sort].present? && params[:sort][:field]
+            @teachers = @teachers.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+          else
+            @teachers = @teachers.order("educode_sales_teachers.created_at desc")
+          end
+          @teachers = @teachers.page(params[:page]).per(params[:limit])
+        end
 
         end
-      end
     end
 
     def import

data/app/models/educode_sales/permission.rb

@@ -1,7 +1,7 @@
 module EducodeSales
   class Permission < ApplicationRecord
     enum clazz: {
-      '市场态势': 'market',
+      '销售态势': 'market',
       '销售分工': 'sale_job',
       '商机管理': 'business',
       '渠道管理': 'place',

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

@@ -55,6 +55,9 @@
 <script type="text/html" id="business">
   <a href="javascript:void(0);" lay-event="business" class="layui-table-link">{{ d.business }}</a>
 </script>
+<script type="text/html" id="school">
+  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
+</script>
 
 
 <script>
@@ -130,7 +133,7 @@
                         field: 'school',
                         width: 120,
                         title: '单位',
-                        templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
+                        templet:'#school'
                     },
                     {
                         field: 'staff',

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

@@ -11,6 +11,9 @@
       <label class="layui-form-label required">单位部门</label>
       <div class="layui-input-block" id="department" style="width: 300px;"></div>
     </div>
+    <div class="layui-inline" >
+      <a href="/missions/customers" style=" color: #0000FF">添加单位/部门</a>
+    </div>
     <br>
     <div class="layui-inline" style="padding-top: 20px">
       <label class="layui-form-label ">商机来源</label>

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

@@ -18,6 +18,7 @@
                 <label class="layui-form-label">商机名称</label>
                 <div class="layui-input-inline">
                   <input type="text" name="name" autocomplete="off" class="layui-input" value="<%=params[:name] %>">
+                  <input type="text" style="display: none" name="place_id" autocomplete="off" class="layui-input" value="<%=params[:place_id] %>">
                 </div>
               </div>
               <div class="layui-inline">
@@ -107,6 +108,9 @@
 <script type="text/html" id="show_follow">
   <a href="javascript:void(0);" lay-event="show_follow" class="layui-table-link">{{ d.follow_ups_count }}</a>
 </script>
+<script type="text/html" id="school_name">
+  <a href="<%= base_url%>/colleges/{{d.school_id}}/statistics" class="layui-table-link" target="_blank">{{ d.school }}</a>
+</script>
 
 
 <script>
@@ -203,7 +207,7 @@
                 field: 'school',
                 width: 150,
                 title: '单位',
-                  templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
+                  templet:'#school_name'
               },
               {
                 field: 'department',
@@ -235,6 +239,22 @@
                 width: 90,
                 title: '阶段'
               },
+                {
+                    field: 'source',
+                    width: 90,
+                    title: '商机来源'
+                },
+                {
+                    field: 'last_follow_person',
+                    width: 100,
+                    title: '最新跟进人'
+                },
+                {
+                    field: 'latest_time',
+                    width: 200,
+                    title: '最新跟进时间',
+                    sort: true
+                },
               {
                 field: 'invitation_at',
                 width: 105,
@@ -285,21 +305,6 @@
                 width: 160,
                 title: '渠道',
               },
-              {
-                field: 'source',
-                width: 90,
-                title: '商机来源'
-              },
-              {
-                field: 'last_follow_person',
-                width: 100,
-                title: '最新跟进人'
-              },
-              {
-                field: 'latest_time',
-                width: 200,
-                title: '最新跟进时间'
-              },
               {
                 title: '操作',
                 minWidth: 170,
@@ -390,6 +395,7 @@
         });
       }
       function time_line(id,name) {
+          business_id = id
         var content = miniPage.getHrefContent('/missions/businesses/time_line?business_id=' + id);
         var openWH = miniPage.getOpenWidthHeight();
         sindex = layer.open({

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

@@ -5,6 +5,7 @@ json.data do
     json.name d.name
     json.department d.department.name
     json.school d.department.school.name
+    json.school_id d.department.school.id
     json.follow_ups_count d.follow_ups_count
     follow_ups_count += d.follow_ups_count
     json.follow_up_id d.last_follow_up_id

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

@@ -12,7 +12,7 @@
     <span class="table-label pull-right" style="padding-right: 20px">温馨提示：仅可以在24小时之内，编辑/删除最新的跟进记录</span>
   </div>
 </script>
-<div class="edit-table tool">
+<div class=" tool">
   <div class="z-index">
     <table class="layui-hide" id="sale_plan_follow_table" lay-filter="sale_plan_follow_table"></table>
   </div>

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

@@ -43,7 +43,7 @@
     function demo(){
         layer.closeAll()
         business_id = parent.business_id
-        var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + parent.business_id);
+        var content = miniPage.getHrefContent('/missions/businesses/show_follow?id=' + business_id);
         var openWH = miniPage.getOpenWidthHeight();
         sindex = layer.open({
             title: '商机列表/'+ parent.business_name +'的跟进记录',

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

@@ -1,14 +1,57 @@
-<%#= Gon::Base.render_data %>
-<form class="layui-form " action="">
+<form class="layui-form layuimini-form " action="">
   <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-inline">
+      <label class="layui-form-label required">客户：</label>
+      <div class="layui-input-block" style="width: 500px;">
+        <input type="text" name="name" required  lay-verify="required" value="<%=@school.name %>" placeholder="请输入客户" autocomplete="off"
+               class="layui-input" id="inputFocus">
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label required">省：</label>
+      <div class="layui-input-block">
+        <%= select_tag "province", options_for_select(EducodeSales::Common.where(clazz: 'area').pluck(:name),@school.province), { include_blank: true } %>
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label ">市：</label>
+      <div class="layui-input-block">
+        <input type="text" name="city"   value="<%=@school.city %>" autocomplete="off"
+               class="layui-input" placeholder="请输入地址"  style="width: 223px">
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label ">地址：</label>
+      <div class="layui-input-block" style="width: 500px;">
+        <input type="text" name="address"   value="<%=@school.address %>" autocomplete="off"
+               class="layui-input" placeholder="请输入地址" >
+      </div>
+    </div>
     <div class="layui-form-item">
-      <label class="layui-form-label required">负责区域</label>
+      <label class="layui-form-label">学校性质：</label>
       <div class="layui-input-block">
-        <div id="area_edit" class="demo-transfer"></div>
+        <input type="checkbox" name="project_985" lay-skin="primary" value="1" <%= 'checked' if @school_property&.project_985 %> title="985工程">
+        <input type="checkbox" name="project_211" lay-skin="primary" value="1" <%= 'checked' if @school_property&.project_211 %> title="211工程" >
+        <input type="checkbox" name="regular_college" lay-skin="primary" value="1" <%= 'checked' if @school_property&.regular_college %> title="本科院校">
       </div>
     </div>
-    <div class="layui-inline" style="padding-left: 30px">
-      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="submits">提交
+    <div class="layui-form-item">
+      <div class="layui-input-block">
+        <input type="checkbox" name="junior_college" lay-skin="primary" value="1" <%= 'checked' if @school_property&.junior_college %> title="大专院校">
+        <input type="checkbox" name="secondary_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.secondary_school %> title="中专院校" >
+        <input type="checkbox" name="military_school" lay-skin="primary" value="1" <%= 'checked' if @school_property&.military_school %> title="军事院校">
+      </div>
+    </div>
+    <div class="layui-form-item">
+      <div class="layui-input-block">
+        <input type="checkbox" name="enterprise" lay-skin="primary" value="1" <%= 'checked' if @school_property&.enterprise %> title="企业">
+      </div>
+    </div>
+    <div class="layui-inline" style="padding-left: 120px">
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
       </button>
     </div>
   </div>
@@ -35,23 +78,13 @@
 
 
         //监听提交
-        form.on('submit(submits)', function (data) {
-
-            var area_ids = []
-            layui.each(transfer.getData('area_list'), function (i, v) {
-                area_ids.push(v.value)
-            })
-            if (area_ids.length == 0) {
-                layer.alert("请选择负责区域");
-                return false;
-            }
-            data.field['area_ids'] = area_ids;
-            request.authPut("missions/places/" + data.field.id, data.field, function (res) {
-                if (res.success == false) {
+        form.on('submit(data-reset-btn)', function (data) {
+            request.authPut("missions/customers/" + <%= @school.id %>, data.field, function (res) {
+                if (res.success === false) {
                     layer.alert(res.msg)
                 } else {
-                    layer.closeAll();
-                    table.reload('place')
+                    layer.closeAll(); //关闭所有层
+                    table.reload('customers_table')
                 }
             })
             return false;

data/app/views/educode_sales/customers/edit_department.html.erb

@@ -1,14 +1,16 @@
 <div class="layuimini-main">
   <form class="layui-form  layuimini-form" action="">
+    <div class="layui-form-item" style="padding: 25px">
     <div class="layui-form-item" style="padding: 25px">
       <div class="layui-inline">
         <label class="layui-form-label required">部门名称</label>
-        <div class="layui-input-block">
+        <div class="layui-input-block" style="width: 300px;">
           <input type="text" name="department_name" required lay-verify="required" autocomplete="off" placeholder="请输入"
                  class="layui-input" id="inputFocus" value="<%=@department.name %>">
         </div>
       </div>
-      <div class="layui-inline" style="padding-left: 30px">
+      </div>
+      <div class="layui-form-item" style="padding-left: 130px">
         <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-edit">提交
         </button>
       </div>

data/app/views/educode_sales/customers/edit_follow_record.html.erb

@@ -1,18 +1,18 @@
 <h1 class="text-center" style="padding: 25px"><%=@school.name %></h1>
-<form class="layui-form " action="">
-  <div class="layui-form-item layui-form-text">
-    <label class="layui-form-label">跟进内容</label>
+<form class="layui-form layuimini-form " action="">
+  <div class="layui-form-item layui-form-text" style="padding-right: 30px">
+    <label class="layui-form-label required">跟进内容</label>
     <div class="layui-input-block">
-      <textarea name="content" placeholder="请输入跟进内容" class="layui-textarea" ><%=@follow_up.content %></textarea>
+      <textarea name="content" placeholder="请输入跟进内容" lay-verify="required" style="height: 200px" class="layui-textarea" ><%=@follow_up.content %></textarea>
     </div>
   </div>
-  <div class="layui-inline">
+  <div class="layui-form-item ">
     <label class="layui-form-label">跟进部门</label>
-    <div class="layui-input-inline">
+    <div class="layui-input-inline" style="width: 300px;">
       <%= select_tag "department_id",options_for_select(@school.departments.pluck(:name, :id),@follow_up.department_id)%>
     </div>
   </div>
-  <div class="layui-inline" style="padding-left: 50px">
+  <div class="layui-form-item " style="padding-left: 110px">
     <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit_follow_up">提交
     </button>
   </div>