educode_sales 0.9.73 → 0.9.74

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

@@ -1,355 +1,14 @@
-<div style="margin: 10px 10px 10px 10px">
-  <form class="layui-form layui-form-pane" lay-filter="search_ideas">
-    <div class="layui-form-item">
-      <div class="layui-inline ">
-        <label class="layui-form-label">创建时间</label>
-        <div class="layui-input-inline">
-          <input type="text" class="layui-input" id="created_at" name="created_at" placeholder=" - " autocomplete="off">
-        </div>
-      </div>
-      <div class="layui-inline">
-        <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>
-        <div class="layui-input-inline">
-          <%= select_tag "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 "status", options_for_select(EducodeSales::Idea.statuses.keys, ""), { include_blank: true } %>
-        </div>
-      </div>
-      <div class="layui-inline">
-        <label class="layui-form-label">类型</label>
-        <div class="layui-input-inline">
-          <%= select_tag "types", options_for_select(EducodeSales::Idea.types.keys, ""), { include_blank: true } %>
-        </div>
-      </div>
-      <div class="layui-inline">
-        <label class="layui-form-label">部署模式</label>
-        <div class="layui-input-inline">
-          <%= select_tag "model", options_for_select(EducodeSales::Idea.models.keys, ""), { include_blank: true } %>
-        </div>
-      </div>
-      <div class="layui-inline">
-        <label class="layui-form-label">历史合作</label>
-        <div class="layui-input-inline">
-          <%= select_tag "history_type", options_for_select([["无", 0], ["有", 1]], ""), { include_blank: true } %>
-        </div>
-      </div>
-      <div class="layui-inline">
-        <label class="layui-form-label">优先级</label>
-        <div class="layui-input-inline">
-          <%= select_tag "level", options_for_select(EducodeSales::Idea.levels.keys, ""), { 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="name" name="name" placeholder=" - " autocomplete="off">
-        </div>
-      </div>
-      <div class="layui-inline">
-        <label class="layui-form-label">学校/单位</label>
-        <div class="layui-input-inline">
-          <input type="text" class="layui-input" id="school" name="school" placeholder=" - " autocomplete="off">
-        </div>
-      </div>
-
-      <div class="layui-inline">
-        <button type="reset" class="layui-btn layui-btn-primary" lay-submit lay-filter="reset_business_search">重置
-        </button>
-        <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="search_ideas">搜 索
-        </button>
-      </div>
+<div class="layui-tab" lay-filter="operation_tab">
+  <ul class="layui-tab-title">
+    <li class="layui-this follows_li">跟进动态</li>
+    <li class="businesses_list_li">方案列表</li>
+  </ul>
+  <div class="layui-tab-content">
+    <div class="layui-tab-item  layui-show">
+      <%= render 'follows' %>
+    </div>
+    <div class="layui-tab-item follows_div">
+      <%= render 'index' %>
     </div>
-  </form>
-</div>
-
-<script type="text/html" id="toolbarDemo">
-  <div class="layui-btn-container">
-    <span class="table-label">方案管理</span>
-    <% if can? :create, EducodeSales::Idea %>
-      <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="add">新增项目方案</button>
-    <% end %>
   </div>
-</script>
-<div class="">
-  <table class="layui-hide" id="ideas_table" style="min-height: 300px;" lay-filter="ideas_table"></table>
-</div>
-<script type="text/html" id="currentTableBar">
-  <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edita" lay-event="add_event">详情</a>
-  <% if can? :update, EducodeSales::Idea %>
-    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="idea_edit">编辑</a>
-  <% end %>
-  <% if can? :destroy, EducodeSales::Idea %>
-    <a class="layui-btn layui-btn-danger layui-btn-xs data-count-edit" lay-event="idea_recycle">移除</a>
-  <% end %>
-</script>
-<script type="text/html" id="statusTpl">
-  {{# if(d.status === '已完成'){ }}
-  <span style="color: #22bf18;">{{ d.status }}</span>
-  {{# } else { }}
-  <span style="color: #e60505;">{{ d.status }}</span>
-  {{# } }}
-</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 laydate = layui.laydate;
-
-        laydate.render({
-            elem: '#created_at',
-            range: true
-        });
-
-        table = layui.table;
-        table.render({
-            elem: '#ideas_table',
-            url: '/missions/ideas',
-            where: {q: form.val('search_form')},
-            toolbar: '#toolbarDemo',
-            totalRow: true,
-            defaultToolbar: ['filter'],
-            cols: [
-                [
-                    {
-                        field: 'school',
-                        width: 160,
-                        title: '学校/单位名称'
-                    },
-                    {
-                        field: 'name',
-                        width: 160,
-                        title: '项目名称'
-                    },
-                    {
-                        field: 'level',
-                        width: 100,
-                        title: '优先级'
-                    },
-                    {
-                        field: 'staff',
-                        title: '方案指派人',
-                        width: 100
-                    },
-                    {
-                        field: 'status',
-                        width: 100,
-                        title: '状态',
-                        templet: '#statusTpl'
-                    },
-                    {
-                        field: 'types',
-                        width: 100,
-                        title: '类型',
-                    },
-                    {
-                        field: 'model',
-                        width: 100,
-                        title: '部署模式',
-                    },
-                    {
-                        field: 'hardware',
-                        width: 150,
-                        title: '硬件规模(万)'
-                    },
-                    {
-                        field: 'project',
-                        width: 150,
-                        title: '并发规模(人)'
-                    },
-                    {
-                        field: 'money',
-                        width: 150,
-                        title: '项目预算(万)'
-                    },
-                    {
-                        field: 'creator',
-                        width: 100,
-                        title: '发布人'
-                    },
-                    {
-                        field: 'end_time',
-                        width: 200,
-                        title: '截止时间'
-                    },
-                    {
-                        field: 'history_type',
-                        width: 150,
-                        title: '历史合作'
-                    },
-                    {
-                        field: 'created_at',
-                        width: 150,
-                        title: '创建时间'
-                    },
-                    {
-                        field: 'content',
-                        width: 200,
-                        title: '反馈情况'
-                    },
-                    {
-                        title: '操作',
-                        minWidth: 170,
-                        toolbar: '#currentTableBar',
-                        align: "center",
-                        fixed: 'right'
-                    }
-                ]
-            ],
-            limit: 20,
-            limits: [10, 15, 20, 30, 40, 50, 60, 70, 80, 90],
-            page: true,
-            done: function (res) {
-            }
-        });
-
-        function deleteBusiness(id, name) {
-            layer.confirm('确定删除' + name, function (index) {
-                request.delete('missions/ideas/' + id, {}, function (res) {
-                    layer.close(index);
-                    table.reload("ideas_table")
-                })
-            });
-        }
-
-        var sort = {}, search = {};
-        table.on('sort(ideas_table)', function (obj) {
-            sort.field = obj.field;
-            sort.order = obj.type;
-            table.reload('ideas_table', {
-                initSort: obj,
-                where: {
-                    sort: sort,
-                    q: search
-                }
-            });
-        })
-
-        // 监听搜索操作
-        form.on('submit(search_ideas)', function (data) {
-            search = data.field
-            table.reload('ideas_table', {
-                page: {
-                    curr: 1
-                },
-                where: {q: search, sort: sort}
-            }, 'data');
-            return false;
-        });
-
-        form.on('submit(reset_business_search)', function (data) {
-            var field = data.field;
-            form.val('search_ideas', {
-                created_at: "",
-                creator_id: "",
-                staff_id: "",
-                name: "",
-                school: "",
-                status: "",
-                model: "",
-                types: "",
-                level: "",
-                history_type: ""
-            })
-            return false;
-        });
-        // form.on('submit(show_hide)', function (data) {
-        //     $(".show_item").toggle()
-        //     return false;
-        // });
-        /**
-         * toolbar事件监听
-         */
-        table.on('toolbar(ideas_table)', function (obj) {
-            if (obj.event === 'add') {  // 手动添加
-                var content = miniPage.getHrefContent('/missions/ideas/new');
-                var openWH = miniPage.getOpenWidthHeight();
-                add_idea_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);
-                });
-            }
-        });
-
-        //监听表格复选框选择
-        // table.on('checkbox(ideas_table)', function (obj) {
-        //     console.log(obj)
-        // });
-
-        table.on('tool(ideas_table)', function (obj) {
-            var data = obj.data;
-            id = data.id
-            if (obj.event === 'add_event') { // 监听添加操作
-                var content = miniPage.getHrefContent('/missions/ideas/detail?id=' + data.id);
-                var openWH = miniPage.getOpenWidthHeight();
-                show_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(show_index);
-                });
-            } else if (obj.event === 'idea_recycle') {
-                layer.confirm('确定删除' + data.name, function (index) {
-                    request.delete('missions/ideas/' + id, {}, function (res) {
-                        layer.close(index);
-                        table.reload("ideas_table")
-                    })
-                });
-            } else if (obj.event === 'idea_edit') { // 监听添加操作
-                var content = miniPage.getHrefContent('/missions/ideas/' + id + '/edit');
-                var openWH = miniPage.getOpenWidthHeight();
-                edit_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(edit_index);
-                });
-            }
-        });
-
-    });
-</script>
-<style>
-    .layui-table-tool-temp {
-        padding-right: 30px;
-    !important;
-    }
-</style>
+</div>

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

