educode_sales 0.9.61 → 0.9.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dda4d36517f72a9d366af24dfad85dda17417676ff115c61337b4611b484474a
-  data.tar.gz: b7febeed63e1933ce7509f4ba708a0fbad03f543f4b71461d2b6994abafb6458
+  metadata.gz: aadc92f524887e60e288e34449257df71ec8649c217836481a2a3af62a69e6c8
+  data.tar.gz: 256153b8488e50aad457a407e35e31451b31610325590de79305d335c921739e
 SHA512:
-  metadata.gz: fd9c33cb2663078a0cb34d5114c5264b92d7146c55c9a80c2699b4010f0215cf37909d5746666697bb3b89bb805063fa3d13cacd96844f0e9b340ac80ba640e7
-  data.tar.gz: 0d03669ffb838bead64df8769417fa5ae627735676f941d44f089fcd7553ed57130249519ca172cede3484eaf757030f0beb2788db68816fa14aee08969f4064
+  metadata.gz: e707698f7149b22d1f776783dbbfd16065be5626ce1213c3d01d096d8b68791c3af28144d07642d6e8f8446f33fc85658ce10d64b915e11a4f0b4ed720819d28
+  data.tar.gz: fad659d669624a2abd61b6db7d29c1954c6b9372ea4e3bf6c1a36dc6956cf4cfab70dc46e207b2ab80ef2b7fcb8e311e2e7449d78700511c4aa2248cb638bc6a

data/app/controllers/educode_sales/activities_controller.rb

@@ -151,6 +151,18 @@ module EducodeSales
       render layout: false
     end
 
+    def show_schools
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          @data = EducodeSales::ActivityTeacher.joins(teacher: [department: :school]).where(activity_id: params[:id]).select("count(teacher_id) AS teachers_count, departments.name AS department, schools.name AS school, school_id").group("school_id")
+          @data = @data.distinct.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
     private
 
     def activity_params

data/app/controllers/educode_sales/businesses_controller.rb

@@ -346,6 +346,9 @@ module EducodeSales
       @quarter = business.where("educode_sales_follow_ups.created_at >= ?",  Time.now.beginning_of_quarter).count("DISTINCT(educode_sales_follow_ups.business_id)")
       @year = business.where("educode_sales_follow_ups.created_at >= ?",  Time.now.beginning_of_year).count("DISTINCT(educode_sales_follow_ups.business_id)")
 
+      @activities = EducodeSales::Activity.where(staff_id: @current_admin.id).where("created_at >= ?",  Time.now.beginning_of_month).count
+      @teachers = EducodeSales::Activity.joins(:teachers).where(staff_id: @current_admin.id).where("educode_sales_activities.created_at >= ?",  Time.now.beginning_of_month).count
+      @schools = EducodeSales::Activity.joins(teachers: :department).where(staff_id: @current_admin.id).where("educode_sales_activities.created_at >= ?",  Time.now.beginning_of_month).count("DISTINCT(departments.school_id)")
       render layout: false
     end
 

data/app/controllers/educode_sales/home_controller.rb

@@ -62,10 +62,18 @@ module EducodeSales
         @staffs = @staffs.where(is_admin: false).where.not(id: @current_admin.id).where(job_type: common.id).page(params[:page]).per(10)
       end
     end
+
     def staff_schools
       @schools = School.all
       if params[:q].present?
-        @schools = @schools.where("name like :q OR province like :q",q: "%#{params[:q]}%").page(params[:page]).per(10)
+        @schools = @schools.where("name like :q OR province like :q", q: "%#{params[:q]}%").page(params[:page]).per(10)
+      end
+    end
+
+    def staff_departments
+      @departments = Department.where(school_id: params[:school_id])
+      if params[:q].present?
+        @departments = @departments.where("name like :q", q: "%#{params[:q]}%").page(params[:page]).per(10)
       end
     end
 

data/app/controllers/educode_sales/ideas_controller.rb

@@ -103,9 +103,11 @@ module EducodeSales
       gon.staffs = staffs.map { |d| { name: d.user.real_name, value: d.id } }
       gon.staff_value = [{ name: @idea.staff&.user&.real_name, value: @idea.staff_id }]
       gon.sale_staff_value = [{ name: @idea.sale_staff&.user&.real_name, value: @idea.sale_staff_id }]
-      gon.assist_staff_value = @idea.assist_staffs.map {|d|{ name: d&.user&.real_name, value: d.id }}
+      gon.assist_staff_value = @idea.assist_staffs.map { |d| { name: d&.user&.real_name, value: d.id } }
       gon.department = { value: @idea&.department_id, name: "#{@idea&.department&.school&.name}-#{@idea&.department&.name}" }
       gon.value = @idea.department_id
+      gon.department_list = @idea.department.present? ? [{ name: @idea.department.name, value: @idea.department_id }] : []
+      gon.school_list = @idea.school.present? ? [{ name: @idea.school.name, value: @idea.school_id }] : []
       render layout: false
     end
 

data/app/controllers/educode_sales/teachers_controller.rb

@@ -92,7 +92,7 @@ module EducodeSales
           if params[:q].present? && params[:q][:status].present?
             if params[:q][:status] == "1"
               @teachers = @teachers.where("educode_sales_teachers.user_id is not null")
-            else
+          else
               @teachers = @teachers.where("educode_sales_teachers.user_id is null")
             end
           end
@@ -120,7 +120,11 @@ module EducodeSales
             ").where("province = ?", p)
           end
           if params[:activity_id].present?
-            @teachers = @teachers.joins(:activity_teachers).where("educode_sales_activity_teachers.activity_id = ?", params[:activity_id])
+            if params[:school_id].present?
+              @teachers = @teachers.joins(activity_teachers: [teacher: :department]).where("educode_sales_activity_teachers.activity_id = ? AND departments.school_id = ?", params[:activity_id], params[:school_id])
+            else
+              @teachers = @teachers.joins(:activity_teachers).where("educode_sales_activity_teachers.activity_id = ?", params[:activity_id])
+            end
           end
           if params[:q].present? && params[:q][:date].present?
             date = params[:q][:date].split(" - ")

data/app/models/educode_sales/idea.rb

@@ -52,14 +52,10 @@ module EducodeSales
 
     def save_history(attr, old_value, new_value)
       case attr
-      when "school_name"
+      when "school_id"
+        old_value = School.find_by(id: old_value)&.name
+        new_value = School.find_by(id: new_value)&.name
         "学校/单位由“#{old_value}”变更为“#{new_value}”"
-      when "department_name"
-        "院系/部门由“#{old_value}”变更为“#{new_value}”"
-      # when "school_id"
-      #   old_value = School.find_by(id: old_value)&.name
-      #   new_value = School.find_by(id: new_value)&.name
-      #   "学校/单位由“#{old_value}”变更为“#{new_value}”"
       when "name"
         "项目名称由“#{old_value}”变更为“#{new_value}”"
       when "level"
@@ -84,10 +80,10 @@ module EducodeSales
         "截止时间由“#{old_value}”变更为“#{new_value}”"
       when "content"
         "反馈情况由“#{old_value}”变更为“#{new_value}”"
-      # when "department_id"
-      #   old_value = Department.find_by(id: old_value)&.name
-      #   new_value = Department.find_by(id: new_value)&.name
-      #   "院系/部门由“#{old_value}”变更为“#{new_value}”"
+      when "department_id"
+        old_value = Department.find_by(id: old_value)&.name
+        new_value = Department.find_by(id: new_value)&.name
+        "院系/部门由“#{old_value}”变更为“#{new_value}”"
       when "manager_name"
         "学校负责人由“#{old_value}”变更为“#{new_value}”"
       when "manager_phone"

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

@@ -74,7 +74,9 @@
 <script type="text/html" id="teachers_count">
   <a href="javascript:void(0);" lay-event="teachers_count" class="layui-table-link">{{ d.teachers_count}}</a>
 </script>
-
+<script type="text/html" id="schools_count">
+  <a href="javascript:void(0);" lay-event="schools_count" class="layui-table-link">{{ d.schools_count}}</a>
+</script>
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
         var $ = layui.jquery,
@@ -139,17 +141,24 @@
                   title: '天数',
                   width: 200
                 },
+                {
+                  field: 'schools_count',
+                  title: '学校数',
+                  width: 200,
+                  totalRow: true,
+                  templet: '#schools_count'
+                },
                 {
                   field: 'teachers_count',
                   title: '教师数',
                   width: 200,
-                    totalRow:true,
+                  totalRow:true,
                   templet: '#teachers_count'
                 },
                 {
                   field: 'students_count',
                   title: '学生数',
-                    totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+                  totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                   width: 200
                 },
                 {
@@ -284,8 +293,32 @@
               return false;
             }
              else if (obj.event === 'teachers_count') {
-                activity_id = obj.data.id
+                activity_id = obj.data.id;
+                school_id = '';
                 content = miniPage.getHrefContent('/missions/activities/show_teachers');
+                openWH = miniPage.getOpenWidthHeight();
+                index2 = layer.open({
+                  title: '活动列表/' + data.name,
+                  type: 1,
+                  shade: 0.2,
+                  maxmin: true,
+                  shadeClose: true,
+                  area: [openWH[0] + 'px', openWH[1] + 'px'],
+                  offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                  content: content,
+                  success: function (layero, index) {
+                    form.render('select');
+                  },
+                });
+                $(window).on("resize", function () {
+                  layer.full(index);
+                });
+                return false;
+            } else if (obj.event == 'schools_count') {
+              activity_id = obj.data.id;
+              activity_name = data.name;
+              school_id = '';
+              content = miniPage.getHrefContent('/missions/activities/' + obj.data.id +'/show_schools');
               openWH = miniPage.getOpenWidthHeight();
               index2 = layer.open({
                 title: '活动列表/' + data.name,

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

@@ -1,4 +1,5 @@
 teachers_count = 0
+schools_count = 0
 json.data do
   json.array! @activities do |d|
     json.id d.id
@@ -15,11 +16,15 @@ json.data do
     json.staff_manage d.manages.map { |d| d.staff.user.real_name}.uniq.join("、")
     json.staff_assist d.assists.map { |d| d.staff.user.real_name}.uniq.join("、")
     json.expert d.experts.pluck(:name).join("、")
+ 
+    json.schools_count EducodeSales::ActivityTeacher.joins(teacher: :department).where(activity_id: d.id).select("distinct(school_id)").count
+    schools_count +=  EducodeSales::ActivityTeacher.joins(teacher: :department).where(activity_id: d.id).select("distinct(school_id)").count
   end
 end
 
 json.totalRow do
   json.teachers_count teachers_count.to_s
+  json.schools_count schools_count.to_s
 end
 json.code 0
 json.count @activities.total_count

data/app/views/educode_sales/activities/show_schools.html.erb

@@ -0,0 +1,84 @@
+<div class="min-height-table">
+  <table class="layui-hide" id="show_school_table" style="min-height: 300px;" lay-filter="show_school_table"></table>
+</div>
+<script type="text/html" id="school_toolbar">
+  <div class="layui-btn-container">
+    <span class="table-label">教师列表</span>
+  </div>
+</script>
+  
+<script type="text/html" id="teachers_count">
+  <a href="javascript:void(0);" lay-event="teachers_count" class="layui-table-link">{{ d.teachers_count}}</a>
+</script>
+  <script>
+  
+      layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+          var $ = layui.jquery,
+              form = layui.form,
+              request = layui.request,
+              miniPage = layui.miniPage;
+  
+          table = layui.table;
+          table.render({
+            elem: '#show_school_table',
+            url: '/missions/activities/' + parent.activity_id + '/show_schools',
+            defaultToolbar: ['filter'],
+            toolbar: '#school_toolbar',
+            cols: [
+                [
+                  {
+                  field: 'id',
+                  width: 60,
+                  title:'序号',
+                  type: 'numbers',
+                },
+                {
+                  field: 'school',
+                  width: 300,
+                  title: '单位',
+                },
+                {
+                  field: 'department',
+                  width: 200,
+                  title: '部门'
+                },
+                {
+                  field: 'teachers_count',
+                  title: '教师数',
+                  width: 120,
+                  templet: "#teachers_count"
+                },
+              ]
+            ],
+            page: true,
+          });
+
+
+        table.on('tool(show_school_table)', function (obj) {
+          if (obj.event === 'teachers_count') {
+            activity_id = parent.activity_id;
+            school_id = obj.data.school_id;
+            content = miniPage.getHrefContent('/missions/activities/show_teachers');
+            openWH = miniPage.getOpenWidthHeight();
+            index2 = layer.open({
+              title: '活动列表/' + parent.activity_name,
+              type: 1,
+              shade: 0.2,
+              maxmin: true,
+              shadeClose: true,
+              area: [openWH[0] + 'px', openWH[1] + 'px'],
+              offset: [openWH[2] + 'px', openWH[3] + 'px'],
+              content: content,
+              success: function (layero, index) {
+                form.render('select');
+              },
+            });
+            $(window).on("resize", function () {
+              layer.full(index);
+            });
+            return false;
+          }
+        })
+  
+      });
+  </script>

data/app/views/educode_sales/activities/show_schools.json.jbuilder

@@ -0,0 +1,12 @@
+json.data do
+  json.array! @data do |d|
+    json.id d.id
+    json.school_id d.school_id
+    json.school d['school']
+    json.department d['department']
+    json.teachers_count d['teachers_count']
+  end
+end
+
+json.code 0
+json.count @data.total_count

data/app/views/educode_sales/activities/show_teachers.html.erb

@@ -52,7 +52,7 @@
         table = layui.table;
         table.render({
             elem: '#show_teachers_table',
-            url: '/missions/teachers?activity_id=' + parent.activity_id,
+            url: '/missions/teachers?activity_id=' + parent.activity_id + "&school_id=" + (parent.school_id ? parent.school_id : ''),
             toolbar: '#teacher_toolbar',
             defaultToolbar: ['filter'],
             cols: [

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

@@ -9,7 +9,12 @@
       本季-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @quarter %>, </span>
       本年-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @year %></span>
     </p>
-    <p style="margin-bottom: 30px;">二、本月已组织会议</p>
+    <p>二、本月已组织会议</p>
+    <p style="margin-bottom: 30px;">
+      活动-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @activities %>, </span>
+      学校-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @schools %>, </span>
+      教师-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @teachers %></span>
+    </p>
     <p>三、客户跟进情况</p>
     <% text = "\n" %>
     <% text += "一、AB类商机开拓情况\n" %>
@@ -17,6 +22,9 @@
     <% text += "本季-#{@quarter }, "%>
     <% text += "本年-#{@year }\n\n"%>
     <% text += "二、本月已组织会议 \n\n"%>
+    <% text += "活动-#{@activities }, "%>
+    <% text += "学校-#{@schools }, "%>
+    <% text += "教师-#{@teachers }\n\n"%>
     <% text += "三、客户跟进情况 \n"%>
     <% @followups.each_with_index do |d, i| %>
       <% text += "#{i+1}、#{d.business&.department&.school&.name}--**商机：#{d.description}\n" %>

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

@@ -84,6 +84,9 @@
 
 
         var dataCustom = [
+            { "n": '',
+              "s": []
+            },
             {
                 "n": "北京",
                 "s": [

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

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @departments do |d|
+    json.value d.id
+    json.name "#{d.name}"
+  end
+end
+json.count @departments.size
+json.code 0
+json.msg "success"

data/app/views/educode_sales/idea_recycles/detail.html.erb

@@ -18,13 +18,13 @@
       <div class="layui-inline">
         <label class="layui-form-label" style="width: 100px">学校/单位：</label>
         <div class="layui-input-inline">
-          <%= idea.school_name %>
+          <%= idea.school&.name %>
         </div>
       </div>
       <div class="layui-inline">
         <label class="layui-form-label" style="width: 100px">院系/部门：</label>
         <div class="layui-input-inline">
-          <%= idea.department_name %>
+          <%= idea.department&.name %>
         </div>
       </div>
       <div class="layui-inline">

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

@@ -1,7 +1,7 @@
 json.data do
   json.array! @ideas do |d|
     json.(d, :id, :name, :level, :status, :types, :model, :content)
-    json.school d.school_name
+    json.school d.school&.name
     json.staff d.staff&.user&.real_name
     json.hardware d.hardware.to_f.round(2)
     json.project d.project.to_i

data/app/views/educode_sales/ideas/detail.html.erb

@@ -18,13 +18,13 @@
       <div class="layui-inline">
         <label class="layui-form-label" style="width: 100px">学校/单位：</label>
         <div class="layui-input-inline">
-          <%= idea.school_name %>
+          <%= idea.school&.name %>
         </div>
       </div>
       <div class="layui-inline">
         <label class="layui-form-label" style="width: 100px">院系/部门：</label>
         <div class="layui-input-inline">
-          <%= idea.department_name %>
+          <%= idea.department&.name %>
         </div>
       </div>
       <div class="layui-inline">

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

@@ -9,13 +9,13 @@
         <div class="layui-col-md6">
           <labeL class="layui-form-label required">学校/单位:</labeL>
           <div class="layui-input-block">
-            <input type="text" name="school_name" autocomplete="off" lay-verify="required" lay-reqtext="学校不能为空" placeholder="请输入学校/单位名称" value="<%= @idea&.school_name %>" class="layui-input">
+            <div id="school_id" style="width: 600px;"></div>
           </div>
         </div>
         <div class="layui-col-md6">
           <labeL class="layui-form-label">院系/部门:</labeL>
           <div class="layui-input-block">
-            <input type="text" name="department_name" autocomplete="off" placeholder="请输入院系/部门名称" value="<%= @idea&.  department_name %>" class="layui-input">
+            <div id="department_id" style="width: 600px;"></div>
           </div>
         </div>
       </div>
@@ -176,17 +176,107 @@
 
     layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput', 'xmSelect', 'upload'], function () {
         var form = layui.form,
-            layer = layui.layer,
-            request = layui.request,
-            laydate = layui.laydate,
-            table = layui.table,
-            laytpl = layui.laytpl,
-            request = layui.request,
-            xmSelect = layui.xmSelect,
-            upload = layui.upload,
-            $ = layui.$;
+          layer = layui.layer,
+          request = layui.request,
+          laydate = layui.laydate,
+          table = layui.table,
+          laytpl = layui.laytpl,
+          request = layui.request,
+          xmSelect = layui.xmSelect,
+          upload = layui.upload,
+          $ = layui.$;
         selectInput = layui.selectInput;
 
+
+        var school_list = xmSelect.render({
+            el: '#school_id',
+            remoteSearch: true,
+            autoRow: true,
+            radio: true,
+            delay: 1000,
+            tips: '支持学校名称搜索,请至少输入一个字符',
+            searchTips: '支持名称/省份搜索,请至少输入一个字符',
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                if (!val) {
+                    return cb([]);
+                }
+                $.ajax('/missions/staff_schools', {
+                    method: 'get',
+                    data: {
+                        q: val,
+                        page: pageIndex
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        var data = res.data;
+                        if (res.code == 0) {
+                            cb(res.data, res.count);
+                        } else {
+                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                        }
+                    }
+                })
+            }
+        })
+
+        var department_list = xmSelect.render({
+            el: '#department_id',
+            remoteSearch: true,
+            autoRow: true,
+            radio: true,
+            delay: 1000,
+            tips: '支持学校名称搜索,请至少输入一个字符',
+            searchTips: '支持名称/省份搜索,请至少输入一个字符',
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+
+                var schools = [];
+                school_list.getValue().forEach(function (d) {
+                    schools.push(d.value);
+                })
+                // if (schools.length == 0) {
+                //     layer.alert("请选择学校");
+                //     return false;
+                // }
+                school_id = schools[0];
+
+
+                if (!val) {
+                    return cb([]);
+                }
+                $.ajax('/missions/staff_departments?school_id=' + school_id, {
+                    method: 'get',
+                    data: {
+                        q: val,
+                        page: pageIndex
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        var data = res.data;
+                        if (res.code == 0) {
+                            cb(res.data, res.count);
+                        } else {
+                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                        }
+                    }
+                })
+            }
+        })
+
+
+        department_list.setValue(
+          gon.department_list
+        )
+        school_list.setValue(
+          gon.school_list
+        )
+
+
         form.render();
         //时间常规用法
         laydate.render({
@@ -261,26 +351,36 @@
 
         //监听提交
         form.on('submit(saveBtn)', function (data) {
-            // if (department.getValue() == "" && department_id == "") {
-            //     layer.alert("请选择单位部门")
-            //     return false;
-            // } else {
-                data.field.department_id = department.getValue() || department_id;
-                data.field.staff_id = staff_list.getValue('valueStr');
+            data.field.staff_id = staff_list.getValue('valueStr');
             data.field.sale_staff_id = sale_staff_list.getValue('valueStr');
             data.field.assist_staff_ids = assist_staff_list.getValue('valueStr');
-                request.authPut("missions/ideas/" + parent.id, data.field, function (res) {
-                    if (res.success == false) {
-                        layer.alert(res.msg)
-                    } else {
-                        layer.close(parent.edit_index);
-                        parent.layer.close(parent.layer.getFrameIndex(window.name))
-                        parent.table.reload('ideas_table', {
-                            done: function () {
-                            }
-                        });
-                    }
-                })
+            var schools = [];
+            school_list.getValue().forEach(function (d) {
+                schools.push(d.value);
+            })
+            if (schools.length == 0) {
+                layer.alert("请选择学校");
+                return false;
+            }
+            data.field.school_id = schools[0];
+
+            var departments = [];
+            department_list.getValue().forEach(function (d) {
+                departments.push(d.value);
+            })
+            data.field.department_id = departments[0];
+            request.authPut("missions/ideas/" + parent.id, data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.edit_index);
+                    parent.layer.close(parent.layer.getFrameIndex(window.name))
+                    parent.table.reload('ideas_table', {
+                        done: function () {
+                        }
+                    });
+                }
+            })
             // }
             return false;
         });

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

@@ -1,7 +1,7 @@
 json.data do
   json.array! @ideas do |d|
     json.(d, :id, :name, :level, :status, :types, :model, :content)
-    json.school d.school_name
+    json.school d.school&.name
     json.staff d.staff&.user&.real_name
     json.hardware d.hardware
     json.project d.project

data/app/views/educode_sales/ideas/new.html.erb

@@ -9,13 +9,13 @@
         <div class="layui-col-md6">
           <labeL class="layui-form-label required">学校/单位:</labeL>
           <div class="layui-input-block">
-            <input type="text" name="school_name" autocomplete="off" lay-verify="required" lay-reqtext="学校不能为空" placeholder="请输入学校/单位名称" value="<%= @idea&.school_name %>" class="layui-input">
+            <div id="school_id" style="width: 600px;"></div>
           </div>
         </div>
         <div class="layui-col-md6">
           <labeL class="layui-form-label">院系/部门:</labeL>
           <div class="layui-input-block">
-            <input type="text" name="department_name" autocomplete="off" placeholder="请输入院系/部门名称" value="<%= @idea&.department_name %>" class="layui-input">
+            <div id="department_id" style="width: 600px;"></div>
           </div>
         </div>
       </div>
@@ -194,6 +194,87 @@
         });
         form.render();
 
+        var school_list = xmSelect.render({
+            el: '#school_id',
+            remoteSearch: true,
+            autoRow: true,
+            radio: true,
+            delay: 1000,
+            tips: '支持学校名称搜索,请至少输入一个字符',
+            searchTips: '支持名称/省份搜索,请至少输入一个字符',
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                if (!val) {
+                    return cb([]);
+                }
+                $.ajax('/missions/staff_schools', {
+                    method: 'get',
+                    data: {
+                        q: val,
+                        page: pageIndex
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        var data = res.data;
+                        if (res.code == 0) {
+                            cb(res.data, res.count);
+                        } else {
+                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                        }
+                    }
+                })
+            }
+        })
+
+        var department_list = xmSelect.render({
+            el: '#department_id',
+            remoteSearch: true,
+            autoRow: true,
+            radio: true,
+            delay: 1000,
+            tips: '支持学校名称搜索,请至少输入一个字符',
+            searchTips: '支持名称/省份搜索,请至少输入一个字符',
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+
+                var schools = [];
+                school_list.getValue().forEach(function (d) {
+                    schools.push(d.value);
+                })
+                // if (schools.length == 0) {
+                //     layer.alert("请选择学校");
+                //     return false;
+                // }
+                school_id = schools[0];
+
+
+                if (!val) {
+                    return cb([]);
+                }
+                $.ajax('/missions/staff_departments?school_id=' + school_id, {
+                    method: 'get',
+                    data: {
+                        q: val,
+                        page: pageIndex
+                    },
+                    dataType: 'json',
+                    success: function (res) {
+                        var data = res.data;
+                        if (res.code == 0) {
+                            cb(res.data, res.count);
+                        } else {
+                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                        }
+                    }
+                })
+            }
+        })
+
+
         upload.render({
             elem: '#test8'
             , url: '/missions/upload_files' //此处配置你自己的上传接口即可
@@ -252,7 +333,7 @@
             el: '#assist_staff_ids',
             data: gon.staffs,
             filterable: true,
-            multiple:true
+            multiple: true
         })
 
         //监听提交
@@ -261,17 +342,32 @@
             //     layer.alert("请选择单位部门")
             //     return false;
             // } else {
-                data.field.department_id = department.getValue() || department_id;
-                data.field.staff_id = staff_list.getValue('valueStr');
-                data.field.sale_staff_id = sale_staff_list.getValue('valueStr');
-                data.field.assist_staff_ids = assist_staff_list.getValue('valueStr');
-                request.authPost("missions/ideas/", data.field, function (res) {
-                    if (res.success == false) {
-                        layer.alert(res.msg)
-                    } else {
-                        layer.close(parent.add_idea_index);
-                        parent.layer.close(parent.layer.getFrameIndex(window.name))
-                        parent.table.reload('ideas_table', {
+
+            var schools = [];
+            school_list.getValue().forEach(function (d) {
+                schools.push(d.value);
+            })
+            if (schools.length == 0) {
+                layer.alert("请选择学校");
+                return false;
+            }
+            data.field.school_id = schools[0];
+
+            var departments = [];
+            department_list.getValue().forEach(function (d) {
+                departments.push(d.value);
+            })
+            data.field.department_id = departments[0];
+            data.field.staff_id = staff_list.getValue('valueStr');
+            data.field.sale_staff_id = sale_staff_list.getValue('valueStr');
+            data.field.assist_staff_ids = assist_staff_list.getValue('valueStr');
+            request.authPost("missions/ideas/", data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.add_idea_index);
+                    parent.layer.close(parent.layer.getFrameIndex(window.name))
+                    parent.table.reload('ideas_table', {
                             done: function () {
                             }
                         });

data/config/routes.rb

@@ -14,6 +14,7 @@ EducodeSales::Engine.routes.draw do
   get :sales_staff, to: "home#sales_staff"
   get :sales_place, to: "home#sales_place"
   get :staff_schools, to: "home#staff_schools"
+  get :staff_departments, to: "home#staff_departments"
   get :filter, to: "application#filter"
 
 
@@ -265,6 +266,9 @@ EducodeSales::Engine.routes.draw do
     collection do
       get :show_teachers
     end
+    member do
+      get :show_schools
+    end
   end
 
   resources :sales do

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.61'
+  VERSION = '0.9.63'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.61
+  version: 0.9.63
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-23 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -236,6 +236,8 @@ files:
 - app/views/educode_sales/activities/index.html.erb
 - app/views/educode_sales/activities/index.json.jbuilder
 - app/views/educode_sales/activities/new.html.erb
+- app/views/educode_sales/activities/show_schools.html.erb
+- app/views/educode_sales/activities/show_schools.json.jbuilder
 - app/views/educode_sales/activities/show_teachers.html.erb
 - app/views/educode_sales/assessments/_finished.html.erb
 - app/views/educode_sales/assessments/_progress.html.erb
@@ -305,6 +307,7 @@ files:
 - app/views/educode_sales/home/search_operation_teacher.json.jbuilder
 - app/views/educode_sales/home/search_teacher.json.jbuilder
 - app/views/educode_sales/home/search_users.json.jbuilder
+- app/views/educode_sales/home/staff_departments.json.jbuilder
 - app/views/educode_sales/home/staff_schools.json.jbuilder
 - app/views/educode_sales/home/statistics.html.erb
 - app/views/educode_sales/idea_recycles/activities.json.jbuilder