educode_sales 0.9.67 → 0.9.69

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

@@ -4,88 +4,81 @@
   <div class="layui-form-item">
     <div class="layui-inline">
       <label class="layui-form-label required">活动名称</label>
-      <div class="layui-input-block">
-        <input type="text" name="name" required lay-verify="required"
-               class="layui-input" value="<%= @activity.name %>">
+      <div class="layui-input-block" style="width: 200px;">
+        <input type="text" name="name" required lay-verify="required" class="layui-input" value="<%= @activity.name %>">
       </div>
     </div>
     <div class="layui-inline">
     <label class="layui-form-label required">活动类型</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <%= select_tag "clazz_id", options_for_select(@clazz, @activity.clazz_id), { 'lay-filter': 'clazz_id', class: 'required' } %>
     </div>
   </div>
   <div class="layui-inline">
     <label class="layui-form-label required">活动状态</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <%= select_tag "state_id", options_for_select(EducodeSales::Activity.state_ids.keys, @activity.state_id), { 'lay-filter': 'clazz_id', class: 'required' } %>
     </div>
   </div>
     <div class="layui-inline">
       <label class="layui-form-label required">活动时间</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="start_at" required lay-verify="required" class="layui-input" id="time" placeholder="请选择时间"
                value="<%= @activity.start_at&.to_s(:date) %>">
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">活动天数</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="days" required lay-verify="required"
                class="layui-input" value="<%= @activity.days %>">
       </div>
     </div>
     <div class="layui-inline">
     <label class="layui-form-label">销售经理</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <div id="sales_list" style="width: 163px;"></div>
     </div>
   </div>
     <div class="layui-inline">
       <label class="layui-form-label">生态经理</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <div id="staff_manage_list" style="width: 163px;"></div>
       </div>
     </div>
-    <div class="layui-inline">
-      <label class="layui-form-label">协助人员</label>
-      <div class="layui-input-block">
-        <div id="staff_assist_list" style="width: 193px;"></div>
-      </div>
-    </div>
     <div class="layui-inline">
     <label class="layui-form-label">主办方</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <input type="text" name="sponsor" class="layui-input" value="<%= @activity.sponsor %>">
     </div>
   </div>
   <div class="layui-inline">
     <label class="layui-form-label">联系人</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <input type="text" name="linkman" class="layui-input" value="<%= @activity.linkman %>">
     </div>
   </div>
   <div class="layui-inline">
     <label class="layui-form-label">联系电话</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <input type="text" name="phone" class="layui-input" value="<%= @activity.phone %>">
     </div>
   </div>
   <div class="layui-inline">
     <label class="layui-form-label">规模</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <input type="text" name="scale" class="layui-input" value="<%= @activity.scale %>">
     </div>
   </div>
   <div class="layui-inline">
     <label class="layui-form-label">会议地点</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <input type="text" name="address" class="layui-input" value="<%= @activity.address %>">
     </div>
   </div>
   <div class="layui-inline">
     <label class="layui-form-label">会议形式</label>
-    <div class="layui-input-block">
+    <div class="layui-input-block" style="width: 200px;">
       <input type="text" name="meeting_form" class="layui-input" value="<%= @activity.meeting_form %>">
     </div>
   </div>
@@ -96,26 +89,13 @@
     </div>
   </div>
     <div class="layui-inline">
-      <label class="layui-form-label">报告专家</label>
+      <label class="layui-form-label">协助人员</label>
       <div class="layui-input-block">
-        <div id="expert_list" style="width: 600px;"></div>
+        <div id="staff_assist_list" style="width: 600px;"></div>
       </div>
     </div>
   </div>
   <div class="layui-form-item">
-    <div class="layui-inline">
-      <label class="layui-form-label">上传附件</label>
-      <div class="layui-input-block">
-        <%= hidden_field_tag 'attachment_id', @activity.attachment&.id %>
-        <span id="attachment">
-          <% if @activity.attachment %>
-            <%= link_to @activity.attachment&.filename.to_s, "/missions/upload_files/download?id=#{@activity.attachment&.id}", target: '_blank'  %>
-            <a href="javascript:;" style="color:red;" id="delete">删除</a>
-          <% end %>
-        </span>
-        <button type="button" class="layui-btn" id="upload_file">上传文件</button>
-      </div>
-    </div>
     <div class="layui-inline" style="padding-left: 30px">
       <button type="submit" class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交
       </button>
@@ -159,17 +139,6 @@
             }
         })
 
-        upload.render({
-          elem: '#upload_file', 
-          url: '/missions/upload_files',
-          auto: true,
-          accept: 'file', 
-          done: function (res) {
-            layer.msg('上传成功');
-            $("#attachment_id").val(res.attachment_id);
-            document.getElementById("attachment").innerHTML = '<a target="_blank" href="' + res.url+ '">' + res.filename + '</a><a href="javascript:;" style="color:red;" id="delete">删除</a>';
-          }
-       });
 
         var staff_manage = xmSelect.render({
           el: '#staff_manage_list',
@@ -184,17 +153,11 @@
           filterable: true,
         })
 
-        
 
         var staff_assist = xmSelect.render({
-          el: '#staff_assist_list',
-          data: gon.assists,
-          filterable: true,
-        })
-        var expert = xmSelect.render({
-          el: '#expert_list', 
+          el: '#staff_assist_list', 
           filterable: true,
-          name: 'expert_ids',
+          name: 'staff_assist_id',
           remoteSearch: true,
           remoteMethod: function(val, cb, show){
             if(!val){
@@ -208,13 +171,13 @@
               }
             })
           },
-          data: gon.experts
+          data: gon.assistss
         })
 
         var invitation_select = xmSelect.render({
           el: '#invitation_list', 
           filterable: true,
-          name: 'expert_ids',
+          name: 'invitation_ids',
           remoteSearch: true,
           remoteMethod: function(val, cb, show){
             if(!val){
@@ -231,21 +194,15 @@
           data: gon.invitation_list
         })
 
-        $(body).on("click", "#delete", function() {
-          document.getElementById("attachment").innerHTML = "";
-          $("#attachment_id").val('');
-        })
-
         //监听提交
         form.on('submit(data-reset-btn)', function (data) {
           data.field.staff_manage_id = staff_manage.getValue('value');
-          data.field.staff_assist_id = staff_assist.getValue('value');
-          var expertids = [];
-          expert.getValue().forEach(function(d) {
+          var staff_assist_id = [];
+          staff_assist.getValue().forEach(function(d) {
             if (typeof(d.value) == 'number') {
-              expertids.push([d.value, d.name]);
+              staff_assist_id.push([d.value, d.name]);
             } else {
-              expertids.push(['', d.name]);
+              staff_assist_id.push(['', d.name]);
             }
           })
           var invitation_ids = [];
@@ -258,7 +215,7 @@
             }
           })
           data.field.invitation_ids = invitation_ids;
-          data.field.expert_ids = expertids;
+          data.field.staff_assist_id = staff_assist_id;
             request.authPut("missions/activities/" + <%= @activity.id %>, data.field, function (res) {
                 if (res.success === false) {
                     layer.alert(res.msg)

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

@@ -0,0 +1,157 @@
+<%= 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::Activity %>
+    <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::Activity %>
+<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::Activity %>
+<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
+</script>
+
+<script type="text/html" id="showchance">
+  <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}</a>
+</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 activity_id = parent.activity_id;
+        table.render({
+            elem: '#file',
+            url: '/missions/activities/' + activity_id +'/files',
+            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') {  //
+                activity_id = parent.activity_id;
+                var content = miniPage.getHrefContent('/missions/activities/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/activities/files.json.jbuilder

@@ -0,0 +1,13 @@
+json.data do
+  json.array! @files do |d|
+    json.id d.id
+    json.name d.filename
+    json.size d.filesize < 1000000 ? (d.filesize.to_f / 1000).round(2).to_s + 'KB' : (d.filesize.to_f / 1000000).round(2).to_s + 'MB'
+    json.created_on d.created_on.to_s
+    json.upload_person d.author.real_name
+    json.disk_filename d.disk_filename
+    json.content_type d.content_type
+  end
+end
+json.code 0
+json.count @files.total_count

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

@@ -6,7 +6,7 @@ json.data do
     json.info_id d.info_id
     json.clazz_id d.activity.clazz_id
     json.staff d.activity.sales&.user&.real_name || d.activity.staff&.user&.real_name
-    json.staff_manage d.activity.manages.map { |d| d.activity.staff.user.real_name}.uniq.join("、")
+    json.staff_manage d.activity.manages.map { |d| d.staff.user.real_name}.uniq.join("、")
     json.follow_up d.staff.user.real_name
     json.created_at d.created_at.to_s
     json.state_id d.activity.state_id

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

@@ -14,8 +14,7 @@ json.data do
     json.clazz_id d.clazz_id
     json.staff d.sales&.user&.real_name || d.staff&.user&.real_name
     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.staff_assist d.assists.pluck(:name).join("、")
     json.invitations d.invitations.pluck(:name).join("、")
     json.sponsor d.sponsor
     json.linkman d.linkman
@@ -24,6 +23,7 @@ json.data do
     json.address d.address
     json.meeting_form d.meeting_form
     json.state_id d.state_id
+    json.advise d.last_follow_up&.advise || ''
  
     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

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

@@ -4,79 +4,73 @@
   <div class="layui-form-item">
     <div class="layui-inline">
       <label class="layui-form-label required">活动名称</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="name" required lay-verify="required" placeholder="请输入" class="layui-input" id="inputFocus">
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">活动类型</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <%= select_tag "clazz_id", options_for_select(@clazz), { 'lay-filter': 'clazz_id', class: 'required' } %>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">活动状态</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <%= select_tag "state_id", options_for_select(EducodeSales::Activity.state_ids.keys), { 'lay-filter': 'clazz_id', class: 'required' } %>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">活动时间</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="start_at" autocomplete="off" required lay-verify="required" class="layui-input" id="new_time" placeholder="请选择时间">
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label required">活动天数</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="days" required lay-verify="required" class="layui-input">
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">生态经理</label>
       <div class="layui-input-block">
-        <div id="staff_manage_list" style="width: 163px;"></div>
-      </div>
-    </div>
-    <div class="layui-inline">
-      <label class="layui-form-label">协助人员</label>
-      <div class="layui-input-block">
-        <div id="staff_assist_list" style="width: 193px;"></div>
+        <div id="staff_manage_list" style="width: 200px;"></div>
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">主办方</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="sponsor" class="layui-input">
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">联系人</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="linkman" class="layui-input">
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">联系电话</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="phone" class="layui-input">
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">规模</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="scale" class="layui-input">
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">会议地点</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="address" class="layui-input">
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">会议形式</label>
-      <div class="layui-input-block">
+      <div class="layui-input-block" style="width: 200px;">
         <input type="text" name="meeting_form" class="layui-input">
       </div>
     </div>
@@ -87,22 +81,13 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">报告专家</label>
+      <label class="layui-form-label">协助人员</label>
       <div class="layui-input-block">
-        <div id="expert_list" style="width: 600px;"></div>
+        <div id="staff_assist_list" style="width: 600px;"></div>
       </div>
     </div>
   </div>
   <div class="layui-form-item">
-    <div class="layui-inline">
-      <label class="layui-form-label">上传附件</label>
-      <div class="layui-input-block">
-        <%= hidden_field_tag 'attachment_id' %>
-        <span id="attachment">
-        </span>
-        <button type="button" class="layui-btn" id="upload_file">上传文件</button>
-      </div>
-    </div>
     <div class="layui-inline" style="padding-left: 30px">
       <button class="layui-btn layui-btn-normal" lay-submit lay-filter="data-reset-btn">提交 </button>
     </div>
@@ -136,16 +121,10 @@
           data: gon.staff_manage,
           filterable: true,
         })
-
         var staff_assist = xmSelect.render({
-          el: '#staff_assist_list',
-          data: gon.staff_manage,
-          filterable: true,
-        })
-        var expert = xmSelect.render({
-          el: '#expert_list', 
+          el: '#staff_assist_list', 
           filterable: true,
-          name: 'expert_ids',
+          name: 'staff_assist_id',
           remoteSearch: true,
           remoteMethod: function(val, cb, show){
             if(!val){
@@ -184,23 +163,6 @@
           data: []
         })
 
-
-        upload.render({
-          elem: '#upload_file', 
-          url: '/missions/upload_files',
-          auto: true,
-          accept: 'file', 
-          done: function (res) {
-            layer.msg('上传成功');
-            $("#attachment_id").val(res.attachment_id);
-            document.getElementById("attachment").innerHTML = '<a target="_blank" href="' + res.url+ '">' + res.filename + '</a><a href="javascript:;" style="color:red;" id="delete">删除</a>';
-          }
-       });
-      
-        $(body).on("click", "#delete", function() {
-          document.getElementById("attachment").innerHTML = "";
-          $("#attachment_id").val('');
-        })
         form.render();
 
         // 当前弹出层，防止ID被覆盖
@@ -222,13 +184,12 @@
         //监听提交
         form.on('submit(data-reset-btn)', function (data) {
             data.field.staff_manage_id = staff_manage.getValue('value');
-            data.field.staff_assist_id = staff_assist.getValue('value');
-            var expertids = [];
-            expert.getValue().forEach(function(d) {
+            var staff_assist_id = [];
+            staff_assist.getValue().forEach(function(d) {
               if (typeof(d.value) == 'number') {
-                expertids.push([d.value, d.name]);
+                staff_assist_id.push([d.value, d.name]);
               } else {
-                expertids.push(['', d.name]);
+                staff_assist_id.push(['', d.name]);
                
               }
             })
@@ -243,7 +204,7 @@
               }
             })
             data.field.invitation_ids = invitation_ids;
-            data.field.expert_ids = expertids;
+            data.field.staff_assist_id = staff_assist_id;
             request.authPost("missions/activities", data.field, function (res) {
                 if (res.success === false) {
                   layer.alert(res.msg)

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

@@ -65,7 +65,7 @@
                 {
                     field: 'name',
                     width: 90,
-                    title: '姓名',
+                    title: '用户名',
                     templet: "#name"
                 },
                 {

data/app/views/educode_sales/activities/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 activity_id = parent.activity_id
+        var renderObj = upload.render({
+            elem: '#get_file'
+            ,url: '/missions/upload_files?activity_id='+activity_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>