educode_sales 1.10.26 → 1.10.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b5943ba3342b717b15aae35d1f7924a361af064491e015a553cc9f0e7b47586
-  data.tar.gz: 37f21daa33a22073f98454512b4488bf39757ed93e471b62c4ef16380ab09453
+  metadata.gz: 7918ebb9f76467d371b5f760a001bcd5fa91f78cac3149882bedd2506add6251
+  data.tar.gz: 5225695183f80422067b3dbad8b0b3e7edd9ab0acaf08fc9261b970f8254f163
 SHA512:
-  metadata.gz: d2c8a7277e685e6a73ad129275bb4b75d041bdfe870760f2833be8a8f0a387dbc41aacaafb3acb52530b941baced2bf02823cc71b313620423c3cd510f94fa85
-  data.tar.gz: 99ecbbc2a8626d0ba99289a499008b7dcc8591154907cbdcab6abf427c3e49ce7b223dc9052df77ef30fcbcb2356b25edd91055267df6df739efecf3fc61ea62
+  metadata.gz: 81319e099aeff24c0df0be5a6f7f6f408e5a2c2c053476788b954d29ca00b1719cb921f250afd9516e0efca9f081dcc3cbfb86dd4a08fc6ba12edc53ce7b0747
+  data.tar.gz: da33b752f9b61b100f995c28377e0a1f8d38e5a375ba62302b9a2ed6b401f8a6d4547c8f3e17d8c474c935314a97b2bc896b6fbd6ffbdb4a87c6be418e841170

data/app/controllers/educode_sales/businesses_controller.rb

@@ -115,7 +115,7 @@ module EducodeSales
           end
         end
         format.json do
-          if params[:q] && (params[:q][:clazz] == 'area' || params[:q][:clazz] == 'special' || params[:q][:clazz] == 'delete_list')
+          if params[:q] && (params[:q][:clazz] == 'area' || params[:q][:clazz] == 'special' || params[:q][:clazz] == 'delete_list' || params[:q][:clazz] == 'plan_year')
             if params[:q][:clazz] == 'special'
               school_ids = []
               # 专项商机
@@ -132,6 +132,8 @@ module EducodeSales
               @businesses = Business.joins("JOIN departments  AS dp ON educode_sales_businesses.department_id = dp.id").where("dp.school_id in (?)", school_ids)
             elsif params[:q][:clazz] == 'delete_list'
               @businesses = Business.unscoped.where(state_id: [1, 3])
+            elsif params[:q][:clazz] == 'plan_year'
+              @businesses = Business.joins(:last_follow_up).where("educode_sales_follow_ups.plan_a_date > :year OR educode_sales_follow_ups.plan_return_date > :year OR educode_sales_follow_ups.invitation_at > :year", year: Time.now.beginning_of_year)
             end
           else
             if @current_admin.is_admin?
@@ -390,6 +392,11 @@ module EducodeSales
           @businesses = @businesses.select("
             distinct
             educode_sales_businesses.*,
+            last_follow.plan_a_date,
+            last_follow.plan_a_money,
+            last_follow.invitation_money,
+            last_follow.plan_return_date,
+            last_follow.plan_return_money,
             last_follow.invitation_at,
             last_follow.budget_amount,
             last_follow.o_business_deployment,

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -409,7 +409,7 @@ module EducodeSales
     end
 
     def follow_up_params
-      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :divide_rate, :budget_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment, :deploy_time, :rival)
+      params.permit(:clazz_id, :stage_id, :invitation_at, :reception_at, :total_amount, :actual_amount, :divide_amount, :divide_rate, :budget_amount, :description, :advise, :place_id, :bidded_date, :signed_date, :year, :o_business_deployment, :deploy_time, :rival, :plan_a_date, :plan_a_money, :invitation_money, :plan_return_date, :plan_return_money)
     end
 
     # 更新部门和部门下老师用户的状态

data/app/controllers/educode_sales/ideas_controller.rb

@@ -142,9 +142,16 @@ module EducodeSales
         idea.department_id = idea.business&.department_id
       end
       idea.attachment_ids = attachment_ids
+
       # idea.assist_staff_ids = assist_staff_ids
       # idea.other_staff_ids = other_staff_ids
       idea.save
+      attachment_ids.each do |a|
+        attachment = Attachment.find_by_id(a)
+        attachment.container_id = idea.id
+        attachment.container_type = 'EducodeSales::Idea'
+        attachment.save
+      end
       render_success
     end
 
@@ -264,6 +271,14 @@ module EducodeSales
       if follow_up.save
         idea.last_idea_follow_id = follow_up.id
         idea.save
+        attachment_ids = Array(params[:attachment_ids].to_s.split(","))
+        attachment_ids.each do |a|
+          attachment = Attachment.find_by_id(a)
+          attachment.container_id = idea.id
+          attachment.container_type = 'EducodeSales::Idea'
+          attachment.description = follow_up.id.to_s
+          attachment.save
+        end
         render_success
       else
         render_failure follow_up

data/app/models/educode_sales/idea.rb

@@ -25,7 +25,7 @@ module EducodeSales
     enum model: %w[本地版 线上版 混合版]
     enum idea_type: %w[建设方案 申报论证 市场调研 课程建设 报价清单 交流汇报 招标参数 资质申报 产品手册 宣传海报 课题论文 投标支持 其他类]
 
-    serialize :assist_staff_ids,Array
+    serialize :assist_staff_ids, Array
     serialize :attachment_ids, Array
     serialize :other_staff_ids, Array
 
@@ -35,6 +35,18 @@ module EducodeSales
       self.update(deleted_at: nil, deleter_id: nil, is_deleted: false)
     end
 
+    def sync_data
+      # {"content"=>"123", "idea_id"=>15, "school_id"=>nil, "money"=>123.0,  "advise"=>"123", "sale_staff_id"=>8, "idea_staff_id"=>12, "staff_id"=>2, "comment"=>nil, "created_at"=>Mon, 01 May 2023 11:12:48 CST +08:00, "updated_at"=>Mon, 01 Ma023 11:14:06 CST +08:00}
+      # {"school_id"=>38739, "name"=>"java项目", "level"=>"高", "staff_id"=>24,"types"=>"低定制", "model"=>"本地版", "hardware"=>111.011, "project"=>333.011, "money"=>222.01, "creator_id"=>2, "end_time"=>Sat, 08 Apr 2023, "history_type"=>n"=>"4441111", "deleter_id"=>nil, "is_deleted"=>false, "deleted_at"=>nil, "department_id"=>35794, "manager_name"=>"王旭11111", "manager_phone"=>"131011111111111", "history_record"=>nil, "created_at"=>Thu, 23 Mar 2023 11:27:22 CST +08:00, "updated_at"=>Tue, 04 Jul 20217:57:32 CST +08:00, "school_name"=>"湖南科技大学1111", "department_name"=>"计算机科学与技术11111", "sale_staff_id"=>53, "idea_staff_id"=>nil, "assist_staff_ids"=>["10"], "attachment_id"=>nil, "attachment_ids"=>["4390068"], "idea_type"=>"建设方案", "other_staff_ids" "12", "13", "14", "16", "17", "18"], "idea_follows_count"=>2, "last_idea_follow_id"=>11, "advise"=>"123123", "business_id"=>nil}
+
+      last_follow = self.idea_follows.order(created_at: :desc).first
+      if last_follow
+        self.update(status: last_follow.status, last_idea_follow_id: last_follow.id, staff_id: last_follow.idea_staff_id, sale_staff_id: last_follow.sale_staff_id)
+      else
+        self.update(last_idea_follow_id: nil)
+      end
+    end
+
     def assist_staffs
       Staff.where(id: self.assist_staff_ids)
     end

data/app/models/educode_sales/idea_follow.rb

@@ -7,5 +7,12 @@ module EducodeSales
     belongs_to :school, optional: true
 
     enum status: %w[未完成 已完成]
+
+    after_save :update_idea_status
+    after_destroy :update_idea_status
+
+    def update_idea_status
+      idea.sync_data
+    end
   end
 end

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

@@ -170,6 +170,7 @@
   <% if can?(:audit_business, EducodeSales::Business) %>
     <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right delete-btn" lay-event="delete_list">审核商机</button>
   <% end %>
+  <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm  pull-right plan_year" lay-event="plan_year">本年计划</button>
   </div>
 </script>
 <script type="text/html" id="delete_bar">
@@ -522,6 +523,20 @@
                     sort: true,
                     hide: gon.filter.latest_time
                 },
+                {
+                  field: 'plan_a_date',
+                  width: 150,
+                  title:'计划A类时间',
+                  sort: true,
+                  hide: gon.filter.plan_a_date
+              },
+              {
+                  field: 'plan_a_money',
+                  width: 150,
+                  title: '计划A类金额',
+                  sort: true,
+                  hide: gon.filter.plan_a_money
+               },
                 {
                     field: 'invitation_at',
                     width: 150,
@@ -529,6 +544,13 @@
                     sort: true,
                     hide: gon.filter.invitation_at
                 },
+                {
+                  field: 'invitation_money',
+                  width: 150,
+                  title: '计划投标金额',
+                  sort: true,
+                  hide: gon.filter.invitation_money
+                },
                 {
                   field: 'bidded_date',
                   width: 105,
@@ -536,6 +558,20 @@
                   sort: true,
                   hide: gon.filter.bidded_date
                 },
+                {
+                  field: 'plan_return_date',
+                  width: 135,
+                  title: '计划回款时间',
+                  sort: true,
+                  hide: gon.filter.plan_return_date
+                },
+                {
+                  field: 'plan_return_money',
+                  width: 135,
+                  title: '计划回款金额',
+                  sort: true,
+                  hide: gon.filter.plan_return_money
+                },
                 {
                     field: 'budget_amount',
                     width: 105,
@@ -1067,6 +1103,8 @@
               $(".area-btn").addClass("selected-btn");
             } else if (search['clazz'] == 'delete_list') {
               $(".delete-btn").addClass("selected-btn");
+            } else if (search['clazz'] == 'plan_year') {
+              $(".plan_year").addClass("selected-btn");
             } else {
               $(".all-btn").addClass("selected-btn");
             }
@@ -1249,6 +1287,26 @@
 
               return false;
             }
+            else if (obj.event === 'plan_year') {
+              search = {"clazz": "plan_year"}
+              business_type_list.setValue([])
+              table.reload('businesses_table', {
+                url: '/missions/businesses',
+                cols: cols_table,
+                page: {
+                  curr: 1
+                },
+                where: {q: search, sort: sort}
+              }, 'data');
+
+              form.val('search_form', {
+                name: '', department: '', staff_id: '', business_type: '', business_step: '',
+                place_id: '', date: '', area: ''
+              })
+              $(".plan_year").addClass("selected-btn");
+
+              return false;
+            }
             else if (obj.event === 'delete') {
               var checkStatus = table.checkStatus('currentTableId'),
                   data = checkStatus.data;

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

@@ -76,6 +76,11 @@ json.data do
     json.self_flag (d.staff_id == @current_admin.id) || (d.last_follow_up_id.in? follow_up_ids)
     json.followed  d.users.pluck(:user_id).include?(@current_admin.user.id) ? 1 : 0 # d.users.where(user_id:@current_admin.user.id).first ? 1 : 0
     json.p_deploy_time d.p_deploy_time
+    json.plan_a_date d.last_follow_up&.plan_a_date&.to_s
+    json.plan_a_money d.last_follow_up&.plan_a_money&.round(6)
+    json.invitation_money d.last_follow_up&.invitation_money&.to_s
+    json.plan_return_date d.last_follow_up&.plan_return_date&.to_s
+    json.plan_return_money d.last_follow_up&.plan_return_money&.round(6)
   end
 end
 

data/app/views/educode_sales/businesses/key_person.html.erb

@@ -43,6 +43,11 @@
             width: 200,
             title: '生日',
           },
+          {
+            field: 'tel',
+            width: 200,
+            title: '联系方式',
+          },
           {
             field: 'remark',
             width: 300,

data/app/views/educode_sales/businesses/new_follow_record.html.erb

@@ -37,6 +37,21 @@
         <%= select_tag "stage_id", options_for_select(@stages, @last_follow_up&.stage_id), { 'lay-filter': 'stage_id', class: 'required', } %>
       </div>
     </div>
+    </br>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划A类时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="plan_a_date" autocomplete="off" id="plan_a_date"
+              value="<%= @last_follow_up&.plan_a_date %>"
+              placeholder="请选择日期">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划A类金额(万)</label>
+      <div class="layui-input-inline">
+        <input name="plan_a_money" class="layui-input" value="<%= @last_follow_up&.plan_a_money.to_f.round(6) %>">
+      </div>
+    </div>
     <br>
     <div class="layui-inline">
       <label class="layui-form-label">计划投标时间</label>
@@ -46,14 +61,29 @@
                placeholder="请选择日期">
       </div>
     </div>
-     <div class="layui-inline">
-      <label class="layui-form-label">中标时间</label>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划投标金额(万)</label>
       <div class="layui-input-inline">
-        <input type="text" class="layui-input" name="bidded_date" autocomplete="off" id="invitation_at_add"
-               value="<%= @last_follow_up&.bidded_date %>"
-               placeholder="请选择日期">
+        <input name="invitation_money" class="layui-input" value="<%= @last_follow_up&.invitation_money.to_f.round(6) %>">
       </div>
     </div>
+    </br>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划回款时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="plan_return_date" autocomplete="off" id="plan_return_date"
+              value="<%= @last_follow_up&.plan_return_date %>"
+              placeholder="请选择日期">
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划回款金额(万)</label>
+      <div class="layui-input-inline">
+        <input name="plan_return_money" class="layui-input" value="<%= @last_follow_up&.plan_return_money.to_f.round(6) %>">
+      </div>
+    </div>
+ 
+  
     <br>
     <!-- 
     <div class="layui-inline">
@@ -88,6 +118,14 @@
     </div> -->
 
     <br class="service_show layui-hide">
+    <div class="layui-inline">
+      <label class="layui-form-label">中标时间</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input" name="bidded_date" autocomplete="off" id="invitation_at_add"
+              value="<%= @last_follow_up&.bidded_date %>"
+              placeholder="请选择日期">
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label">中标额(万)</label>
       <div class="layui-input-inline">
@@ -247,6 +285,14 @@
         laydate.render({
             elem: '#reception_at_add'
         });
+
+        laydate.render({
+            elem: '#plan_a_date'
+        })
+
+        laydate.render({
+            elem: '#plan_return_date'
+        })
         var sales_list = xmSelect.render({
             el: '#assign_follow',
             remoteSearch: true,
@@ -358,6 +404,10 @@
 <style>
     .new_place_select xm-select > .xm-body {
         width: 300px;
-    !important;
+        !important;
+    }
+
+    .layui-form-label {
+      width: 120px;
     }
 </style>

data/app/views/educode_sales/businesses/show_follow_record.html.erb

@@ -35,6 +35,19 @@
       </div>
     </div>
     <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划A类时间：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.plan_a_date.to_s %>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划A类金额：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.plan_a_money&.round(6) %>
+      </div>
+    </div>
+    </br>
     <div class="layui-inline">
       <label class="layui-form-label">计划投标时间：</label>
       <div class="layui-input-inline">
@@ -42,9 +55,22 @@
       </div>
     </div>
     <div class="layui-inline">
-      <label class="layui-form-label">中标时间：</label>
+      <label class="layui-form-label">计划投标金额：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.bidded_date.to_s %>
+        <%= @follow_up.invitation_money&.round(6) %>
+      </div>
+    </div>
+    </br>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划回款时间：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.plan_return_date.to_s %>
+      </div>
+    </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">计划回款金额：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.plan_return_money&.round(6) %>
       </div>
     </div>
     <br>
@@ -86,6 +112,12 @@
         <%= @follow_up.total_amount.to_f.round(6) %>万
       </div>
     </div>
+    <div class="layui-inline">
+      <label class="layui-form-label">中标时间：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.bidded_date.to_s %>
+      </div>
+    </div>
     <div class="layui-inline">
       <label class="layui-form-label">合同额：</label>
       <div class="layui-input-inline">
@@ -222,3 +254,9 @@
         });
     }
 </script>
+<style>
+
+.layui-form-label {
+  width: 120px;
+}
+</style>

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

@@ -145,7 +145,7 @@
           <textarea name="content" placeholder="需求说明" class="layui-textarea"><%= @idea&.content.to_s %></textarea>
         </div>
       </div>
-      <div class="layui-row" style="padding-top: 15px;display: none">
+      <div class="layui-row" style="padding-top: 15px">
         <div class="layui-col-md6">
           <labeL class="layui-form-label">方案材料:</labeL>
           <div class="layui-btn-container">

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

@@ -44,6 +44,20 @@
         <textarea name="content" placeholder="团队建议" class="layui-textarea"><%= @idea_follow&.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 class="layui-col-md6">
+        <labeL class="layui-form-label">文件:</labeL>
+        <div class="layui-input-block">
+          <div id="attachment_ids_f"></div>
+        </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_follow">确认保存</button>
@@ -56,18 +70,34 @@
 
 
 <script>
-    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate'], function () {
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'upload'], function () {
         var form = layui.form,
-            layer = layui.layer,
-            table = layui.table,
-            laytpl = layui.laytpl,
-            request = layui.request,
-            laydate = layui.laydate,
-            $ = layui.$;
+          layer = layui.layer,
+          table = layui.table,
+          laytpl = layui.laytpl,
+          request = layui.request,
+          laydate = layui.laydate,
+          upload = layui.upload,
+          $ = layui.$;
 
         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)
+                a = attachment_list_f.getValue()
+                b = [{name: res.filename, value: res.attachment_id}]
+                c = a.concat(b)
+                attachment_list_f.setValue(c)
+            }
+        });
         var staff_list = xmSelect.render({
             el: '#new_idea_staff_id',
             data: gon.staffs,
@@ -80,6 +110,12 @@
             filterable: true,
             radio: true,
         })
+        var attachment_list_f = xmSelect.render({
+            el: '#attachment_ids_f',
+            data: [],
+            filterable: true,
+            multiple: true
+        })
 
 
         //监听提交
@@ -87,6 +123,7 @@
             data.field.idea_id = "<%= @idea.id %>";
             data.field.idea_staff_id = staff_list.getValue('valueStr');
             data.field.sale_staff_id = sale_staff_list.getValue('valueStr');
+            data.field.attachment_ids = attachment_list_f.getValue('valueStr');
             request.authPost("missions/ideas/" + data.field.idea_id + "/follow_up", data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)

data/app/views/educode_sales/teachers/add_keys.html.erb

@@ -271,7 +271,6 @@
           width: 200,
           title: '联系方式',
           edit: true
-        }, {
         }, {
           field: 'remark',
           width: 200,

data/db/migrate/20230704124921_add_plan_a_date_to_follow_ups.rb

@@ -0,0 +1,9 @@
+class AddPlanADateToFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :plan_a_date, :date, comment:  '计划a类时间'
+    add_column :educode_sales_follow_ups, :plan_a_money, :double, comment:  '计划a类金额'
+    add_column :educode_sales_follow_ups, :invitation_money, :double, comment:  '计划投标金额'
+    add_column :educode_sales_follow_ups, :plan_return_date, :date, comment:  '计划回款时间'
+    add_column :educode_sales_follow_ups, :plan_return_money, :double, comment:  '计划回款金额'
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.26'
+  VERSION = '1.10.28'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.26
+  version: 1.10.28
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-04 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ 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
@@ -745,6 +744,7 @@ files:
 - db/migrate/20230614141628_create_educode_sales_follow_up_tags.rb
 - db/migrate/20230614142145_create_educode_sales_watch_follow_ups.rb
 - db/migrate/20230629130033_add_clazz_to_money_plans.rb
+- db/migrate/20230704124921_add_plan_a_date_to_follow_ups.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -753,7 +753,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -769,7 +769,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.9
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []