educode_sales 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6baded80505507fdcdbd19b692cb8aea834ed542
-  data.tar.gz: e1c6c03ff6afc8f1d9b311b2ac1a443a74937694
+  metadata.gz: 4b4a41e482e6776c9768761b3d37e0ad17e0244e
+  data.tar.gz: 56041da1c4e2f2a2d7a87b8d438af0691e398c95
 SHA512:
-  metadata.gz: 2f29bf7099856cbbd37f27b0b35f0181b74e16b9ac0b8570a66f5f99cdbc2addd71936a608dc449d6a3dc393aa76a90fa0128f4c80813b19d339fc97233e8978
-  data.tar.gz: 9f56ff2aa864e839270995775e73fb43a5353bfdfeaa8a0ad2db0af9210dc1f1e80e1fd6f4ce76b19a8ca0e3b10adc7850d3d61ed9455fc50a9c303a7c097ed2
+  metadata.gz: 6d741309b6fce698679dac6cb314da6ba096ab89fdf83067b4cd45c363995954fcc0b183b7bdc1821aa0c1af0a9a3aa62872723cac2f1b50c5c2aa4935870601
+  data.tar.gz: 83d7f4c01c7737dc391c46cf65641c35e714f390b3792cc001968e11b4abb8e3d7f7316f7727ebccceff5299abce8b9459eeb2600f1c11216e2d2f0a5c520f47

data/app/assets/stylesheets/educode_sales/app.css

@@ -243,7 +243,8 @@ td .layui-table-cell .layui-form-select {
   margin-top: 5px;
 }
 
-.edit-table .layui-table-body.layui-table-main {
+.edit-table .layui-table-body.layui-table-main,
+.min-height-table .layui-table-body.layui-table-main {
   min-height: 200px;
 }
 

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -18,7 +18,11 @@ module EducodeSales
 
     def destroy
       follow_up = FollowUp.find(params[:id])
+      business = follow_up.business
       if follow_up.destroy
+        if follow_up.id == business.last_follow_up_id
+          business.update(last_follow_up: follow_ups.last, return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: follow_ups.last&.id).sum(:amount))
+        end
         render_success
       else
         render_failure follow_up

data/app/controllers/educode_sales/operation_plans_controller.rb

@@ -39,7 +39,7 @@ module EducodeSales
             @sale_plans = @sale_plans.where("month >= ? and month <= ?", "#{params[:q][:year]}-01-01 00:00:00".to_date, "#{params[:q][:year]}-12-31 23:59:00".to_date)
           end
           if params[:q].present? && params[:q][:month].present?
-            @sale_plans = @sale_plans.where("month >= ?", "#{params[:q][:month]}-01 00:00:00".to_date)
+            @sale_plans = @sale_plans.where("month = ?", "#{params[:q][:month]}-01 00:00:00".to_date)
           end
           if params[:sort].present? && params[:sort][:field]
             @sale_plans = @sale_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")
@@ -66,7 +66,7 @@ module EducodeSales
 
 
     def create
-      plan = OperationPlan.build(plan_params)
+      plan = @current_admin.operation_plans.build(plan_params)
       plan.month = params["month"] + "-1"
       plan.teacher_id = @current_admin.teachers.find(params[:teacher_id]).id
       if plan.save
@@ -78,7 +78,7 @@ module EducodeSales
 
     def new_weekly
       sale_plans = OperationPlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", weekly: Time.now.strftime('%W').to_i, staff_id: @current_admin.id)
-      @rate = sale_plans ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
+      @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
       @departments_count = sale_plans.joins(:teacher).count("distinct(department_id)")
       # @departments_count = 1
       render layout: false
@@ -93,7 +93,7 @@ module EducodeSales
 
     def new_monthly
       sale_plans = OperationPlan.where(month: Time.now.strftime("%Y-%m") + "-01 00:00:00", staff_id: @current_admin.id, weekly: nil)
-      @rate = sale_plans ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
+      @rate = sale_plans.present? ? (sale_plans.sum("finish_rate") / sale_plans.size) : 0
       @departments_count = sale_plans.joins(:teacher).count("distinct(department_id)")
       render layout: false
     end

data/app/controllers/educode_sales/places_controller.rb

@@ -29,7 +29,6 @@ module EducodeSales
 
     def create
       place = @current_admin.places.new(name: params[:name])
-      # place = Place.new(name: params[:name])
       commons = []
       params[:area_ids].each do |d|
         commons << Common.find(d)
@@ -43,7 +42,6 @@ module EducodeSales
     end
 
     def update
-      # id = @current_admin.id
       place = Place.find(params[:id])
       place.assign_attributes(name: params[:name])
       commons = []
@@ -62,8 +60,8 @@ module EducodeSales
       place = Place.find(params[:id])
       place.destroy
       render_success
-      # rescue ActiveRecord::DeleteRestrictionError => e
-      #   render_failure '该用户已有数据产生，暂不能删除'
+    rescue ActiveRecord::DeleteRestrictionError => e
+      render_failure '渠道下已有关联数据产生，暂不能删除'
     end
 
   end

data/app/controllers/educode_sales/plans_controller.rb

@@ -39,7 +39,7 @@ module EducodeSales
             @sale_plans = @sale_plans.where("month >= ? and month <= ?", "#{params[:q][:year]}-01-01 00:00:00".to_date, "#{params[:q][:year]}-12-31 23:59:00".to_date)
           end
           if params[:q].present? && params[:q][:month].present?
-            @sale_plans = @sale_plans.where("month >= ?", "#{params[:q][:month]}-01 00:00:00".to_date)
+            @sale_plans = @sale_plans.where("month = ?", "#{params[:q][:month]}-01 00:00:00".to_date)
           end
           if params[:sort].present? && params[:sort][:field]
             @sale_plans = @sale_plans.order("#{params[:sort][:field]} #{params[:sort][:order]}")

data/app/controllers/educode_sales/roles_controller.rb

@@ -35,6 +35,17 @@ module EducodeSales
       render layout: false
     end
 
+    def update_role
+      role = Role.find(params[:id])
+      if role.update(name: params[:name])
+        render_success
+      else
+        render_failure role
+      end
+    end
+
+
+
     def update
       permissions = []
       role = Role.find(params[:id])

data/app/controllers/educode_sales/teachers_controller.rb

@@ -73,7 +73,7 @@ module EducodeSales
             @teachers = @teachers.where("created_at > ? AND created_at < ?", date[0], date[1])
           end
 
-          @teachers = @teachers.page(params[:page]).per(params[:per_page])
+          @teachers = @teachers.order("created_at desc").page(params[:page]).per(params[:per_page])
 
         end
       end

data/app/models/educode_sales/money_plan.rb

@@ -12,10 +12,10 @@ module EducodeSales
     private
 
     def update_return_money
-      if self.clazz == '已完成'
+      if follow_up.business.last_follow_up_id == self.follow_up_id
+        follow_up.business.update(return_money: MoneyPlan.where(clazz: '已完成', follow_up_id: self.follow_up_id).sum(:amount))
+      else
         follow_up.update(return_money: follow_up.money_plans.where(clazz: '已完成').sum(:amount))
-        all_follow_ups_ids = follow_up.business.follow_ups.pluck(:id)
-        follow_up.business.update(return_money: EducodeSales::MoneyPlan.where(clazz: '已完成', follow_up_id: all_follow_ups_ids).sum(:amount))
       end
     end
   end

data/app/models/educode_sales/operation_plan.rb

@@ -2,5 +2,8 @@ module EducodeSales
   class OperationPlan < ApplicationRecord
     belongs_to :staff
     belongs_to :teacher
+
+    validates :month, presence: true
+    validates :weekly, presence: true
   end
 end

data/app/models/educode_sales/place.rb

@@ -3,5 +3,6 @@ module EducodeSales
     belongs_to :staff
     has_many :place_areas, dependent: :destroy
     has_many :areas, through: :place_areas
+    has_many :follow_ups, dependent: :restrict_with_exception
   end
 end

