educode_sales 0.6.3 → 0.6.7

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

@@ -6,11 +6,9 @@ json.data do
     json.department d.department.name
     json.school d.department.school.name
     json.school_id d.department.school.id
-    json.follow_ups_count d.follow_ups_count
+    json.follow_ups_count d.follow_ups.where(deleted_at: nil).size
     follow_ups_count += d.follow_ups_count
     json.follow_up_id d.last_follow_up_id
-    # json.teachers_count d.follow_ups.sum(:key_people_count)
-    # json.teachers_count EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).present? ? EducodeSales::FollowUp.order(created_at: :desc).find_by(business_id: d.id).key_people_count : 0
     json.clazz d.last_follow_up&.clazz&.name || ""
     json.stage d.last_follow_up&.stage&.name
     json.invitation_at d.last_follow_up&.invitation_at.to_s
@@ -20,13 +18,45 @@ json.data do
     json.total_amount d.last_follow_up&.total_amount
     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)
+    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 : ''
     json.place d.last_follow_up&.place&.name
     json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
     json.source d.source
     json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
     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 : d.created_at.to_s
+    json.latest_time d.last_follow_up.present? ? d.last_follow_up.created_at.to_s : ''
+  end
+end
+json.data1 do
+  json.array! @businesses_exports do |d|
+    json.id d.id
+    json.name d.name
+    json.department d.department.name
+    json.school d.department.school.name
+    json.school_id d.department.school.id
+    json.follow_ups_count d.follow_ups.where(deleted_at: nil).size
+    follow_ups_count += d.follow_ups_count
+    json.follow_up_id d.last_follow_up_id
+    json.clazz d.last_follow_up&.clazz&.name || ""
+    json.stage d.last_follow_up&.stage&.name
+    json.invitation_at d.last_follow_up&.invitation_at.to_s
+    json.reception_at d.last_follow_up&.reception_at.to_s
+    json.bidded_date d.last_follow_up&.bidded_date.to_s
+    json.signed_date d.last_follow_up&.signed_date.to_s
+    json.total_amount d.last_follow_up&.total_amount
+    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)
+    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 : ''
+    json.place d.last_follow_up&.place&.name
+    json.last_follow_person d.last_follow_up.present? ? d.last_follow_up.staff.user.real_name : EducodeSales::Staff.find(d.staff_id).user.real_name
+    json.source d.source
+    json.assign_follow_ups d.last_follow_up.present? ? d.last_follow_up.assign_follow_ups.pluck(:staff_id) : []
+    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 : ''
   end
 end
 

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

@@ -74,26 +74,30 @@
         <input name="total_amount" type="number" class="layui-input" autocomplete="off"
           value="<%= @last_follow_up&.total_amount%>">
       </div>
-    </div>
+      客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。    </div>
+    <br>
     <div class="layui-inline">
       <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%>">
       </div>
+      客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
     <br>
     <div class="layui-inline new_place_select">
       <label class="layui-form-label">渠道</label>
-      <div class="layui-input-inline" style="z-index: 101">
+      <div class="layui-input-inline" style="">
         <div id="place" style="width: 190px;"></div>
       </div>
     </div>
+  <br>
     <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%>">
       </div>
+      总额里，渠道拿到的部分。
     </div>
     <div class="layui-form-item">
     <div class="layui-inline">
@@ -106,10 +110,10 @@
     </div>
      <div class="layui-form-item">
       <label class="layui-form-label">指定跟进人</label>
-      <div class="layui-input-inline" style="z-index: 100">
+      <div class="layui-input-inline" style="">
        <div id="assign_follow" style="width: 512px;"></div>
       </div>
-       <div class="layui-inline" style="padding: 9px 15px">
+       <div class="layui-inline" style="padding: 9px 15px;z-index: -1;">
          <label class="layui-form-label" style="padding-left: 220px"></label>
            指定跟进人和商机创建者，同时拥有对该商机的管理权限
        </div>
@@ -139,7 +143,7 @@
     </div>
     <div class="layui-form-item m-t-20">
       <div class="layui-input-block">
-        <button class="layui-btn layui-btn-normal" lay-submit lay-filter="add_follow_up">提交</button>
+        <button class="layui-btn layui-btn-normal submit-btn" lay-submit lay-filter="add_follow_up">提交</button>
       </div>
     </div>
   </div>
@@ -244,6 +248,7 @@
       form.render();
 
       form.on('submit(add_follow_up)', function (data) {
+          $(".submit-btn").addClass("layui-hide");
           var assign_follow = [];
         sales_list.getValue().forEach(function(d) {
           assign_follow.push(d.value);

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

@@ -121,6 +121,7 @@
                     field: 'description',
                     width: 120,
                     title: '最新进展',
+                    templet:'<div><span title="{{d.description}}">{{d.description}}</span></div>'
                 },
               {
                 field: 'invitation_at',

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

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