educode_sales 1.0.9 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06ac69aca1c84150d19b35dd21ed944d1bad8140bc09acb1c07ecfa76af6a955
-  data.tar.gz: ccd9ef3f0774e1a45627f1e05ccac063f5e20ce35606ea4615706eaaa045be98
+  metadata.gz: 20755b572d19ee3c58ffca868b9fc6d5e3829024f1c34863ed6707c83009af41
+  data.tar.gz: 4289012ab4ee0794bdf7c0cc49b57ae46305b16f0b724ec135f82d04e9662b91
 SHA512:
-  metadata.gz: 00b7d6f4308a10d6f7cbd7e901415c4548f3f12119b72d032f91f82fd0c6d24fd273141f0728439eacde51b1851d1f15ffc1b26ed9584c089d2491d10fe8ce13
-  data.tar.gz: b896a8e71a2703ec4d177dc3c24c1853ec853fb9cd04560c26d3422121de6a2daa9254e6345fee19fe772dbd0c43c268c1cb6b40d03bf0d129d15a84abdb7d7c
+  metadata.gz: 62d94ce651961ec7a4a41e40b5993bcd0dfb400d2bf53f66ba0b8d25b81015962f5a8e0553935a854cd40779a9eb710a6f842ba85ada1e349248b786e58390cb
+  data.tar.gz: 95517fc542d7c80d8c40513fcb612a4efa422f9697b7168b4151b599419d999b56dfd0dcab077935abb0c6facf2174b0a1497bcae1952d2ed81b29258c57ad38

data/app/controllers/educode_sales/businesses_controller.rb

@@ -70,6 +70,8 @@ module EducodeSales
             gon.menus << { title: '添加年计划', event: 'year' }
           end
 
+          gon.menus << { title: '添加回款计划', event: 'money_plan' }
+
           gon.menus << { title: '关注', event: 'following' }
           gon.menus << { title: '跟进时间线', event: 'time_line' }
           if can?(:show_file, EducodeSales::Business)

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -85,7 +85,12 @@ module EducodeSales
 
     def create
       load_business
-      follow_up = @business.follow_ups.build(follow_up_params)
+      if @business.last_follow_up
+        follow_up =  @business.last_follow_up.dup
+        follow_up.assign_attributes(follow_up_params)
+      else
+        follow_up = @business.follow_ups.build(follow_up_params)
+      end
       if params[:service_time].present?
         date = params[:service_time].split(" - ")
         follow_up.service_start_time = date[0]
@@ -123,7 +128,8 @@ module EducodeSales
             money.follow_up_id = follow_up.id
             money.save
           end
-
+          # 合同里签到日期全同步到最新跟进
+          last_follow_up.contract_date_lists.update_all(follow_up_id: follow_up.id)
         end
         @business.update(last_follow_up_id: follow_up.id, clazz_id: follow_up.clazz_id, p_deploy_time: params[:deploy_time])
         # 增加o商机编号
@@ -144,6 +150,8 @@ module EducodeSales
             business.clazz_id = business.follow_ups.last&.clazz_id
           end
           business.update(last_follow_up: business.follow_ups.last, return_money: MoneyPlan.where(clazz: '实际回款', follow_up_id: business.follow_ups.last&.id).sum(:amount))
+          # 合同里签到日期全同步到最新跟进
+          follow_up.contract_date_lists.update_all(follow_up: business.follow_ups.last) if business.follow_ups.last.present?
         end
         render_success
       else

data/app/controllers/educode_sales/home_controller.rb

@@ -80,7 +80,7 @@ module EducodeSales
     def search_contracts
       @data = Business
       if params[:q].present?
-        @data = @data.where("name like :q ", q: "%#{params[:q]}%").limit(20)
+        @data = @data.joins(:school).where("educode_sales_businesses.name like :q OR educode_sales_businesses.number like :q OR schools.name like :q ", q: "%#{params[:q]}%").limit(20)
       end
     end
 

data/app/controllers/educode_sales/money_plan_records_controller.rb

@@ -110,6 +110,7 @@ module EducodeSales
         claim.save
         business = claim.money_plan.business
         if business
+          money_plan_record.update(business_id: business.id)
           business.update(return_money: claim.money_plan.money_plan_claims.sum(:amount))
         end
       end

data/app/controllers/educode_sales/money_plans_controller.rb

@@ -42,7 +42,7 @@ module EducodeSales
     end
 
     def list
-      follow_up_ids = Business.pluck(:last_follow_up_id)
+      # follow_up_ids = Business.pluck(:last_follow_up_id)
       authorize! :read, MoneyPlan
       respond_to do |format|
         format.html do
@@ -54,6 +54,12 @@ module EducodeSales
     end
 
     def add
+      if params[:business_id].present?
+        @business = Business.find(params[:business_id])
+        gon.business_id_source = @business.id
+      else
+        gon.business_id_source = ""
+      end
       render layout: false
     end
 
@@ -82,6 +88,12 @@ module EducodeSales
       render_success
     end
 
+    def destroy
+      money_plan = MoneyPlan.find(params[:id])
+      money_plan.destroy
+      render_success
+    end
+
     private
     def money_plan_params
       params.permit(:category, :amount, :payment_clause, :date_at)

data/app/models/educode_sales/money_plan.rb

@@ -4,7 +4,7 @@ module EducodeSales
     belongs_to :business
     belongs_to :follow_up, counter_cache: true
 
-    has_many :money_plan_claims
+    has_many :money_plan_claims, dependent: :destroy
 
     # todo 1 :实际回款 0:计划回款
     enum clazz: ['计划回款', '实际回款']

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

@@ -397,13 +397,7 @@
                     totalRowText: '合计',
                     fixed: "left"
                 },
-                {
-                    field: 'number',
-                    width: 120,
-                    title: '编号',
-                    fixed: 'left',
-                    hide: gon.filter.number
-                },
+              
                 {
                     field: 'name',
                     width: 170,
@@ -522,48 +516,12 @@
                     hide: gon.filter.invitation_at
                 },
                 {
-                    field: 'bidded_date',
-                    width: 105,
-                    title: '中标时间',
-                    sort: true,
-                    hide: gon.filter.bidded_date
-                },
-                {
-                    field: 'signed_date',
-                    width: 105,
-                    title: '签单时间',
-                    sort: true,
-                    hide: gon.filter.signed_date
-                },
-                {
-                    field: 'reception_at',
-                    width: 105,
-                    title: '验收时间',
-                    sort: true,
-                    hide: gon.filter.reception_at
-                },
-                {
-                    field: 'service_end_time',
-                    width: 200,
-                    title: '服务期',
-                    sort: true,
-                    hide: gon.filter.service_end_time
-                },
-                {
-                    field: 'o_business_deployment',
-                    width: 150,
-                    title: '部署类型',
-                    sort: true,
-                    hide: gon.filter.o_business_deployment
-                },
-                {
-                    field: 'p_deploy_time',
-                    width: 150,
-                    title: '部署时间',
-                    sort: true,
-                    hide: gon.filter.p_deploy_time
+                  field: 'bidded_date',
+                  width: 105,
+                  title: '中标时间',
+                  sort: true,
+                  hide: gon.filter.bidded_date
                 },
-                
                 {
                     field: 'budget_amount',
                     width: 105,
@@ -573,42 +531,12 @@
                     hide: gon.filter.budget_amount
                 },
                 {
-                    field: 'total_amount',
-                    width: 100,
-                    title: '中标额',
-                    totalRow: true,
-                    sort: true,
-                    hide: gon.filter.total_amount
-                },
-                {
-                    field: 'actual_amount',
-                    width: 100,
-                    title: '合同额',
-                    totalRow: true,
-                    sort: true,
-                    hide: gon.filter.actual_amount
-                },
-                {
-                    field: 'return_money',
-                    width: 100,
-                    title: '回款',
-                    sort: true,
-                    totalRow: true,
-                    hide: gon.filter.return_money
-                },
-                {
-                    field: 'wait_return_money',
-                    width: 100,
-                    title: '待回款',
-                    sort: true,
-                    totalRow: true,
-                    hide: gon.filter.wait_return_money
-                },
-                {
-                    field: 'return_money_days',
-                    width: 150,
-                    title: '首次回款周期(天)',
-                    hide: gon.filter.return_money_days
+                  field: 'total_amount',
+                  width: 100,
+                  title: '中标额',
+                  totalRow: true,
+                  sort: true,
+                  hide: gon.filter.total_amount
                 },
                 {
                   field: 'divide_rate',
@@ -617,13 +545,7 @@
                   sort: true,
                   hide: gon.filter.divide_rate
                 },
-                {
-                  field: 'divide_money',
-                  width: 160,
-                  title: '渠道分成金额',
-                  sort: true,
-                  hide: gon.filter.divide_money
-                },
+               
                 {
                   field: 'place',
                   width: 160,
@@ -751,6 +673,9 @@
             case 'following':
                following(id);
                 break;
+            case 'money_plan':
+                    money_plan(id);
+                    break;
             }
           }
         });
@@ -786,6 +711,9 @@
                       case 'following':
                           following(id);
                           break;
+                      case 'money_plan':
+                        money_plan(id);
+                        break;
                   }
               }
           });
@@ -808,7 +736,9 @@
             case 'export_records':
                 export_records();
               break;
+
             }
+
           }
         });
       }
@@ -1005,6 +935,24 @@
         });
       }
 
+      function money_plan(business_id) {
+        var content = miniPage.getHrefContent('/missions/money_plans/add?business_id=' + business_id);
+        var openWH = miniPage.getOpenWidthHeight();
+          sindex = layer.open({
+              title: '添加回款计划',
+              type: 1,
+              shade: 0.2,
+              maxmin: true,
+              shadeClose: true,
+              area: [openWH[0] + 'px', openWH[1] + 'px'],
+              offset: [openWH[2] + 'px', openWH[3] + 'px'],
+              content: content,
+          });
+          $(window).on("resize", function () {
+              layer.full(sindex);
+          });
+        }
+
       function month(id) {
         var content = miniPage.getHrefContent('/missions/plans/new_month?business_id=' + id);
         var openWH = miniPage.getOpenWidthHeight();

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

@@ -46,7 +46,7 @@
                placeholder="请选择日期">
       </div>
     </div>
-    <div class="layui-inline">
+     <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"
@@ -55,6 +55,7 @@
       </div>
     </div>
     <br>
+    <!-- 
     <div class="layui-inline">
       <label class="layui-form-label">签单时间</label>
       <div class="layui-input-inline">
@@ -62,14 +63,15 @@
                value="<%= @last_follow_up&.signed_date %>"
                placeholder="请选择日期">
       </div>
-    </div>
+    </div> -->
     <input type="hidden" class="layui-input" name="reception_at" value="<%= @last_follow_up&.reception_at %>">
-    <div class="layui-inline">
+    <input type="hidden" class="layui-input" name="deploy_time" value="<%= @last_follow_up&.deploy_time %>">
+    <!-- <div class="layui-inline">
       <label class="layui-form-label">部署时间</label>
       <div class="layui-input-inline">
         <input type="text" class="layui-input" name="deploy_time" value="<%= @last_follow_up&.deploy_time %>"  id="p_deploy_time" placeholder="请选择日期">
       </div>
-    </div>
+    </div> -->
     <br>
     <div class="layui-inline service_show layui-hide">
       <label class="layui-form-label required">服务期</label>
@@ -78,12 +80,12 @@
       </div>
     </div>
 
-    <div class="layui-inline deployment_type layui-hide">
+    <!-- <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,  @last_follow_up&.o_business_deployment), class: 'required' %>
       </div>
-    </div>
+    </div> -->
 
     <br class="service_show layui-hide">
     <div class="layui-inline">
@@ -94,8 +96,9 @@
       </div>
       客户采购支出的费用。中标额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。
     </div>
-    <br>
-    <div class="layui-inline">
+    <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="本单位的签单金额"
@@ -104,13 +107,15 @@
       客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
     <br>
+    -->
     <div class="layui-inline new_place_select">
       <label class="layui-form-label">渠道</label>
       <div class="layui-input-inline" style="">
         <div id="place" style="width: 190px;"></div>
       </div>
     </div>
-  <br>
+    <br> 
+    <!-- 
     <div class="layui-inline">
       <label class="layui-form-label">渠道分成(万)</label>
       <div class="layui-input-inline">
@@ -119,6 +124,7 @@
       中标额里，渠道拿到的部分。
     </div>
     <br>
+    -->
      <div class="layui-inline">
       <label class="layui-form-label">预算金额(万)</label>
       <div class="layui-input-inline">
@@ -269,49 +275,46 @@
                 })
             }
         })
-        var place_list = xmSelect.render({
-            el: '#place',
-            remoteSearch: true,
-            model: {
-                icon: 'hidden',
-                label: {
-                    type: 'text',
-                    text: {
-                        //左边拼接的字符
-                        left: '',
-                        //右边拼接的字符
-                        right: '',
-                        //中间的分隔符
-                        separator: ', ',
-                    },
-                }
-            },
-            clickClose: true,
-            delay: 1000,
-            paging: true,
-            radio: true,
-            pageRemote: true,
-            filterable: true,
-            remoteMethod: function (val, cb, show, pageIndex) {
-                $.ajax('/missions/sales_place', {
-                    method: 'get',
-                    data: {
-                        q: val,
-                        page: pageIndex
-                    },
-                    dataType: 'json',
-                    success: function (res) {
-                        var data = res.data;
-                        if (res.code == 0) {
-                            cb(res.data, res.count);
-                        } else {
-                            layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
-                        }
+         var place_list = xmSelect.render({
+             el: '#place',
+             remoteSearch: true,
+             model: {
+                 icon: 'hidden',
+                 label: {
+                     type: 'text',
+                     text: {
+                         left: '',
+                         right: '',
+                         separator: ', ',
+                     },
+                 }
+             },
+             clickClose: true,
+             delay: 1000,
+             paging: true,
+             radio: true,
+             pageRemote: true,
+             filterable: true,
+             remoteMethod: function (val, cb, show, pageIndex) {
+                 $.ajax('/missions/sales_place', {
+                     method: 'get',
+                     data: {
+                         q: val,
+                         page: pageIndex
+                     },
+                     dataType: 'json',
+                     success: function (res) {
+                         var data = res.data;
+                         if (res.code == 0) {
+                             cb(res.data, res.count);
+                         } else {
+                             layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                         }
 
-                    }
-                })
-            }
-        })
+                     }
+                 })
+             }
+         })
 
         sales_list.setValue(gon.sales);
         place_list.setValue(gon.place);

data/app/views/educode_sales/home/search_money_plans.json.jbuilder

@@ -1,7 +1,7 @@
 json.data do
   json.array! @data do |d|
     json.value d.id
-    json.name "#{d.business.number} / #{d.business.department&.school&.name.to_s}#{d.business.department&.name.to_s} / #{d.business.name} / #{d.business.last_follow_up&.actual_amount}万 / #{d.date_at.to_s(:date)}"
+    json.name "#{d.business.number} / #{d.business.department&.school&.name.to_s}#{d.business.department&.name.to_s} / #{d.business.name} / #{d.business.last_follow_up&.actual_amount}万 /  #{d.business.last_follow_up&.return_money}万 /#{d.date_at.to_s(:date)}"
   end
 end
 json.count @data.size

data/app/views/educode_sales/money_plans/_index.html.erb

@@ -2,7 +2,7 @@
     <form class="layui-form layui-form-pane" lay-filter="search_plans">
         <div class="layui-form-item">
             <div class="layui-inline">
-                <label class="layui-form-label">合同名称</label>
+                <label class="layui-form-label">商机名称</label>
                 <div class="layui-input-inline">
                     <input type="text" name="business" class="layui-input">
                 </div>
@@ -33,6 +33,7 @@
 </script>
 <script type="text/html" id="currentTableBarmoney_plan">
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">编辑</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="delete">删除</a>
     <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="apply">开票申请</a>
     <!-- <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">催款提醒</a> -->
 
@@ -76,7 +77,7 @@
                 }, {
                     field: 'business_name',
                     width: 150,
-                    title: '合同名称'
+                    title: '商机名称'
                 }, {
                     field: 'school',
                     width: 180,
@@ -130,6 +131,7 @@
                     field: 'created_at',
                     width: 170,
                     title: '添加计划时间',
+                    sort: true,
                 }, {
                     title: '操作',
                     minWidth: 200,
@@ -174,12 +176,7 @@
 
         form.on('submit(reset_business_search)', function(data) {
             var field = data.field;
-            form.val('search_teachers', {
-                area: "",
-                date: "",
-                staff_id: "",
-                clazz: "",
-                professional_title: "",
+            form.val('search_plans', {
                 school: "",
                 business: ""
             });
@@ -245,6 +242,13 @@
                 $(window).on("resize", function() {
                     layer.full(sindex);
                 });
+            } else if (obj.event == 'delete') {
+              layer.confirm('确定删除商机' + data.business_name + "的回款计划", function (index) {
+                request.delete('missions/money_plans/' + data.id, {}, function (res) {
+                  layer.close(index);
+                  table.reload("money_plan_table");
+                })
+              });
             }
         });
 

data/app/views/educode_sales/money_plans/add.html.erb

@@ -1,10 +1,18 @@
+<%= Gon::Base.render_data %>
 <div style="padding:10px">
     <div class="layui-form layuimini-form" lay-filter="searchform">
       <div class="layui-form-item">
-        <label class="layui-form-label required" style="width: 80px !important;">合同名称：</label>
+        <label class="layui-form-label required" style="width: 80px !important;">商机名称：</label>
+        <% if @business.present? %>
+        <div class="layui-input-inline" style="line-height: 38px;">
+          <%= @business.name %>
+        </div>
+        <% else %>
         <div class="layui-input-inline">
           <div id="business" style="width:600px;"></div>
         </div>
+        <% end %>
+      
       </div>
       <div class="layui-form-item">
         <div class="layui-inline">
@@ -22,7 +30,7 @@
         <div class="layui-inline">
           <label class="layui-form-label required" style="width: 110px;">计划回款时间：</label>
           <div class="layui-input-inline">
-            <input type="text" name="date_at[0]" value="" class="layui-input" lay-verify="required" id="date_at">
+            <input type="text" name="date_at[0]" value="" class="layui-input" lay-verify="required" id="money_plan_date_at">
           </div>
         </div>
         <div class="layui-inline">
@@ -86,19 +94,22 @@
       form.render();
 
       laydate.render({
-        elem: '#date_at',
+        elem: '#money_plan_date_at',
       });
 
-
-      var business_id =  "";
-      var business_select = selectInput.render({
+     
+      if (gon.business_id_source) {
+        var business_id =  gon.business_id_source;
+      } else {
+        var business_id = "";
+        var business_select = selectInput.render({
          elem: '#business',
          name: 'bussiness_name', // 渲染的input的name值
          layFilter: 'test', //同layui form参数lay-filter
          layVerType: 'tips', // 同layui form参数lay-verType
          layReqText: '请填写文本', //同layui form参数lay-ReqText
          hasSelectIcon: false,
-         placeholder: '请输入合同名称', // 渲染的inputplaceholder值
+         placeholder: '请输入商机名称、客户名称或合同编号', // 渲染的inputplaceholder值
          remoteSearch: true, // 是否启用远程搜索 默认是false，和远程搜索回调保存同步
          remoteMethod: function (value, cb) { // 远程搜索的回调函数
            if (!value) {
@@ -114,7 +125,7 @@
            })
          }
        });
-
+      }
     
       var num = 0;
       $("#addInput").on("click", function() {
@@ -132,7 +143,12 @@
 
       form.on('submit(saveBtn)', function(data) {
         data.field.num = num;
-        data.field.business_id = business_select.getValue() || business_id;
+        if (gon.business_id_source == "") {
+          data.field.business_id = business_select.getValue() || business_id;
+        } else {
+          data.field.business_id = business_id;
+        }
+       
         if (data.field.business_id == '') {
           layer.msg('请选择合同')
           return false;

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

@@ -2,7 +2,7 @@
 <div style="padding:10px">
     <div class="layui-form layuimini-form" lay-filter="searchform">
       <div class="layui-form-item">
-        <label class="layui-form-label required" style="width: 80px !important;">合同名称：</label>
+        <label class="layui-form-label required" style="width: 80px !important;">商机名称：</label>
         <div class="layui-input-inline">
           <%= hidden_field_tag :id, @money_plan.id %>
           <div id="business" style="line-height:38px;">

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.0.9'
+  VERSION = '1.10.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.10.1
 platform: ruby
 authors:
 - anke1460
@@ -742,7 +742,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.