educode_sales 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 745a9b47b47d917186df80e64b85698ecb980c6348773520b8dc03ca0b2cd985
-  data.tar.gz: c2e13cdd710e59bc828a7af7c28f944a65a11bc4419225c89fbbb20fb830e13a
+  metadata.gz: 32e3ce754e3aeac0c5f424b9188254b88b1da494feb591b5eb1e2d100f0362c2
+  data.tar.gz: 2be5f9d03ccc4781ff534e59ffe8aee273185a0d635c08ca09e60403a4b4d221
 SHA512:
-  metadata.gz: 7b530302422fffd437080d469f59851436f3d3667e52c05da0804c5ccf9ab13038563809918a94d5842622ac478beaf4c4c7e77842ced01e8eb43bcd486eadf3
-  data.tar.gz: f2476d1ad5479026a211698f4e0f3c49f9e060da98bbf319c99a25181457e158fc8df186ac00b0221e310a67142f2cacf06b9fd55cb1e9ee207590501e50bb43
+  metadata.gz: ec4b1594bcc4ac5766e6e3c0fc189f17b8b24b0789328ee1ed75a33022438b6d5f2c2c78f221ae6bf3db2dbb9b4253f7d5f428df24f6c336aa0a3ea5bd081aaf
+  data.tar.gz: '082c2c1a08570db3b4ea942c932c73ad08fd2e2bde8b4be2cff38816a4d3eed64bf503fb151ece68a0140e2db841c153923335fcf10d1142370b41f8f6a10a2f'

data/app/controllers/educode_sales/businesses_controller.rb

@@ -198,7 +198,11 @@ module EducodeSales
           end
 
           if params[:sort].present? && params[:sort][:field]
-            @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+            if params[:sort][:field] = "service_end_time"
+              @businesses = @businesses.order("service_time_long #{params[:sort][:order]}")
+            else
+              @businesses = @businesses.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+            end
           else
             @businesses = @businesses.order("educode_sales_businesses.created_at desc")
           end
@@ -208,6 +212,9 @@ module EducodeSales
           @businesses = @businesses.select("
             educode_sales_businesses.*,
             last_follow.invitation_at,
+            last_follow.service_time_long,
+            last_follow.service_end_time,
+            last_follow.service_start_time,
             last_follow.reception_at,
             last_follow.bidded_date,
             last_follow.signed_date,
@@ -559,6 +566,9 @@ module EducodeSales
             educode_sales_businesses.*,
             last_follow.invitation_at,
             last_follow.reception_at,
+            last_follow.service_time_long,
+            last_follow.service_end_time,
+            last_follow.service_start_time,
             last_follow.bidded_date,
             last_follow.signed_date,
             last_follow.created_at as latest_time,

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -63,11 +63,17 @@ module EducodeSales
     def create
       load_business
       follow_up = @business.follow_ups.build(follow_up_params)
+      if params[:service_time].present?
+        date = params[:service_time].split(" - ")
+        follow_up.service_start_time = date[0]
+        follow_up.service_end_time = date[1]
+        follow_up.service_time_long = (date[1].to_date - date[0].to_date).to_i
+      end
       follow_up.staff = @current_admin
       params[:assign_follow_up].each do |d|
         follow_up.assign_follow_ups.build(staff_id: d)
       end
-      
+
       follow_up.profit_amount = follow_up.actual_amount - (follow_up.divide_amount.to_i) if follow_up.actual_amount
       if follow_up.save
         if @business.last_follow_up.present?
@@ -106,6 +112,12 @@ module EducodeSales
     def update
       follow_up = FollowUp.find(params[:id])
       follow_up.assign_attributes(follow_up_params)
+      if params[:service_time].present?
+        date = params[:service_time].split(" - ")
+        follow_up.service_start_time = date[0]
+        follow_up.service_end_time = date[1]
+        follow_up.service_time_long = (date[1].to_date - date[0].to_date).to_i
+      end
       assign_follow_ups = []
       params[:assign_follow_up].each do |d|
         assign_follow_ups << follow_up.assign_follow_ups.find_or_initialize_by(staff_id: d)

data/app/controllers/educode_sales/results_controller.rb

@@ -0,0 +1,54 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class ResultsController < ApplicationController
+
+    def index
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+          # @commons = Common.group("clazz").page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+    # def create
+    #   common = Common.new(name: params[:name], clazz: params[:clazz])
+    #   if common.save
+    #     render_success
+    #   else
+    #     render_failure common
+    #   end
+    # end
+    #
+    # def edit
+    #   @common = Common.find(params[:id])
+    #   render layout: false
+    # end
+    #
+    # def update
+    #   common = Common.find(params[:id])
+    #   if common.update(common_params)
+    #     render_success
+    #   else
+    #     render_failure common
+    #   end
+    # end
+    #
+    # def new
+    #   render layout: false
+    # end
+    #
+    # def show
+    #   commons = Common.find(params[:id])
+    #   @commons = Common.where(clazz: commons.clazz).order('position')
+    # end
+    #
+    # private
+    #
+    # def common_params
+    #   params.permit(:name, :position)
+    # end
+  end
+end

data/app/models/educode_sales/result.rb

@@ -0,0 +1,4 @@
+module EducodeSales
+  class Result < ApplicationRecord
+  end
+end

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

@@ -19,11 +19,11 @@
       <label class="layui-form-label required">项目类型</label>
       <%if  EducodeSales::FollowUp.where(business_id: @follow_up.business.id,clazz_id: EducodeSales::Common.find_by(name: @o_name).id).count >= 2 %>
         <div class="layui-input-inline">
-          <%= select_tag "clazz_id", options_for_select([[@o_name,EducodeSales::Common.find_by(name: @o_name).id]]),:disabled => true, class: 'required' %>
+          <%= select_tag "clazz_id", options_for_select([[@o_name, EducodeSales::Common.find_by(name: @o_name).id]]), { 'lay-filter': 'clazz_id', class: 'required', :disabled => true } %>
         </div>
       <%else %>
         <div class="layui-input-inline">
-          <%= select_tag "clazz_id", options_for_select(@clazz, @follow_up&.clazz_id), class: 'required' %>
+          <%= select_tag "clazz_id", options_for_select(@clazz, @follow_up&.clazz_id), { 'lay-filter': 'clazz_id', class: 'required' } %>
         </div>
       <%end %>
     </div>
@@ -60,21 +60,29 @@
       <label class="layui-form-label">验收时间</label>
       <div class="layui-input-inline">
         <input type="text" class="layui-input" value="<%= @follow_up.reception_at %>" name="reception_at"
-          id="reception_at_edit" placeholder="请选择日期">
+               id="reception_at_edit" placeholder="请选择日期">
       </div>
     </div>
     <br>
+    <div class="layui-inline service_show layui-hide">
+      <label class="layui-form-label required">服务期</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input required" id="service_time" name="service_time" placeholder=" - " autocomplete="off" value="<%= (@follow_up.service_start_time.present? && @follow_up.service_end_time.present?) ? (@follow_up.service_start_time.to_s + ' - ' + @follow_up.service_end_time.to_s) : '' %>">
+      </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" value="<%= @follow_up.total_amount %>">
       </div>
-      客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。    </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" placeholder="本单位的签单金额" value="<%= @follow_up.actual_amount %>">
+        <input name="actual_amount" type="number" class="layui-input" placeholder="本单位的签单金额" value="<%= @follow_up.actual_amount %>">
       </div>
       客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
@@ -146,128 +154,156 @@
 </div>
 
 <script>
-  layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {
-    var form = layui.form,
-      layer = layui.layer,
-      table = layui.table,
-      xmSelect = layui.xmSelect,
-      laytpl = layui.laytpl,
-      request = layui.request,
-      laydate = layui.laydate,
-      $ = layui.$;
-
-    laydate.render({
-      elem: '#invitation_at_edit'
-    })
-    laydate.render({
-      elem: '#edit_year',
-        type: 'year'
-    })
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            xmSelect = layui.xmSelect,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            laydate = layui.laydate,
+            $ = layui.$;
 
-    laydate.render({
-      elem: '#reception_at_edit'
-    });
+        flag =
+        <%=@follow_up&.clazz_id == EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>
+        if (flag) {
+            $(".service_show").removeClass('layui-hide')
+        }
 
-    var sales_list = xmSelect.render({
-      el: '#edit_assign_follow',
-      remoteSearch: true,
-      clickClose: true,
-      delay: 1000,
-      paging: true,
-      pageRemote: true,
-      filterable: true,
-      remoteMethod: function (val, cb, show, pageIndex) {
-        $.ajax( '/missions/sales_staff', {
-          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);
+        form.on('select(clazz_id)', function (data) {
+            console.log(data.value)
+            const value = data.value;
+            if (value == <%= EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>) {
+                $(".service_show").removeClass('layui-hide')
             } else {
-              layer.msg(res.msg, {time: 2000, icon: 2, shade: 0.01});
+                console.log(data.value)
+                $(".service_show").addClass('layui-hide')
             }
-          }
         })
-      }
-    })
-    sales_list.setValue(gon.sales)
-    var places_list = xmSelect.render({
-      el: '#edit_place',
-      remoteSearch: true,
-      clickClose: true,
-        model: {
-            icon: 'hidden',
-            label: {
-                type: 'text',
-                text: {
-                    //左边拼接的字符
-                    left: '',
-                    //右边拼接的字符
-                    right: '',
-                    //中间的分隔符
-                    separator: ', ',
-                },
+
+        laydate.render({
+            elem: '#invitation_at_edit'
+        })
+        laydate.render({
+            elem: '#service_time',
+            range: true
+        });
+        laydate.render({
+            elem: '#edit_year',
+            type: 'year'
+        })
+
+        laydate.render({
+            elem: '#reception_at_edit'
+        });
+
+        var sales_list = xmSelect.render({
+            el: '#edit_assign_follow',
+            remoteSearch: true,
+            clickClose: true,
+            delay: 1000,
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                $.ajax('/missions/sales_staff', {
+                    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});
+                        }
+                    }
+                })
             }
-        },
-      delay: 1000,
-        radio: true,
-      paging: 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)
+        var places_list = xmSelect.render({
+            el: '#edit_place',
+            remoteSearch: true,
+            clickClose: true,
+            model: {
+                icon: 'hidden',
+                label: {
+                    type: 'text',
+                    text: {
+                        //左边拼接的字符
+                        left: '',
+                        //右边拼接的字符
+                        right: '',
+                        //中间的分隔符
+                        separator: ', ',
+                    },
+                }
+            },
+            delay: 1000,
+            radio: true,
+            paging: 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});
+                        }
+                    }
+                })
             }
-          }
         })
-      }
-    })
-    places_list.setValue(gon.place)
+        places_list.setValue(gon.place)
 
-    form.render();
-    form.on('submit(update_follow_up)', function (data) {
-      var assign_follow = [];
-      sales_list.getValue().forEach(function(d) {
-        assign_follow.push(d.value);
-      })
-        data.field.assign_follow_up = assign_follow;
-        data.field.place_id = places_list.getValue()[0].value;
-        request.authPut("missions/follow_ups/<%= @follow_up.id%>", data.field, function (res) {
-        if (res.success == false) {
-          layer.alert(res.msg)
-        } else {
-          layer.close(parent.sale_plan_edit_open);
-          parent.layer.close(parent.layer.getFrameIndex(window.name))
-          parent.table.reload('sale_plan_follow_table')
-          parent.table.reload('businesses_table')
-          parent.table.reload('teachers_table')
-        }
-      })
+        form.render();
+        form.on('submit(update_follow_up)', function (data) {
+            if (data.field.clazz_id == <%= EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>) {
+                if (data.field.service_time.length == 0) {
+                    layer.msg('请选择服务期', {time: 2000, icon: 2, shade: 0.01});
+                    return false;
+                }
+            }
+            var assign_follow = [];
+            sales_list.getValue().forEach(function (d) {
+                assign_follow.push(d.value);
+            })
+            data.field.assign_follow_up = assign_follow;
+            data.field.place_id = places_list.getValue()[0].value;
+            request.authPut("missions/follow_ups/<%= @follow_up.id%>", data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.sale_plan_edit_open);
+                    parent.layer.close(parent.layer.getFrameIndex(window.name))
+                    parent.table.reload('sale_plan_follow_table')
+                    parent.table.reload('businesses_table')
+                    parent.table.reload('teachers_table')
+                }
+            })
 
 
-      return false;
-    });
+            return false;
+        });
 
-  });
+    });
 </script>
 <style>
-    .place_select xm-select > .xm-body{
-        width: 300px; !important;
+    .place_select xm-select > .xm-body {
+        width: 300px;
+    !important;
     }
 </style>

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

@@ -15,6 +15,7 @@ json.data do
     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.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
     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)

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

@@ -338,26 +338,32 @@
               },
               {
                 field: 'signed_date',
-                width: 105,
-                title: '签单时间',
+                  width: 105,
+                  title: '签单时间',
                   sort: true
               },
-              {
-                field: 'reception_at',
-                width: 105,
-                title: '验收时间',
-                sort: true
-              },
-              {
-                field: 'total_amount',
-                width: 100,
-                title: '总额',
-                  totalRow: true,
-                sort: true
-              },
-              {
-                field: 'actual_amount',
-                width: 100,
+                    {
+                        field: 'reception_at',
+                        width: 105,
+                        title: '验收时间',
+                        sort: true
+                    },
+                    {
+                        field: 'service_end_time',
+                        width: 200,
+                        title: '服务期',
+                        sort: true
+                    },
+                    {
+                        field: 'total_amount',
+                        width: 100,
+                        title: '总额',
+                        totalRow: true,
+                        sort: true
+                    },
+                    {
+                        field: 'actual_amount',
+                        width: 100,
                 title: '合同额',
                   totalRow: true,
                 sort: true

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

@@ -17,6 +17,7 @@ json.data do
     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.service_end_time d.last_follow_up&.service_start_time.to_s + "-" + d.last_follow_up&.service_end_time.to_s
     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

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

@@ -19,11 +19,11 @@
       <label class="layui-form-label required">项目类型</label>
       <%if @last_follow_up&.clazz&.name == @o_name %>
       <div class="layui-input-inline">
-        <%= select_tag "clazz_id", options_for_select([[@o_name,EducodeSales::Common.find_by(name: @o_name).id]]),:disabled => true, class: 'required' %>
+        <%= select_tag "clazz_id", options_for_select([[@o_name, EducodeSales::Common.find_by(name: @o_name).id]]), { 'lay-filter': 'clazz_id', class: 'required', :disabled => true } %>
       </div>
         <%else %>
         <div class="layui-input-inline">
-          <%= select_tag "clazz_id", options_for_select(@clazz, @last_follow_up&.clazz_id), class: 'required' %>
+          <%= select_tag "clazz_id", options_for_select(@clazz, @last_follow_up&.clazz_id), { 'lay-filter': 'clazz_id', class: 'required', } %>
         </div>
         <%end %>
     </div>
@@ -64,23 +64,31 @@
       <div class="layui-input-inline">
         <input type="text" class="layui-input" name="reception_at" autocomplete="off" id="reception_at_add"
           value="<%= @last_follow_up&.reception_at%>"
-          placeholder="请选择日期">
+               placeholder="请选择日期">
       </div>
     </div>
     <br>
+    <div class="layui-inline service_show layui-hide">
+      <label class="layui-form-label required">服务期</label>
+      <div class="layui-input-inline">
+        <input type="text" class="layui-input required" id="service_time" name="service_time" placeholder=" - " autocomplete="off">
+      </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 %>">
       </div>
-      客户采购支出的费用。总额的生命历程：1.在最初阶段，是商机的预算总额；2.在挂网阶段，是项目的挂网预算总额；3.在中标阶段，是项目的中标总额。    </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%>">
+               value="<%= @last_follow_up&.actual_amount %>">
       </div>
       客户签给头歌的费用。合同额的生命历程：1.在中标之前，合同额都是0；2.在中标之后，实际与头歌签合同的金额。
     </div>
@@ -150,132 +158,161 @@
 </div>
 
 <script>
-  layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {
-    var form = layui.form,
-      layer = layui.layer,
-      table = layui.table,
-      laytpl = layui.laytpl,
-      request = layui.request,
-      laydate = layui.laydate,
-      xmSelect = layui.xmSelect,
-      $ = layui.$;
+    layui.use(['form', 'table', 'upload', 'layer', 'laytpl', 'request', 'laydate', 'xmSelect'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            table = layui.table,
+            laytpl = layui.laytpl,
+            request = layui.request,
+            laydate = layui.laydate,
+            xmSelect = layui.xmSelect,
+            $ = layui.$;
 
-      laydate.render({
-        elem: '#year',
-          type: 'year'
-      })
-      laydate.render({
-        elem: '#invitation_at_add'
-      })
+        flag =
+        <%=@last_follow_up&.clazz&.name == @o_name %>
+        if (flag) {
+            $(".service_show").removeClass('layui-hide')
+        }
 
-      laydate.render({
-        elem: '#reception_at_add'
-      });
-      var sales_list = xmSelect.render({
-        el: '#assign_follow',
-        remoteSearch: true,
-        clickClose: true,
-        delay: 1000,
-        paging: true,
-        pageRemote: true,
-        filterable: true,
-        remoteMethod: function (val, cb, show, pageIndex) {
-          $.ajax( '/missions/sales_staff', {
-            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});
-                }
+        form.on('select(clazz_id)', function (data) {
+            console.log(data.value)
+            const value = data.value;
+            if (value == <%= EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>) {
+                $(".service_show").removeClass('layui-hide')
+            } else {
+                console.log(data.value)
+                $(".service_show").addClass('layui-hide')
+            }
+        })
+
+        laydate.render({
+            elem: '#service_time',
+            range: true
+        });
+
+        laydate.render({
+            elem: '#year',
+            type: 'year'
+        })
+        laydate.render({
+            elem: '#invitation_at_add'
+        })
 
+        laydate.render({
+            elem: '#reception_at_add'
+        });
+        var sales_list = xmSelect.render({
+            el: '#assign_follow',
+            remoteSearch: true,
+            clickClose: true,
+            delay: 1000,
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                $.ajax('/missions/sales_staff', {
+                    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});
+        })
+        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);
-      form.render();
+        sales_list.setValue(gon.sales);
+        place_list.setValue(gon.place);
+        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.field.assign_follow_up = assign_follow;
-        data.field.business_id = "<%= @business.id %>";
-        data.field.place_id = place_list.getValue('valueStr');
-          request.authPost("missions/follow_ups", data.field, function (res) {
-          if (res.success == false) {
-            layer.alert(res.msg)
-          } else {
-            layer.close(parent.sale_plan_index);
-            parent.layer.close(parent.layer.getFrameIndex(window.name))
-            parent.table.reload('sale_plan_follow_table')
-            parent.table.reload('businesses_table')
-            parent.table.reload('teachers_table')
-          }
-        })
+        form.on('submit(add_follow_up)', function (data) {
+            if (data.field.clazz_id == <%= EducodeSales::Common.where(extras: EducodeSales::Common::OTYPE).first&.id %>) {
+                if (data.field.service_time.length == 0) {
+                    layer.msg('请选择服务期', {time: 2000, icon: 2, shade: 0.01});
+                    return false;
+                }
+            }
+            $(".submit-btn").addClass("layui-hide");
+            var assign_follow = [];
+            sales_list.getValue().forEach(function (d) {
+                assign_follow.push(d.value);
+            })
+            data.field.assign_follow_up = assign_follow;
+            data.field.business_id = "<%= @business.id %>";
+            data.field.place_id = place_list.getValue('valueStr');
+            request.authPost("missions/follow_ups", data.field, function (res) {
+                if (res.success == false) {
+                    layer.alert(res.msg)
+                } else {
+                    layer.close(parent.sale_plan_index);
+                    parent.layer.close(parent.layer.getFrameIndex(window.name))
+                    parent.table.reload('sale_plan_follow_table')
+                    parent.table.reload('businesses_table')
+                    parent.table.reload('teachers_table')
+                }
+            })
 
 
-        return false;
-      });
+            return false;
+        });
 
-  });
+    });
 </script>
 <style>
-    .new_place_select xm-select > .xm-body{
-        width: 300px; !important;
+    .new_place_select xm-select > .xm-body {
+        width: 300px;
+    !important;
     }
 </style>

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

@@ -163,26 +163,31 @@
                 width: 110,
                 title: '中标时间',
               },
-              {
-                field: 'signed_date',
-                width: 110,
-                title: '签单时间',
-              },
-              {
-                field: 'reception_at',
-                width: 110,
-                title: '验收时间',
-              },
-              {
-                field: 'total_amount',
-                width: 100,
-                title: '总额',
-              },
-              {
-                field: 'actual_amount',
-                width: 100,
-                title: '合同额',
-              },
+                {
+                    field: 'signed_date',
+                    width: 110,
+                    title: '签单时间',
+                },
+                {
+                    field: 'reception_at',
+                    width: 110,
+                    title: '验收时间',
+                },
+                {
+                    field: 'service_end_time',
+                    width: 200,
+                    title: '服务期',
+                },
+                {
+                    field: 'total_amount',
+                    width: 100,
+                    title: '总额',
+                },
+                {
+                    field: 'actual_amount',
+                    width: 100,
+                    title: '合同额',
+                },
               {
                 field: 'divide_amount',
                 width: 100,

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

@@ -9,6 +9,7 @@ json.data do
     json.reception_at d.reception_at&.to_s(:date)
     json.bidded_date d.bidded_date&.to_s(:date)
     json.signed_date d.signed_date&.to_s(:date)
+    json.service_end_time (d.service_start_time.present? && d.service_end_time.present?) ? (d.service_start_time&.to_s + "-" + d.service_end_time&.to_s) : ''
     json.total_amount d.total_amount
     json.actual_amount d.actual_amount
     json.divide_amount d.divide_amount ? d.divide_amount : ""

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

@@ -49,7 +49,14 @@
     <div class="layui-inline">
       <label class="layui-form-label">验收时间：</label>
       <div class="layui-input-inline">
-         <%= @follow_up.reception_at.to_s %>
+        <%= @follow_up.reception_at.to_s %>
+      </div>
+    </div>
+    <br>
+    <div class="layui-inline">
+      <label class="layui-form-label">服务期：</label>
+      <div class="layui-input-inline">
+        <%= @follow_up.service_start_time.to_s + "-" + @follow_up.service_end_time.to_s %>
       </div>
     </div>
     <br>

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

@@ -0,0 +1,111 @@
+<div class="layuimini-main" style="height: 100%;">
+
+  <div class="layui-form layuimini-form" lay-filter="common_edit">
+    <fieldset class="table-search-fieldset">
+      <legend>添加字典</legend>
+      <div class="layui-form-item">
+        <label class="layui-form-label required">字典名称</label>
+        <div class="layui-input-block">
+          <%= select_tag"clazz" ,
+              options_for_select(EducodeSales::Common.clazzs.map{|d| d },
+              EducodeSales::Common.clazzs[@common.clazz]), {'lay-filter': 'clazz',
+              disabled: true} %>
+        </div>
+      </div>
+      <div class="layui-form-item">
+        <label class="layui-form-label required">选项名称</label>
+        <div class="layui-input-block">
+          <input type="text" name="name" autocomplete="off" lay-verify="required" lay-reqtext="选项名称不能为空" placeholder="请输入选项名称" value="" class="layui-input">
+        </div>
+      </div>
+      <hr>
+      <div class="layui-form-item">
+        <div class="layui-input-block">
+          <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确定添加</button>
+        </div>
+      </div>
+    </fieldset>
+    <h4 class="m-t-10">选项列表</h4>
+    <table class="layui-hide" id="edit_table" lay-filter="edit_table"></table>
+  </div>
+</div>
+<script type="text/html" id="edit_currentTableBar">
+  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="edit">保存</a>
+</script>
+<script>
+  layui.use(['form', 'table', 'upload', 'laytpl', 'request'], function() {
+    var form = layui.form,
+      layer = layui.layer,
+      table = layui.table,
+      laytpl = layui.laytpl,
+      request = layui.request,
+      $ = layui.$;
+
+    form.render();
+
+    // 当前弹出层，防止ID被覆盖
+    var parentIndex = layer.index;
+
+    //监听提交
+    form.on('submit(saveBtn)', function(data) {
+
+      request.authPost("missions/commons", data.field, function(res) {
+        if (res.success == false) {
+          layer.alert(res.msg)
+        } else {
+          layer.alert('添加成功')
+          form.val('common_edit', {
+            'name': ''
+          })
+          parent.layer.close(parent.layer.getFrameIndex(window.name))
+          parent.table.reload('table')
+          table.reload('edit_table')
+        }
+      })
+      return false;
+    });
+
+    table.render({
+      elem: '#edit_table',
+      url: '/missions/commons/' + parent.commont_id,
+      cols: [
+        [{
+          field: 'id',
+          width: 80,
+          title:'序号',type: 'numbers',
+          sort: true
+        }, {
+          field: 'name',
+          width: 300,
+          title: '选项名称',
+          edit: true
+        }, {
+          field: 'position',
+          width: 100,
+          title: '位置',
+          edit: true
+        }, {
+          title: '操作',
+          minWidth: 150,
+          toolbar: '#edit_currentTableBar',
+        }]
+      ]
+    });
+
+    table.on('tool(edit_table)', function (obj) {
+      var data = obj.data;
+      if (obj.event === 'edit') {
+        request.authPut('missions/commons/' + data.id, data,
+          function(res) {
+            if (res.success) {
+              table.reload('edit_table')
+            } else {
+              layer.alert(res.msg)
+            }
+             
+          })
+      }
+    });
+
+  });
+</script>

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

@@ -0,0 +1,13 @@
+json.data do
+  i = 0
+  json.array! @commons do |d|
+    i += 1
+    json.i i
+    json.id d.id
+    json.name EducodeSales::Common.where(clazz: d.clazz).pluck(:name).join("、")
+    json.clazz d.clazz
+  end
+end
+
+json.code 0
+json.count @commons.total_count

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

@@ -0,0 +1,58 @@
+<div class="layuimini-main" style="height: 100%;">
+
+  <div class="layui-form layuimini-form">
+    <div class="layui-form-item">
+       <label class="layui-form-label required">字典名称</label>
+       <div class="layui-input-block">
+         <%= select_tag "clazz", options_for_select(EducodeSales::Common.clazzs.map{|d| d }), {'lay-filter': 'clazz'} %>
+       </div>
+     </div>
+    <div class="layui-form-item">
+      <label class="layui-form-label required">选项名称</label>
+      <div class="layui-input-block">
+        <input type="text" name="name" autocomplete="off" lay-verify="required" lay-reqtext="选项名称不能为空"
+          placeholder="请输入选项名称" value="" class="layui-input">
+      </div>
+    </div>
+    <hr>
+    <div class="layui-form-item">
+      <div class="layui-input-block">
+        <button class="layui-btn layui-btn-normal" lay-submit lay-filter="saveBtn">确认保存</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+  layui.use(['form', 'table', 'upload', 'laytpl', 'request'], function () {
+    var form = layui.form,
+      layer = layui.layer,
+      table = layui.table,
+      laytpl = layui.laytpl,
+      request = layui.request,
+      $ = layui.$;
+
+    form.render();
+
+    // 当前弹出层，防止ID被覆盖
+    var parentIndex = layer.index;
+
+    //监听提交
+    form.on('submit(saveBtn)', function (data) {
+  
+    request.authPost("/missions/commons", data.field, function(res) {
+      if (res.success == false) {
+        alert(res.msg)
+      } else {
+        layer.close(parent.index);
+        parent.layer.close(parent.layer.getFrameIndex(window.name))
+        parent.table.reload('table')
+      }
+    })
+
+
+      return false;
+    });
+
+  });
+</script>

data/app/views/educode_sales/results/show.json.jbuilder

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @commons do |d|
+    json.id d.id
+    json.name d.name
+    json.position d.position
+  end
+end
+
+json.code 0

data/app/views/layouts/educode_sales/application.html.erb

@@ -84,13 +84,19 @@
             <% if can? :read, EducodeSales::SalePlan %>
               <dd><a href="/missions/plans" class="<%= current?('layui-this', plans_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/6.销售计划.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>销售计划</a></dd>
             <% end %>
+<!--            <dd>-->
+<!--              <a href="/missions/results" class="<%#= current?('layui-this', results_path) %>"><i style="padding-right: 35px"></i><%#= image_tag "educode_sales/6.销售计划.png", size: "15" %>-->
+<!--                <i style="font-size: 25px;  padding-right: 15px"></i>绩效考核</a></dd>-->
             <% if @current_admin.is_admin %>
-            <dd><a href="/missions/recycles" class="<%= current?('layui-this', recycles_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/回收站.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>回收站</a></dd>
-              <%end %>
+              <dd>
+                <a href="/missions/recycles" class="<%= current?('layui-this', recycles_path) %>"><i style="padding-right: 35px"></i><%= image_tag "educode_sales/回收站.png", size: "15" %>
+                  <i style="font-size: 25px;  padding-right: 15px"></i>回收站</a></dd>
+            <% end %>
           </dl>
         </li>
         <li class="layui-nav-item layui-nav-itemed menu-li">
-          <a class="" href="javascript:;"><b><%= image_tag "educode_sales/7.运营活动.png",size:"15"%><i  style="font-size: 25px;  padding-right: 25px"></i>运营活动</b></a>
+          <a class="" href="javascript:;"><b><%= image_tag "educode_sales/7.运营活动.png", size: "15" %>
+            <i style="font-size: 25px;  padding-right: 25px"></i>运营活动</b></a>
           <dl class="layui-nav-child">
             <% if can? :read, EducodeSales::OperationTrend %>
               <dd>

data/config/routes.rb

@@ -162,7 +162,6 @@ EducodeSales::Engine.routes.draw do
     end
   end
 
-
   resources :import_teachers
 
   resources :upload_files do
@@ -173,6 +172,13 @@ EducodeSales::Engine.routes.draw do
     member do
     end
   end
+  resources :results do
+    collection do
+    end
+
+    member do
+    end
+  end
 
   resources :teachers do
     collection do

data/db/migrate/20220314053856_add_service_start_time_to_follow_ups.rb

@@ -0,0 +1,6 @@
+class AddServiceStartTimeToFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :service_start_time, :date
+    add_column :educode_sales_follow_ups, :service_end_time, :date
+  end
+end

data/db/migrate/20220314074354_add_service_time_long_to_follow_ups.rb

@@ -0,0 +1,5 @@
+class AddServiceTimeLongToFollowUps < ActiveRecord::Migration[5.2]
+  def change
+    add_column :educode_sales_follow_ups, :service_time_long, :integer
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-18 00:00:00.000000000 Z
+date: 2022-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,6 +153,7 @@ files:
 - app/controllers/educode_sales/places_controller.rb
 - app/controllers/educode_sales/plans_controller.rb
 - app/controllers/educode_sales/recycles_controller.rb
+- app/controllers/educode_sales/results_controller.rb
 - app/controllers/educode_sales/roles_controller.rb
 - app/controllers/educode_sales/sale_reports_controller.rb
 - app/controllers/educode_sales/sale_trends_controller.rb
@@ -196,6 +197,7 @@ files:
 - app/models/educode_sales/place.rb
 - app/models/educode_sales/place_area.rb
 - app/models/educode_sales/recycle.rb
+- app/models/educode_sales/result.rb
 - app/models/educode_sales/role.rb
 - app/models/educode_sales/role_area.rb
 - app/models/educode_sales/role_permission.rb
@@ -329,6 +331,11 @@ files:
 - app/views/educode_sales/recycles/monthly.json.jbuilder
 - app/views/educode_sales/recycles/weekPlan.json.jbuilder
 - app/views/educode_sales/recycles/weekly.json.jbuilder
+- app/views/educode_sales/results/edit.html.erb
+- app/views/educode_sales/results/index.html.erb
+- app/views/educode_sales/results/index.json.jbuilder
+- app/views/educode_sales/results/new.html.erb
+- app/views/educode_sales/results/show.json.jbuilder
 - app/views/educode_sales/roles/edit.html.erb
 - app/views/educode_sales/roles/index.html.erb
 - app/views/educode_sales/roles/index.json.jbuilder
@@ -422,6 +429,8 @@ files:
 - db/migrate/20220121060006_create_educode_sales_business_export_records.rb
 - db/migrate/20220125013811_create_educode_sales_staff_schools.rb
 - db/migrate/20220125033552_create_educode_sales_customer_adds.rb
+- db/migrate/20220314053856_add_service_start_time_to_follow_ups.rb
+- db/migrate/20220314074354_add_service_time_long_to_follow_ups.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb