educode_sales 0.9.73 → 0.9.74

data/app/views/educode_sales/ideas/edit.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,7 +21,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">
             <input type="text" name="manager_name" autocomplete="off" placeholder="请输入姓名" value="<%= @idea&.manager_name %>" class="layui-input">
           </div>
@@ -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">
@@ -228,6 +242,40 @@
             }
         })
 
+        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 department_list = xmSelect.render({
             el: '#department_id',
             remoteSearch: true,
@@ -281,6 +329,9 @@
         school_list.setValue(
           gon.school_list
         )
+        business_list.setValue(
+          gon.business_list
+        )
 
 
         form.render();
@@ -324,6 +375,13 @@
             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',
@@ -354,6 +412,7 @@
         sale_staff_list.setValue(gon.sale_staff_value)
         assist_staff_list.setValue(gon.assist_staff_value)
         attachment_list.setValue(gon.attachment_list)
+        other_staff_list.setValue(gon.other_staff_value)
 
         var department_id = gon.value;
         var department = selectInput.render({
@@ -387,15 +446,12 @@
             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');
             var schools = [];
             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 = [];
@@ -403,6 +459,12 @@
                 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];
             request.authPut("missions/ideas/" + parent.id, data.field, function (res) {
                 if (res.success == false) {
                     layer.alert(res.msg)

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

@@ -0,0 +1,157 @@
+<%= Gon::Base.render_data %>
+<script type="text/html" id="toolbarDemo_f">
+  <div class="layui-btn-container">
+    <span class="table-label">附件信息</span>
+    <% if can? :upload_file, EducodeSales::Idea %>
+    <button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn pull-right" lay-event="upload_file">上传文件</button>
+    <% end %>
+  </div>
+</script>
+
+<table class="layui-hide" id="file" lay-filter="file"></table>
+
+<script type="text/html" id="currentTableBar_file">
+    <a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="preview">预览</a>
+  <% if can? :download_file, EducodeSales::Idea %>
+<a href="/missions/upload_files/download?id={{d.id}}" class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="download">下载</a>
+  <% end %>
+  <% if can? :delete_file, EducodeSales::Idea %>
+<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete">删除</a>
+  <% end %>
+</script>
+
+<!--<script type="text/html" id="showchance">-->
+<!--  <a href="/missions/businesses" class="layui-table-link">{{ d.chance }}</a>-->
+<!--</script>-->
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+        var $ = layui.jquery,
+          form = layui.form,
+          table = layui.table,
+          request = layui.request,
+          upload = layui.upload;
+        miniPage = layui.miniPage;
+
+
+        var idea_id = parent.idea_id;
+        table.render({
+            elem: '#file',
+            url: '/missions/ideas/' + idea_id + '/files',
+            toolbar: '#toolbarDemo_f',
+            defaultToolbar: [],
+            cols: [
+                [
+                    {
+                        field: 'id',
+                        width: 80,
+                        title: '序号', type: 'numbers',
+                    },
+                    {
+                        field: 'name',
+                        title: '文件名'
+                    },
+                    {
+                        field: 'size',
+                        width: 100,
+                        title: '文件大小',
+                    },
+                    {
+                        field: 'created_on',
+                        width: 200,
+                        title: '上传时间',
+                        sort: true
+                    },
+                    {
+                        field: 'upload_person',
+                        width: 80,
+                        totalRow:true,
+                        title: '上传人',
+                    },
+                    {
+                        title: '操作',
+                        width: 200,
+                        toolbar: '#currentTableBar_file',
+                        align: "center"
+                    }
+                ]
+            ],
+            limit: 20,
+            limits: [10,15,20,30,40,50,60,70,80,90],
+            page: true
+        });
+
+
+        var sort = {};
+        table.on('sort(file)', function (obj) {
+            sort.field = obj.field;
+            sort.order = obj.type;
+            table.reload('file', {
+                initSort: obj,
+                where: {
+                    sort: sort
+                }
+            });
+        })
+
+
+        table.on('toolbar(file)', function (obj) {
+            if (obj.event === 'upload_file') {  //
+                idea_id = parent.idea_id;
+                var content = miniPage.getHrefContent('/missions/ideas/upload_file');
+                var openWH = miniPage.getOpenWidthHeight();
+                import_index = layer.open({
+                    title: '上传文件',
+                    type: 1,
+                    shade: 0.2,
+                    shadeClose: true,
+                    area: ['200px', '100px'],
+                    offset: 'auto',
+                    closeBtn: 0,
+                    content: content,
+                });
+                $(window).on("resize", function () {
+                    layer.full(index);
+                });
+            }
+        });
+
+
+        table.on('tool(file)', function (obj) {
+            var data = obj.data;
+            var id = data.id
+            name = data.disk_filename
+            folder = gon.folder
+            if (obj.event === 'preview') {
+                if (data.content_type.split("/")[0] === "image"){
+                    layer.photos({
+                        photos: { "data": [{"src": '/files/educode_sales/' + name}] }
+                        ,anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机
+                    });
+                }else if (data.content_type.split("/")[1] === "pdf"){
+                    var pdf = '/files/educode_sales/' + name;
+                    var openWH = miniPage.getOpenWidthHeight();
+                    layer.open({
+                        title: data.name,
+                        type: 2,
+                        area: ['1000px', '750px'],
+                        fixed: false, //不固定
+                        maxmin: true,
+                        content: pdf
+                    });
+                }else{
+                    layer.msg("附件不支持预览，请下载查看！")
+                }
+                return false;
+            }else if (obj.event === 'delete') {
+                layer.confirm('确定删除' + data.name, function (index) {
+                    request.delete('missions/upload_files/' + data.id + '?disk_filename=' + data.disk_filename, {}, function (res) {
+                        layer.close(index);
+                        table.reload("file")
+                    })
+                });
+            }
+        });
+
+    });
+</script>

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

@@ -0,0 +1,13 @@
+json.data do
+  json.array! @files do |d|
+    json.id d.id
+    json.name d.filename
+    json.size d.filesize < 1000000 ? (d.filesize.to_f / 1000).round(2).to_s + 'KB' : (d.filesize.to_f / 1000000).round(2).to_s + 'MB'
+    json.created_on d.created_on.to_s
+    json.upload_person d.author.real_name
+    json.disk_filename d.disk_filename
+    json.content_type d.content_type
+  end
+end
+json.code 0
+json.count @files.total_count

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

@@ -0,0 +1,14 @@
+json.data do
+  json.array! @data do |d|
+    json.(d, *d.attributes.keys)
+    json.name d.idea&.business&.name || d.idea&.name
+    json.school_name d.idea&.business&.department&.school&.name
+    json.created_at d.created_at.strftime("%Y-%m-%d %H:%M:%S")
+    json.staff d.staff&.user&.real_name
+    json.sale_staff d.sale_staff&.user&.real_name
+    json.idea_staff d.idea_staff&.user&.real_name
+  end
+end
+
+json.code 0
+json.count @data.total_count