educode_sales 1.10.3 → 1.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86f8364fd145617cb033ff7034197314eb267e79bf716e14200046c24551fad5
-  data.tar.gz: 70caf8f362c4bf1b40d205f2a44370c7fd930e791f74a934ecef7a9abddc8321
+  metadata.gz: 7d2e7e3e78774b085c64185fddc9b8ecddbcbb7bf87e030c8f449fb21285f8c9
+  data.tar.gz: c1ea147b8d76cc8ef23d6004834d4c79499b2c1d7f18c233e939f030b303488f
 SHA512:
-  metadata.gz: 5ecece08fea07f8ed2213187dc596092fc1961640751a01301416ab97bf0587efbfd2fe2158e13c2becbe6f2eb3c19fa941b67a9c6ff6f2ed528ff61c911f1f0
-  data.tar.gz: 95170fda46d59cf757bbc5c5518a3e6a96a09872d4cb296c5344138e91d5baf9ab12bc64b321d3e50345bf2ae0e927001547a2fb0edcb8e12f0f2a9aaa424403
+  metadata.gz: 37e8d9e9ce8bbf78632588b9bff325548e3004dbb2a8daf7b3a64a29fd547556c41bc0ecfc3b244fb8725e2cd76cb3618cc08db4952a47189f8f0dfb1f19943e
+  data.tar.gz: a5661dcb147e98afe980d0c330c9d8fcb5f297335ec2f305e658b3f088be9c57919f7e534241d6d7b612dc903043190aa9b9132dd6a727122299e7dd847071c5

data/app/controllers/educode_sales/assessments_controller.rb

@@ -437,21 +437,25 @@ module EducodeSales
     #导入签到记录接口
     def import_attendances
       render_failure("文件不存在或格式错误") if params[:file].blank? || !params[:file].is_a?(ActionDispatch::Http::UploadedFile)
+      Rails.logger.info "导入签到数据"
       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]
+        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]
@@ -469,10 +473,6 @@ module EducodeSales
             end
           end
           render_success
-        end
-      rescue Exception => e
-        render_failure(e.message)
-      end
     end
 
 

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/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/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/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
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.3'
+  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.3
+  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
@@ -362,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