educode_sales 1.10.18 → 1.10.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c05c264ac50b0d590a758bb92ea0d39e26d5aa4326f9d891041e5501999f0d5
-  data.tar.gz: b1d43f1098d9118dbb43978c5d10410b16ee42f40d9e7ed94a0cb13b327ea425
+  metadata.gz: e8908d0c995259936abab94c6b0a235b53d28665b95436e06da08dca21fed73e
+  data.tar.gz: 669ac2995a1f97f84b428d96be113636aba86bb59d5a39f43f3d2fdf409169b1
 SHA512:
-  metadata.gz: 24483315990fdb826a90520dabe2cc0e7ba99180209624db38a7f902b3b76ba4743e268b066fca02191f9d2d4d06ba353c5074df0ec273981317f37f11bd19e4
-  data.tar.gz: f549e8982818f99050fcbe876dc974a29aba6c1e8d1c1a6caeb772e100b49090aa2a20a4d19ead7d6001647840911ef941686e5a5d79bdbe320b15fe2f1232d7
+  metadata.gz: 42d35a31b42ffb22685ecbb1269680c64e7a14edc2a43fa5f3e2599282343e6c2f561a7ee3ffca26b7cdafe8ecebb1106353dd6027d5452a0328935acd2deddd
+  data.tar.gz: fbb54ac9f06b76958722487a110529bfb323ed56f537f9a8946f9f4682fc22972b89722171b927fd0b749146d94fcde82b1e0caae4adae819f5968ff4b9b29e8

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -12,6 +12,8 @@ module EducodeSales
           gon.edit_record = can?(:update_record, EducodeSales::MoneyPlan)
           gon.edit_record_self = can?(:update_record_self, EducodeSales::MoneyPlan)
           gon.staff_id = @current_admin.id
+          common = Common.find_by(clazz: 'staff_type', name: '销售')
+          gon.staffs = Staff.joins(:user).where(job_type: common.id).where.not(role_id: 11).map { |d| {name: d.user.real_name, value: d.id } }
         end
         format.json do
           @money_plan_records = MoneyPlanRecord.left_joins(:money_plan_claims).group("educode_sales_money_plan_records.id").select("educode_sales_money_plan_records.*, COUNT(educode_sales_money_plan_claims.id) AS claim_num")
@@ -50,6 +52,15 @@ module EducodeSales
             end
               
           end
+
+          if params[:q].present? && params[:q][:staff_manages].present?
+            # 销售经理
+            @money_plan_records = @money_plan_records.joins(:business).joins("
+              LEFT JOIN educode_sales_follow_ups AS last_follow_up ON educode_sales_businesses.last_follow_up_id = last_follow_up.id AND last_follow_up.deleted_at IS NULL
+              LEFT JOIN educode_sales_assign_follow_ups ON educode_sales_assign_follow_ups.follow_up_id = last_follow_up.id").
+           where("(educode_sales_assign_follow_ups.id IS NOT NULL AND educode_sales_assign_follow_ups.staff_id = ?) OR (educode_sales_assign_follow_ups.id IS NULL AND educode_sales_businesses.staff_id = ?)", params[:q][:staff_manages], params[:q][:staff_manages])
+          end
+          
           if params[:q].present? && params[:q][:amount].present?
             @money_plan_records = @money_plan_records.where(amount: params[:q][:amount])
           end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -124,7 +124,7 @@ module EducodeSales
           # end
           if params[:q].present? && params[:q][:regist_at].present?
             date = params[:q][:regist_at].split(" - ")
-            @teachers = @teachers.where("educode_sales_teachers.regist_at > ? AND educode_sales_teachers.regist_at < ?", date[0], date[1])
+            @teachers = @teachers.where("educode_sales_teachers.regist_at >= ? AND educode_sales_teachers.regist_at <= ?",date[0] + " 00:00:00", date[1] + " 23:59:59")
           end
           if params[:q].present? && params[:q][:status].present?
             if params[:q][:status] == "1"

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

@@ -32,6 +32,12 @@
                     <%= select_tag "state", options_for_select(['已认领', '待认领', '无对应合同', '无对应应收款']), { 'lay-filter': 'state',  include_blank: true,  "lay-search": "" } %>
                 </div>
             </div>
+            <div class="layui-inline show_item">
+              <label class="layui-form-label">销售经理</label>
+              <div class="layui-input-inline">
+                <div id="staff_manages" style="width: 190px;"></div>
+              </div>
+            </div>
             <div class="layui-inline">
                 <button type="reset" class="layui-btn layui-btn-primary" lay-submit
                     lay-filter="reset_business_search_record">重置
@@ -69,11 +75,12 @@
 </script>
 
 <script>
-    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'upload'], function() {
+    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'upload', 'xmSelect'], function() {
         var $ = layui.jquery,
             form = layui.form,
             request = layui.request,
             upload = layui.upload,
+            xmSelect = layui.xmSelect,
             miniPage = layui.miniPage;
         laydate = layui.laydate;
         table = layui.table;
@@ -110,6 +117,11 @@
                         title: '回款日期',
                         sort: true
                     },
+                    {
+                        field: 'staff_manages',
+                        width: 180,
+                        title: '销售经理',
+                    },
                     {
                         field: 'business',
                         width: 180,
@@ -146,6 +158,13 @@
                 uploadMoneyPlan()
             }
         });
+
+        var staff_manages_list = xmSelect.render({
+          el: '#staff_manages',
+          data: gon.staffs,
+          filterable: true,
+          radio: true,
+        })
         var sort = {},
             search = {};
         table.on('sort(money_plan_record_table)', function(obj) {
@@ -161,7 +180,8 @@
         })
         // 监听搜索操作
         form.on('submit(submit_form_record)', function(data) {
-            search = data.field
+            search = data.field;
+            search.staff_manages = staff_manages_list.getValue('valueStr');
             table.reload('money_plan_record_table', {
                 page: {
                     curr: 1
@@ -184,6 +204,7 @@
                 school: "",
                 business: ""
             });
+            staff_manages_list.setValue([]);
             return false;
         });
         table.on('toolbar(money_plan_record_table)', function(obj) {

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

@@ -3,7 +3,7 @@
       <div class="layui-form-item">
           <label class="layui-form-label" style="width: 80px !important;">合同名称：</label>
           <div class="layui-input-inline" style="line-height: 38px;">
-            <%= @money_plan_record.business.name %>
+            <%= @money_plan_record.business&.name %>
           </div>
       </div>
       <div class="layui-form-item">

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

@@ -13,6 +13,7 @@ json.data do
     json.staff_id d.staff_id
     json.number d.business&.number
     json.payer_name d.payer_name
+    json.staff_manages d.business&.last_follow_up&.assign_follow_ups.present? ? (d.business.last_follow_up.assign_follow_ups.map{ |s| s.staff.user.real_name}.join("、")) : d.business&.staff&.user&.real_name
     if d['claim_num'] > 0
       json.state '已认领'
     elsif d.business&.name.nil?

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.18'
+  VERSION = '1.10.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.18
+  version: 1.10.20
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-26 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
+- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -744,7 +745,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -759,8 +760,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []