educode_sales 0.9.73 → 0.9.74

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

@@ -0,0 +1,9 @@
+json.data do
+  json.array! @schools do |d|
+    json.value d.id
+    json.name "#{d.name}-#{d.department&.school&.name.to_s}-#{d.department&.name.to_s}"
+  end
+end
+json.count @schools.size
+json.code 0
+json.msg "success"

data/app/views/educode_sales/idea_recycles/detail.html.erb

@@ -28,7 +28,7 @@
         </div>
       </div>
       <div class="layui-inline">
-        <label class="layui-form-label" style="width: 100px">学校负责人：</label>
+        <label class="layui-form-label" style="width: 100px">单位联系人：</label>
         <div class="layui-input-inline">
           <%= idea.manager_name %>
         </div>
@@ -47,14 +47,14 @@
         </div>
       </div>
       <div class="layui-inline">
-        <label class="layui-form-label" style="width: 100px">方案指派人：</label>
+        <label class="layui-form-label" style="width: 100px">方案经理：</label>
         <div class="layui-input-inline">
           <%= idea.staff&.user&.real_name %>
         </div>
       </div>
       <br>
       <div class="layui-inline">
-        <label class="layui-form-label" style="width: 100px">销售负责人：</label>
+        <label class="layui-form-label" style="width: 100px">销售经理：</label>
         <div class="layui-input-inline">
           <%= idea.sale_staff&.user&.real_name %>
         </div>
@@ -126,7 +126,7 @@
       </div>
       <br>
       <div class="layui-inline">
-        <label class="layui-form-label" style="width: 100px">反馈情况：</label>
+        <label class="layui-form-label" style="width: 100px">需求说明：</label>
         <div class="layui-input-inline" style="width: 1000px">
           <%= idea.content.to_s %>
         </div>

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

@@ -8,13 +8,13 @@
         </div>
       </div>
       <div class="layui-inline">
-        <label class="layui-form-label">发布人</label>
+        <label class="layui-form-label">申请人</label>
         <div class="layui-input-inline">
           <%= select_tag "creator_id", options_for_select(@creator_arr, ""), { include_blank: true } %>
         </div>
       </div>
       <div class="layui-inline">
-        <label class="layui-form-label">方案指派人</label>
+        <label class="layui-form-label">方案经理</label>
         <div class="layui-input-inline">
           <%= select_tag "staff_id", options_for_select(@staff_arr, ""), { include_blank: true } %>
         </div>
@@ -136,7 +136,7 @@
                     },
                     {
                         field: 'staff',
-                        title: '方案指派人',
+                        title: '方案经理',
                         width: 100
                     },
                     {
@@ -173,7 +173,7 @@
                     {
                         field: 'creator',
                         width: 100,
-                        title: '发布人'
+                        title: '申请人'
                     },
                     {
                         field: 'end_time',
@@ -193,7 +193,7 @@
                     {
                         field: 'content',
                         width: 200,
-                        title: '反馈情况'
+                        title: '需求说明'
                     },
                     {
                         field: 'deleter',

data/app/views/educode_sales/ideas/_follows.html.erb

@@ -0,0 +1,258 @@
+<div style="margin: 10px 10px 10px 10px">
+  <form class="layui-form layui-form-pane" lay-filter="search_follows_aa">
+    <div class="layui-form-item">
+      <div class="layui-inline">
+        <label class="layui-form-label">所属商机</label>
+        <div class="layui-input-inline">
+          <input type="text" name="search_name" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">单位</label>
+        <div class="layui-input-inline">
+          <input type="text" name="search_school" class="layui-input">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">销售经理</label>
+        <div class="layui-input-inline">
+          <%= select_tag "search_sale_staff_id", options_for_select(@staff_arr, ""), { include_blank: true } %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">方案经理</label>
+        <div class="layui-input-inline">
+          <%= select_tag "search_idea_staff", options_for_select(@staff_arr, ""), { include_blank: true } %>
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">跟进时间</label>
+        <div class="layui-input-inline">
+          <input type="text" class="layui-input" id="search_created_at" name="search_created_at" placeholder=" - " autocomplete="off">
+        </div>
+      </div>
+      <div class="layui-inline">
+        <label class="layui-form-label">最新进展</label>
+        <div class="layui-input-inline">
+          <input type="text" name="search_content" class="layui-input">
+        </div>
+      </div>
+
+      <div class="layui-inline">
+        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_follows_search_a">重置
+        </button>
+        <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_follows_a">搜 索
+        </button>
+      </div>
+    </div>
+  </form>
+</div>
+<div class="">
+  <table class="layui-hide" id="activity_followp_table" style="min-height: 300px;" lay-filter="activity_followp_table"></table>
+</div>
+<script type="text/html" id="currentTableBar_follows">
+  <% if can? :advise, EducodeSales::Idea %>
+    <a class="layui-btn layui-btn-default layui-btn-xs data-count-edit" lay-event="advise">团队建议</a>
+  <% end %>
+</script>
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
+        var $ = layui.jquery,
+          form = layui.form,
+          request = layui.request,
+          dropdown = layui.dropdown,
+          miniPage = layui.miniPage,
+          laydate = layui.laydate;
+
+        var table = layui.table;
+        table.render({
+            elem: '#activity_followp_table',
+            url: '/missions/ideas/follow_ups',
+            defaultToolbar: ['filter'],
+            initSort: {
+                field: 'created_at', type: 'desc'
+            },
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        width: 60,
+                        title: '序号', type: 'numbers',
+                    },
+                    {
+                        field: 'content',
+                        title: '最新进展',
+                        width: 300
+                    },
+                    {
+                        width: 120,
+                        title: '所属商机',
+                        field: 'name'
+                    },
+                    {
+                        field: 'school_name',
+                        width: 150,
+                        title: '单位',
+                    },
+                    {
+                        field: 'money',
+                        width: 150,
+                        title: '预算',
+                    },
+                    {
+                        field: 'status',
+                        title: '状态',
+                        width: 150,
+                    },
+                    {
+                        field: 'advise',
+                        width: 160,
+                        title: '团队建议',
+                    },
+                    {
+                        field: 'sale_staff',
+                        width: 120,
+                        title: '销售经理',
+                    },
+                    {
+                        field: 'idea_staff',
+                        width: 180,
+                        title: '方案经理',
+                        sort: true,
+                    },
+                    {
+                        field: 'staff',
+                        width: 300,
+                        title: '跟进人'
+                    },
+                    {
+                        field: 'created_at',
+                        width: 300,
+                        title: '跟进时间'
+                    },
+                    {
+                        title: '操作',
+                        width: 200,
+                        toolbar: '#currentTableBar_follows',
+                        align: "center",
+                        fixed: 'right'
+                    }
+                ]
+            ],
+            limit: 20,
+            page: true,
+            limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90]
+        });
+
+        var sort = {}, search = {};
+        table.on('sort(activity_followp_table)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('activity_followp_table', {
+                initSort: obj,
+                where: {
+                    sort: sort,
+                    q: search
+                }
+            });
+        })
+
+        laydate.render({
+            elem: '#search_created_at',
+            range: true
+        });
+
+        // 监听搜索操作
+        form.on('submit(search_follows_a)', function (data) {
+            search = data.field
+            table.reload('activity_followp_table', {
+                page: {
+                    curr: 1
+                },
+                where: {q: search, sort: sort}
+            }, 'data');
+
+            return false;
+        });
+
+        form.on('submit(reset_follows_search_a)', function (data) {
+            var field = data.field;
+            form.val('search_follows_aa', {
+                search_name: "",
+                search_created_at: "",
+                search_content: "",
+                search_status: "",
+                search_school_name: "",
+                search_money: "",
+                search_advise: "",
+                search_sale_staff: "",
+                search_idea_staff: "",
+            })
+            return false;
+        });
+
+
+        table.on('tool(activity_followp_table)', function (obj) {
+            var data = obj.data;
+            id = data.teacher_id;
+            if (obj.event === 'detail') { // 监听添加操作
+                content = miniPage.getHrefContent('/missions/teachers/show_follow?id=' + data.teacher_id);
+                openWH = miniPage.getOpenWidthHeight();
+                index = 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(index);
+                });
+            } else if (obj.event == 'advise') {
+                layer.open({
+                    title: '添加团队建议',
+                    closeBtn: 0,
+                    type: 1,
+                    area: '400px;',
+                    id: 'LAY_layuipro',
+                    content: '<div class="layui-form" lay-filter="edit_project" style="padding: 20px;"><textarea autocomplete="off" type="text" name="name" lay-verify="required" class="layui-textarea">' + data.advise + '</textarea></div>',
+                    btn: ['保存', '取消'],
+                    btn1: function (index, l) {
+                        if (l.find("textarea").val().trim() == '') {
+                            layer.msg('内容不能为空')
+                            return false;
+                        } else {
+                            request.authPost("/missions/ideas/add_advise", {
+                                content: l.find("textarea").val().trim(),
+                                id: data.id
+                            }, function (res) {
+                                if (res.success == false) {
+                                    layer.alert(res.msg);
+                                } else {
+                                    layer.close(index);
+                                    table.reload('activity_followp_table');
+                                }
+                            })
+                        }
+
+                        return false
+                    },
+                    btn2: function (index, l) {
+                        layer.close(index)
+                    }
+                });
+            }
+        });
+
+    });
+</script>
+<style>
+    .layui-table-tool-temp {
+        padding-right: 30px;
+    !important;
+    }
+</style>