@@ -1,6 +1,6 @@
 json.data do
   json.array! @ideas do |d|
-    json.(d, :id, :name, :level, :status, :types, :model, :content)
+    json.(d, *d.attributes.keys)
     json.school d.school&.name
     json.staff d.staff&.user&.real_name
     json.hardware d.hardware
@@ -11,6 +11,12 @@ json.data do
     json.deleter d.deleter&.user&.real_name
     json.created_at d.created_at.to_s(:date)
     json.history_type EducodeSales::Idea.where(school_id: d.school_id).size.to_i >= 2 ? "有" : "无"
+    json.is_deleted @is_deleted
+    json.sale_staff d.sale_staff&.user&.real_name
+    json.f_staff d.last_idea_follow&.staff&.user&.real_name
+    json.f_last_time d.last_idea_follow&.created_at.to_s
+    json.name d.business&.name || d.name
+    json.advise d.advise.to_s
   end
 end
 json.code 0

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

@@ -5,15 +5,15 @@
       <div class="layui-row">
         <h2 style="padding-left: 25px">方案信息</h2>
       </div>
-      <div class="layui-row" style="padding-top: 15px">
+      <div class="layui-row" style="padding-top: 15px;display: none">
         <div class="layui-col-md6">
-          <labeL class="layui-form-label required">学校/单位:</labeL>
+          <labeL class="layui-form-label required">单位:</labeL>
           <div class="layui-input-block">
             <div id="school_id" style="width: 600px;"></div>
           </div>
         </div>
         <div class="layui-col-md6">
-          <labeL class="layui-form-label">院系/部门:</labeL>
+          <labeL class="layui-form-label">部门:</labeL>
           <div class="layui-input-block">
             <div id="department_id" style="width: 600px;"></div>
           </div>
@@ -21,9 +21,9 @@
       </div>
       <div class="layui-row" style="padding-top: 15px">
         <div class="layui-col-md6">
-          <labeL class="layui-form-label">学校负责人:</labeL>
+          <labeL class="layui-form-label">单位联系人:</labeL>
           <div class="layui-input-block">
-            <input type="text" name="manager_name" autocomplete="off" placeholder="请输入学校负责人" value="<%= @idea&.manager_name %>" class="layui-input">
+            <input type="text" name="manager_name" autocomplete="off" placeholder="请输入单位联系人" value="<%= @idea&.manager_name %>" class="layui-input">
           </div>
         </div>
         <div class="layui-col-md6">
@@ -35,7 +35,7 @@
       </div>
       <div class="layui-row" style="padding-top: 15px">
         <div class="layui-col-md6">
-          <labeL class="layui-form-label required">销售负责人:</labeL>
+          <labeL class="layui-form-label required">销售经理:</labeL>
           <div class="layui-input-block">
             <div id="sale_staff_id"></div>
           </div>
@@ -51,11 +51,11 @@
         <div class="layui-col-md6">
           <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="<%= @idea&.name %>" class="layui-input">
+            <div id="business_id" style="width: 600px;"></div>
           </div>
         </div>
         <div class="layui-col-md6">
-          <labeL class="layui-form-label">方案指派人:</labeL>
+          <labeL class="layui-form-label">方案经理:</labeL>
           <div class="layui-input-block">
             <div id="new_staff_id"></div>
           </div>
@@ -77,7 +77,7 @@
       </div>
       <div class="layui-row" style="padding-top: 15px">
         <div class="layui-col-md6">
-          <labeL class="layui-form-label">类型:</labeL>
+          <labeL class="layui-form-label">定制类型:</labeL>
           <div class="layui-input-block">
             <%= select_tag "types", options_for_select(EducodeSales::Idea.types.keys, @idea&.types), { 'lay-filter': 'types', include_blank: false } %>
           </div>
@@ -89,11 +89,25 @@
           </div>
         </div>
       </div>
+      <div class="layui-row" style="padding-top: 15px">
+        <div class="layui-col-md6">
+          <labeL class="layui-form-label">方案类型:</labeL>
+          <div class="layui-input-block">
+            <%= select_tag "idea_type", options_for_select(EducodeSales::Idea.idea_types.keys, @idea&.idea_type), { 'lay-filter': 'idea_type', include_blank: false } %>
+          </div>
+        </div>
+        <div class="layui-col-md6">
+          <labeL class="layui-form-label">指派人:</labeL>
+          <div class="layui-input-block">
+            <div id="other_staff_ids"></div>
+          </div>
+        </div>
+      </div>
       <div class="layui-row" style="padding-top: 15px">
         <div class="layui-col-md6">
           <labeL class="layui-form-label">硬件规模(万):</labeL>
           <div class="layui-input-block">
-            <input type="number" name="hardware" autocomplete="off"  placeholder="请输入硬件规模" value="<%= @idea&.hardware %>" class="layui-input">
+            <input type="number" name="hardware" autocomplete="off" placeholder="请输入硬件规模" value="<%= @idea&.hardware %>" class="layui-input">
           </div>
         </div>
         <div class="layui-col-md6">
@@ -126,9 +140,9 @@
         </div>
       </div>
       <div class="layui-row" style="padding-top: 15px">
-        <labeL class="layui-form-label">反馈情况:</labeL>
+        <labeL class="layui-form-label">需求说明:</labeL>
         <div class="layui-input-block">
-          <textarea name="content" placeholder="反馈情况" class="layui-textarea"><%= @idea&.content.to_s %></textarea>
+          <textarea name="content" placeholder="需求说明" class="layui-textarea"><%= @idea&.content.to_s %></textarea>
         </div>
       </div>
       <div class="layui-row" style="padding-top: 15px">
@@ -182,15 +196,15 @@
 
     layui.use(['form', 'upload', 'table', 'upload', 'layer', 'laytpl', 'request', 'selectInput', 'xmSelect'], function () {
         var form = layui.form,
-            layer = layui.layer,
-            request = layui.request,
-            laydate = layui.laydate,
-            table = layui.table,
-            laytpl = layui.laytpl,
-            request = layui.request,
-            xmSelect = layui.xmSelect,
-            upload = layui.upload,
-            $ = layui.$;
+          layer = layui.layer,
+          request = layui.request,
+          laydate = layui.laydate,
+          table = layui.table,
+          laytpl = layui.laytpl,
+          request = layui.request,
+          xmSelect = layui.xmSelect,
+          upload = layui.upload,
+          $ = layui.$;
         selectInput = layui.selectInput;
 
         form.render();
@@ -200,6 +214,40 @@
         });
         form.render();
 
+        var business_list = xmSelect.render({
+            el: '#business_id',
+            remoteSearch: true,
+            autoRow: true,
+            radio: true,
+            delay: 1000,
+            tips: '支持名称搜索,请至少输入一个字符',
+            searchTips: '支持名称搜索,请至少输入一个字符',
+            paging: true,
+            pageRemote: true,
+            filterable: true,
+            remoteMethod: function (val, cb, show, pageIndex) {
+                if (!val) {
+                    return cb([]);
+                }
+                $.ajax('/missions/staff_business', {
+                    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 school_list = xmSelect.render({
             el: '#school_id',
             remoteSearch: true,
@@ -330,6 +378,12 @@
             filterable: true,
             multiple: true
         })
+        var other_staff_list = xmSelect.render({
+            el: '#other_staff_ids',
+            data: gon.staffs,
+            filterable: true,
+            multiple: true
+        })
 
         var attachment_list = xmSelect.render({
             el: '#attachment_ids',
@@ -367,10 +421,6 @@
             school_list.getValue().forEach(function (d) {
                 schools.push(d.value);
             })
-            if (schools.length == 0) {
-                layer.alert("请选择学校");
-                return false;
-            }
             data.field.school_id = schools[0];
 
             var departments = [];
@@ -378,9 +428,15 @@
                 departments.push(d.value);
             })
             data.field.department_id = departments[0];
+            var business = [];
+            business_list.getValue().forEach(function (d) {
+                business.push(d.value);
+            })
+            data.field.business_id = business[0];
             data.field.staff_id = staff_list.getValue('valueStr');
             data.field.sale_staff_id = sale_staff_list.getValue('valueStr');
             data.field.assist_staff_ids = assist_staff_list.getValue('valueStr');
+            data.field.other_staff_ids = other_staff_list.getValue('valueStr');
             data.field.attachment_ids = attachment_list.getValue('valueStr');
             request.authPost("missions/ideas/", data.field, function (res) {
                 if (res.success == false) {