educode_sales 0.7.2 → 0.7.5

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>
@@ -38,16 +38,16 @@
       <label class="layui-form-label">招标时间</label>
       <div class="layui-input-inline">
         <input type="text" class="layui-input" name="invitation_at" autocomplete="off" id="invitation_at_add"
-          value="<%= @last_follow_up&.invitation_at%>"
-          placeholder="请选择日期">
+               value="<%= @last_follow_up&.invitation_at %>"
+               placeholder="请选择日期">
       </div>
     </div>
     <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"
-          value="<%= @last_follow_up&.bidded_date%>"
-          placeholder="请选择日期">
+               value="<%= @last_follow_up&.bidded_date %>"
+               placeholder="请选择日期">
       </div>
     </div>
     <br>
@@ -55,32 +55,40 @@
       <label class="layui-form-label">签单时间</label>
       <div class="layui-input-inline">
         <input type="text" class="layui-input" name="signed_date" autocomplete="off" id="invitation_at_add"
-          value="<%= @last_follow_up&.signed_date%>"
-          placeholder="请选择日期">
+               value="<%= @last_follow_up&.signed_date %>"
+               placeholder="请选择日期">
       </div>
     </div>
     <div class="layui-inline">
       <label class="layui-form-label">验收时间</label>
       <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="请选择日期">
+               value="<%= @last_follow_up&.reception_at %>"
+               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=<%= (@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>
+    <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/places/index.html.erb

@@ -46,6 +46,9 @@
   <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}</a>
 </script>
 
+
+
+
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
         var $ = layui.jquery,
@@ -172,9 +175,8 @@
             page: true
         });
 
-        /**
-         * toolbar事件监听
-         */
+
+         // * toolbar事件监听
         table.on('toolbar(currentTableFilter)', function (obj) {
             if (obj.event === 'add') { // 监听添加操作
                 var content = miniPage.getHrefContent('/missions/places/new');

data/app/views/educode_sales/plans/_monthPlan.html.erb

@@ -182,9 +182,11 @@
 
         form.on('submit(month_plan_reset_btn)', function(data){
           var field = data.field;
-            form.val('month_plan_search_form', {staff_id: '', year: '', month: '', year: ''})
+            form.val('month_plan_search_form', {  staff_id: '', year: '', month: '', year: ''})
            return false;
         });
+
+
         table.on('toolbar(monthPlanTable)', function (obj) {
           if (obj.event === 'add') { // 监听添加操作
               var content = miniPage.getHrefContent('/missions/plans/new_month');

data/app/views/educode_sales/plans/new_month.html.erb

@@ -66,6 +66,8 @@
     form.on('submit(add_month_plan)', function (data) {
       request.authPost("missions/plans", data.field, function (res) {
         if (res.success == false) {
+            console.log("oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo")
+            console.log(parent.from_sales,parent.from_new_monthly,parent.from_monthly)
           layer.alert(res.msg)
         } else {
           layer.close(parent.sindex);

data/app/views/educode_sales/plans/new_week.html.erb

@@ -73,17 +73,20 @@
     var parentIndex = layer.index;
 
     form.on('submit(add_week_plan)', function (data) {
+        console.log(data)
       request.authPost("missions/plans", data.field, function (res) {
         if (res.success == false) {
+            console.log("no")
           layer.alert(res.msg)
         } else {
+          console.log("ok")
           layer.close(parent.sindex);
           parent.layer.close(parent.layer.getFrameIndex(window.name))
           if (parent.from_sales) {
             parent.table.reload('weekPlanTable')
           } else if (parent.from_weekly) {
             parent.table.reload('newWeeklyTable')
-          } 
+          }
           else {
             parent.table.reload('businesses_table')
           }
@@ -95,6 +98,7 @@
       return false;
     });
 
+    // que xiao
     form.on('submit(cancel_add_week)', function (data) {
       layer.closeAll();
       return false;

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