educode_sales 1.10.2 → 1.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8319a1ab978e05583c3bf97bba97c61d872dbb3165d8e7f62888dc43747732fa
-  data.tar.gz: 12b16d2e7c5c4d8c0c0e6051625308c1dc50693d5dfc26452cf2336ca796736f
+  metadata.gz: 7d2e7e3e78774b085c64185fddc9b8ecddbcbb7bf87e030c8f449fb21285f8c9
+  data.tar.gz: c1ea147b8d76cc8ef23d6004834d4c79499b2c1d7f18c233e939f030b303488f
 SHA512:
-  metadata.gz: 3a134e29aa9a9f3543be3edc4e63ee1e9d5f87f4879905a7b166a2cafb6e85ace9b14d2aa736a3e3e0d0797723da19050a590abd6fff4eec7cd56aa012dc983f
-  data.tar.gz: baf71ec0ec85d306725c0c75f6445b89c7f8953dabc7914a569cecb963fd183d95eafe92540023739d82c07c32819406a40ff8265c602340ea5239d1587c8ccf
+  metadata.gz: 37e8d9e9ce8bbf78632588b9bff325548e3004dbb2a8daf7b3a64a29fd547556c41bc0ecfc3b244fb8725e2cd76cb3618cc08db4952a47189f8f0dfb1f19943e
+  data.tar.gz: a5661dcb147e98afe980d0c330c9d8fcb5f297335ec2f305e658b3f088be9c57919f7e534241d6d7b612dc903043190aa9b9132dd6a727122299e7dd847071c5

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)
+      Rails.logger.info "导入签到数据"
+      begin
+        doc = SimpleXlsxReader.open(params[:file])
+      rescue
+        return render_error("文件不存在或格式错误")
+      end
+      size = doc.sheets.size
+      Rails.logger.info 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
 
 
 
 
     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/follow_ups_controller.rb

@@ -287,8 +287,21 @@ module EducodeSales
       render_success
     end
 
+    def file
+      gon.folder = edu_setting('attachment_folder') + '/'
+      render layout: false
+    end
+
+    def upload_file
+      render layout: false
+    end
+
     private
 
+    def edu_setting name
+      EduSetting.get(name)
+    end
+    
     def load_business
       @business = Business.find(params[:business_id])
     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/controllers/educode_sales/upload_files_controller.rb

@@ -8,7 +8,12 @@ module EducodeSales
         format.html do
         end
         format.json do
-          @files = Attachment.where(description: "business", container_id:params[:business_id])
+          if params[:follow_up_id].present?
+            @files = Attachment.where(container_type: "EducodeSales::FollowUp", container_id: params[:follow_up_id])
+          else
+            @files = Attachment.where(description: "business", container_id:params[:business_id])
+          end
+      
           if params[:sort].present? && params[:sort][:field]
             @files = @files.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
@@ -39,6 +44,9 @@ module EducodeSales
         elsif params[:idea_id].present?
           @attachment.container_id = params[:idea_id]
           @attachment.container_type = 'EducodeSales::Idea'
+        elsif params[:follow_up_id].present?
+          @attachment.container_id = params[:follow_up_id]
+          @attachment.container_type = 'EducodeSales::FollowUp'
         else
           @attachment.description = "business"
           @attachment.container_id = params[:business_id]

data/app/models/educode_sales/attendance.rb

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

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/businesses/time_line.html.erb

@@ -24,7 +24,10 @@
               <a href="javascript:;" class="add_key" data-is_latest="<%= f.id == @latest&.id %>" data-id=<%= f.id %> data-flag="<%= f.created_at.present? ? (Time.now - f.created_at).to_f/3600 < 24 : false %>">添加关键人</a>
             <% end %>
         <br/>
-        评论: <span><%= f.comment %></span> <a href="javascript:;" class="add_comment" data-id=<%= f.id %>>评论</a> 
+        评论: <span><%= f.comment %></span> <a href="javascript:;" class="add_comment" data-id=<%= f.id %>>评论</a> <a href="javascript:;" class="uploadFile" data-id=<%= f.id %>>附件上传</a> 
+        <br/>
+        <!-- <span class="layui-badge layui-bg-green"></span> -->
+        <button type="button" class="layui-btn layui-btn-xs layui-btn-primary add-tag"><i class="layui-icon layui-icon-addition"></i>标签设置</button>
       </p>
     </div>
   </li>
@@ -99,8 +102,28 @@
           layer.close(index)
         },
       });
-     
     })
