educode_sales 0.9.64 → 0.9.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e63a76d8b22ea7491a9ac03c2891cdf2e62d8fdfe902b2fa8b844cb4dbd79458
-  data.tar.gz: 77543a51348757e58029c047e0b2f42d620d618130024969b2f16e9ad3454942
+  metadata.gz: 840004c5725190fa6d1a8b359f886151f5efe6492a343f176fd53325c93563b0
+  data.tar.gz: 86e69f97e1facebfcfe0c0e3c5b059fcba252204d607ed5ff2cd6974057396ac
 SHA512:
-  metadata.gz: 917b3a02eb534a97c87f5c4f8933db9bb72b3f63e655024300f9aea82646dc06438d7ce5de36055c2eda9b98f1118e7748f3883ce1448c49c8fa77598f0a5368
-  data.tar.gz: 9426d2279d8f35de786ad0d0b0f1aba56f37393225eb5e187c1cdc22885fdc0e347d431691decf4570ca0f10e3fbee53146609b4a5a1e81c4a58bf9d0d964e1c
+  metadata.gz: 28284bf39836512e0bbb84a23da24cb5090450d311ee4d00c6dfdc29d72cdf64bc0e755f15248cc0d83bd152a77d1cfe2f369ac01ac63f059cfe6ae71970e6ff
+  data.tar.gz: 80ff218d9f6423ae14a1f08cbd5f0cfad784343f1ce18f5a8338e62a47b032dd5beffa2c08559b16f9b1c1d98f047450d017b7397ea1ef0b51cb5c7cb8666ef2

data/app/controllers/educode_sales/ideas_controller.rb

@@ -62,6 +62,7 @@ module EducodeSales
       gon.staffs = staffs.map { |d| { name: d.user.real_name, value: d.id } }
       gon.department = { value: '', name: '' }
       gon.value = ''
+      gon.attachments = []
       render layout: false
     end
 
@@ -70,6 +71,8 @@ module EducodeSales
       # idea.school_id = Department.find_by_id(idea.department_id)&.school_id
       idea.creator = current_user
       assist_staff_ids = Array(params[:assist_staff_ids].to_s.split(","))
+      attachment_ids = Array(params[:attachment_ids].to_s.split(","))
+      idea.attachment_ids = attachment_ids
       idea.assist_staff_ids = assist_staff_ids
       idea.save
       render_success
@@ -88,6 +91,8 @@ module EducodeSales
       # @idea.school_id = Department.find_by_id(@idea.department_id)&.school_id
       assist_staff_ids = Array(params[:assist_staff_ids].to_s.split(","))
       @idea.assist_staff_ids = assist_staff_ids
+      attachment_ids = Array(params[:attachment_ids].to_s.split(","))
+      @idea.attachment_ids = attachment_ids
       check_changes
       @idea.save
       render_success
@@ -104,6 +109,7 @@ module EducodeSales
       gon.staff_value = [{ name: @idea.staff&.user&.real_name, value: @idea.staff_id }]
       gon.sale_staff_value = [{ name: @idea.sale_staff&.user&.real_name, value: @idea.sale_staff_id }]
       gon.assist_staff_value = @idea.assist_staffs.map { |d| { name: d&.user&.real_name, value: d.id } }
+      gon.attachment_list = @idea.attachments.map { |d| { name: d.filename, value: d.id } }
       gon.department = { value: @idea&.department_id, name: "#{@idea&.department&.school&.name}-#{@idea&.department&.name}" }
       gon.value = @idea.department_id
       gon.department_list = @idea.department.present? ? [{ name: @idea.department.name, value: @idea.department_id }] : []

data/app/models/educode_sales/idea.rb

@@ -20,6 +20,7 @@ module EducodeSales
     enum model: %w[本地版 线上版 混合版]
 
     serialize :assist_staff_ids,Array
+    serialize :attachment_ids, Array
 
     # before_save :check_changes
 
@@ -31,6 +32,10 @@ module EducodeSales
       Staff.where(id: self.assist_staff_ids)
     end
 
+    def attachments
+      Attachment.where(id: self.attachment_ids)
+    end
+
     def soft_destroy(staff_id)
       self.update(deleted_at: Time.now, deleter_id: staff_id, is_deleted: true)
     end

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

@@ -131,6 +131,18 @@
           <%= idea.content.to_s %>
         </div>
       </div>
+
+      <div class="layui-inline">
+        <label class="layui-form-label" style="width: 100px">方案材料：</label>
+        <div class="layui-input-inline" style="width: 1000px">
+          <% idea.attachments.each do |a| %>
+            <%= link_to "/missions/upload_files/download?id=#{a.id}", target: '_blank' do %>
+              <%= a&.filename.to_s %>
+            <% end %>
+          <% end %>
+        </div>
+      </div>
+
     </div>
   </div>
   <hr>

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

@@ -65,14 +65,14 @@
           <%= idea.assist_staffs.map { |d| d&.user&.real_name }.reject(&:blank?).join("、") %>
         </div>
       </div>
-      <div class="layui-inline">
-        <label class="layui-form-label" style="width: 100px">方案材料：</label>
-        <div class="layui-input-inline">
-          <%= link_to "/missions/upload_files/download?id=#{idea.attachment_id}", target: '_blank' do %>
-            <%= idea.attachment&.filename.to_s %>
-          <% end %>
-        </div>
-      </div>
+      <!--      <div class="layui-inline">-->
+      <!--        <label class="layui-form-label" style="width: 100px">方案材料：</label>-->
+      <!--        <div class="layui-input-inline">-->
+      <%#= link_to "/missions/upload_files/download?id=#{idea.attachment_id}", target: '_blank' do %>
+      <%#= idea.attachment&.filename.to_s %>
+      <%# end %>
+      <!--        </div>-->
+      <!--      </div>-->
       <br>
       <div class="layui-inline">
         <label class="layui-form-label" style="width: 100px">优先级：</label>
@@ -131,6 +131,18 @@
           <%= idea.content.to_s %>
         </div>
       </div>
+
+      <div class="layui-inline">
+        <label class="layui-form-label" style="width: 100px">方案材料：</label>
+        <div class="layui-input-inline" style="width: 1000px">
+          <% idea.attachments.each do |a| %>
+            <%= link_to "/missions/upload_files/download?id=#{a.id}", target: '_blank' do %>
+              <%= a&.filename.to_s %>
+            <% end %>
+          <% end %>
+        </div>
+      </div>
+
     </div>
   </div>
   <hr>

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

@@ -138,6 +138,12 @@
             <button type="button" class="layui-btn layui-btn-normal" id="test8">选择文件</button>
           </div>
         </div>
+        <div class="layui-col-md6">
+          <labeL class="layui-form-label">文件:</labeL>
+          <div class="layui-input-block">
+            <div id="attachment_ids"></div>
+          </div>
+        </div>
       </div>
       <div class="layui-row" style="padding-top: 30px; float: left">
         <div class="layui-input-block">
@@ -284,18 +290,18 @@
         });
         form.render();
 
-        upload.render({
-            elem: '#test8'
-            , url: '/missions/upload_files' //此处配置你自己的上传接口即可
-            , auto: true
-            , accept: 'file' //普通文件
-            , bindAction: '#test9'
-            , done: function (res) {
-                layer.msg('上传成功');
-                $("#attachment_id").val(res.attachment_id)
-                // $("#filename").val(res.filename)
-            }
-        });
+        // upload.render({
+        //     elem: '#test8'
+        //     , url: '/missions/upload_files' //此处配置你自己的上传接口即可
+        //     , auto: true
+        //     , accept: 'file' //普通文件
+        //     , bindAction: '#test9'
+        //     , done: function (res) {
+        //         layer.msg('上传成功');
+        //         $("#attachment_id").val(res.attachment_id)
+        //         // $("#filename").val(res.filename)
+        //     }
+        // });
 
 
         var staff_list = xmSelect.render({
@@ -315,12 +321,39 @@
             el: '#assist_staff_ids',
             data: gon.staffs,
             filterable: true,
-            multiple:true
+            multiple: true
+        })
+
+
+        var attachment_list = xmSelect.render({
+            el: '#attachment_ids',
+            data: [],
+            filterable: true,
+            multiple: true
         })
 
+
+        upload.render({
+            elem: '#test8'
+            , url: '/missions/upload_files' //此处配置你自己的上传接口即可
+            , auto: true
+            , accept: 'file' //普通文件
+            , bindAction: '#test9'
+            , done: function (res) {
+                layer.msg('上传成功');
+                // $("#attachment_id").val(res.attachment_id)
+                // $("#filename").val(res.filename)
+                a = attachment_list.getValue()
+                b = [{name: res.filename, value: res.attachment_id}]
+                c = a.concat(b)
+                attachment_list.setValue(c)
+            }
+        });
+
         staff_list.setValue(gon.staff_value)
         sale_staff_list.setValue(gon.sale_staff_value)
         assist_staff_list.setValue(gon.assist_staff_value)
+        attachment_list.setValue(gon.attachment_list)
 
         var department_id = gon.value;
         var department = selectInput.render({
@@ -354,6 +387,7 @@
             data.field.staff_id = staff_list.getValue('valueStr');
             data.field.sale_staff_id = sale_staff_list.getValue('valueStr');
             data.field.assist_staff_ids = assist_staff_list.getValue('valueStr');
+            data.field.attachment_ids = attachment_list.getValue('valueStr');
             var schools = [];
             school_list.getValue().forEach(function (d) {
                 schools.push(d.value);

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

@@ -138,6 +138,12 @@
             <button type="button" class="layui-btn layui-btn-normal" id="test8">选择文件</button>
           </div>
         </div>
+        <div class="layui-col-md6">
+          <labeL class="layui-form-label">文件:</labeL>
+          <div class="layui-input-block">
+            <div id="attachment_ids"></div>
+          </div>
+        </div>
       </div>
       <div class="layui-row" style="padding-top: 30px; float: left">
         <div class="layui-input-block">
@@ -275,18 +281,7 @@
         })
 
 
-        upload.render({
-            elem: '#test8'
-            , url: '/missions/upload_files' //此处配置你自己的上传接口即可
-            , auto: true
-            , accept: 'file' //普通文件
-            , bindAction: '#test9'
-            , done: function (res) {
-                layer.msg('上传成功');
-                $("#attachment_id").val(res.attachment_id)
-                // $("#filename").val(res.filename)
-            }
-        });
+
 
 
         var department_id = gon.value;
@@ -336,6 +331,31 @@
             multiple: true
         })
 
+        var attachment_list = xmSelect.render({
+            el: '#attachment_ids',
+            data: gon.attachments,
+            filterable: true,
+            multiple: true
+        })
+
+
+        upload.render({
+            elem: '#test8'
+            , url: '/missions/upload_files' //此处配置你自己的上传接口即可
+            , auto: true
+            , accept: 'file' //普通文件
+            , bindAction: '#test9'
+            , done: function (res) {
+                layer.msg('上传成功');
+                // $("#attachment_id").val(res.attachment_id)
+                // $("#filename").val(res.filename)
+                a = attachment_list.getValue()
+                b = [{name: res.filename, value: res.attachment_id}]
+                c = a.concat(b)
+                attachment_list.setValue(c)
+            }
+        });
+
         //监听提交
         form.on('submit(saveBtn)', function (data) {
             // if (department.getValue() == "" && department_id == "") {
@@ -361,6 +381,7 @@
             data.field.staff_id = staff_list.getValue('valueStr');
             data.field.sale_staff_id = sale_staff_list.getValue('valueStr');
             data.field.assist_staff_ids = assist_staff_list.getValue('valueStr');
+            data.field.attachment_ids = attachment_list.getValue('valueStr');
             request.authPost("missions/ideas/", data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)
@@ -368,9 +389,9 @@
                     layer.close(parent.add_idea_index);
                     parent.layer.close(parent.layer.getFrameIndex(window.name))
                     parent.table.reload('ideas_table', {
-                            done: function () {
-                            }
-                        });
+                        done: function () {
+                        }
+                    });
                     }
                 })
             // }

data/db/migrate/20230327021033_add_attachment_ids_to_ideas.rb

@@ -0,0 +1,5 @@
+class AddAttachmentIdsToIdeas < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_ideas,:attachment_ids,:string
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.64'
+  VERSION = '0.9.65'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.64
+  version: 0.9.65
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-24 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -568,6 +568,7 @@ files:
 - db/migrate/20230319050647_add_clazz_to_educode_sales_activities.rb
 - db/migrate/20230319105048_create_educode_sales_activity_staffs.rb
 - db/migrate/20230322034022_add_to_school_name_to_ideas.rb
+- db/migrate/20230327021033_add_attachment_ids_to_ideas.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb