educode_sales 0.7.2 → 0.7.5

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

@@ -95,7 +95,7 @@
   <div class="layui-btn-container">
     <span class="table-label">商机列表</span>
     <% if can?(:export_business, EducodeSales::Business) %>
-    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm data-count-edit export_more-btn pull-right" style="color: #0000FF;" data-name="export" data-id="export">导出<i class="layui-icon layui-icon-down  layui-nav-more" style="font-size: 12px"></i></button>
+    <button class="layui-btn layui-btn-primary layui-border-green layui-btn-sm data-count-edit export_more-btn pull-right" style="color: #0000ff;" data-name="export" data-id="export">导出<i class="layui-icon layui-icon-down  layui-nav-more" style="font-size: 12px"></i></button>
     <% end %>
     <% if can? :create, EducodeSales::Business %>
     <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add"> 添加商机</button>
@@ -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