+
+    $(".uploadFile").on("click", function(e) {
+      var data = e.currentTarget.dataset;
+      follow_up_id = parent.id
+      var content = miniPage.getHrefContent('/missions/follow_ups/' + follow_up_id + '/file');
+      var openWH = miniPage.getOpenWidthHeight();
+      lsindex = 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(sindex);
+      });
+    })
+
     });
     function demo(){
         layer.closeAll()

data/app/views/educode_sales/follow_ups/file.html.erb

@@ -0,0 +1,154 @@
+<%= Gon::Base.render_data %>
+<script type="text/html" id="toolbarDemo">
+  <div class="layui-btn-container">
+    <span class="table-label">附件信息</span>
+    <% if can? :upload_file, EducodeSales::Business %>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="upload_file">上传文件</button>
+    <% end %>
+  </div>
+</script>
+
+<table class="layui-hide" id="file" lay-filter="file"></table>
+
+<script type="text/html" id="currentTableBar_file">
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="preview">预览</a>
+  <% if can? :download_file, EducodeSales::Business %>
+<a href="/missions/upload_files/download?id={{d.id}}" class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="download">下载</a>
+  <% end %>
+  <% if can? :delete_file, EducodeSales::Business %>
+<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
+</script>
+
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+            form = layui.form,
+            table = layui.table,
+            request = layui.request,
+            upload = layui.upload;
+        miniPage = layui.miniPage;
+
+
+        var follow_up_id = parent.follow_up_id
+        table.render({
+            elem: '#file',
+            url: '/missions/upload_files?follow_up_id='+follow_up_id,
+            toolbar: '#toolbarDemo',
+            defaultToolbar: [],
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        width: 80,
+                        title:'序号',type: 'numbers',
+                    },
+                    {
+                        field: 'name',
+                        title: '文件名'
+                    },
+                    {
+                        field: 'size',
+                        width: 100,
+                        title: '文件大小',
+                    },
+                    {
+                        field: 'created_on',
+                        width: 200,
+                        title: '上传时间',
+                        sort: true
+                    },
+                    {
+                        field: 'upload_person',
+                        width: 80,
+                        totalRow:true,
+                        title: '上传人',
+                    },
+                    {
+                        title: '操作',
+                        width: 200,
+                        toolbar: '#currentTableBar_file',
+                        align: "center"
+                    }
+                ]
+            ],
+            limit: 20,
+            limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true
+        });
+
+
+        var sort = {};
+        table.on('sort(file)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('file', {
+                initSort: obj,
+                where: {
+                    sort: sort
+                }
+            });
+        })
+
+
+        table.on('toolbar(file)', function (obj) {
+            if (obj.event === 'upload_file') {  //
+                follow_up_id = parent.follow_up_id
+                var content = miniPage.getHrefContent('/missions/follow_ups/' + parent.follow_up_id +'/upload_file');
+                var openWH = miniPage.getOpenWidthHeight();
+                import_index = layer.open({
+                    title: '上传文件',
+                    type: 1,
+                    shade: 0.2,
+                    shadeClose: true,
+                    area: ['200px', '100px'],
+                    offset: 'auto',
+                    closeBtn: 0,
+                    content: content,
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }
+        });
+
+
+        table.on('tool(file)', function (obj) {
+            var data = obj.data;
+            var id = data.id
+            name = data.disk_filename
+            folder = gon.folder
+            if (obj.event === 'preview') {
+                if (data.content_type.split("/")[0] === "image"){
+                    layer.photos({
+                        photos: { "data": [{"src": '/files/educode_sales/' + name}] }
+                        ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机
+                    });
+                }else if (data.content_type.split("/")[1] === "pdf"){
+                    var pdf = '/files/educode_sales/' + name;
+                    var openWH = miniPage.getOpenWidthHeight();
+                    layer.open({
+                        title: data.name,
+                        type: 2,
+                        area: ['1000px', '750px'],
+                        fixed: false, //不固定
+                        maxmin: true,
+                        content: pdf
+                    });
+                }else{
+                    layer.msg("附件不支持预览，请下载查看！")
+                }
+                return false;
+            }else if (obj.event === 'delete') {
+                layer.confirm('确定删除' + data.name, function (index) {
+                    request.delete('missions/upload_files/' + data.id + '?disk_filename=' + data.disk_filename, {}, function (res) {
+                        layer.close(index);
+                        table.reload("file")
+                    })
+                });
+            }
+        });
+
+    });
+</script>

data/app/views/educode_sales/follow_ups/upload_file.html.erb

@@ -0,0 +1,43 @@
+<div style="padding-left: 50px">
+        <button type="button" class="layui-btn" id="get_file"><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,
+            laytpl = layui.laytpl,
+            upload = layui.upload,
+            request = layui.request,
+            $ = layui.$;
+        selectInput = layui.selectInput;
+
+        form.render();
+
+        //指定允许上传的文件类型
+        var follow_up_id = parent.follow_up_id;
+        var renderObj = upload.render({
+            elem: '#get_file'
+            ,url: '/missions/upload_files?follow_up_id='+follow_up_id //此处配置你自己的上传接口即可
+            ,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('file');
+                layer.closeAll('loading'); //关闭loading
+                layer.close(parent.import_index)
+            }
+            ,error: function(index, upload){
+                table.reload('file');
+                layer.closeAll('loading'); //关闭loading
+                layer.alert('导入失败，请检查文件格式')
+                layer.close(parent.import_index)
+            }
+        });
+    });
+</script>

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

@@ -153,6 +153,8 @@ EducodeSales::Engine.routes.draw do
       delete :delete_money
       put :update_advise
       put :comment
+      get :file
+      get :upload_file
     end
   end
 
@@ -266,6 +268,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.2'
+  VERSION = '1.10.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.5
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-13 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -204,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
@@ -276,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
@@ -356,9 +362,11 @@ files:
 - app/views/educode_sales/customers/show_follow.json.jbuilder
 - app/views/educode_sales/customers/show_follow_record.html.erb
 - app/views/educode_sales/customers/show_majors.html.erb
+- app/views/educode_sales/follow_ups/file.html.erb
 - app/views/educode_sales/follow_ups/index.json.jbuilder
 - app/views/educode_sales/follow_ups/money_plans.json.jbuilder
 - app/views/educode_sales/follow_ups/teachers.json.jbuilder
+- app/views/educode_sales/follow_ups/upload_file.html.erb
 - app/views/educode_sales/home/index.html.erb
 - app/views/educode_sales/home/no_permission.html.erb
 - app/views/educode_sales/home/sales_place.json.jbuilder