data/app/models/educode_sales/sale_plan.rb

@@ -2,5 +2,8 @@ module EducodeSales
   class SalePlan < ApplicationRecord
     belongs_to :business
     belongs_to :staff
+
+    validates :month, presence: true
+    validates :weekly, presence: true
   end
 end

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

@@ -39,7 +39,7 @@
 
 <script type="text/html" id="return_money_select">
   <div class="layui-input-block table-select">
-    <select name="sex" lay-filter="return_money_select">
+    <select name="clazz" lay-filter="return_money_select">
       {{# layui.each(['未完成', '已完成'], function(i, data) { }}
       {{# if (data == d.clazz) { }}
       <option value="{{data}}" selected="{{d.clazz}}">{{data}}</option>
@@ -146,7 +146,7 @@
 
     table.on('tool(return_money_list)', function (obj) {
       var data = obj.data;
-      data.clazz = clazz;
+      data.clazz = clazz ? clazz : obj.data.clazz;
       data.plan_id = obj.data.id
       if (obj.event === 'edit') {
         request.authPut('educode_sales/follow_ups/' + parent.follow_up_id + "/update_money", data,
@@ -154,16 +154,19 @@
             if (res.success) {
               layer.alert('保存成功');
               table.reload('return_money_list');
+              table.reload("sale_plan_follow_table");
+              table.reload("businesses_table");
             } else {
               layer.alert(res.msg);
             }
-
           })
       } else if (obj.event == 'delete') {
         layer.confirm('确定删除回款金额为' + data.amount + "的计划", function (index) {
           request.delete('educode_sales/follow_ups/' + parent.follow_up_id + "/delete_money?plan_id=" + data.id, {}, function (res) {
             layer.close(index);
-            table.reload("return_money_list")
+            table.reload("return_money_list");
+            table.reload("sale_plan_follow_table");
+            table.reload("businesses_table");
           })
         });
       }

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

@@ -1,4 +1,4 @@
-<div class="edit-table">
+<div class="min-height-table">
   <div style="margin: 10px 10px 10px 10px">
     <form class="layui-form layui-form-pane" lay-filter="search_form">
       <div class="layui-form-item">

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

@@ -4,6 +4,7 @@ json.data do
     json.staff d.staff.user.real_name
     json.client d.client
     # json.amount d.amount
+    json.month d.month.strftime("%Y-%m")
     json.content d.content.truncate(30)
     json.finish_rate "#{d.finish_rate}%"
     json.level1_score d.level1_score || 0

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

@@ -5,7 +5,7 @@ json.data do
     json.area_id d.areas.present? ? d.areas.pluck(:name).join("、") : ''
     json.businesses_count EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.place_id = #{d.id}").count
     json.amount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum(:profit_amount)
-    json.return_mount  EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.place_id = #{d.id} AND educode_sales_follow_ups.stage_id IN (?)", @stage_ids).sum(:return_money)
+    json.return_mount EducodeSales::Business.joins(:last_follow_up).where("educode_sales_follow_ups.place_id = #{d.id}").sum(:return_money)
   end
 end
 

data/app/views/educode_sales/plans/_monthly.html.erb

@@ -7,7 +7,7 @@
   </div>
 </script>
 <!--搜索-->
-<div class="layuimini-main edit-table" id="monthly_table_wraper">
+<div class="layuimini-main min-height-table" id="monthly_table_wraper">
   <form class="layui-form layui-form-pane  edit-table" lay-filter="monthly_form_fiter">
     <div class="layui-form-item">
       <div class="layui-inline">

data/app/views/educode_sales/plans/_weekPlan.html.erb

@@ -7,7 +7,7 @@
   </div>
 </script>
 <!--搜索-->
-<div class="layuimini-main edit-table" id="week_table_wraper">
+<div class="layuimini-main min-height-table" id="week_table_wraper">
 <div class="layui-form layui-form-pane  edit-table" lay-filter="week_plan_form_filter">
   <div class="layui-form-item">
     <div class="layui-inline">

data/app/views/educode_sales/plans/_weekly.html.erb

@@ -7,7 +7,7 @@
   </div>
 </script>
 <!--搜索-->
-<div class="layuimini-main edit-table" id="sales_weelky_table">
+<div class="layuimini-main min-height-table" id="sales_weelky_table">
 <form class="layui-form layui-form-pane  edit-table" lay-filter="weekly_form_search">
   <div class="layui-form-item">
     <div class="layui-inline">

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

@@ -7,7 +7,7 @@ json.data do
     json.school d.business.department&.school&.name
     json.month d.month.strftime("%Y-%m")
     json.business_id d.business_id
-    json.content d.content.truncate(30)
+    json.content d.content.truncate(40)
     json.follow_ups_count d.business.follow_ups_count
     json.finish_rate "#{d.finish_rate}%"
     json.updated_at d.updated_at.to_s

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

@@ -16,8 +16,9 @@
     var $ = layui.jquery,
     form = layui.form,
     request = layui.request,
+        util = layui.util,
     miniPage = layui.miniPage;
-    table = layui.table
+    table = layui.table;
 
     table.render({
       elem: '#role',
@@ -34,6 +35,7 @@
           field: 'name',
           title: '角色',
           width: 120,
+            edit: 'text'
         }, {
           field: 'permissions',
           title: '模块浏览权限',
@@ -48,7 +50,33 @@
       page: true
     })
 
-    table.on('toolbar(role_filter)', function (obj) {
+
+
+
+
+      //监听单元格编辑
+      table.on('edit(role_filter)', function(obj){
+          var value = obj.value //得到修改后的值
+              ,data = obj.data //得到所在行所有键值
+              ,field = obj.field; //得到字段
+          console.log(obj.data);
+          request.authPut('educode_sales/roles/' + data.id + '/update_role/', data,
+              function(res) {
+                  if (res.success) {
+                      // table.reload('role');
+                  } else {
+                      layer.alert(res.msg)
+                  }
+
+              })
+      });
+
+
+
+
+
+
+      table.on('toolbar(role_filter)', function (obj) {
       if (obj.event === 'add') { // 监听添加操作
         var content = miniPage.getHrefContent('/educode_sales/roles/new');
         var openWH = miniPage.getOpenWidthHeight();
@@ -70,6 +98,9 @@
     });
 
 
+
+
+
     table.on('tool(role_filter)', function (obj) {
       var data = obj.data;
       role_id = data.id;

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

@@ -4,7 +4,7 @@ json.data do
     json.staff d.staff.user.real_name
     json.client d.client
     json.amount d.amount
-    json.content d.content.truncate(30)
+    json.content d.content.truncate(40)
     json.finish_rate "#{d.finish_rate}%"
     json.level1_score d.level1_score || 0
     json.level2_score d.level2_score || 0

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

@@ -104,7 +104,7 @@
                 } else {
                     layer.close(parent.index);
                     parent.layer.close(parent.layer.getFrameIndex(window.name))
-                    parent.table.reload('staff')
+                    parent.table.reload('staff_filter')
                 }
             })
             return false;

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

@@ -86,7 +86,7 @@
             elem: '#user_search',
             name: 'user_id', // 渲染的input的name值
             layFilter: 'user_id', //同layui form参数lay-filter
-            layVerify: 'required', //同layui form参数lay-verify
+            // layVerify: 'required', //同layui form参数lay-verify
             layVerType: 'tips', // 同layui form参数lay-verType
             layReqText: '请填写文本', //同layui form参数lay-ReqText
             initValue: '', // 渲染初始化默认值

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

@@ -218,7 +218,7 @@
                 },
                 {
                     title: '操作',
-                    minWidth: 350,
+                    minWidth: 300,
                     toolbar: '#currentTableBar',
                     align: "center",
                     fixed: 'right'

data/config/routes.rb

@@ -171,6 +171,7 @@ EducodeSales::Engine.routes.draw do
   resources :roles do
     member do
       put :view
+      put :update_role
     end
   end
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails