educode_sales 0.8.5 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 565c9656e2f938ea497976746eea936425f163faef8574462612e127b456d061
-  data.tar.gz: 3d22e09fdde3d3e708ba6c3080071dff56b4bc0dd527795b7c78cfe2470ca36d
+  metadata.gz: d40c49eb6d5bbbaea4b48a8ad0c8c5994bba11888e04ad256406e1fadd833ad2
+  data.tar.gz: f1733a819aadbe481b7a2f8d3233821bf24099612d1828109cd8c004e642be24
 SHA512:
-  metadata.gz: 8059f2626c2a827dda2326eef38f7230b786955dac4440a1b798527c1c067d6619e637ecba870af77614dfa772ace3a47a4e0e0aee03ead3d429aaf93925de98
-  data.tar.gz: 7b61dfea68623101d87c1e4116e4bcd5db8e08a28fbe24aba1cd234565617f5b8cc90005534279ce42858152def2a62cf5c0ed6651f515866776a60c5b79d802
+  metadata.gz: 63bd36188bf06b9a4ef62edbffe8253d8fcd80ae432a748ea061f12e014b8caf0705b7c6449ebe0a82a347dc47ef79552e455fb8f0d644acaac6867087fe99dd
+  data.tar.gz: 851b51d8cdddd226d9854606a88e9441eb59e378a9e32e9a75faf41d3ccac32addeb9e4a65dfe6ec0d9106ee35067bf5a692ad080b71ae112adaf1841d974fc6

data/app/assets/stylesheets/educode_sales/layuimini.css

@@ -37,7 +37,7 @@
 .layui-layout-admin .layui-nav-tree .layui-nav-child dd.layui-this,
 .layui-layout-admin .layui-nav-tree .layui-nav-child dd.layui-this a {
   background-color: #1aa094 !important;
-} */
+}
 
 
 /**头部样式 */

data/app/controllers/educode_sales/assessments_controller.rb

@@ -110,16 +110,11 @@ module EducodeSales
       end
     end
 
-
-
-
     # 导出数据
     def get_export_data
       p 'get_export_data'
     end
 
-
-
     # 考核完成情况
     def progress
       p 'progress'
@@ -128,11 +123,25 @@ module EducodeSales
 
 
     def progress_or_get_export_data
+      if @current_admin.is_admin?
+        @assessments = AssessmentsSetting.all
+      else
+        level = @current_admin.role.role_areas.find_by(clazz: '绩效考核').level
+        case level
+        when '自己'
+          @assessments = AssessmentsSetting.where(staff_id: @current_admin.id)
+        when '区域'
+          @staffs = EducodeSales::Staff.joins(:areas).where("educode_sales_commons.id in (?)", @current_admin.areas.pluck(:id)).distinct
+          @assessments = EducodeSales::AssessmentsSetting.where(staff_id: @staffs.select(:id))
+        else
+          @assessments = AssessmentsSetting.all
+        end
+      end
       # common = Common.find_by(clazz: 'staff_type', name: '销售')
       # @staff_ids = Staff.joins(:user).where(job_type: common.id).pluck(:id)
       @assessment_id = params[:q].present? && params[:q][:assessment_id].present? ? params[:q][:assessment_id]:'1'
       @assessment_year = params[:q].present? && params[:q][:assessment_year].present? ?  params[:q][:assessment_year] : Time.now.year
-      @assessments =AssessmentsSetting.where(assessment: @assessment_id)
+      @assessments =@assessments.where(assessment: @assessment_id)
                                       .where("assessment_year >= ? and assessment_year <= ?", "#{@assessment_year}-01-01 00:00:00".to_date, "#{@assessment_year}-12-31 23:59:00".to_date)
                                       .order("created_at desc")
       if @assessments.present?

data/app/controllers/educode_sales/businesses_controller.rb

@@ -597,10 +597,10 @@ module EducodeSales
             last_follow.total_amount").joins("
             LEFT JOIN educode_sales_follow_ups AS last_follow ON educode_sales_businesses.last_follow_up_id = last_follow.id
           ")
-
         end
       end
     end
+
     #关注接口
     def following
       if brs=follow_business(@current_admin.user_id,params[:business_id])
@@ -642,7 +642,7 @@ module EducodeSales
     end
 
     def followed
-      if brs=follow_business(@current_admin.user_id,params[:business_id])
+      if follow_business(@current_admin.user_id,params[:business_id])
         render json: {msg:'确定取消关注？'}
       else
         render json: {msg:'确定关注？'}
@@ -664,7 +664,7 @@ module EducodeSales
       EduSetting.get(name)
     end
 
-    def follow_business(user_id,business_id)
+    def  follow_business(user_id,business_id)
       BusinessRelationShip.where(user_id:user_id,business_id:business_id).first
     end
   end

data/app/models/educode_sales/business.rb

@@ -23,10 +23,5 @@ module EducodeSales
       self.follow_ups.update_all(deleted_at: Time.now)
       EducodeSales::Recycle.create(source: self, deleter_id: user_id)
     end
-
-
-
-
-
   end
 end

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

@@ -7,7 +7,7 @@
       <li data="assessments" > 考核指标设置</li>
     <%end %>
   </ul>
-    <div class="layuimini-main min-height-table"></div>
+  <!--<div class="layuimini-main min-height-table"></div>-->
   <div class="layui-tab-content">
     <%if can?(:show_result, EducodeSales::AssessmentsSetting) %>
       <div class="layui-tab-item  layui-show">

data/app/views/educode_sales/assessments/progress.json.jbuilder

@@ -4,59 +4,59 @@ json.data do
     # 目标任务
     json.name assessment.staff.user.real_name
     json.id assessment.id
-    json.annual assessment.annual.to_f
-    json.first_quarter assessment.first_quarter.to_f
-    json.january assessment.january.to_f
-    json.february assessment.february.to_f
-    json.march assessment.march.to_f
-    json.second_quarter assessment.second_quarter.to_f
-    json.april assessment.april.to_f
-    json.may assessment.may.to_f
-    json.june assessment.june.to_f
-    json.third_quarter assessment.third_quarter.to_f
-    json.july assessment.july.to_f
-    json.august assessment.august.to_f
-    json.september assessment.september.to_f
-    json.fourth_quarter assessment.fourth_quarter.to_f
-    json.october assessment.october.to_f
-    json.november assessment.november.to_f
-    json.december assessment.december.to_f
+    json.annual assessment.annual.to_f.round(2)
+    json.first_quarter assessment.first_quarter.to_f.round(2)
+    json.january assessment.january.to_f.round(2)
+    json.february assessment.february.to_f.round(2)
+    json.march assessment.march.to_f.round(2)
+    json.second_quarter assessment.second_quarter.to_f.round(2)
+    json.april assessment.april.to_f.round(2)
+    json.may assessment.may.to_f.round(2)
+    json.june assessment.june.to_f.round(2)
+    json.third_quarter assessment.third_quarter.to_f.round(2)
+    json.july assessment.july.to_f.round(2)
+    json.august assessment.august.to_f.round(2)
+    json.september assessment.september.to_f.round(2)
+    json.fourth_quarter assessment.fourth_quarter.to_f.round(2)
+    json.october assessment.october.to_f.round(2)
+    json.november assessment.november.to_f.round(2)
+    json.december assessment.december.to_f.round(2)
     #  实际任务
-    json.annual_progress assessment.annual_progress.to_f
-    json.first_quarter_progress assessment.first_quarter_progress.to_f
-    json.january_progress assessment.january_progress.to_f
-    json.february_progress assessment.february_progress.to_f
-    json.march_progress assessment.march_progress.to_f
-    json.second_quarter_progress assessment.second_quarter_progress.to_f
-    json.april_progress assessment.april_progress.to_f
-    json.may_progress assessment.may_progress.to_f
-    json.june_progress assessment.june_progress.to_f
-    json.third_quarter_progress assessment.third_quarter_progress.to_f
-    json.july_progress assessment.july_progress.to_f
-    json.august_progress assessment.august_progress.to_f
-    json.september_progress assessment.september_progress.to_f
-    json.fourth_quarter_progress assessment.fourth_quarter_progress.to_f
-    json.october_progress assessment.october_progress.to_f
-    json.november_progress assessment.november_progress.to_f
-    json.december_progress assessment.december_progress.to_f
+    json.annual_progress assessment.annual_progress.to_f.round(2)
+    json.first_quarter_progress assessment.first_quarter_progress.to_f.round(2)
+    json.january_progress assessment.january_progress.to_f.round(2)
+    json.february_progress assessment.february_progress.to_f.round(2)
+    json.march_progress assessment.march_progress.to_f.round(2)
+    json.second_quarter_progress assessment.second_quarter_progress.to_f.round(2)
+    json.april_progress assessment.april_progress.to_f.round(2)
+    json.may_progress assessment.may_progress.to_f.round(2)
+    json.june_progress assessment.june_progress.to_f.round(2)
+    json.third_quarter_progress assessment.third_quarter_progress.to_f.round(2)
+    json.july_progress assessment.july_progress.to_f.round(2)
+    json.august_progress assessment.august_progress.to_f.round(2)
+    json.september_progress assessment.september_progress.to_f.round(2)
+    json.fourth_quarter_progress assessment.fourth_quarter_progress.to_f.round(2)
+    json.october_progress assessment.october_progress.to_f.round(2)
+    json.november_progress assessment.november_progress.to_f.round(2)
+    json.december_progress assessment.december_progress.to_f.round(2)
     # 差值 dif
-    json.annual_dif assessment.annual.to_f - assessment.annual_progress.to_f
-    json.first_quarter_dif assessment.first_quarter.to_f - assessment.first_quarter_progress.to_f
-    json.january_dif assessment.january.to_f - assessment.january_progress.to_f
-    json.february_dif assessment.february.to_f - assessment.february_progress.to_f
-    json.march_dif assessment.march.to_f - assessment.may_progress.to_f
-    json.second_quarter_dif assessment.second_quarter.to_f - assessment.second_quarter_progress.to_f
-    json.april_dif assessment.april.to_f - assessment.april_progress.to_f
-    json.may_dif assessment.may.to_f - assessment.may_progress.to_f
-    json.june_dif assessment.june.to_f - assessment.june_progress.to_f
-    json.third_quarter_dif assessment.third_quarter.to_f - assessment.third_quarter_progress.to_f
-    json.july_dif assessment.july.to_f - assessment.july_progress.to_f
-    json.august_dif assessment.august.to_f - assessment.august_progress.to_f
-    json.september_dif assessment.september.to_f - assessment.september_progress.to_f
-    json.fourth_quarter_dif assessment.fourth_quarter.to_f - assessment.fourth_quarter_progress.to_f
-    json.october_dif assessment.october.to_f - assessment.october_progress.to_f
-    json.november_dif assessment.november.to_f - assessment.november_progress.to_f
-    json.december_dif assessment.december.to_f - assessment.december_progress.to_f
+    json.annual_dif (assessment.annual.to_f - assessment.annual_progress.to_f).round(2)
+    json.first_quarter_dif (assessment.first_quarter.to_f - assessment.first_quarter_progress.to_f).round(2)
+    json.january_dif (assessment.january.to_f - assessment.january_progress.to_f).round(2)
+    json.february_dif (assessment.february.to_f - assessment.february_progress.to_f).round(2)
+    json.march_dif (assessment.march.to_f - assessment.may_progress.to_f).round(2)
+    json.second_quarter_dif (assessment.second_quarter.to_f - assessment.second_quarter_progress.to_f).round(2)
+    json.april_dif (assessment.april.to_f - assessment.april_progress.to_f).round(2)
+    json.may_dif (assessment.may.to_f - assessment.may_progress.to_f).round(2)
+    json.june_dif (assessment.june.to_f - assessment.june_progress.to_f).round(2)
+    json.third_quarter_dif (assessment.third_quarter.to_f - assessment.third_quarter_progress.to_f).round(2)
+    json.july_dif (assessment.july.to_f - assessment.july_progress.to_f).round(2)
+    json.august_dif (assessment.august.to_f - assessment.august_progress.to_f).round(2)
+    json.september_dif (assessment.september.to_f - assessment.september_progress.to_f).round(2)
+    json.fourth_quarter_dif (assessment.fourth_quarter.to_f - assessment.fourth_quarter_progress.to_f).round(2)
+    json.october_dif (assessment.october.to_f - assessment.october_progress.to_f).round(2)
+    json.november_dif (assessment.november.to_f - assessment.november_progress.to_f).round(2)
+    json.december_dif (assessment.december.to_f - assessment.december_progress.to_f).round(2)
     # 完成率completion_rate
     json.annual_rate   completion_rate(assessment.annual, assessment.annual_progress)
     json.first_quarter_rate  completion_rate(assessment.first_quarter, assessment.first_quarter_progress)

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

@@ -16,6 +16,12 @@ json.data do
     json.signed_date d.last_follow_up&.signed_date.to_s
     json.total_amount d.last_follow_up&.total_amount
     json.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
+    EducodeSales::FollowUp::BUSINESS_DEPLOYMENT[1..-1].each do |m|
+      if d.last_follow_up&.o_business_deployment == m[1]
+        json.o_business_deployment m[0]
+        break
+      end
+    end
     json.actual_amount d.last_follow_up&.actual_amount
     json.return_money d.return_money
     json.wait_return_money d.wait_return_money.to_i.round(2)
@@ -27,5 +33,6 @@ json.data do
     json.current_staff_id @current_admin.id
     json.staff_id d.staff_id
     json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
+    json.year d.last_follow_up&.year.to_s
   end
 end

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

@@ -5,7 +5,7 @@
   </ul>
   <div class="layui-tab-content">
     <div class="layui-tab-item follows_div layui-show">
-<!--      跟进动态-->
+<!--跟进动态-->
       <%=render 'follows' %>
     </div>
     <div class="layui-tab-item businesses_list_div">
@@ -431,10 +431,8 @@
                     field: 'followed',
                     templet:function(d){
                         if (d.followed==1){
-
                             return  '<i class="layui-icon" style="color: goldenrod">&#xe658;</i> '
                         }
-
                         else return ''
                     },
                     width: 105,
@@ -452,6 +450,7 @@
                 }
             ]
         ]
+
         var business_table = table.render({
             elem: '#businesses_table',
             url: '/missions/businesses',
@@ -472,13 +471,13 @@
               drowpdwonRender()
             export_drowpdwonRender()
           }
-
       });
 
       var dropmenu = gon.menus;
       var dropmenu2=JSON.parse(JSON.stringify(dropmenu));
       var export_dropmenu = gon.export_menus;
-      dropmenu2[dropmenu2.findIndex(function (elem){return elem.title.includes("关注")})].title="取消关注";
+      dropmenu2[dropmenu2.findIndex(function (elem)
+      {return elem.title.includes("关注")})].title="取消关注";
 
       drowpdwonRender = function() {
         dropdown.render({
@@ -695,10 +694,8 @@
                                url: '/missions/businesses/following',
                                data: {business_id:id},
                                success: function (da) {
-
                                    layer.msg(da.msg,{icon: da.code==200? 1:2})
                                    table.reload("businesses_table")
-
                                },
                                error:function (da){
                                    alert('请求错误')
@@ -840,7 +837,6 @@
             form.val('search_follows', {
                 name: data.field.name, department: data.field.department, staff_id: data.field.staff_id,  area: data.field.area
             })
-
           return false;
         });
 
@@ -848,6 +844,7 @@
             $(".show_item").toggle()
             return false;
         });
+
         form.on('submit(reset_business_search)', function (data) {
             var field = data.field;
             form.val('search_form', {
@@ -860,7 +857,7 @@
 
             return false;
         });
-        table.on('toolbar(businesses_table)', function (obj) {
+        table.on('toolbar(businesses_table)', function ( obj) {
             switch (obj.event) {
                 case 'LAYTABLE_COLS':
                     layui.form.on('checkbox(LAY_TABLE_TOOL_COLS)', function(objs) {

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

@@ -25,8 +25,8 @@ json.data do
       end
     end
     json.year d.last_follow_up&.year.to_s
-    json.total_amount d.last_follow_up&.total_amount
-    json.actual_amount d.last_follow_up&.actual_amount
+    json.total_amount d.last_follow_up&.total_amount.to_f.round(2)
+    json.actual_amount d.last_follow_up&.actual_amount.to_f.round(2)
     json.return_money d.return_money
     json.wait_return_money d.wait_return_money.to_f.round(2)
     json.return_money_days d.last_follow_up&.reception_at.present? && d.last_follow_up.money_plans.where(clazz: '实际回款').present? ? (d.last_follow_up.money_plans.where(clazz: '实际回款').order(created_at: :asc).first.date_at.to_s(:date).to_date - d.last_follow_up&.reception_at).to_i : ''

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

@@ -30,7 +30,7 @@
 </div>
 <script>
     document.getElementById("inputFocus").focus();
-  layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput'], function () {
     var form = layui.form,
       layer = layui.layer,
       table = layui.table,
@@ -85,10 +85,7 @@
           parent.table.reload('businesses_table')
         }
       })
-
-
       return false;
     });
-
   });
 </script>

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

@@ -74,18 +74,20 @@
         <input type="text" class="layui-input required" id="service_time" name="service_time" placeholder=" - " autocomplete="off" value="<%= (@last_follow_up&.service_start_time.present? && @last_follow_up&.service_end_time.present?) ? (@last_follow_up.service_start_time.to_s + " - " + @last_follow_up.service_end_time.to_s) : '' %>">
       </div>
     </div>
+
     <div class="layui-inline deployment_type layui-hide">
       <label class="layui-form-label required">部署类型</label>
       <div class="layui-input-inline">
-        <%= select_tag "o_business_deployment", options_for_select(@deployment_type, nil ), class: 'required' %>
+        <%= select_tag "o_business_deployment", options_for_select(@deployment_type,  @last_follow_up&.o_business_deployment), class: 'required' %>
       </div>
     </div>
+
     <br class="service_show layui-hide">
     <div class="layui-inline">
       <label class="layui-form-label">总额(万)</label>
       <div class="layui-input-inline">
         <input name="total_amount" type="number" class="layui-input" autocomplete="off"
-               value="<%= @last_follow_up&.total_amount %>">
+               value="<%= @last_follow_up&.total_amount.to_f.round(2) %>">
       </div>
       客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。
     </div>
@@ -94,7 +96,7 @@
       <label class="layui-form-label">合同额(万)</label>
       <div class="layui-input-inline">
         <input name="actual_amount" type="number" class="layui-input" autocomplete="off" placeholder="本单位的签单金额"
-               value="<%= @last_follow_up&.actual_amount %>">
+               value="<%= @last_follow_up&.actual_amount.to_f.round(2) %>">
       </div>
       客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
@@ -109,7 +111,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
-        <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount%>">
+        <input name="divide_amount" class="layui-input" value="<%= @last_follow_up&.divide_amount.to_f.round(2) %>">
       </div>
       总额里，渠道拿到的部分。
     </div>
@@ -317,8 +319,6 @@
                     parent.table.reload('teachers_table')
                 }
             })
-
-
             return false;
         });
 

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

@@ -17,9 +17,9 @@ json.data do
         end
       end
     end
-    json.total_amount d.total_amount
-    json.actual_amount d.actual_amount
-    json.divide_amount d.divide_amount ? d.divide_amount : ""
+    json.total_amount d.total_amount.to_f.round(2)
+    json.actual_amount d.actual_amount.to_f.round(2)
+    json.divide_amount (d.divide_amount ? d.divide_amount : "").to_f.round(2)
     json.staff d.staff.user.real_name
     json.place d.place&.name
     json.money_plans_count d.money_plans_count

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

@@ -52,6 +52,7 @@
         <%= @follow_up.reception_at.to_s %>
       </div>
     </div>
+
     <br>
     <%if @follow_up.clazz_id == EducodeSales::Common.find_by(extras: EducodeSales::Common::OTYPE)&.id %>
       <div class="layui-inline">
@@ -70,16 +71,17 @@
       </div>
     <% end %>
     <br>
+
     <div class="layui-inline">
       <label class="layui-form-label">总额：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.total_amount %>万
+        <%= @follow_up.total_amount.to_f.round(2) %>万
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">合同额：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.actual_amount %>万
+        <%= @follow_up.actual_amount.to_f.round(2) %>万
       </div>
     </div>
     <br>
@@ -92,7 +94,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成：</label>
       <div class="layui-input-inline">
-        <%= @follow_up.divide_amount %>万
+        <%= @follow_up.divide_amount.to_f.round(2) %>万
       </div>
     </div>
     <div class="layui-form-item">
@@ -137,7 +139,6 @@
 </form>
 <div  style=" text-align:center;">
   <div class="layui-btn-group">
-
     <%if @pre_id != 0 %>
     <button type="button" class="layui-btn" onclick="pre_follow()">上一条</button>
     <%else %>

data/app/views/educode_sales/customers/edit_follow_record.html.erb

@@ -41,8 +41,6 @@
                     parent.table.reload('unfinish_table')
                 }
             })
-
-
             return false;
         });
 

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

@@ -241,4 +241,4 @@
     .layui-table-tool-temp{
         padding-right: 0px; !important;
     }
-</style>
+</style>

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.8.5'
+  VERSION = '0.8.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.9
 platform: ruby
 authors:
 - anke1460
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-26 00:00:00.000000000 Z
+date: 2022-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails