educode_sales 1.10.1 → 1.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20755b572d19ee3c58ffca868b9fc6d5e3829024f1c34863ed6707c83009af41
-  data.tar.gz: 4289012ab4ee0794bdf7c0cc49b57ae46305b16f0b724ec135f82d04e9662b91
+  metadata.gz: 86f8364fd145617cb033ff7034197314eb267e79bf716e14200046c24551fad5
+  data.tar.gz: 70caf8f362c4bf1b40d205f2a44370c7fd930e791f74a934ecef7a9abddc8321
 SHA512:
-  metadata.gz: 62d94ce651961ec7a4a41e40b5993bcd0dfb400d2bf53f66ba0b8d25b81015962f5a8e0553935a854cd40779a9eb710a6f842ba85ada1e349248b786e58390cb
-  data.tar.gz: 95517fc542d7c80d8c40513fcb612a4efa422f9697b7168b4151b599419d999b56dfd0dcab077935abb0c6facf2174b0a1497bcae1952d2ed81b29258c57ad38
+  metadata.gz: 5ecece08fea07f8ed2213187dc596092fc1961640751a01301416ab97bf0587efbfd2fe2158e13c2becbe6f2eb3c19fa941b67a9c6ff6f2ed528ff61c911f1f0
+  data.tar.gz: 95170fda46d59cf757bbc5c5518a3e6a96a09872d4cb296c5344138e91d5baf9ab12bc64b321d3e50345bf2ae0e927001547a2fb0edcb8e12f0f2a9aaa424403

data/app/controllers/educode_sales/assessments_controller.rb

@@ -376,13 +376,114 @@ module EducodeSales
     end
 
 
+    #签到记录
+    def attendances
+      respond_to do |format|
+        format.html do
+        end
+        format.js do
+        end
+        format.json do
+          @attendances = EducodeSales::Attendance
+          if params[:q].present? && params[:q][:name].present?
+            @attendances = @attendances.where("name like ?", "%#{params[:q][:name].strip}%")
+          end
+          if params[:q].present? && params[:q][:attendance_date].present?
+            date = params[:q][:attendance_date].split(" - ")
+            @attendances = @attendances.where("attendance_date >= ?  and attendance_date <= ?", date[0] + ' 00:00:00', date[1] + ' 23:59:59')
+          end
+          if params[:q].present? && params[:q][:customer].present?
+            @attendances = @attendances.where("customer like ?", "%#{params[:q][:customer]}%")
+          end
+          @attendances = @attendances.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    #编辑签到记录界面
+    def edit_attendance
+      @attendance = EducodeSales::Attendance.find(params[:id])
+      render layout: false
+    end
+
+    #更新签到记录信息
+    def update_attendance
+      ActiveRecord::Base.transaction do
+        @attendance = EducodeSales::Attendance.find(params[:id])
+        @attendance.attendance_date = params[:attendance_datetime]
+        @attendance.update_attributes(attendance_update)
+        render_success
+      end
+    end
+
+    #删除签到记录
+    def delete_attendance
+      begin
+        ActiveRecord::Base.transaction do
+          attendance = EducodeSales::Attendance.find(params[:id])
+          attendance.destroy!
+          render_success
+        end
+      rescue Exception => e
+        render_failure(e.message)
+      end
+    end
 
+    #跳转导入界面
+    def import
+      render layout: false
+    end
 
+    #导入签到记录接口
+    def import_attendances
+      render_failure("文件不存在或格式错误") if params[:file].blank? || !params[:file].is_a?(ActionDispatch::Http::UploadedFile)
+      begin
+        ActiveRecord::Base.transaction do
+          doc = SimpleXlsxReader.open(params[:file])
+          size = doc.sheets.size
+          attendance_attrs = %i[name attendance_date longitude latitude location address mobile_id ip_address customer target created_at updated_at]
+          attendance_vales = []
+          (0..size - 1).each do |index|
+            doc.sheets[index].rows.each_with_index do |d, i|
+              next if i <= 2
+              name = d[0]
+              attendance_date_time = "#{d[1]} #{d[2]}"
+              attendance_date = attendance_date_time.strip
+              longitude = d[3]
+              latitude = d[4]
+              location = d[5]
+              address = d[6]
+              mobile_id = d[7]
+              ip_address = d[8]
+              customer = d[9]
+              target = d[10]
+              attendance_vales << {name: name, attendance_date: attendance_date, longitude: longitude, latitude: latitude, location: location,
+                                   address: address, mobile_id: mobile_id, ip_address: ip_address, customer: customer, target: target}
+
+            end
+          end
+          EducodeSales::Attendance.bulk_insert(*attendance_attrs) do |worker|
+            attendance_vales.each do |attendance|
+              worker.add(name: attendance[:name], attendance_date: attendance[:attendance_date].to_datetime, longitude: attendance[:longitude], latitude: attendance[:latitude],
+                         location: attendance[:location], address: attendance[:address], mobile_id: attendance[:mobile_id], ip_address: attendance[:ip_address], customer: attendance[:customer], target: attendance[:target])
+            end
+          end
+          render_success
+        end
+      rescue Exception => e
+        render_failure(e.message)
+      end
+    end
 
 
 
 
     private
+
+    def attendance_update
+      params.permit(:name, :mobile_id, :ip_address, :customer, :target)
+    end
+
       def params_create
         params.permit( :annual, :assessment,:assessment_year, :first_quarter, :second_quarter, :third_quarter, :fourth_quarter,
                       :january, :february, :march, :april, :may, :june, :july, :august, :september, :october, :november, :december,

data/app/controllers/educode_sales/customers_controller.rb

@@ -195,8 +195,6 @@ module EducodeSales
               LEFT JOIN educode_sales_businesses AS d ON d.department_id = departments.id AND d.deleted_at is NULL
               GROUP BY schools.id, departments.id
             ) AS de ON m.id = de.id AND m.department_id = de.department_id
-
-
           ) AS s")
           if @current_admin.is_admin?
             # @customers = School.all
@@ -230,10 +228,10 @@ module EducodeSales
             LEFT JOIN departments ON s.department_id = departments.id
           ")
 
-          part_a_ids = CustomerFollow.all.pluck(:school_id)
-          part_b_ids = Business.pluck(:school_id)
-          ids = part_a_ids + part_b_ids + CustomerAdd.all.pluck(:school_id)
-          @customers = @customers.where(id: ids.uniq)
+          # part_a_ids = CustomerFollow.all.pluck(:school_id)
+          # part_b_ids = Business.pluck(:school_id)
+          # ids = part_a_ids + part_b_ids + CustomerAdd.all.pluck(:school_id)
+          # @customers = @customers.where(id: ids.uniq)
           if params[:q].present? && params[:q][:name].present?
             @customers = @customers.where("schools.name like ?", "%#{params[:q][:name]}%")
           end
@@ -246,7 +244,7 @@ module EducodeSales
           end
           if params[:q].present? && params[:q][:property].present?
             property = params[:q][:property].split(",").map(&:to_i)
-            @customers = @customers.joins(:school_tags).where("school_tags.id in (?)", property).distinct
+            @customers = @customers.joins("JOIN school_tag_middles ON school_tag_middles.school_id = s.id INNER JOIN school_tags ON school_tags.id = school_tag_middles.school_tag_id").where("school_tags.id in (?)", property).distinct
           end
 
           if params[:q].present? && params[:q][:date].present?

data/app/controllers/educode_sales/home_controller.rb

@@ -119,7 +119,8 @@ module EducodeSales
     end
 
     def search_money_plans
-      @data = MoneyPlan.joins(business: :school)
+      # @data = MoneyPlan.joins(business: [:school, :last_follow_up])
+      @data = MoneyPlan.joins("JOIN educode_sales_businesses ON educode_sales_businesses.last_follow_up_id = educode_sales_money_plans.follow_up_id JOIN schools ON schools.id = educode_sales_businesses.school_id")
       if params[:q].present?
         @data = @data.where("educode_sales_businesses.name like :q OR educode_sales_businesses.number like :q OR schools.name like :q ", q: "%#{params[:q]}%").limit(20)
       end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -325,18 +325,23 @@ module EducodeSales
 
     def add_courses
       load_teacher
+      subject_names = %w[程序设计语言 计算机基础 算法设计 计算机系统能力 大数据 人工智能 数据库 电子信息 Web技术 软件工程 网络与安全 区块链 数学与统计 物联网 云计算 虚拟仿真].map{|d| {value: d, name: d}}
+      gon.subject_names = subject_names
       render layout: false
     end
 
 
     def create_course
       load_teacher
-      course_subject =  @teacher.course_subjects.build(name: params[:name], role_name: params[:role_name],)
-      # course_subject =  CourseSubject.new(teacher_id: params[:teacher_id], name: params[:name], role_name: params[:role_name],)
-      if course_subject.save
+      names = params[:select_subject_names].split(",")
+      begin
+        names.each do |name|
+          course_subject =  @teacher.course_subjects.build(name: name, role_name: params[:role_name])
+          course_subject.save!
+        end
         render_success
-      else
-        render_failure course_subject
+      rescue Exception => ex
+        render_failure(ex.message)
       end
     end
 

data/app/models/educode_sales/attendance.rb

@@ -0,0 +1,4 @@
+module EducodeSales
+  class Attendance < ApplicationRecord
+  end
+end

data/app/models/educode_sales/idea.rb

@@ -23,7 +23,7 @@ module EducodeSales
     enum status: %w[未完成 已完成]
     enum types: %w[低定制 非定制 高定制 全定制]
     enum model: %w[本地版 线上版 混合版]
-    enum idea_type: %w[售前 售后]
+    enum idea_type: %w[建设方案 申报论证 市场调研 课程建设 报价清单 交流汇报 招标参数 资质申报 产品手册 宣传海报 课题论文 投标支持 其他类]
 
     serialize :assist_staff_ids,Array
     serialize :attachment_ids, Array

data/app/views/educode_sales/assessments/_attendances.html.erb

@@ -0,0 +1,238 @@
+<div style="padding-right: 50px" id="tab_2">
+  <div class=" layui-show" style="padding-left: 0">
+    <div style="margin: 10px 10px 10px 10px">
+      <form class="layui-form layui-form-pane" lay-filter="search_form">
+        <div class="layui-form-item">
+          <div class="layui-inline">
+            <label class="layui-form-label">姓名</label>
+            <div class="layui-input-inline">
+              <input type="text" class="layui-input" id="name" name="name">
+            </div>
+          </div>
+          <div class="layui-inline">
+            <label class="layui-form-label">签到时间</label>
+            <div class="layui-input-inline">
+              <input type="text" class="layui-input" id="attendance_date" name="attendance_date" autocomplete="off" placeholder=" - ">
+            </div>
+          </div>
+          <div class="layui-inline">
+            <label class="layui-form-label">拜访客户</label>
+            <div class="layui-input-inline">
+              <input type="text" class="layui-input" id="customer" name="customer">
+            </div>
+          </div>
+          <div class="layui-inline">
+            <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_search">重置</button>
+            <button type="button" id="search_bt" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_attendance">确定</button>
+          </div>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
+<script type="text/html" id="toolbarDemo">
+  <div class="layui-btn-container">
+    <span class="table-label">签到列表</span>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="import_attendances">批量导入签到数据</button>
+  </div>
+</script>
+
+<div class="">
+  <table class="layui-hide" id="attendance_table" style="min-height: 300px;" lay-filter="attendance_table"></table>
+</div>
+
+<script type="text/html" id="currentTableBar">
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+  <a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+</script>
+
+<script>
+  layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
+      var $ = layui.jquery,
+          form = layui.form,
+          request = layui.request,
+          miniPage = layui.miniPage,
+          laydate = layui.laydate;
+
+      form.render();
+
+      laydate.render({
+          elem: '#attendance_date',
+          range: true
+      });
+
+      table = layui.table;
+      table.render({
+          elem: '#attendance_table',
+          url: '/missions/assessments/attendances',
+          where: {q: form.val('search_form')},
+          toolbar: '#toolbarDemo',
+          defaultToolbar: ['filter'],
+          cols: [
+              [
+                  {
+                      field: 'id',
+                      width: 100,
+                      title:'序号',
+                      type: 'numbers',
+                      fixed: 'left'
+                  },
+                  {
+                      field: 'name',
+                      width: 120,
+                      title: '姓名',
+                      fixed: 'left',
+                      templet: "#name"
+                  },
+                  {
+                      field: 'attendance_date',
+                      width: 120,
+                      title: '日期',
+                  },
+                  {
+                      field: 'attendance_time',
+                      width: 150,
+                      title: '时间',
+                  },
+                  {
+                      field: 'longitude',
+                      width: 150,
+                      title: '经度',
+                  },
+                  {
+                      field: 'latitude',
+                      width: 120,
+                      title: '纬度',
+                  },
+                  {
+                      field: 'location',
+                      width: 120,
+                      title: '地点',
+                  },
+                  {
+                      field: 'address',
+                      width: 150,
+                      title: '详细地址',
+                  },
+                  {
+                      field: 'mobile_id',
+                      width: 150,
+                      title: '手机标识',
+                  },
+                  {
+                      field: 'ip_address',
+                      width: 150,
+                      title: 'ip地址',
+                  },
+                  {
+                      field: 'customer',
+                      width: 120,
+                      title: '拜访客户',
+                  },
+                  {
+                      field: 'target',
+                      width: 120,
+                      title: '拜访对象',
+                  },
+                  {
+                      title: '操作',
+                      minWidth: 150,
+                      toolbar: '#currentTableBar',
+                      align: "center",
+                      fixed: 'right'
+                  }
+              ]
+          ],
+          limit: 20,
+          limits: [10, 20, 30, 40, 50, 60, 70, 80, 90],
+          page: true
+      });
+
+      //重置
+      form.on('submit(reset_search)', function () {
+          form.val('search_form', {
+              name: "",
+              attendance_date: "",
+              customer: ""
+          });
+          return false;
+      });
+
+      var sort = {}, search = {};
+      table.on('sort(attendance_table)', function (obj) {
+          sort.field = obj.field;
+          sort.order = obj.type;
+          table.reload('attendance_table', {
+              initSort: obj,
+              where: {
+                  sort: sort,
+                  q: search
+              }
+          });
+      });
+
+      // 监听搜索操作
+      form.on('submit(search_attendance)', function (data) {
+          search = data.field;
+          table.reload('attendance_table', {
+              page: {
+                  curr: 1
+              },
+              where: {q: search, sort: sort}
+          }, 'data');
+          return false;
+      });
+
+      //toorbar事件监听
+      table.on('toolbar(attendance_table)', function (obj) {
+          if (obj.event === 'import_attendances') {  //批量导入签到记录
+              var content = miniPage.getHrefContent('/missions/assessments/import');
+              var openWH = miniPage.getOpenWidthHeight();
+              import_index = layer.open({
+                  title: '导入签到记录数据',
+                  type: 1,
+                  shade: 0.2,
+                  shadeClose: true,
+                  area: ['400px', '200px'],
+                  offset: 'auto',
+                  closeBtn: 0,
+                  content: content,
+              });
+              $(window).on("resize", function () {
+                  layer.full(index);
+              });
+          }
+      });
+
+      //tool事件监听
+      table.on('tool(attendance_table)', function (obj) {
+          var data = obj.data;
+          var id = data.id;
+          if (obj.event === 'edit'){ //编辑签到记录
+              var content = miniPage.getHrefContent('/missions/assessments/' + id + '/edit_attendance');
+              var openWH = miniPage.getOpenWidthHeight();
+              var index = layer.open({
+                  title: '编辑签到记录',
+                  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
+              });
+              $(window).on("resize", function () {
+                  layer.full(index);
+              });
+          }else if (obj.event === 'delete'){
+              layer.confirm('确定删除该签到记录吗？', function (index) {
+                  request.delete('missions/assessments/' + id + "/delete_attendance", {}, function (res) {
+                      layer.close(index);
+                      table.reload("attendance_table")
+                  })
+              });
+          }
+      });
+  })
+</script>

data/app/views/educode_sales/assessments/attendances.js.erb

@@ -0,0 +1 @@
+$("#page_1").html("<%= j render 'attendances' %>");

data/app/views/educode_sales/assessments/attendances.json.jbuilder

@@ -0,0 +1,21 @@
+json.data do
+  json.array! @attendances do |d|
+    json.id d.id
+    json.name d.name
+    date = d.attendance_date.to_s.strip
+    attendance_date = date&.split(" ")[0]
+    attendance_time = date&.split(" ")[1]
+    json.attendance_date attendance_date #签到日期
+    json.attendance_time attendance_time #签到时间
+    json.longitude d.longitude #经度
+    json.latitude d.latitude #纬度
+    json.location d.location #签到地点
+    json.address d.address #详细地址
+    json.mobile_id d.mobile_id #手机标识
+    json.ip_address d.ip_address #ip地址
+    json.customer d.customer #拜访客户
+    json.target d.target #拜访对象
+  end
+end
+json.code 0
+json.count @attendances&.total_count

data/app/views/educode_sales/assessments/edit_attendance.html.erb

@@ -0,0 +1,77 @@
+<form class="layui-form layuimini-form" lay-filter="attendance_form">
+  <div class="layui-form-item" style="padding: 25px">
+    <div class="layui-inline">
+      <label class="layui-form-label">姓名：</label>
+      <div class="layui-input-block" style="width: 400px;">
+        <input type="text" name="name" value="<%= @attendance&.name %>" placeholder="请输入姓名" autocomplete="off" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">签到时间：</label>
+      <div class="layui-input-inline" style="width: 400px;">
+        <input type="text" class="layui-input" id="attendance_datetime" name="attendance_datetime" value="<%= @attendance&.attendance_date %>" autocomplete="off">
+      </div>
+    </div>
+    <br/>
+    <div class="layui-inline">
+      <label class="layui-form-label">手机标识：</label>
+      <div class="layui-input-block" style="width: 400px;">
+        <input type="text" name="mobile_id" value="<%= @attendance&.mobile_id %>" placeholder="请输入手机标识" autocomplete="off" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">ip地址：</label>
+      <div class="layui-input-block" style="width: 400px;">
+        <input type="text" name="ip_address" value="<%= @attendance&.ip_address %>" placeholder="请输入ip地址" autocomplete="off" class="layui-input">
+      </div>
+    </div>
+    <br/>
+    <div class="layui-inline">
+      <label class="layui-form-label">拜访客户：</label>
+      <div class="layui-input-block" style="width: 400px;">
+        <input type="text" name="customer" value="<%= @attendance&.customer %>" placeholder="请输入拜访客户" autocomplete="off" class="layui-input">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">拜访对象：</label>
+      <div class="layui-input-block" style="width: 400px;">
+        <input type="text" name="target" value="<%= @attendance&.target %>" placeholder="请输入拜访对象" autocomplete="off" class="layui-input">
+      </div>
+    </div>
+    <br/>
+    <div class="layui-inline" style="padding-left: 110px">
+      <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="attendance_reset">提交</button>
+    </div>
+  </div>
+</form>
+
+<script>
+  layui.use(['form', 'element', 'laydate', 'request'], function () {
+      var $ = layui.jquery,
+          form = layui.form,
+          request = layui.request,
+          laydate = layui.laydate;
+
+      form.render();
+
+      laydate.render({
+          elem: '#attendance_datetime',
+          type: 'datetime',
+          fullPanel: true
+      });
+
+      //监听提交
+      form.on('submit(attendance_reset)', function (data) {
+          request.authPut("missions/assessments/"+ <%= @attendance.id %> + "/update_attendance", data.field, function (res) {
+              if (res.success === false) {
+                  layer.alert(res.msg)
+              } else {
+                  layer.closeAll(); //关闭所有层
+                  table.reload('attendance_table')
+              }
+          });
+          return false;
+      });
+  });
+</script>
+

data/app/views/educode_sales/assessments/import.html.erb

@@ -0,0 +1,38 @@
+<div style="padding-left: 135px; padding-top: 50px">
+  <button type="button" class="layui-btn layui-btn-lg layui-btn-radius layui-btn-normal" id="import_attendance"><i class="layui-icon"></i>选择文件</button>
+</div>
+<script>
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            upload = layui.upload,
+            $ = layui.$;
+        selectInput = layui.selectInput;
+
+        form.render();
+
+        //指定允许上传的文件类型
+        upload.render({
+            elem: '#import_attendance',
+            url: '/missions/assessments/import_attendances', //此处配置你自己的上传接口即可
+            accept: 'file', //普通文件
+            headers: {
+                'X-CSRF-Token': $('meta[name=csrf-token]').attr('content')
+            },
+            before: function(obj){ //obj参数包含的信息，跟 choose回调完全一致，可参见上文。
+                layer.load(); //上传loading
+            },
+            done: function(res){
+                layer.msg('导入成功');
+                table.reload('attendance_table');
+                layer.close(parent.import_index);
+                layer.closeAll('loading'); //关闭loading
+            },
+            error: function(res){
+                layer.closeAll('loading'); //关闭loading
+                layer.msg(res.responseJSON.msg);
+            }
+        });
+    });
+</script>

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

@@ -6,6 +6,7 @@
     <% if can?(:show, EducodeSales::AssessmentsSetting) %>
       <li data="assessments" > 考核指标设置</li>
     <%end %>
+    <li class="">签到记录</li>
   </ul>
   <!--<div class="layuimini-main min-height-table"></div>-->
   <div class="layui-tab-content">
@@ -31,17 +32,26 @@
         </div>
       <%end %>
     <%end %>
+
+    <div class="layui-tab-item">
+      <div id="page_1"></div>
     </div>
+
   </div>
+</div>
 
 <script>
     layui.use(['element', 'table', 'jquery','laydate'], function () {
         var $ = layui.jquery,
             table = layui.table,
-            laydate = layui.laydate
+            laydate = layui.laydate,
             element = layui.element;
 
-          element.on('tab(sale_tab)', function (data) {
+        element.render();
+        element.on('tab(sale_tab)', function (data) {
+            if (data.index === 2 && $("#tab_2").length === 0) {
+                loadPage('/missions/assessments/attendances')
+            }
               // var status = $(this).attr('data')
               // switch (status) {
               //     case 'progress':
@@ -67,6 +77,18 @@
           //     });
           //     return false;
           // });
+
+        function loadPage(url) {
+            var layer_index = layer.load(0, {shade: [0.1, '#fff']});
+            Rails.ajax({
+                url: url,
+                type: 'GET',
+                dataType: "script",
+                success: function () {
+                    layer.close(layer_index);
+                }
+            });
+        }
     })
 </script>
 

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

@@ -399,202 +399,7 @@
             toolbar: '#toolbarDemo',
             totalRow:true,
             defaultToolbar: ['filter'],
-            cols: [
-              [
-                {
-                    field: 'id',
-                    width: 60,
-                    title:'序号',type: 'numbers',
-                    totalRowText:'合计',
-                    fixed: 'left'
-
-                },
-                {
-                    field: 'name',
-                    width: 100,
-                    title: '姓名',
-                    fixed: 'left',
-                    templet: "#name"
-                },
-                {
-                    field: 'realname',
-                    width: 100,
-                    title: '真实姓名',
-                },
-                {
-                    field: 'school',
-                    width: 160,
-                    title: '单位',
-                    templet:'<div><span title="{{d.school}}">{{d.school}}</span></div>'
-
-                },
-                {
-                    field: 'department',
-                    width: 130,
-                    title: '部门',
-                    templet:'<div><span title="{{d.department}}">{{d.department}}</span></div>'
-                },
-                {
-                    field: 'majors',
-                    width: 160,
-                    title: '专业',
-                },
-                {
-                    field: 'area',
-                    width: 80,
-                    title: '区域',
-                },
-                {
-                    field: 'business_count',
-                    width: 120,
-                    title: '单位商机数',
-                },
-                {
-                    field: 'professional_title',
-                    title: '职称',
-                    width: 80,
-                    templet: '#show_follow'
-                },
-                {
-                    field: 'job',
-                    width: 80,
-                    title: '职务',
-                    templet: '#show_keys'
-
-                },
-                {
-                  field: 'source',
-                  width: 90,
-                  title: '来源',
-                },
-                {
-                    field: 'attitude',
-                    width: 60,
-                    title: '态度',
-                },
-                {
-                    field: 'course_subjects_count',
-                    width: 90,
-                    title: '课程方向',
-                    templet: "#courses"
-                },
-                {
-                    field: 'teacher_follows_count',
-                    width: 90,
-                    title: '跟进情况',
-                    totalRow:true,
-                    templet: "#follow"
-                },
-                {
-                    field: 'sales_manage',
-                    width: 160,
-                    title: '销售经理',
-                 },
-                {
-                  field: 'staff_manage',
-                  width: 160,
-                  title: '生态经理',
-                },
-                {
-                    field: 'follow_person',
-                    width: 120,
-                    title: '最新跟进人',
-                },
-                {
-                    field: 'followup_at',
-                    width: 180,
-                    title: '最新跟进时间',
-                },
-                {
-                    field: 'latest_time',
-                    width: 120,
-                    title: '无跟进天数',
-                    sort: true,
-                },
-                {
-                    field: 'teacher_used',
-                    width: 120,
-                    title: '学院渗透率',
-                },
-                {
-                    field: 'students',
-                    width: 60,
-                    totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
-                    title: '学生',
-                },
-                {
-                    field: 'courses_count',
-                    width: 60,
-                    title: '课堂',
-                    totalRow:true,
-                    templet: "#class"
-                },
-                {
-                    field: 'activities_count',
-                    width: 100,
-                    title: '参与活动',
-                    templet: "#event"
-                },
-                {
-                    field: 'created_on',
-                    width: 120,
-                    title: '注册时间',
-                    sort: true,
-                },
-                {
-                    field: 'last_login_on',
-                    width: 120,
-                    title: '最近登录',
-                    sort: true,
-                },
-                {
-                    field: 'created_at',
-                    width: 120,
-                    title: '添加时间',
-                    sort: true,
-                },
-                {
-                    field: 'experience',
-                    width: 120,
-                    title: '经验值',
-                    sort: true,
-                },
-                {
-                    field: 'grade',
-                    width: 120,
-                    title: '金币',
-                    sort: true,
-                },
-                {
-                    field: 'mobile',
-                    width: 120,
-                    title: '联系电话',
-                },
-                {
-                    field: 'wechat',
-                    width: 120,
-                    title: '微信号',
-                },
-                {
-                    field: 'teacher_assist',
-                    width: 120,
-                    title: '教研助理',
-                },
-                {
-                    field: 'is_contact',
-                    width: 120,
-                    title: '是否联系上'
-                },
-                {
-                    title: '操作',
-                    minWidth: 270,
-                    toolbar: '#currentTableBar',
-                    align: "center",
-                    fixed: 'right'
-                }
-              ]
-            ],
-
+            cols: cols_table,
             limit: 20,
           limits: [10,15,20,30,40,50,60,70,80,90],
             page: true,

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

@@ -1,16 +1,17 @@
+<%= Gon::Base.render_data %>
 <div class="layuimini-main" style="height: 100%;">
   <div class="layui-form layuimini-form" lay-filter="common_edit">
     <fieldset class="table-search-fieldset">
       <legend>添加课程方向</legend>
       <div class="layui-form-item">
         <label class="layui-form-label required" >课程名称</label>
-        <div class="layui-input-block">
-          <input type="text" name="name" autocomplete="off" class="layui-input" placeholder="请输入" required lay-verify="required">
+        <div class="layui-input-inline">
+          <div id="subject_name" style="width: 1000px"></div>
         </div>
       </div>
       <div class="layui-form-item">
         <label class="layui-form-label required" >教学角色</label>
-        <div class="layui-input-block">
+        <div class="layui-input-block" style="width: 1000px">
           <input type="text" name="role_name" autocomplete="off" class="layui-input" placeholder="请输入" required lay-verify="required">
         </div>
       </div>
@@ -42,12 +43,28 @@
 
         form.render();
 
+        //课程名称复选框
+        if (document.getElementById("subject_name")) {
+            var subject_list = xmSelect.render({
+                el: '#subject_name',
+                data: gon.subject_names,
+                filterable: true
+            })
+        }
+
         // 当前弹出层，防止ID被覆盖
         var parentIndex = layer.index;
 
 
         //监听提交
         form.on('submit(add_course)', function (data) {
+            var subject_names = [];
+            if (document.getElementById("subject_name")) {
+                subject_list.getValue().forEach(function (d) {
+                    subject_names.push(d.value);
+                })
+            }
+            data.field['select_subject_names'] = subject_names.join(",");
             request.authPost('missions/teachers/'+parent.teacher_id +'/create_course', data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)
@@ -55,11 +72,11 @@
                     table.reload('teachers_table');
                     table.reload('coursesTable');
                     form.val('common_edit', {
-                        'name': '',
+                        'subject_name': '',
                         'role_name':''
                     })
                 }
-            })
+            });
             return false;
         });
 

data/config/routes.rb

@@ -266,6 +266,14 @@ EducodeSales::Engine.routes.draw do
       get :progress  # 考核完成情况
       post :get_export_data # 导出数据
       get :finished
+      get :attendances
+      get :import
+      post :import_attendances
+    end
+    member do
+      get :edit_attendance
+      put :update_attendance
+      delete :delete_attendance
     end
   end
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.1'
+  VERSION = '1.10.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.3
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-09 00:00:00.000000000 Z
+date: 2023-06-13 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
@@ -203,6 +204,7 @@ files:
 - app/models/educode_sales/assessments_setting.rb
 - app/models/educode_sales/assign_follow_up.rb
 - app/models/educode_sales/assign_staff.rb
+- app/models/educode_sales/attendance.rb
 - app/models/educode_sales/business.rb
 - app/models/educode_sales/business_clazz_change.rb
 - app/models/educode_sales/business_export_record.rb
@@ -275,12 +277,17 @@ files:
 - app/views/educode_sales/activities/show_schools.json.jbuilder
 - app/views/educode_sales/activities/show_teachers.html.erb
 - app/views/educode_sales/activities/upload_file.html.erb
+- app/views/educode_sales/assessments/_attendances.html.erb
 - app/views/educode_sales/assessments/_finished.html.erb
 - app/views/educode_sales/assessments/_progress.html.erb
 - app/views/educode_sales/assessments/_setup.html.erb
+- app/views/educode_sales/assessments/attendances.js.erb
+- app/views/educode_sales/assessments/attendances.json.jbuilder
 - app/views/educode_sales/assessments/edit.html.erb
+- app/views/educode_sales/assessments/edit_attendance.html.erb
 - app/views/educode_sales/assessments/finished.json.jbuilder
 - app/views/educode_sales/assessments/get_export_data.json.jbuilder
+- app/views/educode_sales/assessments/import.html.erb
 - app/views/educode_sales/assessments/index.html.erb
 - app/views/educode_sales/assessments/index.json.jbuilder
 - app/views/educode_sales/assessments/new.html.erb
@@ -727,7 +734,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -743,7 +750,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.9
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []