educode_sales 0.9.58 → 0.9.60

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

@@ -14,7 +14,7 @@
         </div>
       </div>
       <div class="layui-inline">
-        <label class="layui-form-label">指派人</label>
+        <label class="layui-form-label">方案指派人</label>
         <div class="layui-input-inline">
           <%= select_tag "staff_id", options_for_select(@staff_arr, ""), { include_blank: true } %>
         </div>
@@ -135,7 +135,7 @@
                     },
                     {
                         field: 'staff',
-                        title: '指派人',
+                        title: '方案指派人',
                         width: 100
                     },
                     {
@@ -161,7 +161,7 @@
                     {
                         field: 'project',
                         width: 150,
-                        title: '项目规模(人)'
+                        title: '并发规模(人)'
                     },
                     {
                         field: 'money',

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

@@ -1,11 +1,11 @@
 json.data do
   json.array! @ideas do |d|
     json.(d, :id, :name, :level, :status, :types, :model, :content)
-    json.school d.school&.name
+    json.school d.school_name
     json.staff d.staff&.user&.real_name
-    json.hardware d.hardware.to_f.round(2)
-    json.project d.project.to_i
-    json.money d.money.to_f.round(2)
+    json.hardware d.hardware
+    json.project d.project
+    json.money d.money
     json.end_time d.end_time.to_s
     json.creator d.creator&.user&.real_name
     json.deleter d.deleter&.user&.real_name

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

@@ -6,9 +6,17 @@
         <h2 style="padding-left: 25px">方案信息</h2>
       </div>
       <div class="layui-row" style="padding-top: 15px">
-        <div class="layui-inline">
-          <label class="layui-form-label required">单位部门</label>
-          <div class="layui-input-block" id="department" style="width: 300px;"></div>
+        <div class="layui-col-md6">
+          <labeL class="layui-form-label required">学校/单位:</labeL>
+          <div class="layui-input-block">
+            <input type="text" name="school_name" autocomplete="off" lay-verify="required" lay-reqtext="学校不能为空" placeholder="请输入学校/单位名称" value="<%= @idea&.school_name %>" class="layui-input">
+          </div>
+        </div>
+        <div class="layui-col-md6">
+          <labeL class="layui-form-label">院系/部门:</labeL>
+          <div class="layui-input-block">
+            <input type="text" name="department_name" autocomplete="off" placeholder="请输入院系/部门名称" value="<%= @idea&.department_name %>" class="layui-input">
+          </div>
         </div>
       </div>
       <div class="layui-row" style="padding-top: 15px">
@@ -25,6 +33,20 @@
           </div>
         </div>
       </div>
+      <div class="layui-row" style="padding-top: 15px">
+        <div class="layui-col-md6">
+          <labeL class="layui-form-label required">销售负责人:</labeL>
+          <div class="layui-input-block">
+            <div id="sale_staff_id"></div>
+          </div>
+        </div>
+        <div class="layui-col-md6">
+          <labeL class="layui-form-label">协作人:</labeL>
+          <div class="layui-input-block">
+            <div id="assist_staff_ids"></div>
+          </div>
+        </div>
+      </div>
       <div class="layui-row" style="padding-top: 15px">
         <div class="layui-col-md6">
           <labeL class="layui-form-label required">项目名称:</labeL>
@@ -33,9 +55,9 @@
           </div>
         </div>
         <div class="layui-col-md6">
-          <labeL class="layui-form-label required">指派人:</labeL>
+          <labeL class="layui-form-label required">方案指派人:</labeL>
           <div class="layui-input-block">
-            <%= select_tag "staff_id", options_for_select(EducodeSales::Staff.all.map { |d| [d.user&.real_name, d.id] }, @idea&.staff_id), { 'lay-filter': 'staff_id', include_blank: false } %>
+            <div id="new_staff_id"></div>
           </div>
         </div>
       </div>
@@ -75,17 +97,17 @@
           </div>
         </div>
         <div class="layui-col-md6">
-          <labeL class="layui-form-label required">项目预算(万):</labeL>
+          <labeL class="layui-form-label">项目预算(万):</labeL>
           <div class="layui-input-block">
-            <input type="number" name="money" autocomplete="off" lay-verify="required" lay-reqtext="项目预算不能为空" placeholder="请输入项目预算" value="<%= @idea&.money %>" class="layui-input">
+            <input type="number" name="money" autocomplete="off" placeholder="请输入项目预算" value="<%= @idea&.money %>" class="layui-input">
           </div>
         </div>
       </div>
       <div class="layui-row" style="padding-top: 5px">
         <div class="layui-col-md6">
-          <labeL class="layui-form-label required">项目规模(人):</labeL>
+          <labeL class="layui-form-label">并发规模(人):</labeL>
           <div class="layui-input-block">
-            <input type="number" name="project" autocomplete="off" lay-verify="required" lay-reqtext="项目规模不能为空" placeholder="请输入项目规模" value="<%= @idea&.project %>" class="layui-input">
+            <input type="number" name="project" autocomplete="off" placeholder="请输入项目规模" value="<%= @idea&.project %>" class="layui-input">
           </div>
         </div>
         <div class="layui-col-md6">
@@ -95,12 +117,28 @@
           </div>
         </div>
       </div>
+      <div class="layui-row" style="padding-top: 5px;display: none">
+        <div class="layui-col-md6">
+          <labeL class="layui-form-label">文件id:</labeL>
+          <div class="layui-input-block">
+            <input type="text" name="attachment_id" id="attachment_id" autocomplete="off" value="" class="layui-input">
+          </div>
+        </div>
+      </div>
       <div class="layui-row" style="padding-top: 15px">
         <labeL class="layui-form-label">反馈情况:</labeL>
         <div class="layui-input-block">
           <textarea name="content" placeholder="反馈情况" class="layui-textarea"><%= @idea&.content.to_s %></textarea>
         </div>
       </div>
+      <div class="layui-row" style="padding-top: 15px">
+        <div class="layui-col-md6">
+          <labeL class="layui-form-label">方案材料:</labeL>
+          <div class="layui-btn-container">
+            <button type="button" class="layui-btn layui-btn-normal" id="test8">选择文件</button>
+          </div>
+        </div>
+      </div>
       <div class="layui-row" style="padding-top: 30px; float: left">
         <div class="layui-input-block">
           <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
@@ -110,7 +148,33 @@
   </div>
 </div>
 <script>
-    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput', 'xmSelect'], function () {
+
+    function displayFile() {
+        var input = document.getElementById("fileInput");
+        var fileName = document.getElementById("fileName");
+        fileName.innerText = "已选择文件：" + input.files[0].name;
+    }
+
+    function uploadFile() {
+        var input = document.getElementById("fileInput");
+        var file = input.files[0];
+        var formData = new FormData();
+        formData.append("file", file);
+
+        var xhr = new XMLHttpRequest();
+        xhr.open("POST", "/api/upload");
+        xhr.onload = function() {
+            if (xhr.status === 200) {
+                console.log(xhr.responseText);
+                alert("上传成功！");
+            } else {
+                alert("上传失败！");
+            }
+        };
+        xhr.send(formData);
+    }
+
+    layui.use(['form', 'upload', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput', 'xmSelect'], function () {
         var form = layui.form,
             layer = layui.layer,
             request = layui.request,
@@ -119,6 +183,7 @@
             laytpl = layui.laytpl,
             request = layui.request,
             xmSelect = layui.xmSelect,
+            upload = layui.upload,
             $ = layui.$;
         selectInput = layui.selectInput;
 
@@ -128,6 +193,21 @@
             elem: '#new_time'
         });
         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)
+            }
+        });
+
+
         var department_id = gon.value;
         var department = selectInput.render({
             elem: '#department',
@@ -155,13 +235,36 @@
         // 当前弹出层，防止ID被覆盖
         var parentIndex = layer.index;
 
+
+        var staff_list = xmSelect.render({
+            el: '#new_staff_id',
+            data: gon.staffs,
+            filterable: true,
+            radio: true,
+        })
+        var sale_staff_list = xmSelect.render({
+            el: '#sale_staff_id',
+            data: gon.staffs,
+            filterable: true,
+            radio: true,
+        })
+        var assist_staff_list = xmSelect.render({
+            el: '#assist_staff_ids',
+            data: gon.staffs,
+            filterable: true,
+            multiple:true
+        })
+
         //监听提交
         form.on('submit(saveBtn)', function (data) {
-            if (department.getValue() == "" && department_id == "") {
-                layer.alert("请选择单位部门")
-                return false;
-            } else {
+            // if (department.getValue() == "" && department_id == "") {
+            //     layer.alert("请选择单位部门")
+            //     return false;
+            // } else {
                 data.field.department_id = department.getValue() || department_id;
+                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');
                 request.authPost("missions/ideas/", data.field, function (res) {
                     if (res.success == false) {
                         layer.alert(res.msg)
@@ -174,7 +277,7 @@
                         });
                     }
                 })
-            }
+            // }
             return false;
         });
 

data/config/routes.rb

@@ -7,6 +7,7 @@ EducodeSales::Engine.routes.draw do
   get :search_users, to: "home#search_users"
   get :search_teacher, to: "home#search_teacher"
   get :search_edu_teacher,to: "home#search_edu_teacher"
+  get :search_edu_user,to: "home#search_edu_user"
   get :search_operation_teacher,to: "home#search_operation_teacher"
   get :search, to: "home#search"
   get :no_permission, to: "home#no_permission"

data/db/migrate/20230319050647_add_clazz_to_educode_sales_activities.rb

@@ -0,0 +1,6 @@
+class AddClazzToEducodeSalesActivities < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_activities, :clazz_id, :integer
+    add_column :educode_sales_follow_ups, :comment, :text
+  end
+end

data/db/migrate/20230319105048_create_educode_sales_activity_staffs.rb

@@ -0,0 +1,13 @@
+class CreateEducodeSalesActivityStaffs < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_activity_staffs do |t|
+      t.references :staff
+      t.references :activity
+      t.integer :user_id
+      t.integer :clazz_id
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230322034022_add_to_school_name_to_ideas.rb

@@ -0,0 +1,17 @@
+class AddToSchoolNameToIdeas < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_ideas,:school_name,:string
+    add_column :educode_sales_ideas,:department_name,:string
+    add_column :educode_sales_ideas,:sale_staff_id,:integer
+    add_column :educode_sales_ideas,:idea_staff_id,:integer
+    add_column :educode_sales_ideas,:assist_staff_ids,:text
+    add_column :educode_sales_ideas,:attachment_id,:integer
+
+    ideas = EducodeSales::Idea.all
+    ideas.each do |d|
+      d.school_name = d.school&.name
+      d.department_name = d.department&.name
+      d.save
+    end
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.58'
+  VERSION = '0.9.60'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.58
+  version: 0.9.60
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-17 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
+- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -187,6 +188,7 @@ files:
 - app/models/ability.rb
 - app/models/concerns/deletable.rb
 - app/models/educode_sales/activity.rb
+- app/models/educode_sales/activity_staff.rb
 - app/models/educode_sales/activity_teacher.rb
 - app/models/educode_sales/application_record.rb
 - app/models/educode_sales/assessments_setting.rb
@@ -300,6 +302,7 @@ files:
 - app/views/educode_sales/home/sales_staff.json.jbuilder
 - app/views/educode_sales/home/search.json.jbuilder
 - app/views/educode_sales/home/search_edu_teacher.json.jbuilder
+- app/views/educode_sales/home/search_edu_user.json.jbuilder
 - app/views/educode_sales/home/search_operation_teacher.json.jbuilder
 - app/views/educode_sales/home/search_teacher.json.jbuilder
 - app/views/educode_sales/home/search_users.json.jbuilder
@@ -559,6 +562,9 @@ files:
 - db/migrate/20230306131055_add_score_to_assessments_settings.rb
 - db/migrate/20230308022633_add_permissions_to_educode_sales_permissions.rb
 - db/migrate/20230314122536_add_delet_reason_to_business.rb
+- 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
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -567,7 +573,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -582,8 +588,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []