educode_sales 1.10.17 → 1.10.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39c60c3cd7dfc7b0d4539a9bffb2f470b3bd8f715cd59e18bb29e2769d17a9f5
-  data.tar.gz: 8351e4270d28ab90775ad91f9b797aa63dd4c305379340ee714f4da25d27f8a6
+  metadata.gz: 8037147081840dd2c090f239b68e31c0262e1e395be83430565da7dab45da06e
+  data.tar.gz: 40e32c9627b100fc6da0e7fdd66fc0cecf3e745263aaf9df12fdbd80803d83e7
 SHA512:
-  metadata.gz: eee717a68d577cce55b28e68d3e9ad59a30ace071f2cbc5c5e88345b765de9fa71aea9c761978146f7376ae666f6bf5f25fabf07d2be96fc7b598ce0ab0af7ea
-  data.tar.gz: f6a598583aa6bcbb120728c2b35771368bc17cf16decdd289e8df4b5ebe0ca55bee5fbba504b3a6b0d1b2829b37816f6d26b06ed33ef860754b0058b90bedc3e
+  metadata.gz: c9dcc35f2f24582825fd8a74e840f1c9534240934a28cf6771f263d4b9295382c1b8c870695c1be5fd20f643ded2aec496675f8c1b379ed74b5f14fd32e41f9c
+  data.tar.gz: 036a61625d1c003e35d8602e56e57635aa4108d6e9246853da7d97c06aa31ec9be40821a027d6a8890e91690489f89ddd63d60eed602ee924fe9670b083a59d2

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/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/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/app/views/educode_sales/money_plans/index.json.jbuilder

@@ -8,9 +8,9 @@ json.data do
     json.clazz d.clazz
     json.business d.business.name
     json.business_id d.business.id
-    json.school d.business.school.name
+    json.school d.business.school&.name
     json.school_id d.business.school_id
-    json.staff d.staff.user.real_name
+    json.staff d.staff&.user&.real_name
     json.staff_id d.staff_id
     json.number d.business.number
     json.category d.category || ''

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.17'
+  VERSION = '1.10.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.17
+  version: 1.10.19
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-25 00:00:00.000000000 Z
+date: 2023-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ 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
@@ -745,7 +744,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -760,8 +759,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []